contrast-agent 6.0.0 → 6.1.2

data/lib/contrast/api/decorators/response_type.rb

@@ -6,25 +6,12 @@ require 'protobuf/message'
 
 module Contrast
   module Api
-    module Decorators
-      # Used to decorate the {Contrast::Api::Dtm::AttackResult::ResponseType} protobuf
-      # model so it can add SUSPICIOUS.
-      module ResponseType
-        ::Protobuf::Enum.define(:SUSPICIOUS, 6)
-
-        def self.included klass
-          klass.extend(ClassMethods)
-        end
-
-        # Used to add class methods to the  class on inclusion of the decorator
-        module ClassMethods
-          def build
-            new
-          end
+    module Dtm
+      class AttackResult < ::Protobuf::Message
+        class ResponseType < ::Protobuf::Enum
+          define :SUSPICIOUS, 6
         end
       end
     end
   end
 end
-
-Contrast::Api::Dtm::AttackResult::ResponseType.include(Contrast::Api::Decorators::ResponseType)

data/lib/contrast/components/agent.rb

@@ -75,7 +75,7 @@ module Contrast
 
         # Insert ourselves into the application, keeping our middleware at the outermost layer of the onion
         def insert_middleware app
-          app.middleware.insert_before 0, Contrast::Agent::Middleware
+          app.middleware.insert_before(0, Contrast::Agent::Middleware)
         end
 
         def enable_tracepoint

data/lib/contrast/components/base.rb

@@ -56,7 +56,7 @@ module Contrast
       def file_exists? path
         return false unless path
 
-        File.exist? path
+        File.exist?(path)
       end
     end
   end

data/lib/contrast/components/config.rb

@@ -28,6 +28,12 @@ module Contrast
       CONTRAST_NAME = 'Contrast Agent'
 
       class Interface # :nodoc:
+        SESSION_VARIABLES = 'Invalid configuration. '\
+                            "Setting both application.session_id and application.session_metadata is not allowed.\n"
+        API_URL = "Invalid configuration. Missing a required connection value 'url' is not set."
+        API_KEY = "Invalid configuration. Missing a required connection value 'api_key' is not set."
+        API_SERVICE_KEY = "Invalid configuration. Missing a required connection value 'service_tag' is not set."
+        API_USERNAME = "Invalid configuration. Missing a required connection value 'user_name' is not set."
         def initialize
           build
         end
@@ -72,14 +78,21 @@ module Contrast
           @config.loggable
         end
 
+        # Typically, this would be accessed through Contrast::SETTINGS, but we're specifically checking for the user
+        # provided value here rather than that echoed back by TeamServer.
+        #
+        # @return [String,nil] the value of the session id set in the configuration, or nil if unset
+        def session_id
+          root.application.session_id
+        end
+
+        # @return [String,nil] the value of the session metadata set in the configuration, or nil if unset
+        def session_metadata
+          root.application.session_metadata
+        end
+
         private
 
-        SESSION_VARIABLES = 'Invalid configuration. '\
-                            "Setting both application.session_id and application.session_metadata is not allowed.\n"
-        API_URL = "Invalid configuration. Missing a required connection value 'url' is not set."
-        API_KEY = "Invalid configuration. Missing a required connection value 'api_key' is not set."
-        API_SERVICE_KEY = "Invalid configuration. Missing a required connection value 'service_tag' is not set."
-        API_USERNAME = "Invalid configuration. Missing a required connection value 'user_name' is not set."
         # The config has information about how to construct the logger. If the config is invalid, and you want to know
         # about it, then you have a circular dependency if you try to log it, so we use basic proto_logger to do this
         # job.
@@ -127,28 +140,6 @@ module Contrast
           end
         end
 
-        # Typically, this would be accessed through
-        # Contrast::Components::AppContext, but we're too early in the
-        # initialization of the Agent to use that mechanism, so we look it up
-        # directly for ourselves
-        #
-        # @return [String,nil] the value of the session id set in the
-        #   configuration, or nil if unset
-        def session_id
-          root.application.session_id
-        end
-
-        # Typically, this would be accessed through
-        # Contrast::Components::AppContext, but we're too early in the
-        # initialization of the Agent to use that mechanism, so we look it up
-        # directly for ourselves
-        #
-        # @return [String,nil] the value of the session metadata set in the
-        #   configuration, or nil if unset
-        def session_metadata
-          root.application.session_metadata
-        end
-
         # Typically, the following values would be accessed through Contrast::Components::AppContext
         # and Contrast::Components::API, but we're too early in the initialization of the Agent to use
         # that mechanism, so we look it up directly for ourselves.

data/lib/contrast/components/contrast_service.rb

@@ -18,7 +18,10 @@ module Contrast
         DEFAULT_SERVICE_LEVEL = :TRACE
         # The Rails ActionDispatch regexp for localhost IP + literal localhost
         # https://github.com/rails/rails/blob/master/actionpack/lib/action_dispatch/http/request.rb#L32
-        LOCALHOST = Regexp.union [/^127\.\d{1,3}\.\d{1,3}\.\d{1,3}$/, /^::1$/, /^0:0:0:0:0:0:0:1(%.*)?$/, /^localhost$/]
+        LOCALHOST = Regexp.union([
+                                   /^127\.\d{1,3}\.\d{1,3}\.\d{1,3}$/, /^::1$/, /^0:0:0:0:0:0:0:1(%.*)?$/,
+                                   /^localhost$/
+                                 ])
 
         def use_bundled_service?
           # Validates the config to decide if it's suitable for starting
@@ -38,6 +41,15 @@ module Contrast
           @_use_agent_communication = true?(::Contrast::CONFIG.root.agent.service.bypass)
         end
 
+        # If we're using the agent directly and not using protect, then there is no need to start the service. Because
+        # we only know this at startup when hardcoded as such (b/c TS could turn protect on otherwise), we can only do
+        # so when bypass is on and protect is off in local config
+        #
+        # @return [Boolean]
+        def unnecessary?
+          ::Contrast::CONTRAST_SERVICE.use_agent_communication? && ::Contrast::PROTECT.forcibly_disabled?
+        end
+
         def host
           @_host ||=
             (::Contrast::CONFIG.root.agent.service.host || Contrast::Config::ServiceConfiguration::DEFAULT_HOST).to_s

data/lib/contrast/components/sampling.rb

@@ -25,7 +25,7 @@ module Contrast
         def sampling_control
           @_sampling_control ||= begin
             config_settings = ::Contrast::CONFIG.root.assess&.sampling
-            settings = ::Contrast::SETTINGS&.assess_state&.[](:sampling_settings)
+            settings = ::Contrast::SETTINGS&.assess_state&.sampling_settings
             {
                 enabled: enabled?(config_settings, settings),
                 baseline: baseline(config_settings, settings),

data/lib/contrast/components/settings.rb

@@ -86,6 +86,10 @@ module Contrast
         #                          Rules to follow when using the masking. Each rules contains Id [String]
         #                          and Keywords [Array<String>].
         attr_reader :sensitive_data_masking
+        # @return [Integer] the time, in ms, that application settings last changed
+        attr_reader :last_app_update_ms
+        # @return [Integer] the time, in ms, that server settings last changed
+        attr_reader :last_server_update_ms
 
         def initialize
           reset_state
@@ -95,39 +99,31 @@ module Contrast
           @application_state.exclusion_matchers.select(&:code?)
         end
 
-        # @param features [Contrast::Api::Settings::ServerFeatures, Contrast::Agent::Reporting::Response]
-        def update_from_server_features features
-          if features.cs__is_a?(Contrast::Agent::Reporting::Response)
-            server_features = features.server_features
-            log_file = server_features.log_file
-            log_level = server_features.log_level
-            Contrast::Logger::Log.instance.update(log_file, log_level) if log_file || log_level
-            @protect_state.enabled = server_features.protect.enabled?
-            @assess_state.enabled = server_features.assess.enabled?
-            @assess_state.sampling_settings = server_features.assess.sampling
+        # @param features_response [Contrast::Api::Settings::ServerFeatures, Contrast::Agent::Reporting::Response]
+        def update_from_server_features features_response
+          if features_response.cs__is_a?(Contrast::Agent::Reporting::Response)
+            update_from_response(features_response)
           else
-            @protect_state.enabled = features.protect_enabled?
-            @assess_state.enabled = features.assess_enabled?
-            @assess_state.sampling_settings = features.assess.sampling
+            @protect_state.enabled = features_response.protect_enabled?
+            @assess_state.enabled = features_response.assess_enabled?
+            @assess_state.sampling_settings = features_response.assess.sampling
+            @last_server_update_ms = Contrast::Utils::Timer.now_ms
           end
+          @last_server_update_ms = Contrast::Utils::Timer.now_ms
         end
 
-        # @param features [Contrast::Api::Settings::ApplicationSettings, Contrast::Agent::Reporting::Response]
-        def update_from_application_settings features
-          if features&.class == Contrast::Agent::Reporting::Response
-            settings = features.application_settings
-            @application_state.modes_by_id = settings.protect.protection_rules_to_settings_hash
-            # TODO: RUBY-1438 this needs to be translated
-            # @application_state.exclusion_matchers = new_vals[:exclusion_matchers]
-            update_sensitive_data_policy(settings.sensitive_data_masking)
-            @assess_state.disabled_assess_rules = settings.assess.disabled_rules
-            @assess_state.session_id = settings.assess.session_id if settings.assess.session_id
+        # @param settings_response [Contrast::Api::Settings::ApplicationSettings, Contrast::Agent::Reporting::Response]
+        def update_from_application_settings settings_response
+          if settings_response&.cs__class == Contrast::Agent::Reporting::Response
+            update_from_response(settings_response)
           else
-            new_vals = features.application_state_translation
+            new_vals = settings_response.application_state_translation
             @application_state.modes_by_id = new_vals[:modes_by_id]
             @application_state.exclusion_matchers = new_vals[:exclusion_matchers]
             @assess_state.disabled_assess_rules = new_vals[:disabled_assess_rules]
+            @last_app_update_ms = Contrast::Utils::Timer.now_ms
           end
+          @last_app_update_ms = Contrast::Utils::Timer.now_ms
         end
 
         # Wipe state to zero.
@@ -174,6 +170,44 @@ module Contrast
 
         private
 
+        # @param response [Contrast::Agent::Reporting::Response]
+        def update_from_response response
+          if (server_features = response.server_features)
+            update_server_features(server_features)
+          end
+          return unless (app_settings = response.application_settings)
+
+          update_application_settings(app_settings)
+        end
+
+        # @param server_features [Contrast::Agent::Reporting::Settings::FeatureSettings]
+        def update_server_features server_features
+          return unless server_features
+
+          log_file = server_features.log_file
+          log_level = server_features.log_level
+          Contrast::Logger::Log.instance.update(log_file, log_level) if log_file || log_level
+          @protect_state.enabled = server_features.protect.enabled?
+          @assess_state.enabled = server_features.assess.enabled?
+          @assess_state.sampling_settings = server_features.assess.sampling
+          @last_server_update_ms = Contrast::Utils::Timer.now_ms
+        end
+
+        # @param app_settings [Contrast::Agent::Reporting::Settings::ApplicationSettings]
+        def update_application_settings app_settings
+          return unless app_settings
+
+          @application_state.modes_by_id = app_settings.protect.protection_rules_to_settings_hash
+          # TODO: RUBY-1438 this needs to be translated
+          # @application_state.exclusion_matchers = new_vals[:exclusion_matchers]
+          update_sensitive_data_policy(app_settings.sensitive_data_masking)
+          @assess_state.disabled_assess_rules = app_settings.assess.disabled_rules
+          if app_settings.assess.session_id && !app_settings.assess.session_id.blank?
+            @assess_state.session_id = app_settings.assess.session_id
+          end
+          @last_app_update_ms = Contrast::Utils::Timer.now_ms
+        end
+
         # check if settings are empty and return true if so.
         #
         # @param settings [String, Boolean, Array, Hash]

data/lib/contrast/config/agent_configuration.rb

@@ -9,23 +9,33 @@ require 'contrast/config/api_configuration'
 
 module Contrast
   module Config
-    # Common Configuration settings. Those in this section pertain to the
-    # core functionality of the Agent.
-    class AgentConfiguration < BaseConfiguration
+    # Common Configuration settings. Those in this section pertain to the core functionality of the Agent.
+    class AgentConfiguration
+      include Contrast::Config::BaseConfiguration
+
       # @return [Boolean, nil]
       attr_accessor :enable
       # @return [Boolean, nil]
       attr_accessor :omit_body
-      attr_writer :ruby, :service, :logger, :heap_dump
+      # @return [Contrast::Config::RubyConfiguration]
+      attr_writer :ruby
+      # @return [Contrast::Config::ServiceConfiguration]
+      attr_writer :service
+      # @return [ Contrast::Config::LoggerConfiguration]
+      attr_writer :logger
+      # @return [Contrast::Config::HeapDumpConfiguration]
+      attr_writer :heap_dump
 
       def initialize hsh = {}
-        @enable = traverse_config(hsh, :enable)
-        @start_bundled_service = traverse_config(hsh, :start_bundled_service)
-        @omit_body = traverse_config(hsh, :omit_body)
-        @service = Contrast::Config::ServiceConfiguration.new(traverse_config(hsh, :service))
-        @logger = Contrast::Config::LoggerConfiguration.new(traverse_config(hsh, :logger))
-        @ruby = Contrast::Config::RubyConfiguration.new(traverse_config(hsh, :ruby))
-        @heap_dump = Contrast::Config::HeapDumpConfiguration.new(traverse_config(hsh, :heap_dump))
+        return unless hsh
+
+        @enable = hsh[:enable]
+        @start_bundled_service = hsh[:start_bundled_service]
+        @omit_body = hsh[:omit_body]
+        @service = Contrast::Config::ServiceConfiguration.new(hsh[:service])
+        @logger = Contrast::Config::LoggerConfiguration.new(hsh[:logger])
+        @ruby = Contrast::Config::RubyConfiguration.new(hsh[:ruby])
+        @heap_dump = Contrast::Config::HeapDumpConfiguration.new(hsh[:heap_dump])
       end
 
       # @return [Boolean, true]

data/lib/contrast/config/api_configuration.rb

@@ -8,7 +8,9 @@ require 'contrast/config/request_audit_configuration'
 module Contrast
   module Config
     # Api keys configuration
-    class ApiConfiguration < BaseConfiguration
+    class ApiConfiguration
+      include Contrast::Config::BaseConfiguration
+
       # @return [String]
       attr_accessor :api_key
       # @return [String]
@@ -20,13 +22,15 @@ module Contrast
       DEFAULT_URL = 'https://app.contrastsecurity.com/Contrast'
 
       def initialize hsh = {}
-        @api_key = traverse_config(hsh, :api_key)
-        @url = traverse_config(hsh, :url)
-        @user_name = traverse_config(hsh, :user_name)
-        @service_key = traverse_config(hsh, :service_key)
-        @proxy = Contrast::Config::ApiProxyConfiguration.new(traverse_config(hsh, :proxy))
-        @request_audit = Contrast::Config::RequestAuditConfiguration.new(traverse_config(hsh, :request_audit))
-        @certificate = Contrast::Config::CertificationConfiguration.new(traverse_config(hsh, :certificate))
+        return unless hsh
+
+        @api_key = hsh[:api_key]
+        @url = hsh[:url]
+        @user_name = hsh[:user_name]
+        @service_key = hsh[:service_key]
+        @proxy = Contrast::Config::ApiProxyConfiguration.new(hsh[:proxy])
+        @request_audit = Contrast::Config::RequestAuditConfiguration.new(hsh[:request_audit])
+        @certificate = Contrast::Config::CertificationConfiguration.new(hsh[:certificate])
       end
 
       def url

data/lib/contrast/config/api_proxy_configuration.rb

@@ -4,14 +4,18 @@
 module Contrast
   module Config
     # Api Proxy keys configuration
-    class ApiProxyConfiguration < BaseConfiguration
+    class ApiProxyConfiguration
+      include Contrast::Config::BaseConfiguration
+
       # @return [String] proxy url
       attr_accessor :url
       attr_writer :enable
 
       def initialize hsh = {}
-        @enable = traverse_config(hsh, :enable)
-        @url = traverse_config(hsh, :url)
+        return unless hsh
+
+        @enable = hsh[:enable]
+        @url = hsh[:url]
       end
 
       # @return [Boolean, false]

data/lib/contrast/config/application_configuration.rb

@@ -7,7 +7,9 @@ module Contrast
   module Config
     # Common Configuration settings. Those in this section pertain to the
     # application identification functionality of the Agent.
-    class ApplicationConfiguration < BaseConfiguration
+    class ApplicationConfiguration
+      include Contrast::Config::BaseConfiguration
+
       # @return [String]
       attr_accessor :name
       # @return [String]
@@ -27,16 +29,18 @@ module Contrast
       attr_writer :session_id, :session_metadata
 
       def initialize hsh = {}
-        @name = traverse_config(hsh, :name)
-        @version = traverse_config(hsh, :version)
-        @language = traverse_config(hsh, :language)
-        @path = traverse_config(hsh, :path)
-        @group = traverse_config(hsh, :group)
-        @tags = traverse_config(hsh, :tags)
-        @code = traverse_config(hsh, :code)
-        @metadata = traverse_config(hsh, :metadata)
-        @session_id = traverse_config(hsh, :session_id)
-        @session_metadata = traverse_config(hsh, :session_metadata)
+        return unless hsh
+
+        @name = hsh[:name]
+        @version = hsh[:version]
+        @language = hsh[:language]
+        @path = hsh[:path]
+        @group = hsh[:group]
+        @tags = hsh[:tags]
+        @code = hsh[:code]
+        @metadata = hsh[:metadata]
+        @session_id = hsh[:session_id]
+        @session_metadata = hsh[:session_metadata]
       end
 
       # @return [String, Contrast::Utils::ObjectShare::EMPTY_STRING]

data/lib/contrast/config/assess_configuration.rb

@@ -5,7 +5,9 @@ module Contrast
   module Config
     # Common Configuration settings. Those in this section pertain to the
     # assess functionality of the Agent.
-    class AssessConfiguration < BaseConfiguration
+    class AssessConfiguration
+      include Contrast::Config::BaseConfiguration
+
       # @return [String, nil]
       attr_accessor :tags
       # @return [Boolean, nil]
@@ -15,14 +17,16 @@ module Contrast
       DEFAULT_STACKTRACES = 'ALL'
 
       def initialize hsh = {}
-        @enable = traverse_config(hsh, :enable)
-        @tags = traverse_config(hsh, :tags)
-        @enable_scan_response = traverse_config(hsh, :enable_scan_response)
-        @enable_dynamic_sources = traverse_config(hsh, :enable_dynamic_sources)
-        @enable_original_object = traverse_config(hsh, :enable_original_object)
-        @sampling = Contrast::Config::SamplingConfiguration.new(traverse_config(hsh, :sampling))
-        @rules = Contrast::Config::AssessRulesConfiguration.new(traverse_config(hsh, :rules))
-        @stacktraces = traverse_config(hsh, :stacktraces)
+        return unless hsh
+
+        @enable = hsh[:enable]
+        @tags = hsh[:tags]
+        @enable_scan_response = hsh[:enable_scan_response]
+        @enable_dynamic_sources = hsh[:enable_dynamic_sources]
+        @enable_original_object = hsh[:enable_original_object]
+        @sampling = Contrast::Config::SamplingConfiguration.new(hsh[:sampling])
+        @rules = Contrast::Config::AssessRulesConfiguration.new(hsh[:rules])
+        @stacktraces = hsh[:stacktraces]
       end
 
       # @return [Boolean, true]

data/lib/contrast/config/assess_rules_configuration.rb

@@ -5,13 +5,17 @@ module Contrast
   module Config
     # Common Configuration settings. Those in this section pertain to the
     # disabled assess rule functionality of the Agent.
-    class AssessRulesConfiguration < BaseConfiguration
+    class AssessRulesConfiguration
+      include Contrast::Config::BaseConfiguration
+
       SPEC_KEY = :disabled_rules.cs__freeze
       # @return [Array, nil] list of disabled assess rules
       attr_accessor :disabled_rules
 
       def initialize hsh = {}
-        @disabled_rules = cast_disabled_rules hsh
+        return unless hsh
+
+        @disabled_rules = cast_disabled_rules(hsh)
       end
 
       private

data/lib/contrast/config/base_configuration.rb

@@ -6,20 +6,11 @@ require 'contrast/utils/object_share'
 
 module Contrast
   module Config
-    # This is the base for our configuration classes. It is intended to
-    # facilitate the translation of the Common Configuration settings to usable
-    # Ruby classes.
-    class BaseConfiguration
+    # This is the base for our configuration classes. It is intended to facilitate the translation of the Common
+    # Configuration settings to usable Ruby classes.
+    module BaseConfiguration
       extend Forwardable
 
-      EMPTY_VALUE = :EMPTY_VALUE
-
-      def initialize hsh = {}, keys = {}
-        # holds configuration key value pairs
-        # each configuration class can contain nested BaseConfigurations
-        traverse_config(hsh, keys)
-      end
-
       def to_hash
         hsh = {}
         instance_variables.each do |iv|
@@ -42,29 +33,6 @@ module Contrast
         end
         nil
       end
-
-      private
-
-      # Traverse the given entity to build out the configuration graph.
-      #
-      # The values will be either a hash, indicating internal nodes to
-      # traverse, or a value to set or the EMPTY_VALUE symbol, indicating a
-      # leaf node.
-      #
-      # The spec_key are the Contrast defined keys based on the instance variables of
-      # a given configuration.
-      def traverse_config values, spec_key
-        internal_nodes = values.cs__respond_to?(:has_key?)
-        val = internal_nodes ? value_from_key_config(spec_key, values) : nil
-        val == EMPTY_VALUE ? nil : val
-      end
-
-      def value_from_key_config key, config_hash
-        return config_hash[key] if config_hash.key?(key)
-        return config_hash.fetch(key.to_sym, nil) if key.is_a?(String)
-
-        config_hash.fetch(key.to_s, nil)
-      end
     end
   end
 end

data/lib/contrast/config/certification_configuration.rb

@@ -4,7 +4,9 @@
 module Contrast
   module Config
     # Certificate Configuration
-    class CertificationConfiguration < BaseConfiguration
+    class CertificationConfiguration
+      include Contrast::Config::BaseConfiguration
+
       # @return [String] path to CA Cert file
       attr_accessor :ca_file
       # @return [String] path to Certification file
@@ -14,10 +16,12 @@ module Contrast
       attr_writer :enable
 
       def initialize hsh = {}
-        @enable = traverse_config(hsh, :enable)
-        @ca_file = traverse_config(hsh, :ca_file)
-        @cert_file = traverse_config(hsh, :cert_file)
-        @key_file = traverse_config(hsh, :key_file)
+        return unless hsh
+
+        @enable = hsh[:enable]
+        @ca_file = hsh[:ca_file]
+        @cert_file = hsh[:cert_file]
+        @key_file = hsh[:key_file]
       end
 
       # @return [Boolean, false]

data/lib/contrast/config/exception_configuration.rb

@@ -3,10 +3,11 @@
 
 module Contrast
   module Config
-    # Common Configuration settings. Those in this section pertain to the
-    # exception handling in Ruby, allowing for the override of Response Code
-    # and Message when Security Exceptions are raised.
-    class ExceptionConfiguration < BaseConfiguration
+    # Common Configuration settings. Those in this section pertain to the exception handling in Ruby, allowing for the
+    # override of Response Code and Message when Security Exceptions are raised.
+    class ExceptionConfiguration
+      include Contrast::Config::BaseConfiguration
+
       # @return [Integer] the HTTP status code override
       attr_accessor :override_status
       # @return [String] the message text override
@@ -14,9 +15,11 @@ module Contrast
       attr_writer :capture
 
       def initialize hsh = {}
-        @capture = traverse_config(hsh, :capture)
-        @override_status = traverse_config(hsh, :override_status)
-        @override_message = traverse_config(hsh, :override_message)
+        return unless hsh
+
+        @capture = hsh[:capture]
+        @override_status = hsh[:override_status]
+        @override_message = hsh[:override_message]
       end
 
       # @return [Boolean, false]

data/lib/contrast/config/heap_dump_configuration.rb

@@ -3,9 +3,11 @@
 
 module Contrast
   module Config
-    # Common Configuration settings. Those in this section pertain to the
-    # Heap Dump collection functionality of the Agent.
-    class HeapDumpConfiguration < BaseConfiguration
+    # Common Configuration settings. Those in this section pertain to the Heap Dump collection functionality of the
+    # Agent.
+    class HeapDumpConfiguration
+      include Contrast::Config::BaseConfiguration
+
       DEFAULT_PATH = 'contrast_heap_dumps' # saved
       DEFAULT_MS = 10_000
       DEFAULT_COUNT = 5
@@ -13,12 +15,14 @@ module Contrast
       attr_writer :enable, :path, :delay_ms, :window_ms, :count, :clean
 
       def initialize hsh = {}
-        @enable = traverse_config(hsh, :enable)
-        @path = traverse_config(hsh, :path)
-        @delay_ms = traverse_config(hsh, :delay_ms)
-        @window_ms = traverse_config(hsh, :window_ms)
-        @count = traverse_config(hsh, :count)
-        @clean = traverse_config(hsh, :clean)
+        return unless hsh
+
+        @enable = hsh[:enable]
+        @path = hsh[:path]
+        @delay_ms = hsh[:delay_ms]
+        @window_ms = hsh[:window_ms]
+        @count = hsh[:count]
+        @clean = hsh[:clean]
       end
 
       # @return [Boolean, Contrast::Utils::ObjectShare::FALSE] should dumps be taken

data/lib/contrast/config/inventory_configuration.rb

@@ -3,17 +3,20 @@
 
 module Contrast
   module Config
-    # Common Configuration settings. Those in this section pertain to the
-    # inventory functionality of the Agent.
-    class InventoryConfiguration < BaseConfiguration
+    # Common Configuration settings. Those in this section pertain to the inventory functionality of the Agent.
+    class InventoryConfiguration
+      include Contrast::Config::BaseConfiguration
+
       # @return [Array, nil] tags
       attr_accessor :tags
       attr_writer :enable, :analyze_libraries
 
       def initialize hsh = {}
-        @enable = traverse_config(hsh, :enable)
-        @analyze_libraries = traverse_config(hsh, :analyze_libraries)
-        @tags = traverse_config(hsh, :tags)
+        return unless hsh
+
+        @enable = hsh[:enable]
+        @analyze_libraries = hsh[:analyze_libraries]
+        @tags = hsh[:tags]
       end
 
       # @return [Boolean, true]