sqreen 1.21.1 → 1.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6611caf7add24e05a248fce4026be48a4c47612335c5fc9a26c64c33cd0409e9
-  data.tar.gz: 8381eba611e37df32a8744848661bcf144eaffe00c818e306355508fe0267394
+  metadata.gz: 72fc8c4943ce7cb8cd45a80553ae02ae8c28086ca1895a89f2ec5840b2e6a883
+  data.tar.gz: ca46dc3483df4a16fca77e0226ca7c9a3d832c5a837155b86f0ee70c5fc12226
 SHA512:
-  metadata.gz: 65c820c306961ed812360c2c73a1f37396433238cff8fd79e2676132d7842eaa86d3555bf860d7c2f6fd465783f8c1aeb59100c94349b8c53588d83513265d2e
-  data.tar.gz: 38cda532df6f1037ac243c8cd5ccaecd708b880ff377d3fcbcecad329be184d40ec9f27deb61b69124be3d37ff74a16f88a7ab1032a6e6a0f6b5387645181027
+  metadata.gz: 112a455abff8baca0c586f1479351e8e900e73d7f89b31e83fcbdc07ae99dbfa86f7439541a2f1688d56b481ce9094e16cd6bf860cb9959c7edd7be80ed66f92
+  data.tar.gz: 3f867ee75cf103c8817007540151e189c10116e0da8fa0bdad324de3bfa611d2bb4f888fdccf1074248f7976f26eb68fc81f987fcae0db5208ee9c00569f9797

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.22.0
+
+* Update WAF via libsqreen
+* Add support for raw body
+* Improve signature check
+* Improve APM detection
+
 ## 1.21.1
 
 * Work around NewRelic initialisation (see https://github.com/newrelic/newrelic-ruby-agent/issues/461)

data/lib/sqreen/frameworks/generic.rb

@@ -400,6 +400,18 @@ module Sqreen
         r
       end
 
+      def body
+        return nil unless request.respond_to?(:body)
+        return nil unless request.body.respond_to?(:read)
+        return nil unless request.body.respond_to?(:rewind)
+
+        body_io = request.body
+        body = body_io.read(4096)
+        body_io.rewind
+
+        body
+      end
+
       # Expose current working directory
       def cwd
         Dir.getwd

data/lib/sqreen/version.rb

@@ -4,5 +4,5 @@
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 module Sqreen
-  VERSION = '1.21.1'.freeze
+  VERSION = '1.22.0'.freeze
 end

data/lib/sqreen/weave/legacy/instrumentation.rb

@@ -96,25 +96,77 @@ class Sqreen::Weave::Legacy::Instrumentation
   def instrument!(rules, framework)
     Sqreen::Weave.logger.debug { "#{rules.count} rules, #{framework}" }
 
+    # TODO: make config able to see if value was user-set or default
     strategy = Sqreen.config_get(:weave_strategy)
+    # TODO: factor generic hint system out
+    # TODO: factor those hint definitions to dependency
+    strategy_hints = []
     if strategy == :prepend && !Module.respond_to?(:prepend)
-      Sqreen::Weave.logger.warn { "strategy: #{strategy.inspect} unavailable, falling back to :chain" }
-      strategy = :chain
-    elsif strategy == :chain && Gem::Specification.select { |s| s.name == 'scout_apm' && Gem::Requirement.new('>= 2.5.2').satisfied_by?(Gem::Version.new(s.version)) }.any?
-      Sqreen::Weave.logger.warn { "strategy: #{strategy.inspect} unavailable with scout_apm >= 2.5.2, switching to :prepend" }
-      strategy = :prepend
+      Sqreen::Weave.logger.debug { "strategy: #{strategy.inspect} unavailable, falling back to :chain" }
+      strategy_hints << [:chain, 'Module.respond_to?(:prepend)', 'false']
+    end
+    if Gem::Specification.select { |s| s.name == 'scout_apm' && Gem::Requirement.new('< 2.5.2').satisfied_by?(Gem::Version.new(s.version)) }.any?
+      Sqreen::Weave.logger.debug { "strategy: :prepend unavailable with scout_apm < 2.5.2, switching to :chain" }
+      strategy_hints << [:chain, 'scout_apm', '< 2.5.2']
+    end
+    if Gem::Specification.select { |s| s.name == 'scout_apm' && Gem::Requirement.new('>= 2.5.2').satisfied_by?(Gem::Version.new(s.version)) }.any?
+      Sqreen::Weave.logger.debug { "strategy: :chain unavailable with scout_apm >= 2.5.2, switching to :prepend" }
+      strategy_hints << [:prepend, 'scout_apm', '>= 2.5.2']
+    end
+    if Gem::Specification.select { |s| s.name == 'ddtrace' && Gem::Requirement.new('< 0.27').satisfied_by?(Gem::Version.new(s.version)) }.any?
+      Sqreen::Weave.logger.debug { "strategy: :prepend unavailable with ddtrace < 0.27, switching to :chain" }
+      strategy_hints << [:chain, 'ddtrace', '< 0.27']
+    end
+    if Gem::Specification.select { |s| s.name == 'ddtrace' && Gem::Requirement.new('>= 0.27').satisfied_by?(Gem::Version.new(s.version)) }.any?
+      Sqreen::Weave.logger.debug { "strategy: :chain unavailable with ddtrace >= 0.27, switching to :prepend" }
+      strategy_hints << [:prepend, 'ddtrace', '>= 0.27']
+    end
+    if Gem::Specification.select { |s| s.name == 'skylight' && Gem::Requirement.new('< 5.0.0.beta').satisfied_by?(Gem::Version.new(s.version)) }.any?
+      Sqreen::Weave.logger.debug { "strategy: :prepend unavailable with skylight < 5.0.0.beta, switching to :chain" }
+      strategy_hints << [:chain, 'skylight', '< 5.0.0.beta']
+    end
+    if Gem::Specification.select { |s| s.name == 'skylight' && Gem::Requirement.new('>= 5.0.0.beta').satisfied_by?(Gem::Version.new(s.version)) }.any?
+      Sqreen::Weave.logger.debug { "strategy: :chain unavailable with skylight >= 5.0.0.beta, switching to :prepend" }
+      strategy_hints << [:prepend, 'skylight', '>= 5.0.0.beta']
+    end
+    if strategy_hints.map(&:first).uniq.count > 1
+      raise Sqreen::Exception, "conflicting instrumentation strategies: #{strategy_hints.inspect}"
+    end
+    if strategy_hints.map(&:first).uniq.count == 1 && strategy != strategy_hints.first.first
+      was = strategy
+      strategy = strategy_hints.first.first
+      Sqreen::Weave.logger.warn { "strategy: #{strategy.inspect} was: #{was.inspect} hints: #{strategy_hints.inspect}" }
+    else
+      Sqreen::Weave.logger.info { "strategy: #{strategy.inspect}" }
     end
-    Sqreen::Weave.logger.debug { "strategy: #{strategy.inspect}" }
 
     ### set up rule signature verifier
     verifier = nil
-    if Sqreen.features['rules_signature'] &&
-       Sqreen.config_get(:rules_verify_signature) == true &&
-       !defined?(::JRUBY_VERSION)
+    # TODO: check for JRuby via dependency
+    # TODO: reinstate signatures for JRuby
+    if Sqreen.config_get(:rules_verify_signature) == true && !defined?(::JRUBY_VERSION)
       verifier = Sqreen::SqreenSignedVerifier.new
-      Sqreen::Weave.logger.debug('Rules signature enabled')
+      Sqreen::Weave.logger.debug('rules: signature status: enabled')
     else
-      Sqreen::Weave.logger.debug('Rules signature disabled')
+      Sqreen::Weave.logger.debug('rules: signature status: disabled')
+    end
+
+    if verifier
+      invalid_rules = rules.reject do |rule|
+        valid = verifier.verify(rule)
+
+        if valid
+          Sqreen::Weave.logger.debug { "rule: #{rule['name']} signed: true result: ok" }
+        else
+          Sqreen::Weave.logger.error { "rule: #{rule['name']} singed: true result: fail" }
+        end
+      end
+      if invalid_rules.any?
+        Sqreen::Weave.logger.error { "weave: instrument status: abort reason: signature result: fail" }
+        raise Sqreen::Exception, "Signature error: rules: #{invalid_rules.map { |r| r['name'] }.inspect}"
+      else
+        Sqreen::Weave.logger.info { "weave: instrument rules: signed result: ok" }
+      end
     end
 
     ### force clean instrumentation callback list

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqreen
 version: !ruby/object:Gem::Version
-  version: 1.21.1
+  version: 1.22.0
 platform: ruby
 authors:
 - Sqreen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-06 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqreen-backport
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1.0.0
+        version: '1.0'
 description: Sqreen is a SaaS based Application protection and monitoring platform
   that integrates directly into your Ruby applications. Learn more at https://sqreen.com.
 email: contact@sqreen.com
@@ -342,7 +342,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Sqreen Ruby agent