sqreen-alt 1.11.1 → 1.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a04af20485331ca42056930bb78f81c6f11f0e4b4385f73b81f71f6e6af413e3
-  data.tar.gz: 0cbe16e0bdbc373ec5f948dfebbcb39e7379a57efea2bd2b93a1dceff9c389b2
+  metadata.gz: ed1bf3668ee726d4f9414ea85a805775d3a75a160b507ea96d53da5d3e87cd62
+  data.tar.gz: 615bd9a36ce087cd039ebd5dc1729e119fe9b36e73ef209702d5654ec63e0f5b
 SHA512:
-  metadata.gz: 7b1eda52335145dbf4bf4dbc279c36ab63f4f10b6e673d96f8da395d6e6a369febf869fc42ff43b3a7a27233a6ce287305045bccea1657524398f39b2f987db9
-  data.tar.gz: 840409d8a53ff8d1d3e362f6f3721d26051ee1ce7cae2677aaa5044ab9815e454361277896a3ae29665a6a92d24e2c002d985ab734f99930cbda419c6ff36abc
+  metadata.gz: f45492974f68638ad57611baf6f9c7373e251d87ac5434fa512935a1406f5e5e0f0ba1d1a6cb3fb9bc9f993864ef2a697fecce262ca250dc53e6caa63267bc64
+  data.tar.gz: 5e82c549535af6ac729b49b926779857d39436d112ce2bb8743a90a03f787a226958dce279645c1514f2fe8590dc1444affc33837bd0b680dcf2a0624900664a

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-alt
 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