sqreen 1.18.3.beta1 → 1.18.3.beta2

data/lib/sqreen/binding_accessor/path_elem.rb

@@ -0,0 +1,8 @@
+# Copyright (c) 2015 Sqreen. All Rights Reserved.
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
+
+module Sqreen
+  class BindingAccessor
+    PathElem = Struct.new(:kind, :value)
+  end
+end

data/lib/sqreen/binding_accessor/transforms.rb

@@ -0,0 +1,107 @@
+# Copyright (c) 2015 Sqreen. All Rights Reserved.
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
+
+require 'set'
+
+module Sqreen
+  class BindingAccessor
+    # Available final transformations
+    module Transforms
+      def flat_keys(value, max_iter = 1000)
+        return nil if value.nil?
+        seen = Set.new
+        look_into = [value]
+        keys = []
+        idx = 0
+        until look_into.empty? || max_iter <= idx
+          idx += 1
+          val = look_into.pop
+          next unless seen.add?(val.object_id)
+          case val
+          when Hash
+            keys.concat(val.keys)
+            look_into.concat(val.values)
+          when Array
+            look_into.concat(val)
+          else
+            next if val.respond_to?(:seek)
+            val.each { |v| look_into << v } if val.respond_to?(:each)
+          end
+        end
+        keys
+      end
+
+      def flat_values(value, max_iter = 1000)
+        return nil if value.nil?
+        seen = Set.new
+        look_into = [value]
+        values = []
+        idx = 0
+        until look_into.empty? || max_iter <= idx
+          idx += 1
+          val = look_into.shift
+          next unless seen.add?(val.object_id)
+          case val
+          when Hash
+            look_into.concat(val.values)
+          when Array
+            look_into.concat(val)
+          else
+            next if val.respond_to?(:seek)
+            if val.respond_to?(:each)
+              val.each { |v| look_into << v }
+            else
+              values << val
+            end
+          end
+        end
+        values
+      end
+
+      def concat_keys_and_values(value, max_size = nil)
+        return nil if value.nil?
+        values = Set.new
+        max_size = max_size.to_i if max_size
+        res = ''
+        descend(value) do |x|
+          next unless values.add?(x)
+          x = x.to_s
+          return res if max_size && res.size + x.size + 1 > max_size
+          res << "\n" unless res.empty?
+          res << x
+        end
+        res
+      end
+
+      private
+
+      def descend(value, max_iter = 1000)
+        seen = Set.new
+        look_into = [value]
+        idx = 0
+        until look_into.empty? || max_iter <= idx
+          idx += 1
+          val = look_into.pop
+
+          case val
+          when Hash
+            next unless seen.add?(val.object_id)
+            look_into.concat(val.keys)
+            look_into.concat(val.values)
+          when Array
+            next unless seen.add?(val.object_id)
+            look_into.concat(val)
+          else
+            next if val.respond_to?(:seek)
+            if val.respond_to?(:each)
+              next unless seen.add?(val.object_id)
+              val.each { |v| look_into << v }
+            else
+              yield val
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sqreen/capped_queue.rb

@@ -1,6 +1,8 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
+require 'sqreen/log'
+
 module Sqreen
   # A simple size limited queue.
   # When trying to enqueue more than the capacity

data/lib/sqreen/{callbacks.rb → cb.rb}

@@ -1,12 +1,10 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
-require 'set'
-require 'sqreen/shared_storage'
+require 'sqreen/exception'
 require 'sqreen/log'
 
 module Sqreen
-
   class CB
     # Callback class.
     #
@@ -87,54 +85,4 @@ module Sqreen
       nil
     end
   end
-  # target_method, position, callback, callback class
-
-  class DefaultCB < CB
-    def pre(_inst, args, _budget = nil, &_block)
-      Sqreen.log.debug "<< #{@klass} #{@method} #{Thread.current}"
-      Sqreen.log.debug args.join ' '
-      # log params
-    end
-
-    def post(_rv, _inst, _args, _budget = nil, &_block)
-      # log "#{rv}"
-      Sqreen.log.debug ">> #{@klass} #{@method} #{Thread.current}"
-    end
-  end
-
-  class RunWhenCalledCB < CB
-    def initialize(klass, method, &block)
-      super(klass, method)
-
-      raise 'missing block' unless block_given?
-      @block = block
-    end
-
-    def pre(_inst, _args, _budget = nil, &_block)
-      # FIXME: implement this removal
-      @remove_me = true
-      @block.call
-    end
-  end
-
-  # Framework-aware callback
-  class FrameworkCB < CB
-    attr_accessor :framework
-
-    def whitelisted?
-      whitelisted = SharedStorage.get(:whitelisted)
-      return whitelisted unless whitelisted.nil?
-      framework && !framework.whitelisted_match.nil?
-    end
-
-    # Record a metric observation
-    # @param category [String] Name of the metric observed
-    # @param key [String] aggregation key
-    # @param observation [Object] data observed
-    # @param at [Time] time when observation was made
-    def record_observation(category, key, observation, at = Time.now.utc)
-      return unless framework
-      framework.observe(:observations, [category, key, observation, at], [], false)
-    end
-  end
 end

data/lib/sqreen/{callback_tree.rb → cb_tree.rb}

@@ -31,7 +31,7 @@ module Sqreen
         methods[1] ||= []
         add_to_array(methods[1], cb)
       end
-      if cb.failing?
+      if cb.failing? # rubocop:disable Style/GuardClause
         methods[2] ||= []
         add_to_array(methods[2], cb)
       end
@@ -50,7 +50,7 @@ module Sqreen
         types[1].delete(cb)
         types[1] = nil if types[1].empty?
       end
-      if cb.failing? && types[2]
+      if cb.failing? && types[2] # rubocop:disable Style/GuardClause
         types[2].delete(cb)
         types[2] = nil if types[2].empty?
       end

data/lib/sqreen/condition_evaluator.rb

@@ -179,7 +179,7 @@ module Sqreen
       return true if exp.empty?
       raise(Sqreen::Exception, 'too deep call detected') if rem <= 0
       exp.all? do |op, values|
-        res = values.map do |v|
+        val_to_res = lambda do |v|
           case v
           when Hash
             evaluate_expr(v, rem - 1, *args)
@@ -191,27 +191,42 @@ module Sqreen
         end
 
         arity = OPERATORS_ARITY[op]
-        if !arity.nil? && res.size != arity
-          raise(Sqreen::Exception, "bad res #{res} (op #{op} wanted #{arity})")
+        if !arity.nil? && values.size != arity
+          raise(Sqreen::Exception, "bad arg count #{values.inspect} (op #{op} wanted #{arity})")
         end
         bool = case op
                when OR_OPERATOR
-                 res.any?
+                 values.reduce(false) do |_, v|
+                   r = val_to_res.call(v)
+                   break r if r
+                   r
+                 end
                when AND_OPERATOR
-                 res.all?
+                 values.reduce(true) do |_, v|
+                   r = val_to_res.call(v)
+                   break r unless r
+                   r
+                 end
                when EQ_OPERATOR
+                 res = values.map(&val_to_res)
                  res[0] == res[1]
                when NEQ_OPERATOR
+                 res = values.map(&val_to_res)
                  res[0] != res[1]
                when GT_OPERATOR
+                 res = values.map(&val_to_res)
                  res[0] > res[1]
                when GTE_OPERATOR
+                 res = values.map(&val_to_res)
                  res[0] >= res[1]
                when LT_OPERATOR
+                 res = values.map(&val_to_res)
                  res[0] < res[1]
                when LTE_OPERATOR
+                 res = values.map(&val_to_res)
                  res[0] <= res[1]
                when INC_OPERATOR
+                 res = values.map(&val_to_res)
                  unless res[0].respond_to?(:include?)
                    raise(Sqreen::Exception, "no include on res #{res[0].inspect}")
                  end
@@ -221,8 +236,10 @@ module Sqreen
                    res[0].include?(res[1])
                  end
                when HASH_INC_OPERATOR
+                 res = values.map(&val_to_res)
                  ConditionEvaluator.hash_val_include?(res[0], res[1], res[2])
                when HASH_KEY_OPERATOR
+                 res = values.map(&val_to_res)
                  ConditionEvaluator.hash_key_include?(res[0], res[1], res[2])
                else
                  # FIXME: this should be check in compile

data/lib/sqreen/configuration.rb

@@ -6,6 +6,9 @@ require 'erb'
 require 'sqreen/performance_notifications/newrelic'
 
 module Sqreen
+  # TODO: remove all referecnes to global such as config_get
+  # TODO: move within Sqreen::Configuration
+
   @config = nil
 
   def self.config_init(framework = nil)

data/lib/sqreen/default_cb.rb

@@ -0,0 +1,20 @@
+# Copyright (c) 2015 Sqreen. All Rights Reserved.
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
+
+require 'sqreen/cb'
+require 'sqreen/log'
+
+module Sqreen
+  class DefaultCB < CB
+    def pre(_inst, args, _budget = nil, &_block)
+      Sqreen.log.debug "<< #{@klass} #{@method} #{Thread.current}"
+      Sqreen.log.debug args.join ' '
+      # log params
+    end
+
+    def post(_rv, _inst, _args, _budget = nil, &_block)
+      # log "#{rv}"
+      Sqreen.log.debug ">> #{@klass} #{@method} #{Thread.current}"
+    end
+  end
+end

data/lib/sqreen/deferred_logger.rb

@@ -0,0 +1,63 @@
+# Copyright (c) 2015 Sqreen. All Rights Reserved.
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
+
+require 'singleton'
+require 'logger'
+require 'sqreen/logger'
+
+module Sqreen
+  class DeferredLogger
+    include Singleton
+
+    def initialize
+      @buffer = StringIO.new
+      @logger = ::Logger.new(@buffer)
+    end
+
+    def debug(msg = nil, &block)
+      @logger.debug(msg, &block)
+    end
+
+    def info(msg = nil, &block)
+      @logger.info(msg, &block)
+    end
+
+    def warn(msg = nil, &block)
+      @logger.warn(msg, &block)
+    end
+
+    def error(msg = nil, &block)
+      @logger.error(msg, &block)
+    end
+
+    def fatal(msg = nil, &block)
+      @logger.error(msg, &block)
+    end
+
+    def add(severity, msg = nil, &block)
+      send(Sqreen::Logger::SEVERITY_TO_METHOD[severity], msg, &block)
+    end
+
+    def formatter=(value)
+      @logger.formatter = value
+    end
+
+    def flush_to(logger)
+      logger.instance_eval { @logdev }.write(read).tap { reset }
+    end
+
+    private
+
+    def read
+      @buffer.rewind
+      @buffer.read
+    end
+
+    def reset
+      buffer = StringIO.new
+      logger = ::Logger.new(buffer)
+      logger.formatter = @logger.formatter
+      @buffer, @logger = buffer, logger
+    end
+  end
+end

data/lib/sqreen/deliveries.rb

@@ -0,0 +1,10 @@
+# Copyright (c) 2015 Sqreen. All Rights Reserved.
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
+
+require 'sqreen/deliveries/simple'
+require 'sqreen/deliveries/batch'
+
+module Sqreen
+  module Deliveries
+  end
+end

data/lib/sqreen/deliveries/batch.rb

@@ -1,9 +1,15 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
-require 'sqreen/deliveries/simple'
+# TODO: Sqreen::Attack => sqreen/events
+# TODO: Sqreen::RemoteException  => sqreen/events
+# TODO: Sqreen::RequestRecord => sqreen/events
+# TODO: Sqreen.time
+
+require 'sqreen/events/attack'
 require 'sqreen/events/remote_exception'
 require 'sqreen/mono_time'
+require 'sqreen/deliveries/simple'
 
 module Sqreen
   module Deliveries

data/lib/sqreen/deliveries/simple.rb

@@ -1,6 +1,11 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
+# TODO: Sqreen::Attack => sqreen/events
+# TODO: Sqreen::RemoteException  => sqreen/events
+# TODO: Sqreen::RequestRecord => sqreen/events
+
+require 'sqreen/events/attack'
 require 'sqreen/events/remote_exception'
 require 'sqreen/events/request_record'
 

data/lib/sqreen/dependency/rails.rb

@@ -1,6 +1,10 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
+require 'sqreen/middleware'
+require 'sqreen/error_handling_middleware'
+require 'sqreen/rails_middleware'
+
 module Sqreen
   module Dependency
     module Rails

data/lib/sqreen/dependency/sinatra.rb

@@ -1,6 +1,10 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
+require 'sqreen/middleware'
+require 'sqreen/error_handling_middleware'
+require 'sqreen/sinatra_middleware'
+
 module Sqreen
   module Dependency
     module Sinatra