sqreen 1.11.2 → 1.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 729e481e969ff8187a3927f867812792de037a77f107a84c11269876fd8be84e
-  data.tar.gz: 4d3cfc1c63134cfcd56d10c4086107df2e4ecf5e48b2c8cdd09797156d47e3fa
+  metadata.gz: 3e8eff78019936af7f34aba50cc99778250b703abf40045b13d3656dcb905804
+  data.tar.gz: 39ad12dfbe8dc9429ed66b2015e2e8aaa6383ecd5eb90dbe9221a35c38fcf0b5
 SHA512:
-  metadata.gz: 33f234007987eb877da95b7178259748302591799bacc9db8968529ee431079d6e13f2bb9557b1bca0ae2494315a67a3b0b3ae1d9da37458a4d9a23d55a534b2
-  data.tar.gz: 86b459747ae5d1eea783dbbbf64d354c7cb8a63ed48668232144f9e99a366e320fc501147f10a90c892936399f573af31413f04ebafc3c524075b1cac74aa0fc
+  metadata.gz: 9737911ca8cfa2fb17bc88454c47d28134e7f923a5490abab57be7d63d852842f5ca457b83a90d28a38b34baac09a099d42dd66d8cbd116fe1127511d3b7b6d6
+  data.tar.gz: 95e83d374c1e68d8085ae09538669b6a6a42ab84e461faf7620090154127bd1dd69bf80ed7a25a45d1b9aa338816b8e9e7425752346b7e25771c06de099c71e1

data/lib/sqreen/capped_queue.rb

@@ -1,45 +1,22 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.io/terms.html
-require "sqreen/backported_queue" if RUBY_VERSION >= "2.5.0"
-
 module Sqreen
-  if RUBY_VERSION >= "2.5.0"
-    # A simple size limited queue.
-    # When trying to enqueue more than the capacity
-    # the older elements will get thrown
-    class CappedQueue < BackportedQueue
-      attr_reader :capacity
-
-      def initialize(capacity)
-        @capacity = capacity
-        super()
-      end
+  # A simple size limited queue.
+  # When trying to enqueue more than the capacity
+  # the older elements will get thrown
+  class CappedQueue < Queue
+    attr_reader :capacity
 
-      alias original_push push
-
-      def push(value)
-        pop until size < @capacity
-        original_push(value)
-      end
+    def initialize(capacity)
+      @capacity = capacity
+      super()
     end
-  else
-    # A simple size limited queue.
-    # When trying to enqueue more than the capacity
-    # the older elements will get thrown
-    class CappedQueue < Queue
-      attr_reader :capacity
-
-      def initialize(capacity)
-        @capacity = capacity
-        super()
-      end
 
-      alias original_push push
+    alias original_push push
 
-      def push(value)
-        pop until size < @capacity
-        original_push(value)
-      end
+    def push(value)
+      pop until size < @capacity
+      original_push(value)
     end
   end
 end

data/lib/sqreen/runner.rb

@@ -40,6 +40,10 @@ module Sqreen
       @queue ||= CappedQueue.new(MAX_QUEUE_LENGTH)
     end
 
+    def update_queue(queue)
+      @queue = queue
+    end
+
     def observations_queue
       @observations_queue ||= CappedQueue.new(MAX_OBS_QUEUE_LENGTH)
     end
@@ -87,6 +91,7 @@ module Sqreen
     # startup
     # set_at_exit do not place a global at_exit (used for testing)
     def initialize(configuration, framework, set_at_exit = true, session_class = Sqreen::Session)
+      Sqreen.update_queue(CappedQueue.new(MAX_QUEUE_LENGTH))
       @logged_out_tried = false
       @configuration = configuration
       @framework = framework

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.11.2'.freeze
+  VERSION = '1.11.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqreen
 version: !ruby/object:Gem::Version
-  version: 1.11.2
+  version: 1.11.3
 platform: ruby
 authors:
 - Sqreen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-21 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -51,7 +51,6 @@ files:
 - lib/sqreen-alt.rb
 - lib/sqreen.rb
 - lib/sqreen/attack_detected.html
-- lib/sqreen/backported_queue.rb
 - lib/sqreen/binding_accessor.rb
 - lib/sqreen/ca.crt
 - lib/sqreen/call_countable.rb

data/lib/sqreen/backported_queue.rb

@@ -1,110 +0,0 @@
-## Backported PureRuby queue from Ruby 2.0.0
-# Necessary while ruby 2.5.0 native queue are segfaulting
-module Sqreen
-  class BackportedQueue
-    #
-    # Creates a new queue.
-    #
-    def initialize
-      @que = []
-      @que.taint          # enable tainted communication
-      @num_waiting = 0
-      self.taint
-      @mutex = Mutex.new
-      @cond = ConditionVariable.new
-    end
-
-    #
-    # Pushes +obj+ to the queue.
-    #
-    def push(obj)
-      Thread.handle_interrupt(StandardError => :on_blocking) do
-        @mutex.synchronize do
-          @que.push obj
-          @cond.signal
-        end
-      end
-    end
-
-    #
-    # Alias of push
-    #
-    alias << push
-
-    #
-    # Alias of push
-    #
-    alias enq push
-
-    #
-    # Retrieves data from the queue.  If the queue is empty, the calling thread is
-    # suspended until data is pushed onto the queue.  If +non_block+ is true, the
-    # thread isn't suspended, and an exception is raised.
-    #
-    def pop(non_block=false)
-      Thread.handle_interrupt(StandardError => :on_blocking) do
-        @mutex.synchronize do
-          while true
-            if @que.empty?
-              if non_block
-                raise ThreadError, "queue empty"
-              else
-                begin
-                  @num_waiting += 1
-                  @cond.wait @mutex
-                ensure
-                  @num_waiting -= 1
-                end
-              end
-            else
-              return @que.shift
-            end
-          end
-        end
-      end
-    end
-
-    #
-    # Alias of pop
-    #
-    alias shift pop
-
-    #
-    # Alias of pop
-    #
-    alias deq pop
-
-    #
-    # Returns +true+ if the queue is empty.
-    #
-    def empty?
-      @que.empty?
-    end
-
-    #
-    # Removes all objects from the queue.
-    #
-    def clear
-      @que.clear
-    end
-
-    #
-    # Returns the length of the queue.
-    #
-    def length
-      @que.length
-    end
-
-    #
-    # Alias of length.
-    #
-    alias size length
-
-    #
-    # Returns the number of threads waiting on the queue.
-    #
-    def num_waiting
-      @num_waiting
-    end
-  end
-end