sqreen 1.9.2 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e18e5e4043a3cb2cfa23b0de7e196fb36b2cb180
-  data.tar.gz: 62cc6f1b5b08aa6b01b9401085dea466e45bb2bc
+SHA256:
+  metadata.gz: db75e03bbaf0ff955d869f7e5fea1dd06d911ef363fe85b875befbabc147c948
+  data.tar.gz: 118223689c18fa3627f901b857c67c0309d6f17a5b4eeffdf631da37d801bebf
 SHA512:
-  metadata.gz: 0217afc0de67b065771e9cb102b94c12c6885ffd27031043f96fc14af7754b0f25a845c1a44a69b7dc5ef798f72300a4fc657aea583dab71398ebae01ad75c30
-  data.tar.gz: 929ae4a93889afb4ec576932c7e92993c9e52385f247d2bab928796ae6cb07037ccfad1fe42d53d459918f1024460003f5c74b0aa30d46ad1900c0cfedee23b1
+  metadata.gz: cba1b32cb6753e60442e7f17a3b4e8267f978e37552303dec79cb92e429958b3815d9f7c18bda5dd72b4db7bca923ab6e6cafb062fb1194b952bfee977585c7a
+  data.tar.gz: 6c73b78873835a36ba2b69ef8ac01b06927b138622a9c082690fa45d65c06d5a65f5234da28d6b9928850d107d269428742406b1cd05534ee1bdcec742773d35

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: ruby
 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
@@ -48,6 +48,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
@@ -140,7 +141,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