sqreen 1.19.1-java → 1.19.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45c1eba91e744d72930e245aecd85bb63289a7dcdec9da50ade62f89ea747672
-  data.tar.gz: 4b524d0c1a186e657fee98761faebf7934bb12596aad9e91e398b910732a92fc
+  metadata.gz: a53d1102a76d7218c37306492482b71b5639ee519d085c3fd6aa219bbc3d1b93
+  data.tar.gz: cd477f8dbb86292c8c7bfec97b8a658927ded45f594f718250eb6848ba81d731
 SHA512:
-  metadata.gz: c065d7d1acd87bdbefff597b5b37624ec6c34d7067f87b63c3cf5d6ce5e0e3bc6a61ed714c9a6885eef9b4637915b401675361a292c85b42627e2e0fc8b1bbf8
-  data.tar.gz: 9f78ce57412a1745739353c82b341dcb9081fd7bb3f345f13b452ea03e2a0e1a85186afef4ec42a431543a610ad08a67dcb7b62ef8819a3b2248d862f6e49984
+  metadata.gz: b306a201d11156c4e9213a7f0ffa218597c1e59e520b6575476d7e151813364f782f659e7955844023eb3e880d5024058f0ea7eb509b239a93eedda856c3901d
+  data.tar.gz: e3c458d1d3625d9d78ff1e1599a1d47297629633537319360da003c61c9d44e4b7832ed828b5adcd15be619b3518eafe061b0fdfa62fc14103f73c49317fc452

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.19.2
+
+* Handle unexpected rule callback return values more gracefully
+* Fix incorrect return value for 404 native callback
+
 ## 1.19.1
 
 * Fix LocalJumpError when reaching a Rack app nested in a Rails app

data/lib/sqreen/rules/not_found_cb.rb

@@ -24,6 +24,8 @@ module Sqreen
         exception   = env['action_dispatch.exception']
 
         record_from_env(ua, script_name, path_info, verb, override, host, exception)
+
+        nil
       end
 
       def record_from_env(ua, script_name, path_info, verb, override, host, exception)

data/lib/sqreen/version.rb

@@ -4,5 +4,5 @@
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 module Sqreen
-  VERSION = '1.19.1'.freeze
+  VERSION = '1.19.2'.freeze
 end

data/lib/sqreen/weave/legacy/instrumentation.rb

@@ -296,7 +296,7 @@ class Sqreen::Weave::Legacy::Instrumentation
           when :raise, 'raise'
             throw(b, b.raise(ret[:exception])) if ret.key?(:exception)
             throw(b, b.raise(Sqreen::AttackBlocked.new("Sqreen blocked a security threat (type: #{callback.rule_name}). No action is required.")))
-          end unless ret.nil?
+          end unless ret.nil? || !ret.is_a?(Hash)
         end
       end
 
@@ -328,7 +328,7 @@ class Sqreen::Weave::Legacy::Instrumentation
           when :raise, 'raise'
             throw(b, b.raise(ret[:exception])) if ret.key?(:exception)
             throw(b, b.raise(Sqreen::AttackBlocked.new("Sqreen blocked a security threat (type: #{callback.rule_name}). No action is required.")))
-          end unless ret.nil?
+          end unless ret.nil? || !ret.is_a?(Hash)
         end
       end
 
@@ -354,7 +354,7 @@ class Sqreen::Weave::Legacy::Instrumentation
           end
           Sqreen::Weave.logger.debug { "#{rule} klass=#{callback.klass} method=#{callback.method} when=#failing instance=#{i} => return=#{ret.inspect}" }
 
-          raise e if ret.nil?
+          throw(b, b.raise(e)) if ret.nil? || !ret.is_a?(Hash)
 
           case ret[:status]
           when :override, 'override'
@@ -368,7 +368,7 @@ class Sqreen::Weave::Legacy::Instrumentation
             throw(b, b.raise(e))
           else
             throw(b, b.raise(e))
-          end unless ret.nil?
+          end unless ret.nil? || !ret.is_a?(Hash)
         end
       end
     end.install

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqreen
 version: !ruby/object:Gem::Version
-  version: 1.19.1
+  version: 1.19.2
 platform: java
 authors:
 - Sqreen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-01 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement