sqreen 1.7.1-java → 1.7.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 050e9e1dd1e941ee11ff26906ce3042b3f1c074a
-  data.tar.gz: f2bfd3b7e4e3d1c84cd0c372e974830e46d5a16e
+  metadata.gz: 8223ebd05a7bc08f9b17998ec2f44cddb5e1e958
+  data.tar.gz: e203f67c6f078dd1003a1e47a351e0f41df83987
 SHA512:
-  metadata.gz: 7e601c8a9a906e6a33405216b1440ec7d4a8e08b7865b73870687b48d1dea8d4355a814e8b83b587743dd6083f71436089a572e821248205edfbf251775796a1
-  data.tar.gz: 248697508a0d1b63be0d20686841df7cd25aad411096c03be9c90d2bf098494daad349636e0d1fe69cbc9565a35452a2c601296c73131f94989fca9a7d50d34f
+  metadata.gz: a5e7309f49b33393de0480239146c6f89265dfae21fadcfc2183964f388f6a00e1259fe30269c716733846b6349b12555bf7e0f9c8112b0c28ad2db4fa363b88
+  data.tar.gz: 71e8adf17dbe6cbcfea8467160f3b5560ab0ff71429ab33bf1fa84db366bc0c7e9b56cae2e118144db5829b2a77b8ece1e6359f304bfa5cad657be84d4e7f259

data/lib/sqreen/instrumentation.rb

@@ -61,6 +61,8 @@ module Sqreen
 
         returns = []
         callbacks.each do |cb|
+          # If record_request is part of callbacks we should filter after it ran
+          next if cb.whitelisted?
           rule = cb.rule_name if cb.respond_to?(:rule_name)
           Sqreen.log.debug { "running pre cb #{cb}" }
           Sqreen::PerformanceNotifications.instrument("Callbacks/#{rule || cb.class.name}/pre") do

data/lib/sqreen/rules_callbacks/binding_accessor_matcher.rb

@@ -57,6 +57,7 @@ module Sqreen
             next unless val.respond_to?(:each)
             next if val.respond_to?(:seek)
             val.each do |v|
+              next if !v.is_a?(String) || (!matcher.min_size.nil? && v.size < matcher.min_size)
               next if matcher.match(v).nil?
               infos = {
                 'id' => id,

data/lib/sqreen/rules_callbacks/matcher_rule.rb

@@ -7,6 +7,7 @@ module Sqreen
   module Rules
     # matcher behavior
     module Matcher
+      attr_reader :min_size
       def self.prepare_re_pattern(value, options, case_sensitive)
         res = 0
         res |= Regexp::MULTILINE  if options.include?('multiline')
@@ -33,6 +34,7 @@ module Sqreen
           'equals'.freeze    => lambda { |value, str| str == value           },
         }
 
+        sizes = []
         patterns.each do |entry|
           next unless entry
           type = entry['type']
@@ -56,25 +58,28 @@ module Sqreen
             end
             @string[opt] = { :ci => [], :cs => [] } unless @string.key?(opt)
             @string[opt][case_type] << val
-
+            sizes << entry.fetch('min_length') { val.size }
           when 'regexp'
             pattern = Matcher.prepare_re_pattern(val, opt, case_sensitive)
             next unless pattern
             @regexp_patterns << pattern
+            sizes << entry['min_length']
           else
             raise Sqreen::Exception, "No such matcher type #{type}"
           end
         end
 
+        @min_size = sizes.min unless sizes.any?(&:nil?)
+
         return unless [@regexp_patterns, @string].map(&:empty?).all?
         msg = "no key 'regexp' nor 'match' in data (had #{@data.keys})"
         raise Sqreen::Exception, msg
       end
 
       def match(str)
-        return if str.nil? || str.empty?
-        str = enforce_encoding(str)
-        istr = str.downcase
+        return if str.nil? || str.empty? || !str.is_a?(String)
+        str = enforce_encoding(str) unless str.ascii_only?
+        istr = str.downcase unless @string.empty?
 
         @string.each do |type, cases|
           fun = @funs[type]
@@ -100,7 +105,6 @@ module Sqreen
           end
         else
           @regexp_patterns.each do |p|
-            warn(Encoding.compatible?(p, str).inspect)
             return p if p.match(str)
           end
         end
@@ -110,8 +114,6 @@ module Sqreen
       private
 
       def enforce_encoding(str)
-        return str unless str.is_a?(String)
-        return str if str.ascii_only?
         encoded8bit = str.encoding.name == 'ASCII-8BIT'
         return str if !encoded8bit && str.valid_encoding?
         str.chars.map do |v|

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.7.1'.freeze
+  VERSION = '1.7.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqreen
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: java
 authors:
 - Sqreen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-07-10 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs