securenative 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b61f74882bbf23be71999125df784a88a509c29ef3ca5cee0569ebdaa2063f32
-  data.tar.gz: c6305ecadb3bf5d45245b54dfa336fc7d8b2774b0ceb7fc8997c2cdb1060a4a1
+  metadata.gz: 7ba285b1ac9a68c9cb1143ab595a4c052636e47b8d4cc39e16821e0582e06a62
+  data.tar.gz: c6295e963d7440c4dc8be4046077cafb4af96311f500fa2220717bf726b0ffba
 SHA512:
-  metadata.gz: 0a46b6fed3c5478412f1e437142e2c74bc8e27d8213c0c8af8d08c4ad2dbfc71c13cf8695cd31a406d1600eb5005ce206ee7b3613b4dbb436cb072a199e3a7a2
-  data.tar.gz: c14bdfe15041f74dc7b899f8b8eac5b8d3228a5f638a1d0edd347a4793bbdf7ce9bc9c39e78d7a38b595feb0044337e2e2e73679dd804364ccc79057fb7f8c89
+  metadata.gz: 7f78c7385e543d75dd106611eb77f71004fcb12d10702ae99a02af27cf3273bd45fcb2d5c7725a7001f143973f1cf2d70c19b3d57e3222d0b7965a40ec343f2c
+  data.tar.gz: fada20df309348b5e74a8886fb5855d51aed1ad4ba2245dd23df60f409b1fd6e3bc11efd829b4b21a2b0fa9cf2dac45c08628f088e49879a09a45853aee52ef7

data/Gemfile.lock

@@ -1,61 +1,61 @@
 PATH
   remote: .
   specs:
-    securenative (0.1.22)
+    securenative (0.1.23)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.3.2)
-      actionpack (= 6.0.3.2)
+    actioncable (6.0.3.3)
+      actionpack (= 6.0.3.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activejob (= 6.0.3.2)
-      activerecord (= 6.0.3.2)
-      activestorage (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
+    actionmailbox (6.0.3.3)
+      actionpack (= 6.0.3.3)
+      activejob (= 6.0.3.3)
+      activerecord (= 6.0.3.3)
+      activestorage (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
       mail (>= 2.7.1)
-    actionmailer (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      actionview (= 6.0.3.2)
-      activejob (= 6.0.3.2)
+    actionmailer (6.0.3.3)
+      actionpack (= 6.0.3.3)
+      actionview (= 6.0.3.3)
+      activejob (= 6.0.3.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.2)
-      actionview (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
+    actionpack (6.0.3.3)
+      actionview (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activerecord (= 6.0.3.2)
-      activestorage (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
+    actiontext (6.0.3.3)
+      actionpack (= 6.0.3.3)
+      activerecord (= 6.0.3.3)
+      activestorage (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
       nokogiri (>= 1.8.5)
-    actionview (6.0.3.2)
-      activesupport (= 6.0.3.2)
+    actionview (6.0.3.3)
+      activesupport (= 6.0.3.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.3.2)
-      activesupport (= 6.0.3.2)
+    activejob (6.0.3.3)
+      activesupport (= 6.0.3.3)
       globalid (>= 0.3.6)
-    activemodel (6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activerecord (6.0.3.2)
-      activemodel (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activestorage (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activejob (= 6.0.3.2)
-      activerecord (= 6.0.3.2)
+    activemodel (6.0.3.3)
+      activesupport (= 6.0.3.3)
+    activerecord (6.0.3.3)
+      activemodel (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
+    activestorage (6.0.3.3)
+      actionpack (= 6.0.3.3)
+      activejob (= 6.0.3.3)
+      activerecord (= 6.0.3.3)
       marcel (~> 0.3.1)
-    activesupport (6.0.3.2)
+    activesupport (6.0.3.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -64,11 +64,9 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     builder (3.2.4)
-    codecov (0.2.6)
-      colorize
+    codecov (0.2.11)
       json
       simplecov
-    colorize (0.8.1)
     concurrent-ruby (1.1.7)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
@@ -157,7 +155,7 @@ GEM
       concurrent-ruby (~> 1.0)
     inflecto (0.0.2)
     json (2.3.1)
-    loofah (2.6.0)
+    loofah (2.7.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -168,41 +166,41 @@ GEM
     mimemagic (0.3.5)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.14.1)
+    minitest (5.14.2)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
-    nio4r (2.5.2)
+    nio4r (2.5.4)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    public_suffix (4.0.5)
+    public_suffix (4.0.6)
     rack (2.2.3)
-    rack-protection (2.0.8.1)
+    rack-protection (2.1.0)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.3.2)
-      actioncable (= 6.0.3.2)
-      actionmailbox (= 6.0.3.2)
-      actionmailer (= 6.0.3.2)
-      actionpack (= 6.0.3.2)
-      actiontext (= 6.0.3.2)
-      actionview (= 6.0.3.2)
-      activejob (= 6.0.3.2)
-      activemodel (= 6.0.3.2)
-      activerecord (= 6.0.3.2)
-      activestorage (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
+    rails (6.0.3.3)
+      actioncable (= 6.0.3.3)
+      actionmailbox (= 6.0.3.3)
+      actionmailer (= 6.0.3.3)
+      actionpack (= 6.0.3.3)
+      actiontext (= 6.0.3.3)
+      actionview (= 6.0.3.3)
+      activejob (= 6.0.3.3)
+      activemodel (= 6.0.3.3)
+      activerecord (= 6.0.3.3)
+      activestorage (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
       bundler (>= 1.3.0)
-      railties (= 6.0.3.2)
+      railties (= 6.0.3.3)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
+    railties (6.0.3.3)
+      actionpack (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -226,15 +224,15 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
     simplecov-html (0.12.2)
-    sinatra (2.0.8.1)
+    sinatra (2.1.0)
       mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.8.1)
+      rack (~> 2.2)
+      rack-protection (= 2.1.0)
       tilt (~> 2.0)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
@@ -246,7 +244,7 @@ GEM
       thread_safe (~> 0.1)
     url_mount (0.2.1)
       rack
-    webmock (3.8.3)
+    webmock (3.9.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

data/lib/config/configuration_builder.rb

@@ -3,12 +3,12 @@
 require 'enums/failover_strategy'
 
 class ConfigurationBuilder
-  attr_reader :api_key, :api_url, :interval, :max_events, :timeout, :auto_send, :disable, :log_level, :fail_over_strategy
-  attr_writer :api_key, :api_url, :interval, :max_events, :timeout, :auto_send, :disable, :log_level, :fail_over_strategy
+  attr_reader :api_key, :api_url, :interval, :max_events, :timeout, :auto_send, :disable, :log_level, :fail_over_strategy, :proxy_headers
+  attr_writer :api_key, :api_url, :interval, :max_events, :timeout, :auto_send, :disable, :log_level, :fail_over_strategy, :proxy_headers
 
   def initialize(api_key: nil, api_url: 'https://api.securenative.com/collector/api/v1', interval: 1000,
                  max_events: 1000, timeout: 1500, auto_send: true, disable: false, log_level: 'FATAL',
-                 fail_over_strategy: FailOverStrategy::FAIL_OPEN)
+                 fail_over_strategy: FailOverStrategy::FAIL_OPEN, proxy_headers: nil)
     @api_key = api_key
     @api_url = api_url
     @interval = interval
@@ -18,6 +18,7 @@ class ConfigurationBuilder
     @disable = disable
     @log_level = log_level
     @fail_over_strategy = fail_over_strategy
+    @proxy_headers = proxy_headers
   end
 
   def self.default_securenative_options

data/lib/config/configuration_manager.rb

@@ -50,6 +50,7 @@ class ConfigurationManager
                              auto_send: _get_env_or_default(properties, 'SECURENATIVE_AUTO_SEND', options.auto_send),
                              disable: _get_env_or_default(properties, 'SECURENATIVE_DISABLE', options.disable),
                              log_level: _get_env_or_default(properties, 'SECURENATIVE_LOG_LEVEL', options.log_level),
-                             fail_over_strategy: _get_env_or_default(properties, 'SECURENATIVE_FAILOVER_STRATEGY', options.fail_over_strategy))
+                             fail_over_strategy: _get_env_or_default(properties, 'SECURENATIVE_FAILOVER_STRATEGY', options.fail_over_strategy),
+                             proxy_headers: _get_env_or_default(properties, 'SECURENATIVE_PROXY_HEADERS', options.proxy_headers))
   end
 end

data/lib/config/securenative_options.rb

@@ -3,12 +3,12 @@
 require 'enums/failover_strategy'
 
 class SecureNativeOptions
-  attr_reader :api_key, :api_url, :interval, :max_events, :timeout, :auto_send, :disable, :log_level, :fail_over_strategy
-  attr_writer :api_key, :api_url, :interval, :max_events, :timeout, :auto_send, :disable, :log_level, :fail_over_strategy
+  attr_reader :api_key, :api_url, :interval, :max_events, :timeout, :auto_send, :disable, :log_level, :fail_over_strategy, :proxy_headers
+  attr_writer :api_key, :api_url, :interval, :max_events, :timeout, :auto_send, :disable, :log_level, :fail_over_strategy, :proxy_headers
 
   def initialize(api_key: nil, api_url: "https://api.securenative.com/collector/api/v1", interval: 1000,
                  max_events: 1000, timeout: 1500, auto_send: true, disable: false, log_level: "FATAL",
-                 fail_over_strategy: FailOverStrategy::FAIL_OPEN)
+                 fail_over_strategy: FailOverStrategy::FAIL_OPEN, proxy_headers: nil)
     @api_key = api_key
     @api_url = api_url
     @interval = interval
@@ -18,5 +18,6 @@ class SecureNativeOptions
     @disable = disable
     @log_level = log_level
     @fail_over_strategy = fail_over_strategy
+    @proxy_headers = proxy_headers
   end
 end

data/lib/utils/request_utils.rb

@@ -13,7 +13,7 @@ class RequestUtils
     []
   end
 
-  def self.get_client_ip_from_request(request)
+  def self.get_client_ip_from_request(request, options = nil)
     begin
       return request.ip unless request.ip.nil?
     rescue NoMethodError
@@ -21,26 +21,41 @@ class RequestUtils
 
     begin
       x_forwarded_for = request.env['HTTP_X_FORWARDED_FOR']
-      return x_forwarded_for unless x_forwarded_for.nil?
+      return x_forwarded_for.scan(/\b(?:[0-9]{1,3}\.){3}[0-9]{1,3}\b/)[0] unless x_forwarded_for.nil?
     rescue NoMethodError
       begin
         x_forwarded_for = request['HTTP_X_FORWARDED_FOR']
-        return x_forwarded_for unless x_forwarded_for.nil?
+        return x_forwarded_for.scan(/\b(?:[0-9]{1,3}\.){3}[0-9]{1,3}\b/)[0] unless x_forwarded_for.nil?
       rescue NoMethodError
       end
     end
 
     begin
       x_forwarded_for = request.env['REMOTE_ADDR']
-      return x_forwarded_for unless x_forwarded_for.nil?
+      return x_forwarded_for.scan(/\b(?:[0-9]{1,3}\.){3}[0-9]{1,3}\b/)[0] unless x_forwarded_for.nil?
     rescue NoMethodError
       begin
         x_forwarded_for = request['REMOTE_ADDR']
-        return x_forwarded_for unless x_forwarded_for.nil?
+        return x_forwarded_for.scan(/\b(?:[0-9]{1,3}\.){3}[0-9]{1,3}\b/)[0] unless x_forwarded_for.nil?
       rescue NoMethodError
       end
     end
 
+    unless options.nil?
+      for header in options.proxy_headers do
+        begin
+          h = request.env[header]
+          return h.scan(/\b(?:[0-9]{1,3}\.){3}[0-9]{1,3}\b/)[0] unless h.nil?
+        rescue NoMethodError
+          begin
+            h = request[header]
+            return h.scan(/\b(?:[0-9]{1,3}\.){3}[0-9]{1,3}\b/)[0] unless h.nil?
+          rescue NoMethodError
+          end
+        end
+      end
+    end
+
     ''
   end
 

data/out/production/securenative-ruby/api_manager.rb

@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
+require 'models/sdk_event'
+require 'enums/failover_strategy'
+require 'enums/risk_level'
+require 'enums/api_route'
+require 'models/verify_result'
 require 'json'
 
 class ApiManager
@@ -19,13 +24,16 @@ class ApiManager
     event = SDKEvent.new(event_options, @options)
 
     begin
-      res = JSON.parse(@event_manager.send_sync(event, ApiRoute::VERIFY, false))
-      return VerifyResult.new(res['riskLevel'], res['score'], res['triggers'])
+      res = @event_manager.send_sync(event, ApiRoute::VERIFY, false)
+      ver_result = JSON.parse(res.body)
+      return VerifyResult.new(risk_level: ver_result['riskLevel'], score: ver_result['score'], triggers: ver_result['triggers'])
     rescue StandardError => e
-      SecureNativeLogger.debug('Failed to call verify; {}'.format(e))
+      SecureNativeLogger.debug("Failed to call verify; #{e}")
+    end
+    if @options.fail_over_strategy == FailOverStrategy::FAIL_OPEN
+      return VerifyResult.new(risk_level: RiskLevel::LOW, score: 0, triggers: nil)
     end
-    return VerifyResult.new(RiskLevel::LOW, 0, nil) if @options.fail_over_strategy == FailOverStrategy::FAIL_OPEN
 
-    VerifyResult.new(RiskLevel::HIGH, 1, nil)
+    VerifyResult.new(risk_level: RiskLevel::HIGH, score: 1, triggers: nil)
   end
 end

data/out/production/securenative-ruby/config/configuration_builder.rb

@@ -3,12 +3,12 @@
 require 'enums/failover_strategy'
 
 class ConfigurationBuilder
-  attr_reader :api_key, :api_url, :interval, :max_events, :timeout, :auto_send, :disable, :log_level, :fail_over_strategy
-  attr_writer :api_key, :api_url, :interval, :max_events, :timeout, :auto_send, :disable, :log_level, :fail_over_strategy
+  attr_reader :api_key, :api_url, :interval, :max_events, :timeout, :auto_send, :disable, :log_level, :fail_over_strategy, :proxy_headers
+  attr_writer :api_key, :api_url, :interval, :max_events, :timeout, :auto_send, :disable, :log_level, :fail_over_strategy, :proxy_headers
 
-  def initialize(api_key = nil, api_url = 'https://api.securenative.com/collector/api/v1', interval = 1000,
-                 max_events = 1000, timeout = 1500, auto_send = true, disable = false, log_level = 'FATAL',
-                 fail_over_strategy = FailOverStrategy::FAIL_OPEN)
+  def initialize(api_key: nil, api_url: 'https://api.securenative.com/collector/api/v1', interval: 1000,
+                 max_events: 1000, timeout: 1500, auto_send: true, disable: false, log_level: 'FATAL',
+                 fail_over_strategy: FailOverStrategy::FAIL_OPEN, proxy_headers: [])
     @api_key = api_key
     @api_url = api_url
     @interval = interval
@@ -18,10 +18,7 @@ class ConfigurationBuilder
     @disable = disable
     @log_level = log_level
     @fail_over_strategy = fail_over_strategy
-  end
-
-  def self.default_config_builder
-    ConfigurationBuilder.new
+    @proxy_headers = proxy_headers
   end
 
   def self.default_securenative_options

data/out/production/securenative-ruby/config/configuration_manager.rb

@@ -1,21 +1,21 @@
 # frozen_string_literal: true
 
-require 'parseconfig'
+require 'yaml'
+require 'config/configuration_builder'
 
 class ConfigurationManager
-  DEFAULT_CONFIG_FILE = 'securenative.cfg'
-  CUSTOM_CONFIG_FILE_ENV_NAME = 'SECURENATIVE_COMFIG_FILE'
+  DEFAULT_CONFIG_FILE = 'securenative.yml'
+  CUSTOM_CONFIG_FILE_ENV_NAME = 'SECURENATIVE_CONFIG_FILE'
   @config = nil
 
   def self.read_resource_file(resource_path)
-    @config = ParseConfig.new(resource_path)
-
     properties = {}
-    @config.get_groups.each { |group|
-      group.each do |key, value|
-        properties[key.upcase] = value
-      end
-    }
+    begin
+      @config = YAML.load_file(resource_path)
+      properties = @config unless @config.nil?
+    rescue StandardError => e
+      SecureNativeLogger.error("Could not parse config file #{resource_path}; #{e}")
+    end
     properties
   end
 
@@ -24,32 +24,33 @@ class ConfigurationManager
   end
 
   def self.config_builder
-    ConfigurationBuilder.default_config_builder
+    ConfigurationBuilder.new
   end
 
   def self._get_env_or_default(properties, key, default)
-    return Env[key] if Env[key]
+    return ENV[key] if ENV[key]
     return properties[key] if properties[key]
 
     default
   end
 
   def self.load_config
-    options = ConfigurationBuilder().default_securenative_options
+    options = ConfigurationBuilder.default_securenative_options
 
     resource_path = DEFAULT_CONFIG_FILE
-    resource_path = Env[CUSTOM_CONFIG_FILE_ENV_NAME] if Env[CUSTOM_CONFIG_FILE_ENV_NAME]
+    resource_path = ENV[CUSTOM_CONFIG_FILE_ENV_NAME] unless ENV[CUSTOM_CONFIG_FILE_ENV_NAME].nil?
 
     properties = read_resource_file(resource_path)
 
-    ConfigurationBuilder(_get_env_or_default(properties, 'SECURENATIVE_API_KEY', options.api_key),
-                         _get_env_or_default(properties, 'SECURENATIVE_API_URL', options.api_url),
-                         _get_env_or_default(properties, 'SECURENATIVE_INTERVAL', options.interval),
-                         _get_env_or_default(properties, 'SECURENATIVE_MAX_EVENTS', options.max_events),
-                         _get_env_or_default(properties, 'SECURENATIVE_TIMEOUT', options.timeout),
-                         _get_env_or_default(properties, 'SECURENATIVE_AUTO_SEND', options.auto_send),
-                         _get_env_or_default(properties, 'SECURENATIVE_DISABLE', options.disable),
-                         _get_env_or_default(properties, 'SECURENATIVE_LOG_LEVEL', options.log_level),
-                         _get_env_or_default(properties, 'SECURENATIVE_FAILOVER_STRATEGY', options.fail_over_strategy))
+    ConfigurationBuilder.new(api_key: _get_env_or_default(properties, 'SECURENATIVE_API_KEY', options.api_key),
+                             api_url: _get_env_or_default(properties, 'SECURENATIVE_API_URL', options.api_url),
+                             interval: _get_env_or_default(properties, 'SECURENATIVE_INTERVAL', options.interval),
+                             max_events: _get_env_or_default(properties, 'SECURENATIVE_MAX_EVENTS', options.max_events),
+                             timeout: _get_env_or_default(properties, 'SECURENATIVE_TIMEOUT', options.timeout),
+                             auto_send: _get_env_or_default(properties, 'SECURENATIVE_AUTO_SEND', options.auto_send),
+                             disable: _get_env_or_default(properties, 'SECURENATIVE_DISABLE', options.disable),
+                             log_level: _get_env_or_default(properties, 'SECURENATIVE_LOG_LEVEL', options.log_level),
+                             fail_over_strategy: _get_env_or_default(properties, 'SECURENATIVE_FAILOVER_STRATEGY', options.fail_over_strategy),
+                             proxy_headers: _get_env_or_default(properties, 'SECURENATIVE_PROXY_HEADERS', options.proxy_headers))
   end
 end