Fix parsing config file

Author: Inbal Tako

Gemfile

@@ -3,7 +3,6 @@ source "https://rubygems.org"
 gemspec
 gem "rspec"
 gem "rake"
-gem "parseconfig"
 gem "simplecov", :require => false, :group => :test
 gem "codecov", :require => false, :group => :test
 gem "webmock", :require => false, :group => :test

Gemfile.lock

@@ -174,7 +174,6 @@ GEM
     nio4r (2.5.2)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    parseconfig (1.0.8)
     public_suffix (4.0.5)
     rack (2.2.3)
     rack-protection (2.0.8.1)
@@ -263,7 +262,6 @@ DEPENDENCIES
   bundler (~> 2.0)
   codecov
   hanami
-  parseconfig
   rails
   rake
   rspec

lib/api_manager.rb

@@ -24,8 +24,9 @@ def verify(event_options)
     event = SDKEvent.new(event_options, @options)
 
     begin
-      res = @event_manager.send_sync(event, ApiRoute::VERIFY, false).to_json
-      return VerifyResult.new(risk_level: res['riskLevel'], score: res['score'], triggers: 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; #{e}")
     end

lib/config/configuration_builder.rb

@@ -20,10 +20,6 @@ def initialize(api_key: nil, api_url: 'https://api.securenative.com/collector/ap
     @fail_over_strategy = fail_over_strategy
   end
 
-  def self.default_config_builder
-    ConfigurationBuilder.new
-  end
-
   def self.default_securenative_options
     SecureNativeOptions.new
   end

lib/config/configuration_manager.rb

@@ -1,20 +1,20 @@
 # frozen_string_literal: true
 
-require 'parseconfig'
+require 'yaml'
+require 'config/configuration_builder'
 
 class ConfigurationManager
-  DEFAULT_CONFIG_FILE = 'securenative.cfg'
+  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 do |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,32 @@ def self._get_resource_path(env_name)
   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))
   end
 end

lib/context/rails_context.rb

@@ -35,7 +35,8 @@ def self.get_method(request)
 
   def self.get_headers(request)
     begin
-      request.headers.to_h
+      # Note: At the moment we're filtering out everything but user-agent since rails payload is way too big
+      {"user-agent" => request.headers['HTTP_USER_AGENT']}
     rescue StandardError
       nil
     end

lib/event_manager.rb

@@ -65,7 +65,7 @@ def send_sync(event, resource_path, retry_sending)
     SecureNativeLogger.debug("Attempting to send event #{event}")
     res = @http_client.post(resource_path, EventManager.serialize(event).to_json)
 
-    if res.nil? || res.code != 200
+    if res.nil? || res.code != '200'
       SecureNativeLogger.info("SecureNative failed to call endpoint #{resource_path} with event #{event}. adding back to queue")
       item = QueueItem.new(resource_path, EventManager.serialize(event).to_json, retry_sending)
       @queue.append(item)

lib/securenative.rb

@@ -8,6 +8,7 @@
 require 'errors/securenative_config_error'
 require 'enums/failover_strategy'
 require 'config/configuration_builder'
+require 'config/configuration_manager'
 require 'event_manager'
 require 'api_manager'