sqreen 1.11.1-java → 1.11.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a70bef09cb6da963c38ee03d9caf758d66456afb1ba1943f6eb084a6a826ccb2
-  data.tar.gz: f34e57917ed3dac5ab54ae517d5302f49037a57e85b183d566fa6f93b74cec66
+  metadata.gz: f4dfdb8465c560693a881e41c966844e86a9ac3749411bc07c4393a06fd6f843
+  data.tar.gz: c9121844fddfb01f5da67954c6e21d6bc1a5f3ef90fbba1681b8f8849374976e
 SHA512:
-  metadata.gz: dfb6563fed2fd99cf7f314b14b98be08af1e2877d9f2552e3ae76d81291ee636ee2c2fcaf80433cc8570f409be4aeceb08bbd96382d751e569d2a9d37d6872b3
-  data.tar.gz: 74fdd37d02a93e642f6de235ad1b85d6015f8058df05bd16689c5ad687e345e3e4fdc5e2b4d686229ce48f0a76a81ede7f5abdc5cae5287f7041aa88b287f8ae
+  metadata.gz: c352c227db08adc5be3d298106e6b7c3b78c583626c07a2317296489ebd1173c03801b6f7fb5a78b238fe0c5afa4f69f5cba40fb64f3d4e0fe658489b1f820a8
+  data.tar.gz: 2bb3acb9a2db28c897f6cc8b1335bca65ee73fe5f066da2a2a5c9821ad1548c33b785ae9214e48e6e6872d06208f4c527374bfff456daef7eb704659f49c6f8b

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: java
 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
@@ -50,6 +50,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