sqreen 1.1.51482852304 → 1.2.01484936161

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a26aaa8da8d26dd436954f305fa4edd3012e1b4
-  data.tar.gz: 4149459209326187539244978f475f62d4596eb9
+  metadata.gz: f8b8e4c339703d78d76d87c9c00306ee5d658331
+  data.tar.gz: fbe298fb99b526c9b1a8366347ce90b830529412
 SHA512:
-  metadata.gz: ceb98979ac432d65cb3d01ba744a272e009978c8568fd112dc5cbf49e1717d80d35f5e6cf7e50eea5c36b427ca017a7aacf864b181aea8e0303d9f9d48586784
-  data.tar.gz: 0ccc23a42825667d824a2ec4e4e83d47c4242094c033c23a8f6b35715ad11b6c93f296b45950343390807b02c6ccafe83605df2333809561d5c75bfff04669f7
+  metadata.gz: 6567012ee61a57b061758f1f680443c1a1808ab9a63f253ddbb4f58e33172462e1bb3c02d6741ee30c4d357508c24994916b97ab78191a06fde8ecb789623ecf
+  data.tar.gz: 70f865c6df795c027b1c4225982904ae48b5b71cd94099cb066e80d7cd3d56277b5356b59dddbcb7d7649c2f6b66daacd6018929204809a37271635ec0184675

data/lib/sqreen.rb

@@ -63,5 +63,6 @@ Sqreen.framework.on_start do |framework|
       sleep(delay)
       retry
     end
+    Sqreen.log.debug("shutting down Sqreen #{Sqreen::VERSION}")
   end
 end unless ENV['SQREEN_DISABLE'].to_i == 1

data/lib/sqreen/frameworks/generic.rb

@@ -1,5 +1,6 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.io/terms.html
+require 'ipaddr'
 
 require 'sqreen/events/remote_exception'
 require 'sqreen/callbacks'
@@ -20,7 +21,6 @@ module Sqreen
         end
       end
 
-
       # What kind of database is this
       def db_settings(_options = {})
         raise Sqreen::NotImplementedYet
@@ -67,7 +67,7 @@ module Sqreen
         return nil unless req
         forwarded = req.env['HTTP_X_FORWARDED_FOR']
         ips = split_ip_addresses(forwarded)
-        last = ips.reject { |ip| ip =~ TRUSTED_PROXIES }.first
+        last = ips.find { |ip| (ip !~ TRUSTED_PROXIES) && valid_ip?(ip) }
         return last unless last.nil?
         req.env['REMOTE_ADDR']
       end
@@ -321,6 +321,13 @@ module Sqreen
       def split_ip_addresses(ip_addresses)
         ip_addresses ? ip_addresses.strip.split(/[,\s]+/) : []
       end
+
+      def valid_ip?(ip)
+        IPAddr.new(ip)
+        true
+      rescue
+        false
+      end
     end
   end
 end

data/lib/sqreen/remote_command.rb

@@ -11,6 +11,7 @@ module Sqreen
       :rules_reload => :reload_rules,
       :features_get => :features,
       :features_change => :change_features,
+      :force_logout => :shutdown,
     }.freeze
 
     attr_reader :uuid

data/lib/sqreen/runner.rb

@@ -62,6 +62,7 @@ module Sqreen
     attr_reader :deliverer
     attr_reader :session
     attr_reader :instrumenter
+    attr_accessor :running
     attr_accessor :next_command_results
     attr_accessor :next_metrics
 
@@ -76,6 +77,7 @@ module Sqreen
       @last_heartbeat_request = Time.now
       @next_command_results = {}
       @next_metrics = []
+      @running = true
 
       @token = @configuration.get(:token)
       @url = @configuration.get(:url)
@@ -285,9 +287,7 @@ module Sqreen
     end
 
     def run_watcher
-      loop do
-        run_watcher_once
-      end
+      run_watcher_once while running
     end
 
     # Sinatra is using at_exit to run the application, see:
@@ -298,6 +298,11 @@ module Sqreen
         !Sinatra::Application.run?
     end
 
+    def shutdown(_context_infos={})
+      remove_instrumentation
+      logout
+    end
+
     def logout(retrying = true)
       return unless session
       if @logged_out_tried
@@ -309,6 +314,7 @@ module Sqreen
       aggregate_observations
       session.post_metrics(metrics_engine.publish) if metrics_engine
       session.logout(retrying)
+      @running = false
     end
 
     def register_exit_cb(try_again = true)

data/lib/sqreen/sdk.rb

@@ -7,5 +7,8 @@ module Sqreen
     # Authentication tracking method
     def auth_track(is_logged_in, authentication_keys)
     end
+
+    def signup_track(authentication_keys)
+    end
   end
 end

data/lib/sqreen/session.rb

@@ -133,7 +133,7 @@ module Sqreen
       return yield
     rescue => e
 
-      Sqreen.log.error(e.inspect)
+      Sqreen.log.warn(e.inspect)
 
       current_retry += 1
 

data/lib/sqreen/version.rb

@@ -2,5 +2,5 @@
 # Please refer to our terms for more information: https://www.sqreen.io/terms.html
 # Warning This file is auto generated! DO NOT edit.
 module Sqreen
-  VERSION = "1.1.51482852304".freeze
+  VERSION = "1.2.01484936161".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqreen
 version: !ruby/object:Gem::Version
-  version: 1.1.51482852304
+  version: 1.2.01484936161
 platform: ruby
 authors:
 - Sqreen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-27 00:00:00.000000000 Z
+date: 2017-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs