sqreen 1.18.1-java → 1.18.2-java

data/lib/sqreen/metrics/binning.rb

@@ -1,5 +1,5 @@
-# Copyright (c) 2018 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Copyright (c) 2015 Sqreen. All Rights Reserved.
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'sqreen/mono_time'
 require 'sqreen/metrics/base'

data/lib/sqreen/metrics/collect.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'sqreen/metrics/base'
 

data/lib/sqreen/metrics/sum.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'sqreen/metrics/base'
 

data/lib/sqreen/metrics_store.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'sqreen/exception'
 require 'sqreen/metrics'

data/lib/sqreen/middleware.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 module Sqreen
   class Middleware

data/lib/sqreen/mono_time.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2015 Sqreen. All Rights Reserved.
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
+
 module Sqreen
   has_mono_time = begin
     Process.clock_gettime Process::CLOCK_MONOTONIC

data/lib/sqreen/payload_creator.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'sqreen/runtime_infos'
 require 'sqreen/events/remote_exception'

data/lib/sqreen/performance_notifications.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'sqreen/mono_time'
 

data/lib/sqreen/performance_notifications/binned_metrics.rb

@@ -1,5 +1,5 @@
-# Copyright (c) 2018 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Copyright (c) 2015 Sqreen. All Rights Reserved.
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'sqreen/performance_notifications'
 

data/lib/sqreen/performance_notifications/log.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'sqreen/performance_notifications'
 

data/lib/sqreen/performance_notifications/log_performance.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'sqreen/performance_notifications'
 require 'sqreen/performance_notifications/log'

data/lib/sqreen/performance_notifications/metrics.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'sqreen/performance_notifications'
 require 'sqreen/performance_notifications/log'

data/lib/sqreen/performance_notifications/newrelic.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'sqreen/performance_notifications'
 require 'sqreen/performance_notifications/log'

data/lib/sqreen/remote_command.rb

@@ -1,5 +1,6 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
+
 require 'sqreen/log'
 require 'sqreen/events/remote_exception'
 

data/lib/sqreen/rule_attributes.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 module Sqreen
   module Rules

data/lib/sqreen/rule_callback.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'sqreen/callbacks'
 require 'sqreen/context'

data/lib/sqreen/rules.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'sqreen/log'
 require 'sqreen/rule_attributes'

data/lib/sqreen/rules_callbacks.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'sqreen/rules_callbacks/regexp_rule'
 require 'sqreen/rules_callbacks/matcher_rule'
@@ -24,6 +24,7 @@ require 'sqreen/rules_callbacks/execjs'
 require 'sqreen/rules_callbacks/binding_accessor_metrics'
 require 'sqreen/rules_callbacks/binding_accessor_matcher'
 require 'sqreen/rules_callbacks/count_http_codes'
+require 'sqreen/rules_callbacks/not_found'
 require 'sqreen/rules_callbacks/crawler_user_agent_matches_metrics'
 require 'sqreen/rules_callbacks/sdk_auth_track'
 require 'sqreen/rules_callbacks/sdk_signup_track'

data/lib/sqreen/rules_callbacks/binding_accessor_matcher.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'sqreen/rule_callback'
 require 'sqreen/binding_accessor'

data/lib/sqreen/rules_callbacks/binding_accessor_metrics.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'sqreen/rule_callback'
 require 'sqreen/binding_accessor'

data/lib/sqreen/rules_callbacks/blacklist_ips.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'sqreen/trie'
 

data/lib/sqreen/rules_callbacks/count_http_codes.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'sqreen/rule_attributes'
 require 'sqreen/rule_callback'

data/lib/sqreen/rules_callbacks/crawler_user_agent_matches.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'sqreen/rules_callbacks/matcher_rule'
 require 'sqreen/frameworks'

data/lib/sqreen/rules_callbacks/crawler_user_agent_matches_metrics.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'sqreen/rules_callbacks/matcher_rule'
 require 'sqreen/frameworks'

data/lib/sqreen/rules_callbacks/custom_error.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'sqreen/rule_callback'
 require 'sqreen/exception'

data/lib/sqreen/rules_callbacks/devise_auth_track.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2015 Sqreen. All Rights Reserved.
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
+
 require 'sqreen/rule_attributes'
 require 'sqreen/rule_callback'
 require 'sqreen/safe_json'

data/lib/sqreen/rules_callbacks/devise_signup_track.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2015 Sqreen. All Rights Reserved.
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
+
 require 'sqreen/rule_attributes'
 require 'sqreen/rule_callback'
 require 'sqreen/safe_json'

data/lib/sqreen/rules_callbacks/execjs.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 
 require 'sqreen/js/js_service'

data/lib/sqreen/rules_callbacks/headers_insert.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'sqreen/rule_callback'
 

data/lib/sqreen/rules_callbacks/inspect_rule.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'sqreen/rule_callback'
 

data/lib/sqreen/rules_callbacks/matcher_rule.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'sqreen/rule_callback'
 

data/lib/sqreen/rules_callbacks/not_found.rb

@@ -0,0 +1,74 @@
+require 'sqreen/rule_attributes'
+require 'sqreen/rule_callback'
+
+module Sqreen
+  module Rules
+    class NotFoundCB < RuleCB
+      IGNORED_EXTENSIONS = ['.css', '.gif', '.jpg', '.jpeg', '.png', '.svg', '.ico', '.webp', '.pdf', '.woff'].freeze
+
+      def post(rv, _inst, args, _budget = nil, &_block)
+        return if rv[0].to_i != 404
+
+        env         = args[0]
+        ua          = env['HTTP_USER_AGENT']
+        script_name = env['SCRIPT_NAME']
+        path_info   = env['PATH_INFO']
+        verb        = env['REQUEST_METHOD']
+        host        = env['SERVER_NAME']
+        override    = env['action_dispatch.original_path']
+        exception   = env['action_dispatch.exception']
+
+        record_from_env(ua, script_name, path_info, verb, override, host, exception)
+      end
+
+      def record_from_env(ua, script_name, path_info, verb, override, host, exception)
+        path = path_from_variables(script_name, path_info, override)
+
+        return if extension?(path, IGNORED_EXTENSIONS)
+
+        if !override && exception && !exception.to_s.empty?
+          record_from_exception({ 'ua' => ua, 'verb' => verb, 'host' => host, 'script_name' => script_name, 'path_info' => path_info }, exception.exception)
+        end
+
+        record_event({ 'path' => path, 'ua' => ua, 'verb' => verb, 'host' => host })
+      end
+
+      def record_from_exception(payload, exception)
+        message = exception.to_s
+
+        if message && !message.empty?
+          override = message =~ /No route matches\s+\[[a-z]+\]\s+"(.*)"/i && $1
+        end
+        payload['path'] = path_from_variables(payload['script_name'], payload['path_info'], override)
+        return if extension?(payload['path'], IGNORED_EXTENSIONS)
+
+        record = payload.reject { |k, v| v.nil? || ['path_info', 'script_name'].include?(k) }
+        payload.delete('path') # remove added claim
+
+        record_event(record)
+      end
+
+      def path_from_variables(script_name, path_info, override)
+        path = script_name
+
+        if path.nil?
+          path = override || path_info
+        elsif override
+          path += override
+        elsif path_info
+          path += path_info
+        end
+
+        path
+      end
+
+      def extension?(path, extensions)
+        return false if path.nil?
+
+        candidate = File.extname(path).downcase
+
+        extensions.include?(candidate)
+      end
+    end
+  end
+end

data/lib/sqreen/rules_callbacks/rails_parameters.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'sqreen/rule_callback'
 

data/lib/sqreen/rules_callbacks/record_request_context.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'sqreen/rule_callback'
 

data/lib/sqreen/rules_callbacks/reflected_xss.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'cgi'
 

data/lib/sqreen/rules_callbacks/regexp_rule.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'sqreen/rule_callback'
 

data/lib/sqreen/rules_callbacks/run_req_start_actions.rb

@@ -1,5 +1,5 @@
-# Copyright (c) 2018 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Copyright (c) 2015 Sqreen. All Rights Reserved.
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'sqreen/rule_callback'
 require 'sqreen/actions'

data/lib/sqreen/rules_callbacks/run_user_actions.rb

@@ -1,5 +1,5 @@
-# Copyright (c) 2018 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Copyright (c) 2015 Sqreen. All Rights Reserved.
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'sqreen/rule_callback'
 require 'sqreen/actions'

data/lib/sqreen/rules_callbacks/sdk_auth_track.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2015 Sqreen. All Rights Reserved.
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
+
 require 'sqreen/rule_attributes'
 require 'sqreen/rule_callback'
 require 'sqreen/safe_json'

data/lib/sqreen/rules_callbacks/sdk_signup_track.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2015 Sqreen. All Rights Reserved.
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
+
 require 'sqreen/rule_attributes'
 require 'sqreen/rule_callback'
 require 'sqreen/safe_json'

data/lib/sqreen/rules_callbacks/shell_env.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'sqreen/rules_callbacks/regexp_rule'
 

data/lib/sqreen/rules_callbacks/url_matches.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'sqreen/rules_callbacks/regexp_rule'
 

data/lib/sqreen/rules_callbacks/user_agent_matches.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
-# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 require 'sqreen/rules_callbacks/regexp_rule'
 

data/lib/sqreen/rules_callbacks/waf.rb

@@ -1,8 +1,12 @@
+# Copyright (c) 2015 Sqreen. All Rights Reserved.
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
+
 require 'securerandom'
 require 'sqreen/rule_attributes'
 require 'sqreen/binding_accessor'
 require 'sqreen/rule_callback'
 require 'sqreen/safe_json'
+require 'sqreen/exception'
 
 module Sqreen
   module Rules
@@ -81,9 +85,17 @@ module Sqreen
           advise_action(:raise)
         when :good
           advise_action(nil)
-        when :timeout, :invalid_call, :invalid_rule, :invalid_flow, :no_rule
-          Sqreen.log.warn("error from waf: #{action}")
+        when :timeout
+          Sqreen.log.debug("WAF over time budget: #{action}")
+          advise_action(nil)
+        when :invalid_call
+          Sqreen.log.debug("Error from waf: #{action}")
+          advise_action(nil)
+          raise Sqreen::WAFError.new(waf_rule_name, action, data, waf_args)
+        when :invalid_rule, :invalid_flow, :no_rule
+          Sqreen.log.debug("error from waf: #{action}")
           advise_action(nil)
+          raise Sqreen::WAFError.new(waf_rule_name, action, data)
         else
           Sqreen.log.warn("unexpected action returned from waf")
           advise_action(nil)
@@ -98,6 +110,35 @@ module Sqreen
           Sqreen.log.debug("WAF rule #{rule_name} deleted, from #<#{name}:0x#{object_id.to_s(16).rjust(16, '0')}>")
         end
       end
+
+      def record_exception(exception, infos = {}, at = Time.now.utc)
+        infos.merge!(exception_to_infos(exception))
+        super(exception, infos, at)
+      end
+
+      private
+
+      def exception_to_infos(e)
+        {
+          waf_rule: e.rule_name,
+          error_code: ERROR_CODES[e.error],
+        }.tap do |r|
+          r[:error_data] = e.data if e.data
+          r[:args] = e.args if e.args
+        end
+      end
+
+      ERROR_CODES = {
+        internal_error: -6,
+        timeout:        -5,
+        invalid_call:   -4,
+        invalud_rule:   -3,
+        invalid_flow:   -2,
+        no_rule:        -1,
+        good:            0,
+        monitor:         1,
+        block:           2,
+      }.freeze
     end
   end
 end