sqreen 1.4.2-java → 1.4.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcc1bc6cf192ce4b177a5e638226a989e0f8e174
-  data.tar.gz: b52e7d1765d4021129bb0107a4345613872f389c
+  metadata.gz: 3be83ec63339da677df7f8d12efd3f57c5ae135b
+  data.tar.gz: 873ab18040fdb66fd7a6f4ebe75d6c465b2035e0
 SHA512:
-  metadata.gz: f9ffbbcfa1fa5c9ebeeca43963c74c724e2322de0feb38d42e39242bfd5402efe4c6043af307b55e34564f2ccec7d3847906f71e15b9987a635b2f97758d7d38
-  data.tar.gz: aeb35086030d9b6ce6cbf3d210b9388927066a237d3bdb83c080004b43b6a00b562b8d889f4499ae46336a7a889141dcc8ac259c0bfa5974c90b8db5e9db0b78
+  metadata.gz: 208b06ca1100546c07a8512d5ab22ee9630f749408aa7f450ba7ea41c7449c952f16f58ef76c3d2631183f64f353bb53fc94d52a6c871f18cfd7cbcea7b64530
+  data.tar.gz: 503bfca4f48c619745153cbfa9049cdc0fbb234a320dfdab74a7a0672604b50b0c36d8dd0540af1c53dc3433c6b611204b8da39c6487709c3c45825ea131ae72

data/lib/sqreen/condition_evaluator.rb

@@ -56,6 +56,34 @@ class ConditionEvaluator
     end
   end
 
+  # Predicate: Is one of values deeply present in keys of hash
+  # @params value [Array] Array of objects to find
+  # @params hash [Hash] Hash to search into
+  # @params min_value_size [Fixnum] to compare against
+  def self.hash_key_include?(values, hash, min_value_size, rem = 10)
+    return true if rem <= 0
+    if hash.is_a?(Array)
+      return hash.any? do |v|
+        ConditionEvaluator.hash_key_include?(values, v, min_value_size, rem - 1)
+      end
+    end
+
+    return false unless hash.is_a?(Hash)
+
+    hash.any? do |hkey, hval|
+      case hkey
+      when NilClass
+        false
+      else
+        if hkey.respond_to?(:empty?) && hkey.empty?
+          false
+        else
+          values.include?(hkey.to_s) || ConditionEvaluator.hash_key_include?(values, hval, min_value_size, rem - 1)
+        end
+      end
+    end
+  end
+
   # Test is a str contains what. Rencode if necessary
   def self.str_include?(str, what)
     str1 = if str.encoding != Encoding::UTF_8
@@ -128,12 +156,14 @@ class ConditionEvaluator
   GT_OPERATOR       = '%gt'.freeze
   LT_OPERATOR       = '%lt'.freeze
   HASH_INC_OPERATOR = '%hash_val_include'.freeze
+  HASH_KEY_OPERATOR = '%hash_key_include'.freeze
   INC_OPERATOR      = '%include'.freeze
   OR_OPERATOR       = '%or'.freeze
   AND_OPERATOR      = '%and'.freeze
 
   OPERATORS_ARITY = {
     HASH_INC_OPERATOR => 3,
+    HASH_KEY_OPERATOR => 3,
     EQ_OPERATOR       => 2,
     NEQ_OPERATOR      => 2,
     INC_OPERATOR      => 2,
@@ -191,6 +221,8 @@ class ConditionEvaluator
                end
              when HASH_INC_OPERATOR
                ConditionEvaluator.hash_val_include?(res[0], res[1], res[2])
+             when HASH_KEY_OPERATOR
+               ConditionEvaluator.hash_key_include?(res[0], res[1], res[2])
              else
                # FIXME: this should be check in compile
                raise(Sqreen::Exception, "unknown op #{op})")

data/lib/sqreen/frameworks/generic.rb

@@ -167,7 +167,7 @@ module Sqreen
         @wait << block
       end
 
-      # Does the parameters include this value
+      # Does the parameters value include this value
       def params_include?(value)
         params = request_params
         return false if params.nil?
@@ -177,6 +177,16 @@ module Sqreen
         false
       end
 
+      # Does the parameters key/value include this value
+      def full_params_include?(value)
+        params = request_params
+        return false if params.nil?
+        each_key_value_for_hash(params) do |param|
+          return true if param == value
+        end
+        false
+      end
+
       # Fetch and store the current request object
       # Nota: cleanup should be performed at end of request (see clean_request)
       def store_request(object)
@@ -313,6 +323,18 @@ module Sqreen
         end
       end
 
+      def each_key_value_for_hash(params, &block)
+        case params
+        when Hash then params.each do |k, v|
+          yield k
+          each_key_value_for_hash(v, &block)
+        end
+        when Array then params.each { |v| each_key_value_for_hash(v, &block) }
+        else
+          yield params
+        end
+      end
+
       def ensure_rack_loaded
         @cannot_load_rack ||= false
         return false if @cannot_load_rack

data/lib/sqreen/rules_callbacks/count_http_codes.rb

@@ -1,6 +1,7 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.io/terms.html
 
+require 'sqreen/rule_attributes'
 require 'sqreen/rule_callback'
 
 module Sqreen
@@ -14,5 +15,25 @@ module Sqreen
         advise_action(nil)
       end
     end
+
+    # Count 1 for each things located by the binding accessor
+    class BindingAccessorCounter < RuleCB
+      def initialize(klass, method, rule_hash)
+        super(klass, method, rule_hash)
+        @accessors = @data['values'].map do |expr|
+          BindingAccessor.new(expr, true)
+        end
+        @metric_category = rule_hash[Attrs::METRICS].first['name']
+      end
+
+      def post(rv, inst, *args, &_block)
+        return unless rv.is_a?(Array) && !rv.empty?
+        key = @accessors.map do |accessor|
+          accessor.resolve(binding, framework, inst, args, @data, rv)
+        end
+        record_observation(@metric_category, JSON.dump(key), 1)
+        advise_action(nil)
+      end
+    end
   end
 end

data/lib/sqreen/rules_callbacks/reflected_xss.rb

@@ -10,8 +10,24 @@ require 'sqreen/rules_callbacks/regexp_rule'
 module Sqreen
   # Sqreen rules
   module Rules
+    # XSSCB abstract common behaviour of tpls
+    class XSSCB < RegexpRuleCB
+      # 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)
+        found = match_regexp(value)
+
+        return unless found
+        infos = {
+          :found => found,
+          :payload => value,
+        }
+        record_event(infos)
+      end
+    end
     # look for reflected XSS with erb template engine
-    class ReflectedXSSCB < RegexpRuleCB
+    class ReflectedXSSCB < XSSCB
       def pre(_inst, *args, &_block)
         value = args[0]
 
@@ -38,33 +54,20 @@ module Sqreen
         advise_action(nil)
       end
 
-      # 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)
-        found = match_regexp(value)
-
-        return unless found
-        infos = {
-          :found => found,
-          :payload => value,
-        }
-        record_event(infos)
-      end
     end
     # look for reflected XSS with haml template engine
     # hook function arguments of
     # Haml::Buffer.format_script(result, preserve_script, in_tag, preserve_tag,
     #                            escape_html, nuke_inner_whitespace,
     #                            interpolated, ugly)
-    class ReflectedXSSHamlCB < ReflectedXSSCB
+    class ReflectedXSSHamlCB < XSSCB
       def post(ret, _inst, *_args, &_block)
         value = ret
         return if value.nil?
 
         # Sqreen::log.debug value
 
-        return unless framework.params_include?(value)
+        return unless framework.full_params_include?(value)
 
         Sqreen.log.debug { format('Found unescaped user param: %s', value) }
 
@@ -103,10 +106,117 @@ module Sqreen
         nil
       end
     end
+
+    class Haml4UtilInterpolationHookCB < RuleCB
+      def pre(_inst, *args, &_block)
+        str = args[0]
+        escape_html = args[1]
+        # Original code from HAML tuned up to insert escape_haml call
+        res = ''
+        rest = Haml::Util.handle_interpolation str.dump do |scan|
+          escapes = (scan[2].size - 1) / 2
+          res << scan.matched[0...-3 - escapes]
+          if escapes.odd?
+            res << '#{'
+          else
+            content = eval('"' + Haml::Util.balance(scan, '{', '}', 1)[0][0...-1] + '"')
+            content = "Haml::Helpers.html_escape((#{content}))" if escape_html
+            res << '#{Sqreen.escape_haml(' + content + ')}' # Use eval to get rid of string escapes
+          end
+        end
+        { :status => :skip, :new_return_value => res + rest }
+      end
+    end
+
+    # Hook build attributes
+    class Haml4CompilerBuildAttributeCB < XSSCB
+      def pre(inst, *args, &_block)
+        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)
+            Sqreen.log.debug { format('Found unescaped user param: %s', key) }
+            report_dangerous_xss(key)
+            [CGI.escape_html(key), true]
+          else
+            [key, false]
+          end
+        end
+
+        return if !found_xss || !block
+        # potential XSS! let's escape
+        if !framework || !find_whitelisted_path(framework.request_path.to_s)
+          args[-1] = new_attrs
+          r = inst.send(method, *args)
+          return { :status => :skip, :new_return_value => r }
+        end
+      end
+
+      def self.clean_hash_key(hash, limit = 10, seen = [], &block)
+        seen << hash.object_id
+        has_xss = false
+        new_h = {}
+        return if limit <= 0
+        hash.each do |k, v|
+          if seen.include?(v.object_id)
+            new_h[k] = nil
+            next
+          end
+          seen << v.object_id
+          new_key, found_xss = yield k
+          has_xss |= found_xss
+          if v.is_a?(Hash)
+            new_h[new_key], found_xss = Haml4CompilerBuildAttributeCB.clean_hash_key(v, limit - 1, seen, &block)
+            has_xss |= found_xss
+          else
+            new_h[new_key] = v
+          end
+        end
+        [new_h, has_xss]
+      end
+    end
+
+    # Hook into temple template rendering
+    class TempleEscapableHookCB < RuleCB
+      def post(ret, _inst, *_args, &_block)
+        ret[1] = "Sqreen.escape_temple(#{ret[1]})"
+        { :status => :override, :new_return_value => ret }
+      end
+    end
+
+    # Hook into temple template rendering
+    class SlimSplatBuilderCB < XSSCB
+      def pre(inst, *args, &_block)
+        value = args[0]
+        return if value.nil?
+
+        return unless framework.full_params_include?(value)
+
+        Sqreen.log.debug { format('Found unescaped user param: %s', value) }
+
+        return unless value.is_a?(String)
+
+        report_dangerous_xss(value)
+
+        return unless block
+        # potential XSS! let's escape
+        if block &&
+           (!framework || !find_whitelisted_path(framework.request_path.to_s))
+          args[0] = CGI.escape_html(value)
+          r = inst.send(method, *args)
+          return { :status => :skip, :new_return_value => r }
+        end
+        nil
+      end
+    end
   end
 
   # Escape HAML when instrumented to do it
   def self.escape_haml(x)
     x
   end
+
+  # Escape Temple when instrumented to do it
+  def self.escape_temple(x)
+    x
+  end
 end

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.4.2'.freeze
+  VERSION = '1.4.3'.freeze
 end

metadata

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