contrast-agent 6.6.2 → 6.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f00aee3e36cdb303ca9b209824fbb92386e0ca0043c0f24377f79168dca8d252
-  data.tar.gz: 7fc3d7571246ff92a10da151ce4b723768e3f7214b5a1e57d5bb1d6a66e86e2b
+  metadata.gz: 38657595e182ad9ef1a26180b273061522dcea43e441e1750d9883d2d1d2d9f6
+  data.tar.gz: 37fe627c2fec00f17c6a2cd6b42aa96149bc4b01871fddd6bb929c5a2baabb63
 SHA512:
-  metadata.gz: 9fc9e69602a2706cb41bf8d13e07693afb61ad85ad03ff43182f3c79c5f9dff1c0b8ed3e0cb690d15cf8e43830920516604e9b497945963897f0ee1b82e11f9b
-  data.tar.gz: dfd4e5146f9ac498b83d76b13a9d6ed17a5de0e659ed301acbf6a873e18d5ff75ea8aa8fa7c3789433e100903a9f6bfb4b87c9d283107c5bd04015f862e88644
+  metadata.gz: 1a2a85843ec7ba80d84a84f21defd2333a1b1130165113777c324176597231ca17b6c861f1f44ff6024f71e01e7d3508f0d57e767381e3d7580e82c7e10bee4a
+  data.tar.gz: b7b98e93f5b8e3bfd826f730e3981bb6006aa69a71dbd24ecec6eeef373b0b147ce542f0e0416f42d9da33dbbe4a76945bb1341bde91ea9b7134a4ddee80b2fb

data/lib/contrast/agent/inventory/database_config.rb

@@ -31,7 +31,7 @@ module Contrast
           # Contrast::Api::Dtm::ArchitectureComponent, but have different names for their fields.
           #
           # @param activity_or_update [Contrast::Api::Dtm::Activity, Contrast::Agent::Reporting::ApplicationUpdate]
-          # @param hash_or_str [Hash, String] the database connection information
+          # @param hash_or_str [Hash, String, #configuration_hash] the database connection information
           def append_db_config activity_or_update, hash_or_str = active_record_config
             arr = build_from_db_config(hash_or_str)
             return unless arr&.any?
@@ -82,6 +82,11 @@ module Contrast
           def build_from_db_config hash_or_str
             return unless hash_or_str
 
+            # we need to handle types of HashConfig, which != Hash
+            # for example ActiveRecord::DatabaseConfigurations::HashConfig is type of active_record config
+            # but the method is not handling it properly
+            # so we need to handle it here and extract the hash
+            hash_or_str = hash_or_str.configuration_hash if hash_or_str.cs__respond_to?(:configuration_hash)
             if hash_or_str.is_a?(Hash)
               build_from_db_hash(hash_or_str)
             else

data/lib/contrast/agent/inventory/policy/datastores.rb

@@ -13,9 +13,8 @@ module Contrast
         # in which database operations occur. It is responsible for deciding if
         # the given invocation is worth reporting or not.
         module DataStores
+          extend Contrast::Components::Logger::InstanceMethods
           class << self
-            extend Contrast::Components::Logger::InstanceMethods
-
             # The key used in policy.json to indicate the database type to
             # report.
             DATA_STORE_MARKER = 'data_store'

data/lib/contrast/agent/reporting/reporting_events/preflight_message.rb

@@ -27,8 +27,8 @@ module Contrast
 
         def initialize
           @app_language = Contrast::Utils::ObjectShare::RUBY
-          @app_name = ::Contrast::APP_CONTEXT.app_name
-          @app_version = ::Contrast::APP_CONTEXT.app_version
+          @app_name = ::Contrast::APP_CONTEXT.name # rubocop:disable Security/Module/Name
+          @app_version = ::Contrast::APP_CONTEXT.version
           @routes = []
         end
 

data/lib/contrast/agent/reporting/reporting_utilities/endpoints.rb

@@ -153,7 +153,7 @@ module Contrast
           def app_name
             return @_app_name unless @_app_name.nil?
 
-            @_app_name = ::Contrast::APP_CONTEXT.app_name
+            @_app_name = ::Contrast::APP_CONTEXT.name # rubocop:disable Security/Module/Name
           end
 
           # @return [String,nil]

data/lib/contrast/agent/reporting/reporting_utilities/headers.rb

@@ -18,12 +18,12 @@ module Contrast
         CONTENT_TYPE = 'application/json'
 
         def initialize
-          @app_name = Base64.strict_encode64(Contrast::APP_CONTEXT.app_name)
+          @app_name = Base64.strict_encode64(Contrast::APP_CONTEXT.name) # rubocop:disable Security/Module/Name
           @api_key = Contrast::API.api_key
           @agent_version = [RUBY, Contrast::Agent::VERSION].join(SPACE)
           @app_language = RUBY
           @app_path = Base64.strict_encode64(Contrast::APP_CONTEXT.path)
-          @app_version = Contrast::APP_CONTEXT.app_version
+          @app_version = Contrast::APP_CONTEXT.version
           @authorization = Base64.strict_encode64("#{ Contrast::API.user_name }:#{ Contrast::API.service_key }")
           @server_name = Base64.strict_encode64(Contrast::APP_CONTEXT.server_name)
           @server_path = Base64.strict_encode64(Contrast::APP_CONTEXT.server_path)

data/lib/contrast/agent/reporting/reporting_utilities/response_handler_utils.rb

@@ -107,7 +107,7 @@ module Contrast
           suspend_reporting(message, ready_after, error_message) if mode == @_mode.resending
           return unless mode == @_mode.disabled
 
-          stop_reporting(message, application: Contrast::APP_CONTEXT.app_name, error_message: error_message)
+          stop_reporting(message, application: Contrast::APP_CONTEXT.name, error_message: error_message) # rubocop:disable Security/Module/Name
         rescue StandardError => e
           logger.debug('Could not handle Response error information', error: e)
         end

data/lib/contrast/agent/version.rb

@@ -3,6 +3,6 @@
 
 module Contrast
   module Agent
-    VERSION = '6.6.2'
+    VERSION = '6.6.3'
   end
 end

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

@@ -52,7 +52,7 @@ module Contrast
 
           def build event
             msg = new
-            msg.app_name      = ::Contrast::APP_CONTEXT.app_name
+            msg.app_name      = ::Contrast::APP_CONTEXT.name # rubocop:disable Security/Module/Name
             msg.app_path      = ::Contrast::APP_CONTEXT.path
             msg.app_language  = Contrast::Utils::ObjectShare::RUBY
             msg.client_id     = ::Contrast::APP_CONTEXT.client_id

data/lib/contrast/components/app_context.rb

@@ -6,6 +6,7 @@ require 'contrast/api/decorators/agent_startup'
 require 'contrast/api/decorators/application_startup'
 require 'contrast/utils/object_share'
 require 'contrast/components/app_context_extend'
+require 'contrast/config/base_configuration'
 
 module Contrast
   module Components
@@ -18,15 +19,66 @@ module Contrast
       class Interface
         include Contrast::Components::AppContextExtend
         include Contrast::Components::ComponentBase
-        include Contrast::Components::Logger::InstanceMethods
+        include Contrast::Config::BaseConfiguration
 
         DEFAULT_APP_NAME    = 'rails'
         DEFAULT_APP_PATH    = '/'
         DEFAULT_SERVER_NAME = 'localhost'
         DEFAULT_SERVER_PATH = '/'
 
-        def initialize
+        # @return [String]
+        attr_reader :version
+        # @return [String]
+        attr_reader :language
+        # @return [String]
+        attr_reader :group
+        # @return [String]
+        attr_reader :tags
+        # @return [String]
+        attr_reader :code
+        # @return [String]
+        attr_reader :metadata
+
+        def initialize hsh = {}
           original_pid
+          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]
+        def session_id
+          @_session_id ||= Contrast::Utils::ObjectShare::EMPTY_STRING
+        end
+
+        # Set session_id
+        #
+        # @param id [String]
+        # @return [String]
+        def session_id= id
+          @_session_id = id
+        end
+
+        # @return [String, Contrast::Utils::ObjectShare::EMPTY_STRING]
+        def session_metadata
+          @_session_metadata ||= Contrast::Utils::ObjectShare::EMPTY_STRING
+        end
+
+        # Set session_metadata
+        #
+        # @param meta [String]
+        # @return [String]
+        def session_metadata= meta
+          @_session_metadata = meta
         end
 
         def server_type
@@ -37,9 +89,8 @@ module Contrast
           end
         end
 
-        def app_name
-          @_app_name ||= begin
-            tmp = ::Contrast::CONFIG.root.application.name # rubocop:disable Security/Module/Name
+        def name
+          @_name ||= begin
             tmp = Contrast::Agent.framework_manager.app_name unless Contrast::Utils::StringUtils.present?(tmp)
             tmp = File.basename(Dir.pwd) unless Contrast::Utils::StringUtils.present?(tmp)
             Contrast::Utils::StringUtils.truncate(tmp, DEFAULT_APP_NAME)
@@ -48,13 +99,16 @@ module Contrast
           end
         end
 
-        def app_version
-          @_app_version ||= Contrast::CONFIG.root.application.version
+        # Set application name
+        #
+        # @param app_name [String] application name
+        # @return [String]
+        def name= app_name
+          @_name = app_name
         end
 
         def path
           @_path ||= begin
-            tmp = ::Contrast::CONFIG.root.application.path
             tmp = Contrast::Agent.framework_manager.application_root unless Contrast::Utils::StringUtils.present?(tmp)
             Contrast::Utils::StringUtils.truncate(tmp, DEFAULT_APP_PATH)
           rescue StandardError

data/lib/contrast/components/app_context_extend.rb

@@ -18,13 +18,13 @@ module Contrast
 
       def build_agent_startup_message
         msg = Contrast::Api::Dtm::AgentStartup.build(server_name, server_path, server_type)
-        logger.info('Application context',
-                    server_name: msg.server_name,
-                    server_path: msg.server_path,
-                    server_type: msg.server_type,
-                    application_name: app_name,
-                    application_path: path,
-                    application_language: Contrast::Utils::ObjectShare::RUBY)
+        Contrast::CONFIG.proto_logger.info('Application context',
+                                           server_name: msg.server_name,
+                                           server_path: msg.server_path,
+                                           server_type: msg.server_type,
+                                           application_name: name, # rubocop:disable Security/Module/Name
+                                           application_path: path,
+                                           application_language: Contrast::Utils::ObjectShare::RUBY)
 
         msg
       end
@@ -42,7 +42,7 @@ module Contrast
       end
 
       def client_id
-        @_client_id ||= [app_name, pgid].join('-')
+        @_client_id ||= [name, pgid].join('-') # rubocop:disable Security/Module/Name
       end
 
       def app_and_server_information

data/lib/contrast/config/root_configuration.rb

@@ -4,6 +4,8 @@
 require 'contrast/components/agent'
 require 'contrast/components/inventory'
 require 'contrast/components/protect'
+require 'contrast/components/app_context'
+
 module Contrast
   module Config
     # The base of the Common Configuration settings.
@@ -14,7 +16,7 @@ module Contrast
       attr_writer :api
       # @return [Contrast::Components::Agent::Interface]
       attr_writer :agent
-      # @return [Contrast::Config::ApplicationConfiguration]
+      # @return [Contrast::Components::AppContext::Interface]
       attr_writer :application
       # @return [Contrast::Config::ServerConfiguration]
       attr_writer :server
@@ -36,7 +38,7 @@ module Contrast
         @api = Contrast::Components::Api::Interface.new(hsh[:api])
         @enable = hsh[:enable]
         @agent = Contrast::Components::Agent::Interface.new(hsh[:agent])
-        @application = Contrast::Config::ApplicationConfiguration.new(hsh[:application])
+        @application = Contrast::Components::AppContext::Interface.new(hsh[:application])
         @server = Contrast::Config::ServerConfiguration.new(hsh[:server])
         @assess = Contrast::Config::AssessConfiguration.new(hsh[:assess])
         @inventory = Contrast::Components::Inventory::Interface.new(hsh[:inventory])
@@ -54,9 +56,9 @@ module Contrast
         @agent ||= Contrast::Components::Agent::Interface.new
       end
 
-      # @return [Contrast::Config::ApplicationConfiguration]
+      # @return [Contrast::Components::AppContext::Interface]
       def application
-        @application ||= Contrast::Config::ApplicationConfiguration.new
+        @application ||= Contrast::Components::AppContext::Interface.new
       end
 
       # @return [Contrast::Config::ServerConfiguration]

data/lib/contrast/config.rb

@@ -18,7 +18,6 @@ require 'contrast/config/protect_rule_configuration'
 require 'contrast/config/protect_rules_configuration'
 
 require 'contrast/config/ruby_configuration'
-require 'contrast/config/application_configuration'
 require 'contrast/config/server_configuration'
 require 'contrast/config/assess_configuration'
 require 'contrast/config/root_configuration'

data/lib/contrast/utils/log_utils.rb

@@ -182,7 +182,7 @@ module Contrast
                          else
                            DEFAULT_METADATA
                          end
-        app_name = ::Contrast::APP_CONTEXT.app_name
+        app_name = ::Contrast::APP_CONTEXT.name # rubocop:disable Security/Module/Name
         attach_request_and_sender_info(message, sender_info)
         message << "request=#{ context.request.url } "
         message << "requestMethod=#{ request_method } "

data/lib/contrast/utils/string_utils.rb

@@ -1,15 +1,11 @@
 # Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
-require 'contrast/components/logger'
-
 module Contrast
   module Utils
     # Utilities for encoding and normalizing strings
-    class StringUtils
+    module StringUtils
       class << self
-        include Contrast::Components::Logger::InstanceMethods
-
         UTF8 = 'utf-8'
         HTTP_PREFIX = 'HTTP_'
 
@@ -61,7 +57,7 @@ module Contrast
           # We were unable to switch the String to a UTF-8 format.
           # Return non-nil so as not to throw an exception later when trying
           # to do regexp or other compares on the String
-          logger.trace('Unable to cast String to UTF-8 format', e, value: str)
+          Contrast::CONFIG.proto_logger.trace('Unable to cast String to UTF-8 format', e, value: str)
 
           Contrast::Utils::ObjectShare::EMPTY_STRING
         end

data/lib/contrast.rb

@@ -81,7 +81,7 @@ module Contrast
   AGENT = CONFIG.root.agent
   LOGGER = AGENT.logger
   CONTRAST_SERVICE = Contrast::Components::ContrastService::Interface.new
-  APP_CONTEXT = Contrast::Components::AppContext::Interface.new
+  APP_CONTEXT = CONFIG.root.application
 end
 
 module Contrast

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contrast-agent
 version: !ruby/object:Gem::Version
-  version: 6.6.2
+  version: 6.6.3
 platform: ruby
 authors:
 - galen.palmer@contrastsecurity.com
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-15 00:00:00.000000000 Z
+date: 2022-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -665,22 +665,22 @@ executables:
 - contrast_service
 extensions:
 - ext/cs__common/extconf.rb
-- ext/cs__assess_fiber_track/extconf.rb
-- ext/cs__assess_string/extconf.rb
+- ext/cs__tests/extconf.rb
 - ext/cs__assess_module/extconf.rb
-- ext/cs__assess_test/extconf.rb
-- ext/cs__assess_kernel/extconf.rb
-- ext/cs__assess_yield_track/extconf.rb
+- ext/cs__assess_array/extconf.rb
 - ext/cs__assess_hash/extconf.rb
+- ext/cs__assess_basic_object/extconf.rb
+- ext/cs__assess_regexp/extconf.rb
 - ext/cs__os_information/extconf.rb
+- ext/cs__assess_test/extconf.rb
+- ext/cs__assess_string/extconf.rb
 - ext/cs__contrast_patch/extconf.rb
-- ext/cs__assess_marshal_module/extconf.rb
-- ext/cs__assess_regexp/extconf.rb
-- ext/cs__assess_array/extconf.rb
-- ext/cs__scope/extconf.rb
-- ext/cs__assess_basic_object/extconf.rb
-- ext/cs__tests/extconf.rb
 - ext/cs__assess_string_interpolation/extconf.rb
+- ext/cs__scope/extconf.rb
+- ext/cs__assess_marshal_module/extconf.rb
+- ext/cs__assess_fiber_track/extconf.rb
+- ext/cs__assess_yield_track/extconf.rb
+- ext/cs__assess_kernel/extconf.rb
 extra_rdoc_files: []
 files:
 - ".clang-format"
@@ -1193,7 +1193,6 @@ files:
 - lib/contrast/components/settings.rb
 - lib/contrast/config.rb
 - lib/contrast/config/api_proxy_configuration.rb
-- lib/contrast/config/application_configuration.rb
 - lib/contrast/config/assess_configuration.rb
 - lib/contrast/config/assess_rules_configuration.rb
 - lib/contrast/config/base_configuration.rb

data/lib/contrast/config/application_configuration.rb

@@ -1,57 +0,0 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
-# frozen_string_literal: true
-
-require 'contrast/utils/object_share'
-
-module Contrast
-  module Config
-    # Common Configuration settings. Those in this section pertain to the
-    # application identification functionality of the Agent.
-    class ApplicationConfiguration
-      include Contrast::Config::BaseConfiguration
-
-      # @return [String]
-      attr_accessor :name
-      # @return [String]
-      attr_accessor :version
-      # @return [String]
-      attr_accessor :language
-      # @return [String]
-      attr_accessor :path
-      # @return [String]
-      attr_accessor :group
-      # @return [String]
-      attr_accessor :tags
-      # @return [String]
-      attr_accessor :code
-      # @return [String]
-      attr_accessor :metadata
-      attr_writer :session_id, :session_metadata
-
-      def initialize hsh = {}
-        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]
-      def session_id
-        @session_id ||= Contrast::Utils::ObjectShare::EMPTY_STRING
-      end
-
-      # @return [String, Contrast::Utils::ObjectShare::EMPTY_STRING]
-      def session_metadata
-        @session_metadata ||= Contrast::Utils::ObjectShare::EMPTY_STRING
-      end
-    end
-  end
-end