sqreen 1.11.1 → 1.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eee0cd857bae436a452af37bf21237fe240d24dd255f991586df7c925158ceb9
-  data.tar.gz: 310700ff34c420244c49873f3b6ccd38b3c8141fbefba8ce2ba268876b2dc982
+  metadata.gz: 729e481e969ff8187a3927f867812792de037a77f107a84c11269876fd8be84e
+  data.tar.gz: 4d3cfc1c63134cfcd56d10c4086107df2e4ecf5e48b2c8cdd09797156d47e3fa
 SHA512:
-  metadata.gz: 3e270c262f3583202ba31f4a58bbe06d292123903581a90b39bba351f434f81c4fd32c723e9abad6853cedb0d4a727409118828ddc037c92e9267a9a475a76d2
-  data.tar.gz: 69a4b0158995ef8029d72c635e0cccd5781be910468ee77e65016a73038727066eb2c0a465cbb9c7869238bbc7cd5ebbaff1b94a107b15fe9e512e77684f8485
+  metadata.gz: 33f234007987eb877da95b7178259748302591799bacc9db8968529ee431079d6e13f2bb9557b1bca0ae2494315a67a3b0b3ae1d9da37458a4d9a23d55a534b2
+  data.tar.gz: 86b459747ae5d1eea783dbbbf64d354c7cb8a63ed48668232144f9e99a366e320fc501147f10a90c892936399f573af31413f04ebafc3c524075b1cac74aa0fc

data/lib/sqreen/backported_queue.rb

@@ -0,0 +1,110 @@
+## 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

data/lib/sqreen/capped_queue.rb

@@ -1,23 +1,45 @@
 # 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
-  # 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
+  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()
+      def initialize(capacity)
+        @capacity = capacity
+        super()
+      end
+
+      alias original_push push
+
+      def push(value)
+        pop until size < @capacity
+        original_push(value)
+      end
     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)
+      def push(value)
+        pop until size < @capacity
+        original_push(value)
+      end
     end
   end
 end

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.1'.freeze
+  VERSION = '1.11.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqreen
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.11.2
 platform: ruby
 authors:
 - Sqreen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-20 00:00:00.000000000 Z
+date: 2018-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -51,6 +51,7 @@ 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