sqreen 1.15.1 → 1.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87e7db04c8d69640cf2da93b2dc235f5b1a95c8f2847db137c3047eb9f87ac1a
-  data.tar.gz: 690b3963a003fced7eb7e699576a488b006dc63589e372c67b0f808d9b2aafd6
+  metadata.gz: bd9348f46f9d003e9a1302fdf2f138fe6f0db7e49e50a51d1482991ad68ee2a5
+  data.tar.gz: 2d49d42af3a45e9c1061d550c5b45c1652406f901f89c81525dca90c2f2c6584
 SHA512:
-  metadata.gz: e70942a29b5a702ebd3e023d72ad49a58234510c798e0fbf88dfc99388ddbbb24bc0c25a41f3103df92884d1b9804355e2d724868372f9dc3197bcad134a9fd4
-  data.tar.gz: 5719e61c1bae72c9dbf4257ccce892cf8135b7a887e69dce1320c5955ddae9b575a992ab42a83e28887daaa09187705686579a6cabc53c555d5931f90a812b11
+  metadata.gz: 3ccb75506d4344d4d2ec1d6c7f4e2c1957a762d7d60cee5e34bf2aec98abdf9d8c72158f4dd3e23fa0da8a054cbc694754d2a81d959facdbe9fd6911e36de1e2
+  data.tar.gz: 20933b21b52fa4f95de2964a3a15ab757f7dff8f4058b91a29547440f3446eae6510c40193ae4a44494c5494e60c9de1290d2c483033b687c79c5526dbff66ab

data/lib/sqreen/actions.rb

@@ -171,6 +171,7 @@ module Sqreen
       def matching_actions(client_ip)
         parsed_ip = IPAddr.new(client_ip)
         trie = parsed_ip.family == Socket::AF_INET6 ? @trie_v6 : @trie_v4
+        return [] unless trie
         found = trie.search_matching(parsed_ip.to_i, parsed_ip.family)
         return [] unless found.size > 0
 
@@ -271,6 +272,7 @@ module Sqreen
 
       class << self
         def actions_matching(identity_params)
+          return [] unless @idx
           key = stringify_keys(identity_params)
           actions = @idx[key]
           actions || []

data/lib/sqreen/callbacks.rb

@@ -127,23 +127,6 @@ module Sqreen
       framework && !framework.whitelisted_match.nil?
     end
 
-    # Record an attack event into Sqreen system
-    # @param infos [Hash] Additional information about request
-    def record_event(infos, at = Time.now.utc)
-      return unless framework
-      payload = {
-        :infos => infos,
-        :rulespack_id => rulespack_id,
-        :rule_name => rule_name,
-        :test => test,
-        :time => at,
-      }
-      if payload_tpl.include?('context')
-        payload[:backtrace] = Sqreen::Context.new.bt
-      end
-      framework.observe(:attacks, payload, payload_tpl)
-    end
-
     # Record a metric observation
     # @param category [String] Name of the metric observed
     # @param key [String] aggregation key
@@ -153,22 +136,5 @@ module Sqreen
       return unless framework
       framework.observe(:observations, [category, key, observation, at], [], false)
     end
-
-    # Record an exception that just occurred
-    # @param exception [Exception] Exception to send over
-    # @param infos [Hash] Additional contextual information
-    def record_exception(exception, infos = {}, at = Time.now.utc)
-      return unless framework
-      payload = {
-        :exception => exception,
-        :infos => infos,
-        :rulespack_id => rulespack_id,
-        :rule_name => rule_name,
-        :test => test,
-        :time => at,
-        :backtrace => exception.backtrace || Sqreen::Context.bt,
-      }
-      framework.observe(:sqreen_exceptions, payload)
-    end
   end
 end

data/lib/sqreen/capped_queue.rb

@@ -15,7 +15,11 @@ module Sqreen
     alias original_push push
 
     def push(value)
-      pop until size < @capacity
+      until size < @capacity
+        discarded = pop
+        Sqreen.log.debug { "Discarded from queue: #{discarded}" }
+      end
+      Sqreen.log.debug { "Pushed to the queue: #{value}" }
       original_push(value)
     end
   end

data/lib/sqreen/event.rb

@@ -12,5 +12,9 @@ module Sqreen
     def to_hash
       payload.to_hash
     end
+
+    def to_s
+      "<#{self.class.name}: #{to_hash}>"
+    end
   end
 end

data/lib/sqreen/rule_callback.rb

@@ -51,6 +51,40 @@ module Sqreen
         @rule[Attrs::PRIORITY] || super
       end
 
+      # Record an attack event into Sqreen system
+      # @param infos [Hash] Additional information about request
+      def record_event(infos, at = Time.now.utc)
+        return unless framework
+        payload = {
+          :infos => infos,
+          :rulespack_id => rulespack_id,
+          :rule_name => rule_name,
+          :test => test,
+          :time => at,
+        }
+        if payload_tpl.include?('context')
+          payload[:backtrace] = Sqreen::Context.new.bt
+        end
+        framework.observe(:attacks, payload, payload_tpl)
+      end
+
+      # Record an exception that just occurred
+      # @param exception [Exception] Exception to send over
+      # @param infos [Hash] Additional contextual information
+      def record_exception(exception, infos = {}, at = Time.now.utc)
+        return unless framework
+        payload = {
+          :exception => exception,
+          :infos => infos,
+          :rulespack_id => rulespack_id,
+          :rule_name => rule_name,
+          :test => test,
+          :time => at,
+          :backtrace => exception.backtrace || Sqreen::Context.bt,
+        }
+        framework.observe(:sqreen_exceptions, payload)
+      end
+
       # Recommend taking an action (optionnally adding more data/context)
       #
       # This will format the requested action and optionnally

data/lib/sqreen/session.rb

@@ -292,6 +292,10 @@ module Sqreen
         h[EVENT_TYPE_KEY] = event_kind(event)
         h
       end
+      Sqreen.log.debug do
+        tally = Hash[events.group_by(&:class).map{ |k,v| [k, v.count] }]
+        "Doing batch with the following tally of event types: #{tally}"
+      end
       resilient_post(BATCH_KEY, BATCH_KEY => batch)
     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.15.1'.freeze
+  VERSION = '1.15.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqreen
 version: !ruby/object:Gem::Version
-  version: 1.15.1
+  version: 1.15.2
 platform: ruby
 authors:
 - Sqreen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-29 00:00:00.000000000 Z
+date: 2018-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sq_mini_racer