sqreen 1.10.3-java → 1.10.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c91d7e3b39f5bfa453736517993a2f82e09c517ca64d4193a854d31c590732ba
-  data.tar.gz: 9fdc5c95877b79971bd834555ef4e899ba14b9675a93dd20f812b088782b4654
+  metadata.gz: c301ecad1e0f0566670a74f1bacc71970d1b0e0e82d7063fb44f28387220e45a
+  data.tar.gz: 17ca88d0b156a29acb03356a7d88181cdfa462b371d457778e9afe2b169a68a8
 SHA512:
-  metadata.gz: aeab43c7f9cdd3aab746f49ce1b35d5b9cc1cb09da7bafef45ce9ade183e0c4c576533ae9088308de8695006eeda5aabb5114b34f96922dda4f69d610d0446be
-  data.tar.gz: 4a894580f1ed880ecf7760483709ee811a3f86ff3fd2b9c7eea5392c45737c78bccb003b37c4ad72ec68394052485c78425557677e7e6c22fbea599e53690c4e
+  metadata.gz: 7ec990100f7eccbe5c222a1861b34ba8b90205614a549dbed3bb0d47c0548b3209cae89ceb8b68ef0bd422ed01294db94b270fd2e29abe0e300082a8669b8a37
+  data.tar.gz: cc5196a0dc30538f78cfce9eac0937ebf68ebc2f83f957aacb43983a14b4ac7ecbbbc1f9bd21a69113fe48a294ba7c2ad1ef7eab16b6ec992d109a10a59d8a43

data/lib/sqreen/instrumentation.rb

@@ -176,10 +176,29 @@ module Sqreen
       end
     end
 
+    def self.guard_multi_call(instance, method, original_method, args, block)
+      @sqreen_multi_instr ||= nil
+      key = [method]
+      Instrumentation.guard_call(nil, :guard_multi_call) do
+        args.each{|e| key.push(e.object_id)}
+      end
+      if key && @sqreen_multi_instr && @sqreen_multi_instr[instance.object_id].member?(key)
+        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)
+      r = yield
+      return r
+    ensure
+      if @sqreen_multi_instr && @sqreen_multi_instr[instance.object_id] && @sqreen_multi_instr[instance.object_id].delete(key).empty?
+        @sqreen_multi_instr.delete(instance.object_id)
+      end
+    end
+
     def self.guard_call(method, retval)
       @sqreen_in_instr ||= nil
       return retval if @sqreen_in_instr && @sqreen_in_instr.member?(method)
-      @sqreen_in_instr ||= Set.new
+      @sqreen_in_instr ||= Set.new # TODO this should probably be a thread local
       @sqreen_in_instr.add(method)
       r = yield
       @sqreen_in_instr.delete(method)
@@ -197,6 +216,7 @@ module Sqreen
           end
           return send(original_meth, *args, &block)
         end
+        Instrumentation.guard_multi_call(self, meth, original_meth, args, block) do
         Sqreen.stats.callbacks_calls += 1
 
         skip = false
@@ -271,6 +291,7 @@ module Sqreen
           result
         end
       end
+      end
     end
 
     def override_class_method(klass, meth)
@@ -325,8 +346,8 @@ module Sqreen
       end
     end
 
-    def get_saved_method_name(meth)
-      "#{meth}_not_modified".to_sym
+    def get_saved_method_name(meth, suffix=nil)
+      "#{meth}_sq#{suffix}_not_modified".to_sym
     end
 
     def override_instance_method(klass_name, meth)
@@ -403,6 +424,30 @@ module Sqreen
       is_instance_method?(obj, method)
     end
 
+    # Override a singleton method on an instance
+    def override_singleton_method(instance, klass_name, meth)
+      saved_meth_name = get_saved_method_name(meth, 'singleton')
+      if instance.respond_to?(saved_meth_name, true)
+        Sqreen.log.debug { "#{saved_meth_name} found #{instance.class}##{instance.object_id} already instrumented" }
+        return nil
+      elsif instance.frozen?
+        Sqreen.log.debug { "#{instance.class}##{instance.object_id} is frozen, not reinstrumenting" }
+        return nil
+      end
+      raise Sqreen::NotImplementedYet, "#{instance.inspect} doesn't respond to define_singleton_method" unless instance.respond_to?(:define_singleton_method)
+      p = Instrumentation.define_callback_method(meth, saved_meth_name,
+                                                 klass_name)
+      instance.define_singleton_method(saved_meth_name, instance.method(meth))
+      instance.define_singleton_method(meth, p)
+      # Hide saved method (its only available in this syntax)
+      eval <<-RUBY, binding, __FILE__, __LINE__ + 1
+      class << instance
+        private :#{saved_meth_name}
+      end
+      saved_meth_name
+      RUBY
+    end
+
     def add_callback(cb)
       @@override_semaphore.synchronize do
         klass = cb.klass
@@ -427,7 +472,7 @@ module Sqreen
             #  - method_missing
             #  ...
             #
-            msg = "#{cb} is neither singleton or instance"
+            msg = "#{cb} is neither class or instance"
             raise Sqreen::NotImplementedYet, msg
           end
 
@@ -436,6 +481,18 @@ module Sqreen
           Sqreen.log.debug "#{key} was already overriden"
         end
 
+        if klass != Object && klass != Kernel && !Sqreen.features['instrument_all_instances'] && !defined?(::JRUBY_VERSION)
+          insts = 0
+          ObjectSpace.each_object(klass) do |e|
+            next if e.is_a?(Class) || e.is_a?(Module)
+            next unless e.singleton_methods.include?(method.to_sym)
+            insts += 1 if override_singleton_method(e, klass, method)
+          end
+          if insts > 0
+            Sqreen.log.debug { "Reinstrumented #{insts} instances of #{klass}" }
+          end
+        end
+
         @@registered_callbacks.add(cb)
         @@instrumented_pid = Process.pid
       end

data/lib/sqreen/rules_signature.rb

@@ -7,6 +7,16 @@ require 'set'
 require 'openssl'
 require 'base64'
 require 'json'
+if defined?(::JRUBY_VERSION)
+  OJ_LOADED = false
+else
+  begin
+    require "oj"
+    OJ_LOADED = true
+  rescue LoadError
+    OJ_LOADED = false
+  end
+end
 
 ## Rules signature
 module Sqreen
@@ -25,7 +35,7 @@ module Sqreen
 
   # Normalize and verify a rule
   class SqreenSignedVerifier
-    REQUIRED_SIGNED_KEYS = %w(hookpoint name callbacks conditions).freeze
+    REQUIRED_SIGNED_KEYS = %w[hookpoint name callbacks conditions].freeze
     SIGNATURE_KEY        = 'signature'.freeze
     SIGNATURE_VALUE_KEY  = 'value'.freeze
     SIGNED_KEYS_KEY      = 'keys'.freeze
@@ -42,12 +52,14 @@ module Sqreen
     attr_accessor :pub_key
     attr_accessor :required_signed_keys
     attr_accessor :digest
+    attr_accessor :use_oj
 
     def initialize(required_keys = REQUIRED_SIGNED_KEYS,
                    public_key    = PUBLIC_KEY,
-                   digest        = OpenSSL::Digest::SHA512.new)
+                   digest        = OpenSSL::Digest::SHA512.new, use_oj_gem = nil)
       @required_signed_keys = required_keys
       @signature_verifier   = SignatureVerifier.new(public_key, digest)
+      @use_oj = use_oj_gem.nil? ? OJ_LOADED : use_oj_gem
     end
 
     def normalize_val(val, level)
@@ -62,6 +74,7 @@ module Sqreen
         end
         "[#{ary.join(',')}]"
       when String, Integer
+        return Oj.dump(val, :mode => :compat, :escape_mode => :json) if use_oj
         begin
           JSON.dump(val)
         rescue JSON::GeneratorError
@@ -76,6 +89,7 @@ module Sqreen
     def normalize_key(key)
       case key
       when String, Integer
+        return Oj.dump(key, :mode => :compat, :escape_mode => :json) if use_oj
         begin
           JSON.dump(key)
         rescue JSON::GeneratorError

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.10.3'.freeze
+  VERSION = '1.10.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqreen
 version: !ruby/object:Gem::Version
-  version: 1.10.3
+  version: 1.10.4
 platform: java
 authors:
 - Sqreen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2018-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs