sqreen 1.7.2 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5741aa7c3b34891c2a790746a3bdaa41b89af92b
-  data.tar.gz: bf1170f3d02dc780352e4c55a5f26862ce0a340e
+  metadata.gz: 88a77217a4b3525192d6fe2fc6d2af9ef361aacc
+  data.tar.gz: b8eb0ee8e0f6d098cf940e6773c07cf3aeeb8fd5
 SHA512:
-  metadata.gz: 87ca7a7ae12ab3b762c12b4c051d0fbf7bce0f16a4b11d9b80462aff8ba01a2f3ce4c8ddcd41c41cc9c93ddb4f920384f6812410b0c4089ffd3c78e2812c4490
-  data.tar.gz: d93a22ee357be92f2fe75b877f2be5af7d7b947ca605102743a241c7592b300d8fd43ad2cb19c7cc707bb832512edf56a5df6fbaf05851dc5fb64b91b123bf8f
+  metadata.gz: 56962d11eb18ff1ebdc527231ea88400ca623dd004c6d13201013bc50ced65bbc0d2b23b8229f675068c3470393865e48446d32099d8644f3c611e3be7343e29
+  data.tar.gz: 9a28c30ba483d3d33690147c6490fdba6c21cb7a79012c25f592fbfa533c17cf8ba0fc8d07c1f158f2c4a52701403207b76ad07ee2ef2425d20a1a41b55d0c72

data/lib/sqreen.rb

@@ -65,4 +65,4 @@ Sqreen.framework.on_start do |framework|
     end
     Sqreen.log.debug("shutting down Sqreen #{Sqreen::VERSION}")
   end
-end unless ENV['SQREEN_DISABLE'].to_i == 1
+end unless Sqreen::to_bool(ENV['SQREEN_DISABLE'])

data/lib/sqreen/configuration.rb

@@ -8,7 +8,7 @@ require 'sqreen/performance_notifications/newrelic'
 module Sqreen
   @config = nil
 
-  def self::config_init(framework = nil)
+  def self.config_init(framework = nil)
     @config = Configuration.new(framework)
     @config.load!
     if @config && config_get(:report_perf_newrelic)
@@ -17,7 +17,7 @@ module Sqreen
     @config
   end
 
-  def self::config_get(name)
+  def self.config_get(name)
     raise 'No configuration defined' if @config.nil?
     @config.get(name)
   end
@@ -26,7 +26,7 @@ module Sqreen
 
   CONFIG_DESCRIPTION = [
     { :env => :SQREEN_DISABLE, :name => :disable,
-      :default => false },
+      :default => false, :convert => :to_bool },
     { :env => :SQREEN_URL,       :name => :url,
       :default => 'https://back.sqreen.io' },
     { :env => :SQREEN_TOKEN,     :name => :token,
@@ -36,15 +36,15 @@ module Sqreen
     { :env => :SQREEN_RULES_SIGNATURE, :name => :rules_verify_signature,
       :default => true },
     { :env => :SQREEN_LOG_LEVEL, :name => :log_level,
-      :default => 'WARN', :choice => %w(UNKNOWN FATAL ERROR WARN INFO DEBUG) },
+      :default => 'WARN', :choice => %w[UNKNOWN FATAL ERROR WARN INFO DEBUG] },
     { :env => :SQREEN_LOG_LOCATION, :name => :log_location,
       :default => 'log/sqreen.log' },
     { :env => :SQREEN_RUN_IN_TEST, :name => :run_in_test,
-      :default => false },
+      :default => false, :convert => :to_bool },
     { :env => :SQREEN_BLOCK_ALL_RULES, :name => :block_all_rules,
       :default => nil },
     { :env => :SQREEN_REPORT_PERF_NR, :name => :report_perf_newrelic,
-      :default => false },
+      :default => false, :convert => :to_bool },
     { :env => :SQREEN_INITIAL_FEATURES, :name => :initial_features,
       :default => nil },
 
@@ -52,6 +52,10 @@ module Sqreen
 
   CONFIG_FILE_NAME = 'sqreen.yml'.freeze
 
+  def self.to_bool(value)
+      %w[1 true].include?(value.to_s.downcase.strip)
+  end
+
   # Class to access configurations variables
   # This try to load environment by different ways.
   # 1. By file:
@@ -90,7 +94,7 @@ module Sqreen
           msg = format("Invalid value '%s' for env '%s' (allowed: %s)", value, name, choices)
           raise Sqreen::Exception, msg
         end
-        res[name] = value
+        res[name] = param[:convert] ? send(param[:convert], value) : value
       end
       res
     end
@@ -101,27 +105,31 @@ module Sqreen
         name      = param[:name]
         value     = ENV[param[:env].to_s]
         next unless value
-        res[name] = value
+        res[name] = param[:convert] ? send(param[:convert], value) : value
       end
       res
     end
 
     def parse_configuration_file(path)
-      res = YAML.load(ERB.new(File.read(path)).result)
-      return {} unless res.is_a?(Hash)
+      yaml = YAML.load(ERB.new(File.read(path)).result)
+      return {} unless yaml.is_a?(Hash)
       if @framework
         env = @framework.framework_infos[:environment]
-        res = res[env] if env && res[env].is_a?(Hash)
+        yaml = yaml[env] if env && yaml[env].is_a?(Hash)
       end
+      res = {}
       # hash keys loaded by YAML are strings instead of symbols
-      res.keys.each do |key|
-        res[key.to_sym] = res.delete(key)
+      Sqreen::CONFIG_DESCRIPTION.each do |param|
+        name      = param[:name]
+        value     = yaml[name.to_s]
+        next unless value
+        res[name] = param[:convert] ? send(param[:convert], value) : value
       end
       res
     end
 
     def find_user_home
-      homes = %w(HOME HOMEPATH)
+      homes = %w[HOME HOMEPATH]
       homes.detect { |h| !ENV[h].nil? }
     end
 
@@ -152,5 +160,9 @@ module Sqreen
       path = File.join(ENV[home], '.' + CONFIG_FILE_NAME)
       return path if File.exist?(path)
     end
+
+    def to_bool(value)
+      Sqreen::to_bool(value)
+    end
   end
 end

data/lib/sqreen/frameworks/generic.rb

@@ -151,7 +151,8 @@ module Sqreen
       def prevent_startup
         return :irb if $0 == 'irb'
         return if sqreen_configuration.nil?
-        return :config_disable if sqreen_configuration.get(:disable)
+        disable = sqreen_configuration.get(:disable)
+        return :config_disable if disable == true || disable.to_s.to_i == 1
       end
 
       # Instrument with our rules when the framework as finished loading

data/lib/sqreen/remote_command.rb

@@ -15,6 +15,7 @@ module Sqreen
       :force_logout => :shutdown,
       :paths_whitelist => :change_whitelisted_paths,
       :ips_whitelist => :change_whitelisted_ips,
+      :get_bundle => :upload_bundle,
     }.freeze
 
     attr_reader :uuid

data/lib/sqreen/runner.rb

@@ -125,7 +125,7 @@ module Sqreen
       # Ensure a deliverer is there unless features have set it first
       self.deliverer ||= Deliveries::Simple.new(session)
       context_infos = {}
-      %w(rules pack_id).each do |p|
+      %w[rules pack_id].each do |p|
         context_infos[p] = response[p] unless response[p].nil?
       end
       process_commands(response.fetch('commands', []), context_infos)
@@ -251,6 +251,12 @@ module Sqreen
       true
     end
 
+    def upload_bundle(_context_infos = {})
+      t = Time.now
+      session.post_bundle(RuntimeInfos.dependencies_signature, RuntimeInfos.dependencies)
+      Time.now - t
+    end
+
     def change_whitelisted_ips(ips, _context_infos = {})
       return false unless ips.respond_to?(:each)
       Sqreen.update_whitelisted_ips(ips)
@@ -323,7 +329,7 @@ module Sqreen
         !Sinatra::Application.run?
     end
 
-    def shutdown(_context_infos={})
+    def shutdown(_context_infos = {})
       remove_instrumentation
       logout
     end

data/lib/sqreen/runtime_infos.rb

@@ -5,6 +5,7 @@ require 'sqreen/version'
 require 'sqreen/frameworks'
 
 require 'socket'
+require 'digest/sha1'
 
 module Sqreen
   module RuntimeInfos
@@ -16,8 +17,8 @@ module Sqreen
       res.merge! os
       res.merge! runtime
       res.merge! framework.framework_infos
+      res[:bundle_signature] = dependencies_signature
       res[:various_infos].merge! time
-      res[:various_infos].merge! dependencies
       res[:various_infos].merge! process
       res
     end
@@ -31,7 +32,7 @@ module Sqreen
 
     def dependencies
       gem_info = Gem.loaded_specs
-      gem_info = gem_info.map do |name, spec|
+      gem_info.map do |name, spec|
         {
           :name => name,
           :version => spec.version.to_s,
@@ -39,9 +40,6 @@ module Sqreen
           :source => (extract_source(spec.source) if spec.respond_to?(:source)),
         }
       end
-      {
-        :dependencies => gem_info,
-      }
     end
 
     def time
@@ -60,8 +58,7 @@ module Sqreen
         {
           :type => type,
           :version => version,
-        },
-      }
+        } }
     end
 
     def agent
@@ -113,6 +110,19 @@ module Sqreen
       }
     end
 
+    def dependencies_signature
+      calculate_dependencies_signature(dependencies)
+    end
+
+    def calculate_dependencies_signature(pkgs)
+      return nil if pkgs.nil? || pkgs.empty?
+      sha1 = Digest::SHA1.new
+      pkgs.map { |pkg| [pkg[:name], pkg[:version]] }.sort.each_with_index do |p, i|
+        sha1 << format(i.zero? ? '%s-%s' : '|%s-%s', *p)
+      end
+      sha1.hexdigest
+    end
+
     def extract_source(source)
       return nil unless source
       ret = { 'name' => source.class.name.split(':')[-1] }

data/lib/sqreen/session.rb

@@ -132,7 +132,6 @@ module Sqreen
     def resiliently(retry_request_seconds, max_retry, current_retry = 0)
       return yield
     rescue => e
-
       Sqreen.log.debug(e.inspect)
 
       current_retry += 1
@@ -161,6 +160,7 @@ module Sqreen
       headers['X-Session-Key'] = @session_id if @session_id
       headers['X-Sqreen-Time'] = Time.now.utc.to_f.to_s
       headers['X-Sqreen-Agent'] = "Ruby/#{Sqreen::VERSION}"
+      headers['User-Agent'] = "Ruby/#{Sqreen::VERSION}"
       headers['X-Sqreen-Beta'] = format('pid=%d;tid=%s;nb=%d;t=%f',
                                         Process.pid,
                                         thread_id,
@@ -258,14 +258,19 @@ module Sqreen
       resilient_post('attack', attack.to_hash)
     end
 
+    def post_bundle(bundle_sig, dependencies)
+      resilient_post('bundle', 'bundle_signature' => bundle_sig,
+                               'dependencies' => dependencies)
+    end
+
     # Post an exception to Sqreen for analysis
     # @param exception [RemoteException] Exception and context to be sent over
     def post_sqreen_exception(exception)
       post('sqreen_exception', exception.to_hash, {}, 5)
     rescue *NET_ERRORS => e
       Sqreen.log.warn(format('Could not post exception (network down? %s) %s',
-                              e.inspect,
-                              exception.to_hash.inspect))
+                             e.inspect,
+                             exception.to_hash.inspect))
       nil
     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.7.2'.freeze
+  VERSION = '1.8.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqreen
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.8.0
 platform: ruby
 authors:
 - Sqreen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-18 00:00:00.000000000 Z
+date: 2017-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs