sqreen 1.18.3-java → 1.18.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5177255c97d442d2af7974527feed94c317d277b602938b242f7c21f4a4cc35
-  data.tar.gz: c14efef9d6a6c2c89549e0cb4d56e9be5a47f4e80a5369f6488014da06d21822
+  metadata.gz: 43b9ddb790f25ff47df2953ec789110bc2273fa02fe632b76c36066da880ad9a
+  data.tar.gz: 05544de42de06ad978ea9dfe330b330a090eff0ae8661bdfa8509251cf57d9ce
 SHA512:
-  metadata.gz: 713c71161a1b89545404f23a779e49a15428ffb32403677ae668648c1c03639ed434e422e00ac01213a6415b5355f04049c4b16975d9ed0ba1bbdbf666a014b1
-  data.tar.gz: d9b60a660bfca8b12c3abd4711c9364cd1ac11660fc1df5bfb079a4cfeecb28ea529de49f29da3dcd8f465b9284b280da3ba1d793dface374859a9c4f8a92a79
+  metadata.gz: e3ba0e41808617dddbfc03d2f8807fa8039ad1ad40ac6a8b815082986ac8ef39aae795e1867faa685625c5a048f36a44beb4e29092528f7cb28aa087bd3a8034
+  data.tar.gz: b7f7b42ea91a2a9ece4e660485dac8aa65c4dfa635241f9e685b3ff855d21f68c091260814a9c7a14f3ecd9c6fe92f03824f084c718e8cb27691569537e5c011

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.18.4
+
+* Fix instrumentation conflict when a class defines a send method
+* Fix compatibility with Sorbet type checker
+* Improve WAF time budget handling
+
 ## 1.18.3
 
 * Improve PII protection

data/lib/sqreen.rb

@@ -1,3 +1,5 @@
+# typed: ignore
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 

data/lib/sqreen/instrumentation.rb

@@ -237,7 +237,7 @@ module Sqreen
       key = [method]
       args.each { |e| key.push(e.object_id) }
       if key && @sqreen_multi_instr && @sqreen_multi_instr[instance.object_id].member?(key)
-        return instance.send(original_method, *args, &block)
+        return instance.__send__(original_method, *args, &block)
       end
       @sqreen_multi_instr ||= Hash.new { |h, k| h[k] = Set.new } # TODO: this should probably be a thread local
       @sqreen_multi_instr[instance.object_id].add(key)
@@ -273,7 +273,7 @@ module Sqreen
           skip_call = true
         end
         # If we are already overbudget let's not work at all
-        return send(original_meth, *args, &block) if skip_call
+        return __send__(original_meth, *args, &block) if skip_call
         Instrumentation.guard_multi_call(self, meth, original_meth, args, block) do
           precbs, postcbs, failcbs = Instrumentation.callbacks.get(klass_name, meth)
           Thread.current[:sqreen_in_use] = true
@@ -328,7 +328,7 @@ module Sqreen
           Thread.current[:sqreen_in_use] = false
           return result if skip
           begin
-            result = send(original_meth, *args, &block)
+            result = __send__(original_meth, *args, &block)
           rescue StandardError => e
             Thread.current[:sqreen_in_use] = true
             budget = Sqreen.performance_budget && framework && framework.remaining_perf_budget
@@ -401,7 +401,7 @@ module Sqreen
         Sqreen::PerformanceNotifications::BinnedMetrics.start_request if has_notifications
 
         begin
-          send(original_meth, *args, &block)
+          __send__(original_meth, *args, &block)
         ensure
           if has_notifications
             Sqreen::PerformanceNotifications.instrument('next_req_notifs', PRE_CB) do
@@ -437,7 +437,7 @@ module Sqreen
         end
 
         alias_method original, new_method
-        send(method_kind, original)
+        __send__(method_kind, original)
         private saved_meth_name
       end
     end
@@ -456,7 +456,7 @@ module Sqreen
           method_kind = :private
         end
         alias_method meth, saved_meth_name
-        send(method_kind, meth)
+        __send__(method_kind, meth)
 
         remove_method saved_meth_name
       end
@@ -503,7 +503,7 @@ module Sqreen
         alias_method meth, new_method
         private saved_meth_name
         private new_method
-        send(method_kind, meth)
+        __send__(method_kind, meth)
       end
       saved_meth_name
     end
@@ -522,7 +522,7 @@ module Sqreen
           method_kind = :private
         end
         alias_method meth.to_sym, saved_meth_name.to_sym
-        send(method_kind, meth.to_sym)
+        __send__(method_kind, meth.to_sym)
       end
     end
 

data/lib/sqreen/rules/waf_cb.rb

@@ -57,7 +57,7 @@ module Sqreen
         ObjectSpace.define_finalizer(self, WAFCB.finalizer(@waf_rule_name.dup))
       end
 
-      def pre(instance, args, _budget)
+      def pre(instance, args, budget)
         return unless WAFCB.libsqreen? && WAFCB.waf?
 
         request = framework.request
@@ -70,6 +70,7 @@ module Sqreen
           h[e] = capper.call(b.resolve(*env))
         end
         waf_args = Sqreen::EncodingSanitizer.sanitize(waf_args)
+        budget = [self.budget, budget].compact.min
         action, data = ::LibSqreen::WAF.run(waf_rule_name, waf_args, budget)
 
         case action

data/lib/sqreen/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqreen
 version: !ruby/object:Gem::Version
-  version: 1.18.3
+  version: 1.18.4
 platform: java
 authors:
 - Sqreen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-19 00:00:00.000000000 Z
+date: 2020-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement