sqreen 1.15.3.beta2 → 1.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22bb2bb71ea7c1ab0a557a3cd2f8018a3da8531f3adb985eb95b23ba36a06bda
-  data.tar.gz: 17a9ab6b561e96366fff1fe89aa3dc61bb3ee120a8ffcf36dad3c9f9e6cb2a9d
+  metadata.gz: 4d3aa083f1891ea59e35ad5eca5ee46a9aed99a535bb90e0b6e6a2255d8beffc
+  data.tar.gz: 7f9003dbc6f7078071757e4aac16a38f7d317ca92d0ba159374c5409e3cd0099
 SHA512:
-  metadata.gz: ef504985ed22ae98abc51cf88d08e8ce0e99c4c3c990f8e4d2233deeabd009e6aa8564e260f15705716c8115db89e282e1582d84dd93070d0c0a82246c8e8a18
-  data.tar.gz: ed7b28ca551034387bfb5373aad968d4e6432602fffa696f872b8a489f3e3186d3d5a8c239a4ed3a737079c91db1552818c254f8521f7e291be95dab37a0bf10
+  metadata.gz: 79020866e2549ea65bbbda91aa3370e83200d92ce14d00ab8e16166e0ceeba028def6125c6e2fd899678922c8290821723b3270c55c6d49e2c10d112943c2027
+  data.tar.gz: c2c65bb389fe944644161b3ed8e71bd895b594da33061ba493d5c40ae9e80e40dd934ccb7d1a5bc2d479df4cd877bff77233cc9a02846a5cf23574538fb188eb

data/lib/sqreen/configuration.rb

@@ -53,6 +53,10 @@ module Sqreen
       :default => nil },
     { :env => :SQREEN_STRIP_SENSITIVE_DATA, :name => :strip_sensitive_data,
       :default => true, :convert => :to_bool },
+    { :env => :SQREEN_STRIP_SENSITIVE_KEYS, :name => :strip_sensitive_keys,
+      :default => nil },
+    { :env => :SQREEN_STRIP_SENSITIVE_REGEX, :name => :strip_sensitive_regex,
+      :default => nil },
 
   ].freeze
 

data/lib/sqreen/events/request_record.rb

@@ -7,6 +7,11 @@ require 'sqreen/event'
 module Sqreen
   # When a request is deeemed worthy of being sent to the backend
   class RequestRecord < Sqreen::Event
+    def initialize(payload, redactor = nil)
+      @redactor = redactor
+      super(payload)
+    end
+
     def observed
       (payload && payload[:observed]) || {}
     end
@@ -56,8 +61,8 @@ module Sqreen
       res[:request][:parameters] = payload['params'] if payload['params']
       res[:request][:headers] = payload['headers'] if payload['headers']
 
-      if Sqreen.config_get(:strip_sensitive_data)
-        res[:request] = SensitiveDataRedactor.redact(res[:request])
+      if @redactor
+        res[:request] = @redactor.redact(res[:request])
       end
 
       res
@@ -105,14 +110,42 @@ module Sqreen
 
   # For redacting sensitive data and avoid having it sent to our servers
   class SensitiveDataRedactor
-    SENSITIVE_KEYS = Set.new(%w[password secret passwd authorization api_key apikey access_token]).freeze
+    DEFAULT_SENSITIVE_KEYS = Set.new(%w[password secret passwd authorization api_key apikey access_token]).freeze
+    DEFAULT_REGEX = /\A(?:\d[ -]*?){13,16}\z/
     MASK = '<Redacted by Sqreen>'.freeze
-    REGEX = /\A(?:\d[ -]*?){13,16}\z/
 
-    def self.redact(obj)
+    def self.from_config
+      keys = Sqreen.config_get(:strip_sensitive_keys)
+      if keys && keys.is_a?(String)
+        keys = keys.split(',')
+      else
+        keys = nil
+      end
+
+      regex = Sqreen.config_get(:strip_sensitive_regex)
+      if regex && regex.is_a?(String)
+        begin
+          regex = Regexp.compile(regex)
+        rescue RegexpError
+          Sqreen.log.warn("Invalid regular expression given in strip_sensitive_keys: #{regex}")
+          regex = nil
+        end
+      else
+        regex = nil
+      end
+
+      new(keys: keys, regex: regex)
+    end
+
+    def initialize(params = {})
+      @regex = params[:regex] || DEFAULT_REGEX
+      @keys = params[:keys] || DEFAULT_SENSITIVE_KEYS
+    end
+
+    def redact(obj)
       case obj
       when String
-        return MASK if obj =~ REGEX
+        return MASK if obj =~ @regex
 
       when Array
         return obj.map(&method(:redact))
@@ -121,7 +154,7 @@ module Sqreen
         return Hash[
           obj.map do |k, v|
             ck = k.is_a?(String) ? k.downcase : k
-            [k, SENSITIVE_KEYS.include?(ck) ? MASK : redact(v)]
+            [k, @keys.include?(ck) ? MASK : redact(v)]
           end
         ]
       end

data/lib/sqreen/frameworks/request_recorder.rb

@@ -56,12 +56,21 @@ module Sqreen
       end
       payload = payload_creator.payload(payload_requests)
       payload[:observed] = observed_items
-      queue.push RequestRecord.new(payload)
+      queue.push create_request_record(payload)
       clean_request_record
     end
 
     protected
 
+    def create_request_record(payload)
+      RequestRecord.new(payload, redactor)
+    end
+
+    def redactor
+      return nil unless Sqreen.config_get(:strip_sensitive_data)
+      @redactor ||= SensitiveDataRedactor.from_config
+    end
+
     def push_metrics(observations_queue, event_queue)
       observed_items[:observations].each do |obs|
         observations_queue.push obs

data/lib/sqreen/js/mini_racer_adapter.rb

@@ -82,6 +82,14 @@ module Sqreen
 
       def run_js_cb(cb_name, budget, arguments)
         @pool.with_context do |ctx|
+          if ctx.code_failed?(@code_id)
+            Sqreen.log.debug do
+              "Skipping execution of callback #{cb_name} (code md5 #{@code_id})" \
+              " due to prev failure of definition evaluation"
+            end
+            return nil
+          end
+
           ctx.add_code(@code_id, @code) unless ctx.has_code?(@code_id)
 
           begin
@@ -89,6 +97,7 @@ module Sqreen
             ctx.eval_unsafe(
               "sqreen_data['#{@code_id}']['#{cb_name}'].apply(this, #{json_args})", nil, budget)
           rescue @module::ScriptTerminatedError
+            Sqreen.log.debug "ScriptTerminatedError/#{cb_name}"
             nil
           end
         end
@@ -149,13 +158,20 @@ module Sqreen
               @code_ids.include?(code_id)
             end
 
-            def add_code(code_id, code)
-              @code_ids ||= Set.new
-              # if it fails, we don't try again
-              @code_ids << code_id
+            def code_failed?(code_id)
+              return false unless @failed_code_ids
+              @failed_code_ids.include?(code_id)
+            end
 
+            def add_code(code_id, code)
               eval_unsafe code
               transf_global_funcs code_id
+              @code_ids ||= Set.new
+              @code_ids << code_id
+            rescue
+              @failed_code_ids ||= Set.new
+              @failed_code_ids << code_id
+              raise
             end
 
             def eval_unsafe(str, filename = nil, timeoutv = nil)

data/lib/sqreen/remote_command.rb

@@ -59,6 +59,7 @@ module Sqreen
         Sqreen.log.debug { commands.inspect }
         return res_list
       end
+      commands = coalesce_reloads(commands, res_list)
       commands.each do |cmd_json|
         Sqreen.log.debug { cmd_json }
         cmd = RemoteCommand.new(cmd_json)
@@ -69,6 +70,31 @@ module Sqreen
       res_list
     end
 
+    # will need changes if we ever distinguish forced/soft reloads
+    # ('force' parameter in the command)
+    def self.coalesce_reloads(commands, res_list)
+      new_commands = []
+      saw_rules_reload = false
+      commands.reverse_each do |cmd_json|
+        name = cmd_json['name']
+        unless name == 'rules_reload'
+          new_commands.unshift cmd_json
+          next
+        end
+
+        if saw_rules_reload
+          res_list[cmd_json['uuid']] =
+            { :status => false, :reason => "redundant rules_reload ignored" }
+        else
+          saw_rules_reload = true
+          new_commands.unshift cmd_json
+          next
+        end
+      end
+
+      new_commands
+    end
+
     def to_h
       {
         :name => @name,

data/lib/sqreen/version.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
 module Sqreen
-  VERSION = '1.15.3.beta2'.freeze
+  VERSION = '1.15.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqreen
 version: !ruby/object:Gem::Version
-  version: 1.15.3.beta2
+  version: 1.15.3
 platform: ruby
 authors:
 - Sqreen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-05 00:00:00.000000000 Z
+date: 2018-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sq_mini_racer
@@ -133,9 +133,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.7