sqreen 1.6.4-java → 1.6.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16272b9166ff785fd074fa26c4f9d4d57d9a4999
-  data.tar.gz: 2a8e6688467b84113424e9888053f7ee16a8c979
+  metadata.gz: 8de3ba0a88a08bfeb9fe901f3870882405f1b6b6
+  data.tar.gz: 9e930c8b0e45edff7363942e32706137c70fca89
 SHA512:
-  metadata.gz: a81ca9d97fef431d8a3ec8d3de8755c04ab8b252ba8b88080cce05699ca9e18eb52facec8e4cbbb76c4835a17095eb24b6d7fa978bb927233bc75a263ca9a106
-  data.tar.gz: 44dfd38d40d3e6d2824c4892d110636620af9a71675f96ab06c052aaf7cc1c42c7ff326ec5ba7fd6b413b778426ceb239bfe737822516d87317de5aa2249bfaf
+  metadata.gz: dfe9a9b819bc7886f8d441cbd35849941743ed71d3c0f83e83713504f9775d1d5ab2bb7603e2c590aba022a2c2ba55476c6fd94ef6224fb354efc80ba77a32c4
+  data.tar.gz: 2cc48e1d74f06c0623d8299883ba731b42f686b23f65438588bf518716fc179948f99df05acbfbc77ec5a1930645a1bfbddbd267d2dcbac0a2bac76b460860f2

data/lib/sqreen/binding_accessor.rb

@@ -244,6 +244,7 @@ module Sqreen
           when Array
             look_into.concat(val)
           else
+            next if val.respond_to?(:seek)
             val.each { |v| look_into << v } if val.respond_to?(:each)
           end
         end
@@ -266,6 +267,7 @@ module Sqreen
           when Array
             look_into.concat(val)
           else
+            next if val.respond_to?(:seek)
             if val.respond_to?(:each)
               val.each { |v| look_into << v }
             else

data/lib/sqreen/rules_callbacks/binding_accessor_matcher.rb

@@ -55,6 +55,7 @@ module Sqreen
             val = resol_cache[accessor]
             val = [val] if val.is_a?(String)
             next unless val.respond_to?(:each)
+            next if val.respond_to?(:seek)
             val.each do |v|
               next if matcher.match(v).nil?
               infos = {

data/lib/sqreen/rules_callbacks/reflected_xss.rb

@@ -15,15 +15,16 @@ module Sqreen
       # The remaining code is only to find out if user entry was an attack,
       # and record it. Since we don't rely on it to respond to user, it would
       # be better to do it in background.
-      def report_dangerous_xss(value)
+      def report_dangerous_xss?(value)
         found = match_regexp(value)
 
-        return unless found
+        return false unless found
         infos = {
           :found => found,
           :payload => value,
         }
         record_event(infos)
+        true
       end
     end
     # look for reflected XSS with erb template engine
@@ -43,14 +44,14 @@ module Sqreen
         Sqreen.log.debug { format('Found unescaped user param: %s', value) }
 
         saved_value = value.dup
+        return unless report_dangerous_xss?(saved_value)
+
         # potential XSS! let's escape
         if block &&
            (!framework || !find_whitelisted_path(framework.request_path.to_s))
           args[0].replace(CGI.escape_html(value))
         end
 
-        report_dangerous_xss(saved_value)
-
         advise_action(nil)
       end
     end
@@ -72,7 +73,7 @@ module Sqreen
 
         return unless value.is_a?(String)
 
-        report_dangerous_xss(value)
+        return unless report_dangerous_xss?(value)
 
         return unless block
         # potential XSS! let's escape
@@ -139,9 +140,8 @@ module Sqreen
         return unless Haml::VERSION < '5'
         attrs = args[-1]
         new_attrs, found_xss = Haml4CompilerBuildAttributeCB.clean_hash_key(attrs) do |key|
-          if !key.nil? && key.is_a?(String) && framework.full_params_include?(key)
+          if !key.nil? && key.is_a?(String) && framework.full_params_include?(key) && report_dangerous_xss?(key)
             Sqreen.log.debug { format('Found unescaped user param: %s', key) }
-            report_dangerous_xss(key)
             [CGI.escape_html(key), true]
           else
             [key, false]
@@ -209,7 +209,7 @@ module Sqreen
 
         return unless value.is_a?(String)
 
-        report_dangerous_xss(value)
+        return unless report_dangerous_xss?(value)
 
         return unless block
         # potential XSS! let's escape

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.6.4'.freeze
+  VERSION = '1.6.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqreen
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.5
 platform: java
 authors:
 - Sqreen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-29 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs