sqreen 1.9.2-java → 1.10.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ad04bee0a61218373cab51d02d3690ddd5f19021
-  data.tar.gz: f4921ac550a7801022795f66f959a2e5e1ebd8e4
+SHA256:
+  metadata.gz: 9ddf2c0f35a8ee5a30253430edb9a7ba8316870018c306273c5beb2a7d802777
+  data.tar.gz: b1b64ccd659f142389934d2a2ec6e30bedffd95f83f2f96a30333979cc8cd80d
 SHA512:
-  metadata.gz: 4ed1ca9938ab9bcb1b6277641ac1470270f3c9bd350a32e5f58eb9ca9bf7fb42c1a6951fd7cc1f5d97ea40a6cd79aa76e970f1b166823bc15610b9eafb940de7
-  data.tar.gz: aacc4964978719bf65037639a063a9c8a5d00eaad956fb81c1f9f579e997f38b5fb7f064a1bbd460a9748471ec0db62be5d350c45d34c355ffd7480639f0b3cd
+  metadata.gz: 74bc35df0b7114e50d4c618787553e916130ee69870c35ace9b881ffefa360866f075071c802952d18483696ec6fab20c3830cfd65a45365eb51e9f15ee66250
+  data.tar.gz: 5d2842f3376b7b9951cb366a763c4b3ab5a5854b100b7db477d9c137d5f8552c76da47b1395d1c10e07bb5be1b409fec1b6bff4ea90033fa1b559befe7d10728

data/lib/sqreen-alt.rb

@@ -0,0 +1 @@
+require "sqreen"

data/lib/sqreen/rules_callbacks/execjs.rb

@@ -3,8 +3,15 @@
 
 if defined?(::JRUBY_VERSION)
   require 'rhino'
+  SQREEN_V8_THREAD = false
 else
-  require 'therubyracer'
+  begin
+    require 'mini_racer'
+    SQREEN_V8_THREAD = true
+  rescue LoadError
+    require 'therubyracer'
+    SQREEN_V8_THREAD = false
+  end
 end
 
 require 'execjs'
@@ -32,7 +39,9 @@ module Sqreen
         end
 
         build_runnable(callbacks)
-        @compiled = ExecJS.compile(@source)
+        if !SQREEN_V8_THREAD
+          @compiled = ExecJS.compile(@source)
+        end
         @restrict_max_depth = 20
       end
 
@@ -122,7 +131,10 @@ module Sqreen
                                    end)] = ret[k] end
           record_event(ret[:record]) unless ret[:record].nil?
           unless ret['observations'].nil?
-            ret['observations'].each { |obs| record_observation(*obs) }
+            ret['observations'].each do |obs|
+              obs[3] = Time.parse(obs[3]) if obs.size >= 3 && obs[3].is_a?(String)
+              record_observation(*obs)
+            end
           end
           return !ret[:call].nil?
         else
@@ -131,6 +143,9 @@ module Sqreen
       end
 
       def call_callback(name, inst, args, rv = nil)
+        if SQREEN_V8_THREAD
+          Thread.current["SQREEN_EXECJS_SOURCE#{self.object_id}"] ||= ExecJS.compile(@source)
+        end
         ret = nil
         args_override = nil
         arguments = nil
@@ -140,7 +155,11 @@ module Sqreen
           end
           arguments = restrict(name, arguments) if @conditions.key?(name)
           Sqreen.log.debug { [name, arguments].inspect }
-          ret = @compiled.call(name, *arguments)
+          if SQREEN_V8_THREAD
+            ret = Thread.current["SQREEN_EXECJS_SOURCE#{self.object_id}"].call(name, *arguments)
+          else
+            ret = @compiled.call(name, *arguments)
+          end
           unless record_and_continue?(ret)
             return nil if ret.nil?
             return advise_action(ret[:status], ret)

data/lib/sqreen/shared_storage.rb

@@ -3,22 +3,21 @@
 
 module Sqreen
   module SharedStorage
-    @@shared = {}
 
     def self::get(key, default = nil)
-      h = @@shared[Thread.current]
+      h = Thread.current["SQREEN_SHARED_STORAGE_#{self.object_id}"]
       return h.fetch(key, default) if h
       default
     end
 
     def self::set(key, obj)
-      main_key = Thread.current
-      @@shared[main_key] = {} unless @@shared.key? main_key
-      @@shared[main_key][key] = obj
+      Thread.current["SQREEN_SHARED_STORAGE_#{self.object_id}"] ||= {}
+      Thread.current["SQREEN_SHARED_STORAGE_#{self.object_id}"][key] = obj
     end
 
     def self.clear
-      @@shared.delete(Thread.current)
+      return unless Thread.current["SQREEN_SHARED_STORAGE_#{self.object_id}"].is_a?(Hash)
+      Thread.current["SQREEN_SHARED_STORAGE_#{self.object_id}"].clear
     end
 
     def self.inc(value)

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.9.2'.freeze
+  VERSION = '1.10.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqreen
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.10.0
 platform: java
 authors:
 - Sqreen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-06 00:00:00.000000000 Z
+date: 2018-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -47,6 +47,7 @@ files:
 - CODE_OF_CONDUCT.md
 - README.md
 - Rakefile
+- lib/sqreen-alt.rb
 - lib/sqreen.rb
 - lib/sqreen/attack_detected.html
 - lib/sqreen/binding_accessor.rb
@@ -139,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.12
+rubygems_version: 2.7.5
 signing_key:
 specification_version: 4
 summary: Sqreen Ruby agent