sqreen 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 465f1e96c5f05d74be7a753b77454dec4738ead7
-  data.tar.gz: 730be003ff5f5d80110ad07eb49714cafdebc16d
+  metadata.gz: da14a9fd26a579f3a1dd61274ee693807de66cb5
+  data.tar.gz: 59e9c7f4cdaba120edf901b9e9c1263cc5cf48d4
 SHA512:
-  metadata.gz: 06c92cd9d9cb2e151206246ad2120ce4e0eae545f17613ee90d6df04853415c532311a706684d68ae05e21b738be3c8870c7d5d9cd8ed34fa026d6ad13735489
-  data.tar.gz: d8c9577156bfa2a232927a35df86d61737b41bb51d38161e6744b33a16e4c71a2a8cf8aa7f5e5b38774aee519c52eac130a06d753016322b0fcaa23fbce0541e
+  metadata.gz: 7ac81e8adb933f2b70faf218922aa75aa6d69ad83e6f39a6dec227af458b2b24df9708150c5f05e8334a75515be16faea459d4f60bd8cb6038f7130f6345a561
+  data.tar.gz: 504a06d8e356a3f90c530b5c5027048fb6c3f0356d7511f89341c3b3e0d451ad06d14ac19f5142defe7f0c1423a81f262334bb291dc49e06ab02cf62c70d2e09

data/lib/sqreen/rules_callbacks/reflected_xss.rb

@@ -53,7 +53,6 @@ module Sqreen
 
         advise_action(nil)
       end
-
     end
     # look for reflected XSS with haml template engine
     # hook function arguments of
@@ -85,10 +84,12 @@ module Sqreen
     class Haml4ParserScriptHookCB < RuleCB
       def pre(_inst, *args, &_block)
         return unless args.size > 1
-        return unless Haml::VERSION < "5"
+        return unless Haml::VERSION < '5'
         text = args[0]
         escape_html = args[1]
-        if escape_html == false && !text.include?('html_escape')
+        if escape_html == false &&
+           text.respond_to?(:include?) &&
+           !text.include?('html_escape')
           args[0].replace("Sqreen.escape_haml(#{args[0]})")
         end
         nil
@@ -98,9 +99,10 @@ module Sqreen
     # Hook into haml4 tag parser
     class Haml4ParserTagHookCB < RuleCB
       def post(ret, _inst, *_args, &_block)
-        return unless Haml::VERSION < "5"
+        return unless Haml::VERSION < '5'
         tag = ret
         if tag.value[:escape_html] == false &&
+           tag.value[:value].respond_to?(:include?) &&
            !tag.value[:value].include?('html_escape')
           tag.value[:value] = "Sqreen.escape_haml(#{tag.value[:value]})"
           return { :status => :override, :new_return_value => tag }
@@ -134,7 +136,7 @@ module Sqreen
     # Hook build attributes
     class Haml4CompilerBuildAttributeCB < XSSCB
       def pre(inst, *args, &_block)
-        return unless Haml::VERSION < "5"
+        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)
@@ -148,11 +150,12 @@ module Sqreen
 
         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 }
+        if framework && find_whitelisted_path(framework.request_path.to_s)
+          return nil
         end
+        args[-1] = new_attrs
+        r = inst.send(method, *args)
+        { :status => :skip, :new_return_value => r }
       end
 
       def self.clean_hash_key(hash, limit = 10, seen = [], &block)
@@ -186,7 +189,6 @@ module Sqreen
       end
     end
 
-
     # Hook into temple template rendering
     class TempleEscapableHookCB < RuleCB
       def post(ret, _inst, *_args, &_block)
@@ -195,7 +197,6 @@ module Sqreen
       end
     end
 
-
     # Hook into temple template rendering
     class SlimSplatBuilderCB < XSSCB
       def pre(inst, *args, &_block)

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.3'.freeze
+  VERSION = '1.6.4'.freeze
 end

metadata

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