sqreen 1.17.2.beta1 → 1.17.2.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3862ecef24ba42830b6570cc6bf05902a40e605b467339a62499f929ff6ed953
-  data.tar.gz: 7aa4b16b8b80f5cbdeba29393aeef199c466e9148f6ad6a67fd522e8e5bf09d8
+  metadata.gz: b146b5b2fc5e830ab98c049eb17c576a943899035226300157eb88ab9db8fad5
+  data.tar.gz: 6a3ec0498bd1f1eac06caef917708a837fc06d83b6931e139f2da7890a2cc59a
 SHA512:
-  metadata.gz: f51c35e5537404e214faf6686b771882d40eda98c2850105f3067a82e56756666cb52b188651db8e26a832df5f02971dc0d2f9aa30a8a300a486f93390333345
-  data.tar.gz: 9c538573202337981c7b1daa6f369bb8e7115a280904a6d5f2040b4b2978526a90c52e0ab0762c5fe17a12fbfeb035aa08a001f51422c5dd4195836efab07c8e
+  metadata.gz: c357bbd375005220b136be93496689df76d883cce643dda9c8260024393b2fc82173aa3f7ebd76e12fbe7d62309df9d5f009e7d304e38c2db548f40cd1fee6d2
+  data.tar.gz: 2606d78d949c24784f04fc71fab61d964a323cbbbe04580750c5dda4f954b3e07d95f9f34b15efb0e7a09ed2b1ee008cbd22d2a470cc03f84c1f3963fe111189

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: ruby
 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
   name: sq_mini_racer
@@ -61,6 +61,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