sqreen 1.18.6-java → 1.20.0-java

data/lib/sqreen/call_countable.rb

@@ -1,3 +1,5 @@
+# typed: false
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 

data/lib/sqreen/capped_queue.rb

@@ -1,3 +1,5 @@
+# typed: true
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 

data/lib/sqreen/cb.rb

@@ -1,3 +1,5 @@
+# typed: true
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 

data/lib/sqreen/cb_tree.rb

@@ -1,3 +1,5 @@
+# typed: ignore
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 

data/lib/sqreen/condition_evaluator.rb

@@ -1,3 +1,5 @@
+# typed: false
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 

data/lib/sqreen/conditionable.rb

@@ -1,3 +1,5 @@
+# typed: false
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 

data/lib/sqreen/configuration.rb

@@ -1,3 +1,5 @@
+# typed: ignore
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
@@ -36,8 +38,16 @@ module Sqreen
       :default => false, :convert => :to_bool },
     { :env => :SQREEN_LIBSQREEN, :name => :libsqreen,
       :default => true, :convert => :to_bool },
-    { :env => :SQREEN_URL,       :name => :url,
+    { :env => :SQREEN_WEAVE, :name => :weave,
+      :default => true, :convert => :to_bool },
+    { :env => :SQREEN_WEAVE_STRATEGY, :name => :weave_strategy,
+      :default => :prepend, :convert => :to_sym },
+    { :env => :SQREEN_URL, :name => :url,
       :default => 'https://back.sqreen.io' },
+    { :env => :SQREEN_INGESTION_URL, :name => :ingestion_url,
+      :default => 'https://ingestion.sqreen.com/' },
+    { :env => :SQREEN_PROXY_URL, :name => :proxy_url,
+      :default => nil },
     { :env => :SQREEN_TOKEN,     :name => :token,
       :default => nil },
     { :env => :SQREEN_APP_NAME,  :name => :app_name,
@@ -83,6 +93,10 @@ module Sqreen
     str.to_i
   end
 
+  def self.to_sym(value)
+    value.to_sym
+  end
+
   # Class to access configurations variables
   # This try to load environment by different ways.
   # 1. By file:
@@ -206,5 +220,9 @@ module Sqreen
     def to_int(value)
       Sqreen::to_int(value)
     end
+
+    def to_sym(value)
+      Sqreen::to_sym(value)
+    end
   end
 end

data/lib/sqreen/context.rb

@@ -1,3 +1,5 @@
+# typed: true
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 

data/lib/sqreen/default_cb.rb

@@ -1,3 +1,5 @@
+# typed: true
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 

data/lib/sqreen/deferred_logger.rb

@@ -1,3 +1,5 @@
+# typed: false
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 

data/lib/sqreen/deliveries.rb

@@ -1,3 +1,5 @@
+# typed: strong
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 

data/lib/sqreen/deliveries/batch.rb

@@ -1,3 +1,5 @@
+# typed: true
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
@@ -6,6 +8,7 @@
 # TODO: Sqreen::RequestRecord => sqreen/events
 # TODO: Sqreen.time
 
+require 'sqreen/aggregated_metric'
 require 'sqreen/events/attack'
 require 'sqreen/events/remote_exception'
 require 'sqreen/mono_time'
@@ -89,9 +92,11 @@ module Sqreen
       def event_key(event)
         case event
         when Sqreen::Attack
-          "att-#{event.type}"
+          "att-#{event.rule_name}"
         when Sqreen::RemoteException
           "rex-#{event.klass}"
+        when Sqreen::AggregatedMetric
+          "agg-metric"
         end
       end
     end

data/lib/sqreen/deliveries/simple.rb

@@ -1,3 +1,5 @@
+# typed: true
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
@@ -5,6 +7,7 @@
 # TODO: Sqreen::RemoteException  => sqreen/events
 # TODO: Sqreen::RequestRecord => sqreen/events
 
+require 'sqreen/log/loggable'
 require 'sqreen/events/attack'
 require 'sqreen/events/remote_exception'
 require 'sqreen/events/request_record'
@@ -13,6 +16,7 @@ module Sqreen
   module Deliveries
     # Simple delivery method that directly call session on event
     class Simple
+      include Log::Loggable
       attr_accessor :session
 
       def initialize(session)
@@ -27,6 +31,8 @@ module Sqreen
           session.post_sqreen_exception(event)
         when Sqreen::RequestRecord
           session.post_request_record(event)
+        when Sqreen::AggregatedMetric
+          logger.warn 'Delivery of metrics using signals is not supported with simple delivery'
         else
           session.post_event(event)
         end

data/lib/sqreen/dependency.rb

@@ -1,3 +1,5 @@
+# typed: true
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
@@ -12,7 +14,7 @@ module Sqreen
     def self.resolve_const(name)
       raise ArgumentError if name.nil? || name.empty?
 
-      name.to_s.split('::').inject(Object) { |a, e| a.const_get(e) }
+      name.to_s.split('::').inject(Object) { |a, e| a.const_get(e, false) }
     end
   end
 end

data/lib/sqreen/dependency/detector.rb

@@ -1,7 +1,9 @@
+# typed: ignore
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
-require 'sqreen/dependency/hook'
+require 'sqreen/graft/hook'
 require 'sqreen/dependency/rails'
 require 'sqreen/dependency/sinatra'
 require 'sqreen/dependency/rack'
@@ -32,28 +34,34 @@ module Sqreen
           Sqreen::Dependency::Rails.insert_sqreen_middlewares
         end if Sqreen::Dependency::Rails.required?
 
-        Sqreen::Dependency::Hook.add('Rack::Builder#to_app') do
+        Sqreen::Graft::Hook.add('Rack::Builder#to_app') do
           after do
             Sqreen::Dependency::Rails.inspect_middlewares
           end
         end if Sqreen::Dependency::Rails.required?
 
-        Sqreen::Dependency::Hook.add('Sinatra::Base.setup_middleware') do
-          after do |_, _, _, args|
+        Sqreen::Graft::Hook.add('Sinatra::Base.setup_middleware') do
+          after do |call|
+            args = call.args
+
             Sqreen::Dependency::Sinatra.insert_sqreen_middlewares(args.first)
           end
         end.install if Sqreen::Dependency::Sinatra.required?
 
-        Sqreen::Dependency::Hook.add('Rack::Builder#to_app') do
-          after do |_, builder|
+        Sqreen::Graft::Hook.add('Rack::Builder#to_app') do
+          after do |call|
+            builder = call.instance
+
             Sqreen::Dependency::Sinatra.inspect_middlewares(builder)
           end
         end if Sqreen::Dependency::Sinatra.required?
 
         # ensure startup of thread in request handling processes
 
-        Sqreen::Dependency::Hook.add('Rack::Builder#to_app') do
-          after do |callback, *|
+        Sqreen::Graft::Hook.add('Rack::Builder#to_app') do
+          after do |call|
+            callback = call.callback
+
             Sqreen.log.debug "[#{Process.pid}] Start mode #{Sqreen::Dependency::Detector.start_mode}"
             if Sqreen::Dependency::Detector.start_mode == :rails || Sqreen::Dependency::Detector.start_mode == :rackup
 
@@ -61,7 +69,7 @@ module Sqreen
                 Sqreen::Dependency::Rack.on_run(handler) do
                   case handler.name
                   when 'Rack::Handler::Puma'
-                    Sqreen::Dependency::Hook.add('Puma::Launcher#run') do
+                    Sqreen::Graft::Hook.add('Puma::Launcher#run') do
                       before do
                         # HACK: Puma master? hack falls apart when not preloading
                         # it would think master is not, triggering startup
@@ -73,12 +81,12 @@ module Sqreen
                         end
                       end
                     end
-                    Sqreen::Dependency::Hook['Puma::Launcher#run'].install
+                    Sqreen::Graft::Hook['Puma::Launcher#run'].install
                   when 'Rack::Handler::PhusionPassenger'
                     # noop, passenger will start his own separate process
                     Sqreen.log.debug "[#{Process.pid}] Passenger will start in standalone process"
                   when 'Rack::Handler::Unicorn' # unicorn-rails
-                    Sqreen::Dependency::Hook.add('Unicorn::HttpServer.new') do
+                    Sqreen::Graft::Hook.add('Unicorn::HttpServer.new') do
                       before do
                         # BUG: detects single process...
                       end
@@ -97,12 +105,12 @@ module Sqreen
           end
         end
 
-        Sqreen::Dependency::Hook['Rack::Builder#to_app'].install
+        Sqreen::Graft::Hook['Rack::Builder#to_app'].install
 
-        # Sqreen::Dependency::Hook.add('Rails::Server#start') do
+        # Sqreen::Graft::Hook.add('Rails::Server#start') do
         #   before { }
         # end
-        # Sqreen::Dependency::Hook['Rails::Server#start'].install
+        # Sqreen::Graft::Hook['Rails::Server#start'].install
         # /!\ double instrument Rails < Rack => Rails.start_with -> Rails.start_without -> super -> Rack.start_with -> Rails.start_without
       end
     end

data/lib/sqreen/dependency/libsqreen.rb

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

data/lib/sqreen/dependency/new_relic.rb

@@ -1,3 +1,5 @@
+# typed: ignore
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 

data/lib/sqreen/dependency/rack.rb

@@ -1,3 +1,5 @@
+# typed: ignore
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
@@ -7,23 +9,26 @@ module Sqreen
       module_function
 
       def find_handler(&block)
-        Sqreen::Dependency::Hook.add('Rack::Server#server') do
-          after do |callback, _, server, _|
+        Sqreen::Graft::Hook.add('Rack::Server#server') do
+          after do |call|
+            callback = call.callback
+            server = call.returned
+
             block.call(server)
             callback.disable # do this once, :server is a lazy init accessor
           end
         end
-        Sqreen::Dependency::Hook['Rack::Server#server'].install
+        Sqreen::Graft::Hook['Rack::Server#server'].install
       end
 
       def on_run(handler, &block)
         Sqreen.log.debug "[#{Process.pid}] #{handler.inspect}"
         hookpoint_name = "#{handler.name}.run"
 
-        Sqreen::Dependency::Hook.add(hookpoint_name) do
+        Sqreen::Graft::Hook.add(hookpoint_name) do
           before { block.call(handler) }
         end
-        Sqreen::Dependency::Hook[hookpoint_name].install
+        Sqreen::Graft::Hook[hookpoint_name].install
       end
 
       def rackup?

data/lib/sqreen/dependency/rails.rb

@@ -1,6 +1,9 @@
+# typed: ignore
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
+require 'sqreen/shrink_wrap'
 require 'sqreen/middleware'
 require 'sqreen/error_handling_middleware'
 require 'sqreen/rails_middleware'
@@ -27,6 +30,7 @@ module Sqreen
       def insert_sqreen_middlewares
         Sqreen.log.debug { 'Inserting Sqreen middlewares for Rails' }
         app = ::Rails.application
+        app.middleware.insert(0, Sqreen::ShrinkWrap)
         app.middleware.insert_after(::Rack::Runtime, Sqreen::Middleware)
         app.middleware.insert_after(::ActionDispatch::DebugExceptions, Sqreen::RailsMiddleware)
         app.middleware.insert_after(::ActionDispatch::DebugExceptions, Sqreen::ErrorHandlingMiddleware)

data/lib/sqreen/dependency/sentry.rb

@@ -1,3 +1,5 @@
+# typed: ignore
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 

data/lib/sqreen/dependency/sinatra.rb

@@ -1,6 +1,9 @@
+# typed: ignore
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
+require 'sqreen/shrink_wrap'
 require 'sqreen/middleware'
 require 'sqreen/error_handling_middleware'
 require 'sqreen/sinatra_middleware'
@@ -33,7 +36,7 @@ module Sqreen
           end
         end
 
-        insert_middleware(builder, Sqreen::Middleware, args, block) do |p, u|
+        insert_middleware(builder, Sqreen::ShrinkWrap, args, block) do |p, u|
           if (i = middlewares(builder).index(::Sinatra::ExtendedRack))
             u.insert(i, p)
           else
@@ -41,6 +44,14 @@ module Sqreen
           end
         end
 
+        insert_middleware(builder, Sqreen::Middleware, args, block) do |p, u|
+          if (i = middlewares(builder).index(::Sinatra::ExtendedRack))
+            u.insert(i, p)
+          else
+            u.insert(1, p)
+          end
+        end
+
         insert_middleware(builder, Sqreen::SinatraMiddleware, args, block) do |p, u|
           if ::Sqreen::Dependency.const_exist?('Rack::PostBodyContentTypeParser') && (i = middlewares(builder).index(::Rack::PostBodyContentTypeParser))
             u.insert(i + 1, p)

data/lib/sqreen/encoding_sanitizer.rb

@@ -1,3 +1,5 @@
+# typed: true
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 

data/lib/sqreen/error_handling_middleware.rb

@@ -1,3 +1,5 @@
+# typed: false
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 

data/lib/sqreen/event.rb

@@ -1,3 +1,5 @@
+# typed: true
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
@@ -6,17 +8,19 @@
 module Sqreen
   # Master interface for point in time events (e.g. Attack, RemoteException)
   class Event
+    # @return [Hash]
     attr_reader :payload
+
+    # @return [Time]
+    attr_accessor :time # writer used only in tests
+
     def initialize(payload)
       @payload = payload
-    end
-
-    def to_hash
-      payload.to_hash
+      @time = Time.now.utc
     end
 
     def to_s
-      "<#{self.class.name}: #{to_hash}>"
+      "<#{self.class.name}: #{payload.to_hash}>"
     end
   end
 end

data/lib/sqreen/events/attack.rb

@@ -1,3 +1,5 @@
+# typed: true
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
@@ -9,6 +11,8 @@ module Sqreen
   # Attack
   # When creating a new attack, it gets automatically pushed to the event's
   # queue.
+  # XXX: TURNS OUT THIS CLASS IS ACTUALLY NOT USED ANYMORE
+  # Framework.observe is used instead with unstructured attack details
   class Attack < Event
     def self.record(payload)
       attack = Attack.new(payload)
@@ -24,11 +28,31 @@ module Sqreen
       payload['rule']['rulespack_id']
     end
 
-    def type
+    def rule_name
       return nil unless payload['rule']
       payload['rule']['name']
     end
 
+    def test?
+      return nil unless payload['rule']
+      payload['rule']['test'] ? true : false
+    end
+
+    def beta?
+      return nil unless payload['rule']
+      payload['rule']['beta'] ? true : false
+    end
+
+    def block?
+      return nil unless payload['rule']
+      payload['rule']['block'] ? true : false
+    end
+
+    def attack_type
+      return nil unless payload['rule']
+      payload['rule']['attack_type']
+    end
+
     def time
       return nil unless payload['local']
       payload['local']['time']
@@ -42,22 +66,5 @@ module Sqreen
     def enqueue
       Sqreen.queue.push(self)
     end
-
-    def to_hash
-      res = {}
-      rule_p = payload['rule']
-      request_p = payload['request']
-      res[:rule_name]    = rule_p['name']         if rule_p && rule_p['name']
-      res[:rulespack_id] = rule_p['rulespack_id'] if rule_p && rule_p['rulespack_id']
-      res[:test]         = rule_p['test']         if rule_p && rule_p['test']
-      res[:infos]        = payload['infos']       if payload['infos']
-      res[:time]         = time                   if time
-      res[:client_ip]    = request_p[:addr]       if request_p && request_p[:addr]
-      res[:request]      = request_p              if request_p
-      res[:params]       = payload['params']      if payload['params']
-      res[:context]      = payload['context']     if payload['context']
-      res[:headers]      = payload['headers']     if payload['headers']
-      res
-    end
   end
 end