sqreen 1.14.0.beta3-java → 1.14.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4e8efa6908940531662b925941a3bc59413670b80a48c9e758932abd7647b5e
-  data.tar.gz: bd56cf6968cd82cc05bee7294b3de887064203b352abcc84e15c0945792fd6e0
+  metadata.gz: bb56629cb030a8c8ae7e1d3438fe241bbaa0c9f425dc95073498551ee84e53cd
+  data.tar.gz: dc28f65a8de23fead674554aaa7c1e076482a009407224e3d9e2b972417fdadc
 SHA512:
-  metadata.gz: e6ca675f7878bf9484867e90313b0a058599413b7f29c4f1d502dc103d70d6f90a1a084d0c8c547d74a3a80019b0fd2770d1aca7c2f9668fad90d2da6cf29ff1
-  data.tar.gz: 11c11c046eb0f92b3c4a15c6b95c2d33d73aba144ec9dd43f11693849e63c9e94c5e8aeae2139e7b8d1e6e274da6d674000a0efd66f4560a36f536bdce0b1c55
+  metadata.gz: c494d1f9a2add8ab06cf4db09de8be8c6b8bc36278e4a3c2796c60ad6ebd0419bb3974d32cf872bc3b73942e47861a856111db8b1530b5a36990e1abe5d3448f
+  data.tar.gz: 56ee9cc964987ff4c343b84f758c222d6aa7a9971b11e0ebb5342bc0ffc5e31bd9ce86a244f77c21fb671acbe2057ca103f395bf3e4f6184d155696c1bc28f91

data/lib/sqreen/actions.rb

@@ -177,7 +177,8 @@ module Sqreen
 
       def do_run(client_ip)
         return nil unless matches_ip? client_ip
-        e = Sqreen::AttackBlocked.new("Blocked client's IP (action: #{id}). No action is required")
+        e = Sqreen::AttackBlocked.new("Blocked client's IP #{client_ip} " \
+          "(action: #{id} covering range(s) #{ranges}). No action is required")
         { :status => :raise, :exception => e }
       end
 
@@ -203,7 +204,8 @@ module Sqreen
 
       def do_run(client_ip)
         return nil unless matches_ip? client_ip
-        Sqreen.log.info "Will request redirect for client with IP #{client_ip} (action: #{id}). "
+        Sqreen.log.info "Will request redirect for client with IP #{client_ip} " \
+          "(action: #{id} covering range(s) #{ranges})."
         {
           :status => :skip,
           :new_return_value => [303, { 'Location' => @redirect_url }, ['']],

data/lib/sqreen/exception.rb

@@ -8,7 +8,11 @@ module Sqreen
   class Exception < ::StandardError
     def initialize(msg = nil, *args)
       super(msg, *args)
-      Sqreen.log.error msg if msg
+      log_message msg if msg
+    end
+
+    def log_message(msg)
+      Sqreen.log.error(msg)
     end
   end
 
@@ -24,6 +28,9 @@ module Sqreen
   # Sqreen users when watching their logs. It should not raise any concern to
   # them.
   class AttackBlocked < Exception
+    def log_message(msg)
+      Sqreen.log.warn(msg)
+    end
   end
 
   class NotImplementedYet < Exception

data/lib/sqreen/frameworks/generic.rb

@@ -519,6 +519,18 @@ module Sqreen
         Sqreen.log.warn "Failed ignoring AttackBlocked on NewRelic: #{e.inspect}"
       end
 
+      def worker_fork_detection
+        # only Puma currently supported
+        return unless defined?(Puma::Cluster) && Puma::Cluster.instance_methods.include?(:worker)
+        cur_worker_meth = Puma::Cluster.instance_method(:worker)
+        Puma::Cluster.class_eval do
+          define_method(:worker) do |*args|
+            Sqreen.on_forked_worker = true
+            cur_worker_meth.bind(self)[*args]
+          end
+        end
+      end
+
       private
 
       def split_ip_addresses(ip_addresses)

data/lib/sqreen/frameworks/rails.rb

@@ -89,6 +89,7 @@ module Sqreen
       def on_start(&block)
         @calling_pid = Process.pid
         Init.startup do |app|
+          worker_fork_detection
           sentry_ignore_exceptions
           newrelic_ignore_errors
           hook_rack_request(app.class, &block)

data/lib/sqreen/frameworks/sinatra.rb

@@ -16,6 +16,7 @@ module Sqreen
       end
 
       def on_start(&block)
+        worker_fork_detection
         sentry_ignore_exceptions
         newrelic_ignore_errors
         hook_app_build(Sinatra::Base)

data/lib/sqreen/js/mini_racer_adapter.rb

@@ -34,9 +34,9 @@ module Sqreen
         @module = vendored ? Sqreen::MiniRacer : MiniRacer
         @source = source
         @recycle_runtime_every = GC_MINI_RACER
-        @snapshot = @module::Snapshot.new(source)
         @runtimes = []
         @tl_key = "SQREEN_MINI_RACER_CONTEXT_#{object_id}".freeze
+        snapshot if Sqreen.on_forked_worker? # called to eagerly initialize snapshot
         unless @@ctx_defined
           self.class.define_sqreen_context(@module)
           @@ctx_defined = true
@@ -52,7 +52,7 @@ module Sqreen
           dead_runtime = true
         end
         if dead_runtime
-          new_runtime = SqreenContext.new(:snapshot => @snapshot)
+          new_runtime = SqreenContext.new(:snapshot => snapshot)
           push_runtime new_runtime
           mini_racer_context = {
               :c => 0,
@@ -72,6 +72,10 @@ module Sqreen
 
       private
 
+      def snapshot
+        @snapshot ||= @module::Snapshot.new(@source)
+      end
+
       def push_runtime(runtime)
         @runtimes.delete_if do |th, runt, _thid|
           del = th.nil? || !th.weakref_alive? || !th.alive?

data/lib/sqreen/runner.rb

@@ -60,6 +60,9 @@ module Sqreen
     attr_accessor :logged_in
     alias logged_in? logged_in
 
+    attr_accessor :on_forked_worker
+    alias on_forked_worker? on_forked_worker
+
     attr_reader :whitelisted_paths
     def update_whitelisted_paths(paths)
       @whitelisted_paths = paths.freeze

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.14.0.beta3'.freeze
+  VERSION = '1.14.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqreen
 version: !ruby/object:Gem::Version
-  version: 1.14.0.beta3
+  version: 1.14.0
 platform: java
 authors:
 - Sqreen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-09-06 00:00:00.000000000 Z
+date: 2018-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -146,9 +146,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project:
 rubygems_version: 2.7.7