sqreen 1.17.2.beta1-java → 1.17.2.beta2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d641143765279b3ff60b2ba1eb6f42bf24916be87e5bf1cf4b7fcd7a3192e07
-  data.tar.gz: 2e5056b5a3f74c086166057ac2d8ff0ee5ccff4465e4999e9d77887e8f03f789
+  metadata.gz: 01c3c821c21de60612d7bea58944b0d350e97c31bc2506200c712f366b866285
+  data.tar.gz: be7c642d80bb226edb19e54d478ee3835eb1c1e61dd704b966d42bc7b12ae831
 SHA512:
-  metadata.gz: 9683fe81e1d88b6725d865d99b7c440f2a1975bec6b16602319cd03c3c946faa6beaa937dfc676bbdd9559f90f7ca8fe9dadf6df470cab19161b0beddb26c1e8
-  data.tar.gz: 398c200cbef6012e27479ec843b28ba9daa350f224f9c297e6eec05bbe0609d462297ba4eabfc37cea1dca3325994001721d59c7429add207fea3487565eaab2
+  metadata.gz: 3c5f2ea96cf758cd23628213ffae12c0183eba93106e59f0fbc40ee2237c2801ee635db7bf8448459644d7a70a1e6d7f7bcebdf7401583c7b7b8e534e62f6a29
+  data.tar.gz: 74c1989008d6b3053e15168c36e468e64af87ef088d91680538a47af3782ccf7925eb2da8d4aec96c4aaf72f2eadc21da26e4227993520d132f34c254d4b3be7

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.17.2.beta2
+
+* Important note: this beta release supports Ruby 2.2 or above only
+* Add support for Sinatra 2.0
+
 ## 1.17.2.beta1
 
 * Important note: this beta release supports Rails only, and notably excludes Sinatra support

data/lib/sqreen/dependency/detector.rb

@@ -3,6 +3,7 @@
 
 require 'sqreen/dependency/hook'
 require 'sqreen/dependency/rails'
+require 'sqreen/dependency/sinatra'
 require 'sqreen/dependency/rack'
 require 'sqreen/dependency/sentry'
 require 'sqreen/dependency/new_relic'
@@ -37,6 +38,18 @@ module Sqreen
           end
         end if Sqreen::Dependency::Rails.required?
 
+        Sqreen::Dependency::Hook.add('Sinatra::Base.setup_default_middleware') do
+          after do |_, _, _, 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::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

data/lib/sqreen/dependency/sinatra.rb

@@ -0,0 +1,54 @@
+# Copyright (c) 2015 Sqreen. All Rights Reserved.
+# Please refer to our terms for more information: https://www.sqreen.io/terms.html
+
+module Sqreen
+  module Dependency
+    module Sinatra
+      module_function
+
+      def required?
+        Sqreen::Dependency.const_exist?('Sinatra::Base')
+      end
+
+      def insert_sqreen_middlewares(builder, *args, &block)
+        Sqreen.log.debug { 'Inserting Sqreen middlewares for Sinatra' }
+        middleware = Sqreen::ErrorHandlingMiddleware
+        use = builder.instance_variable_get('@use')
+
+        p = proc { |app| middleware.new(app, *args, &block) }
+
+        return if middlewares(builder).include?(middleware)
+
+        if middlewares(builder).include?(::Sinatra::ShowExceptions)
+          Sqreen.log.warn('Sinatra :show_exceptions detected: Sinatra exception handling may prevent the Sqreen error page to display on attacks.')
+        end
+
+        if (i = middlewares(builder).index(::Rack::Head))
+          use.insert(i, p)
+        elsif (i = middlewares(builder).index(::Rack::MethodOverride))
+          use.insert(i + 1, p)
+        elsif (i = middlewares(builder).index(::Sinatra::ExtendedRack))
+          use.insert(i + 1, p)
+        else
+          use.insert(0, p)
+        end
+      end
+
+      def inspect_middlewares(builder)
+        Sqreen.log.debug do
+          "Middlewares: " << middlewares(builder).map(&:inspect).inspect
+        end
+      end
+
+      def middlewares(builder)
+        builder.instance_variable_get(:@use).map do |p|
+          unless p.respond_to?(:binding) && p.binding.local_variable_defined?(:middleware)
+            next :unknown
+          end
+
+          p.binding.local_variable_get(:middleware)
+        end
+      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.17.2.beta1'.freeze
+  VERSION = '1.17.2.beta2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqreen
 version: !ruby/object:Gem::Version
-  version: 1.17.2.beta1
+  version: 1.17.2.beta2
 platform: java
 authors:
 - Sqreen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-03 00:00:00.000000000 Z
+date: 2019-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +75,7 @@ files:
 - lib/sqreen/dependency/rack.rb
 - lib/sqreen/dependency/rails.rb
 - lib/sqreen/dependency/sentry.rb
+- lib/sqreen/dependency/sinatra.rb
 - lib/sqreen/event.rb
 - lib/sqreen/events/attack.rb
 - lib/sqreen/events/remote_exception.rb