contrast-agent 6.2.0 → 6.3.0

data/lib/contrast/agent/assess/tag.rb

@@ -1,12 +1,16 @@
 # 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 Agent
     module Assess
       # A Tag represents a range in a given piece of data. It is used by the
       # Agent to determine if a vulnerable dataflow has occurred.
       class Tag
+        include Contrast::Components::Logger::InstanceMethods
+
         attr_reader :label,     # the label of this tag
                     :length,    # length of tagged text within string
                     :start_idx, # start of range
@@ -35,6 +39,8 @@ module Contrast
         def initialize label, length, start_idx = 0
           @label = label
           update_range(start_idx, start_idx + length)
+        rescue ArgumentError => e
+          logger.error('Range update for Tag failed with: ', e)
         end
 
         # Return true if the tag covers the given position in the string
@@ -74,22 +80,32 @@ module Contrast
 
         def shift idx
           update_range(@start_idx + idx, @end_idx + idx)
+        rescue ArgumentError => e
+          logger.error('Range update for Tag failed with: ', e)
         end
 
         def shift_end idx
           update_range(@start_idx, @end_idx + idx)
+        rescue ArgumentError => e
+          logger.error('Range update for Tag failed with: ', e)
         end
 
         def update_start start_idx
           update_range(start_idx, @end_idx)
+        rescue ArgumentError => e
+          logger.error('Range update for Tag failed with: ', e)
         end
 
         def update_end end_idx
           update_range(@start_idx, end_idx)
+        rescue ArgumentError => e
+          logger.error('Range update for Tag failed with: ', e)
         end
 
         def repurpose start_idx, end_idx
           update_range(start_idx, end_idx)
+        rescue ArgumentError => e
+          logger.error('Range update for Tag failed with: ', e)
         end
 
         # Given a tag, merge its ranges with this one
@@ -104,6 +120,8 @@ module Contrast
           start = other.start_idx < @start_idx ? other.start_idx : @start_idx
           finish = other.end_idx > @end_idx ? other.end_idx : @end_idx
           update_range(start, finish)
+        rescue ArgumentError => e
+          logger.error('Range update for Tag failed with: ', e)
         end
 
         # Modification to tracked String can change the position and length of the tracked tag
@@ -160,6 +178,7 @@ module Contrast
 
         private
 
+        # @raise[ArgumentError] raises if start_idx is negative or the end_idx is smaller than the start_idx
         def update_range start_idx, end_idx
           raise(ArgumentError, ERROR_NEGATIVE_START) if start_idx.negative?
           raise(ArgumentError, ERROR_END_BEFORE_START) if end_idx < start_idx

data/lib/contrast/agent/at_exit_hook.rb

@@ -31,16 +31,16 @@ module Contrast
         context = Contrast::Agent::REQUEST_TRACKER.current
         return unless context
 
-        Contrast::Agent.reporter.send_event_immediately(context.observed_library_usage)
+        [
+          Contrast::Agent::Inventory::DependencyUsageAnalysis.instance.generate_library_usage,
+          context.observed_route
+        ].compact.each do |event|
+          Contrast::Agent.reporter&.send_event_immediately(event)
+        end
 
         if Contrast::Agent::Reporter.enabled?
-          [
-            context.new_observed_route,
-            Contrast::Agent::Reporting::DtmMessage.dtm_to_event(context.server_activity),
-            Contrast::Agent::Reporting::DtmMessage.dtm_to_event(context.activity)
-          ].each do |event|
-            Contrast::Agent.reporter&.send_event_immediately(event)
-          end
+          event = Contrast::Agent::Reporting::DtmMessage.dtm_to_event(context.activity)
+          Contrast::Agent.reporter&.send_event_immediately(event)
         else
           Contrast::Agent.messaging_queue&.send_event_immediately(context.activity)
         end

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

@@ -1,6 +1,7 @@
 # Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
+require 'contrast/agent/reporting/reporting_events/architecture_component'
 require 'contrast/api/decorators/architecture_component'
 require 'contrast/components/logger'
 require 'contrast/utils/object_share'
@@ -25,10 +26,11 @@ module Contrast
 
         class << self
           # Append the available database connection information to the message being sent to TeamServer. This message
-          # may be a Contrast::Api::Dtm::Activity or Contrast::Api::Dtm::ApplicationUpdate. Both report the same
+          # may be a Contrast::Api::Dtm::Activity or Contrast::Agent::Reporting::ApplicationUpdate.
+          # Both report the same
           # Contrast::Api::Dtm::ArchitectureComponent, but have different names for their fields.
           #
-          # @param activity_or_update [Contrast::Api::Dtm::Activity, Contrast::Api::Dtm::ApplicationUpdate]
+          # @param activity_or_update [Contrast::Api::Dtm::Activity, Contrast::Agent::Reporting::ApplicationUpdate]
           # @param hash_or_str [Hash, String] 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)
@@ -40,7 +42,8 @@ module Contrast
               if activity_or_update.is_a?(Contrast::Api::Dtm::Activity)
                 activity_or_update.architectures << a
               else
-                activity_or_update.components << a
+                converted_comp = Contrast::Agent::Reporting::ArchitectureComponent.convert(a)
+                activity_or_update.components << converted_comp
               end
             end
           rescue StandardError => e

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

@@ -1,6 +1,7 @@
 # Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
+require 'contrast/agent/reporting/reporting_events/library_discovery'
 require 'contrast/agent/inventory/dependencies'
 require 'contrast/utils/object_share'
 
@@ -14,7 +15,7 @@ module Contrast
 
         # Report the dependencies of this application
         #
-        # @return [Array<Contrast::Api::Dtm::Library>] protobuf form of the
+        # @return [Array<Contrast::Agent::Reporting::LibraryDiscovery>] direct report form of
         #   Gem::Specification that have been loaded for this application.
         def library_pb_list
           return Contrast::Utils::ObjectShare::EMPTY_ARRAY unless ::Contrast::INVENTORY.enabled?
@@ -24,7 +25,7 @@ module Contrast
             next unless spec
             next unless (digest = Contrast::Utils::Sha256Builder.instance.build_from_spec(spec))
 
-            reported_lib_list << Contrast::Api::Dtm::Library.build(digest, spec)
+            reported_lib_list << Contrast::Agent::Reporting::LibraryDiscovery.new(digest, spec)
           end
         end
       end

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

@@ -52,7 +52,6 @@ module Contrast
           return unless enabled?
 
           spec_lookup_path = adjust_path_for_spec_lookup(path)
-
           spec = Gem::Specification.find_by_path(spec_lookup_path)
           unless spec
             logger.debug('Unable to resolve gem spec for path', path: path)
@@ -70,15 +69,13 @@ module Contrast
           logger.error('Unable to inventory file path', e, path: path)
         end
 
-        # Populate the library_usages field of the Activity message using the data stored in the @gemdigest_cache.
+        # Populate the library_usages field of the Activity message using the data stored in the @gemdigest_cache. If
+        # no libraries had files loaded, or inventory analysis is disabled, return nil instead.
         #
-        # TODO: RUBY-1355
-        # TODO: RUBY-1438 -- change to just use EventMessage
-        # @param observed_library_usage [Contrast::Agent::Reporting::ObservedLibraryUsage] the message to
-        #   which to append the usage data
-        def generate_library_usage observed_library_usage
+        # @return [Contrast::Agent::Reporting::ObservedLibraryUsage, nil]
+        def generate_library_usage
           return unless enabled?
-          return unless observed_library_usage
+          return unless @gemdigest_cache.any?
 
           # Disconnect gemdigest_cache and replace it with an empty one; synch so new libs cannot be added between the
           # assignment and the replace
@@ -87,12 +84,15 @@ module Contrast
             @gemdigest_cache = Hash.new { |hash, key| hash[key] = Set.new }
             hold
           end
+
+          observed_library_usage = Contrast::Agent::Reporting::ObservedLibraryUsage.new
           gem_spec_digest_to_files.each_pair do |digest, files|
-            usage = Contrast::Agent::Reporting::LibraryUsageObservation.new(digest, files)
-            next if usage.names.empty?
+            next unless files.any?
 
+            usage = Contrast::Agent::Reporting::LibraryUsageObservation.new(digest, files)
             observed_library_usage.observations << usage
           end
+          observed_library_usage.observations.any? ? observed_library_usage : nil
         rescue StandardError => e
           logger.error('Unable to generate library usage.', e)
         end

data/lib/contrast/agent/middleware.rb

@@ -142,6 +142,8 @@ module Contrast
       #
       # @param context [Contrast::Agent::RequestContext]
       # @param request_handler [Contrast::Agent::RequestHandler]
+      # @raise [StandardError] raises an error if the exception is security concern
+      #    which is being triggered when there is a failure within the pre-call with the agent
       def pre_call_with_agent context, request_handler
         with_contrast_scope do
           context.service_extract_request
@@ -160,6 +162,8 @@ module Contrast
       #   this Request
       # @param request_handler [Contrast::Agent::RequestHandler]
       # @param response [Array,Rack::Response]
+      # @raise [StandardError] raises an error if the exception is security concern
+      #    which is being triggered when there is a failure within the post-call with the agent
       def post_call_with_agent context, env, request_handler, response
         with_contrast_scope do
           context.extract_after(response) # update context with final response information

data/lib/contrast/agent/patching/policy/after_load_patcher.rb

@@ -5,6 +5,8 @@ require 'contrast/agent/patching/policy/after_load_patch'
 require 'contrast/components/logger'
 require 'contrast/framework/manager'
 require 'contrast/extension/extension'
+require 'contrast/extension/assess/kernel'
+require 'contrast/extension/assess/marshal'
 
 module Contrast
   module Agent
@@ -29,22 +31,31 @@ module Contrast
           # there are no require time side effects of loading our core
           # extensions.
           def apply_direct_patches!
-            @_apply_direct_patches ||= begin # TODO: RUBY-1541 - put 'kernel' back
+            @_apply_direct_patches ||= begin
               paths = %w[
                 array
                 basic_object
                 module
                 fiber_track
                 hash
+                kernel
                 marshal_module
                 regexp
                 string
-                string_interpolation26
+                string_interpolation
               ].cs__freeze
               paths.each do |p|
                 path_part = "cs__assess_#{ p }"
                 Contrast::Extension::Assess::InstrumentHelper.instrument("#{ path_part }/#{ path_part }")
               end
+              # apply Kernel#exec alias patch:
+              unless Contrast::Agent::Assess.cs__object_method_prepended?(Kernel, :exec, false)
+                apply_kernel_exec_alias_patch
+              end
+              # apply Marshal load alias patch:
+              unless Contrast::Agent::Assess.cs__object_method_prepended?(Marshal, :load, false)
+                apply_marshal_load_alias_patch
+              end
               true
             end
           end
@@ -96,6 +107,20 @@ module Contrast
             patch.instrument!
             after_load_patches.delete_if(&:applied?)
           end
+
+          # Applies the Kernel#exec alias patch
+          def apply_kernel_exec_alias_patch
+            Kernel.extend(Contrast::Extension::Assess::ContrastKernel)
+            Marshal.alias_method(:cs__kernel_exec, :exec)
+            Marshal.alias_method(:exec, :cs__kernel_exec)
+          end
+
+          # Applies the Marshal#load alias patch
+          def apply_marshal_load_alias_patch
+            Marshal.extend(Contrast::Extension::Assess::ContrastMarshal)
+            Marshal.alias_method(:cs__marshal_load, :load)
+            Marshal.alias_method(:load, :cs__marshal_load)
+          end
         end
       end
     end

data/lib/contrast/agent/patching/policy/policy.rb

@@ -35,16 +35,21 @@ module Contrast
           end
 
           # Indicates the folder in `resources` where this policy lives.
+          #
+          # @raise[NoMethodError] raises if any of the subclasses, extending this class is not implementing this method
           def self.policy_folder
             raise(NoMethodError, 'specify policy_folder for patching')
           end
 
           # Indicates is this feature has been disabled by the configuration, read at startup, and therefore can never
           # be enabled.
+          #
+          # @raise[NoMethodError] raises if any of the subclasses, extending this class is not implementing this method
           def disabled_globally?
             raise(NoMethodError, 'specify disabled_globally? conditions for patching')
           end
 
+          # @raise[NoMethodError] raises if any of the subclasses, extending this class is not implementing this method
           def node_type
             raise(NoMethodError, 'specify the concrete node type for this poilcy')
           end

data/lib/contrast/agent/patching/policy/policy_node.rb

@@ -47,10 +47,14 @@ module Contrast
           # Scope of the method parsed from our JSON policy.
           attr_reader :method_scope
 
+          # @raise [NoMethodError] This is being raised if any of the implementing subclasses does not have
+          #     that method implemented, but is being called on.
           def node_class
             raise(NoMethodError, 'specify the type of the feature for which this node patches')
           end
 
+          # @raise [NoMethodError] This is being raised if any of the implementing subclasses does not have
+          #     that method implemented, but is being called on.
           def feature
             raise(NoMethodError, 'specify the name of the feature for which this node patches')
           end
@@ -62,6 +66,8 @@ module Contrast
           # Don't let nodes be created that will be missing things we need
           # later on. Really, if they don't have these things, they couldn't have
           # done their jobs anyway.
+          #
+          # @raise [ArgumentError] Validates if the created nodes have everything that we'll need now or later on.
           def validate
             unless class_name
               raise(ArgumentError, "#{ node_class } #{ id } did not have a proper class name. Unable to create.")

data/lib/contrast/agent/patching/policy/trigger_node.rb

@@ -41,6 +41,7 @@ module Contrast
             NODE
           end
 
+          # @raise [ArgumentError] Validates if the created nodes have everything that we'll need now or later on.
           def validate
             super
             unless applicator.public_methods(false).any?(applicator_method)
@@ -52,6 +53,7 @@ module Contrast
             validate_rule
           end
 
+          # @raise [ArgumentError] Validates if the created nodes have everything that we'll need now or later on.
           def validate_properties
             if (required_properties & optional_properties).any?
               raise(ArgumentError,
@@ -66,6 +68,7 @@ module Contrast
             raise(ArgumentError, "#{ id } did not have a required property. Unable to create.")
           end
 
+          # @raise [ArgumentError] Validates if the created nodes have everything that we'll need now or later on.
           def validate_rule
             raise(ArgumentError, 'Unknown rule did not have a proper name. Unable to create.') unless rule_id
             raise(ArgumentError, "#{ id } did not have a proper applicator. Unable to create.") unless applicator

data/lib/contrast/agent/protect/policy/applies_deserialization_rule.rb

@@ -31,13 +31,12 @@ module Contrast
             #   was invoked
             # @param args [Array<Object>] the arguments passed to the triggering
             #   method at invocation
-            # @raise [Contrast::SecurityException] on block, will pass the
-            #   exception from the rule
             def invoke _method, _exception, _properties, _object, args
               return unless valid_input?(args)
               return if skip_analysis?
 
               rule.infilter(Contrast::Agent::REQUEST_TRACKER.current, args[0])
+              # add rescue here
             end
 
             # Calls the actual rule for this applicator, if required, when the
@@ -46,13 +45,12 @@ module Contrast
             #
             # @param arg [Object] the argument passed to the triggering method
             #   at invocation
-            # @raise [Contrast::SecurityException] on block, will pass the
-            #   exception from the rule
             def prepended_invoke arg
               return unless arg&.cs__is_a?(String)
               return if skip_analysis?
 
               rule.infilter(Contrast::Agent::REQUEST_TRACKER.current, arg)
+              # add rescue here
             end
 
             # Allow the rule to check if the given input is an attempt to
@@ -67,6 +65,7 @@ module Contrast
               return if skip_analysis?
 
               rule.check_command_scope(command)
+              # add rescue here
             end
 
             protected

data/lib/contrast/agent/protect/policy/applies_path_traversal_rule.rb

@@ -64,6 +64,7 @@ module Contrast
               write_marker && possible_write?(write_marker)
             end
 
+            # @raise [Contrast::SecurityException] re-raises if some attack is blocked and raised from the infilter
             def path_traversal_rule path, possible_write, object, method
               return unless applies_to?(path, possible_write: possible_write)
 

data/lib/contrast/agent/protect/policy/rule_applicator.rb

@@ -61,8 +61,7 @@ module Contrast
           #   was invoked
           # @param _args [Array<Object>] the arguments passed to the triggering
           #   method at invocation
-          # @raise [Contrast::SecurityException] on block, will pass the
-          #   exception from the rule
+          # @raise [NoMethodError] This is abstract method
           def invoke _method, _exception, _properties, _object, _args
             raise(NoMethodError, 'This is abstract, override it.')
           end
@@ -70,6 +69,7 @@ module Contrast
           # The name of the rule, as expected by the Contrast Service and Contrast UI.
           #
           # @return [String]
+          # @raise [NoMethodError] This is abstract method
           def rule_name
             raise(NoMethodError, 'This is abstract, override it.')
           end

data/lib/contrast/agent/protect/rule/base.rb

@@ -230,6 +230,7 @@ module Contrast
           #   the rule and matched the attack detection logic
           # @param _kwargs [Hash] key-value pairs used by the rule to build a
           #   report.
+          # @raise[NoMethodError] raises if subclass did not implement this method on extend
           def find_attacker _context, _potential_attack_string, **_kwargs
             raise(NoMethodError, "Rule #{ rule_name } did not implement find_attack")
           end

data/lib/contrast/agent/protect/rule/no_sqli.rb

@@ -40,6 +40,8 @@ module Contrast
             BLOCK_MESSAGE
           end
 
+          # @raise [Contrast::SecurityException] if the attack is blocked
+          #   raised with BLOCK_MESSAGE
           def infilter context, database, query_string
             return unless infilter?(context)
 

data/lib/contrast/agent/reporting/reporter.rb

@@ -38,14 +38,12 @@ module Contrast
         @_thread = Contrast::Agent::Thread.new do
           logger.debug('Starting background Reporter thread.')
           loop do
-            # TODO: RUBY-99999
-            # The client and connection are being used in multiple threads/ concurrently, and that's not okay. We need
-            # to figure out why that is and lock it so that it isn't.
-            next unless client && connection
+            next unless connected?
+            next unless app_create_complete?
 
             process_event(queue.pop)
           rescue StandardError => e
-            logger.debug('Reporter thread could not process because of:', error: e)
+            logger.debug('Reporter thread could not process because of:', e)
           end
         end
       end
@@ -71,7 +69,6 @@ module Contrast
         end
         return unless event
 
-        logger.debug('Enqueued event for sending', event_type: event.cs__class)
         queue << event
       end
 
@@ -84,7 +81,9 @@ module Contrast
           logger.warn('Reporter attempted to send event immediately with Agent disabled', caller: caller, event: event)
           return
         end
-        client.send_event(event, connection, send_immediately: true)
+        return unless event
+
+        client.send_event(event, connection)
       rescue StandardError => e
         logger.error('Could not send message to TeamServer from Reporter queue.', e)
       end
@@ -108,6 +107,32 @@ module Contrast
         @_queue ||= Queue.new
       end
 
+      # TODO: RUBY-99999
+      # The client and connection are being used in multiple threads/ concurrently, and that's not okay. We need
+      # to figure out why that is and lock it so that it isn't.
+      #
+      # @return [Boolean]
+      def connected?
+        return true if client && connection
+
+        logger.debug('No client/connection; sleeping', client: client, connection: connection)
+        sleep(5)
+        false
+      end
+
+      # Unless we're in bypass mode, we need to make sure the service has started and built the application on
+      # TeamServer since we're doing a split style here.
+      #
+      # @return [Boolean]
+      def app_create_complete?
+        return true if Contrast::CONTRAST_SERVICE.use_agent_communication?
+        return true if Contrast::Agent.messaging_queue&.speedracer&.status&.startup_messages_sent?
+
+        logger.debug('Service startup incomplete; Application may not be created; sleeping')
+        sleep(5)
+        false
+      end
+
       # @param event [Contrast::Agent::Reporting::ReportingEvent]
       def process_event event
         client.send_event(event, connection)

data/lib/contrast/agent/reporting/reporter_heartbeat.rb

@@ -4,12 +4,15 @@
 require 'contrast/agent/worker_thread'
 require 'contrast/agent/reporting/report'
 require 'contrast/components/logger'
-require 'contrast/agent/reporting/reporting_events/agent_startup'
+require 'contrast/agent/inventory/dependency_usage_analysis'
+require 'contrast/agent/reporting/reporting_events/poll'
+require 'contrast/agent/reporting/reporting_events/server_activity'
 
 module Contrast
   module Agent
     # The ReporterHeartbeat will make sure that the process remains marked alive by TeamServer and that we periodically
-    # reach out to get the latest settings for this application.
+    # reach out to get the latest settings for this application. It also sends out those messages which do not need to
+    # be associated directly with a request, such as Server Activity and Library Observation.
     class ReporterHeartbeat < WorkerThread
       include Contrast::Components::Logger::InstanceMethods
 
@@ -17,33 +20,36 @@ module Contrast
       # to satisfy our goals.
       REFRESH_INTERVAL_SEC = 60
 
-      # check if we can report to TS
-      #
-      # @return[Boolean] true if bypass is enabled, or false if bypass disabled
-      def enabled?
-        @_enabled = Contrast::CONTRAST_SERVICE.use_agent_communication? if @_enabled.nil?
-        @_enabled
-      end
-
-      def connection
-        @_connection ||= client.initialize_connection
-      end
-
       def start_thread!
         return if running?
 
         @_thread = Contrast::Agent::Thread.new do
           logger.info('Starting heartbeat thread.')
           loop do
-            Contrast::Agent.reporter&.send_event(poll_message)
+            polling_events.each do |event|
+              Contrast::Agent.reporter&.send_event(event)
+            end
             sleep(REFRESH_INTERVAL_SEC)
           end
         end
       end
 
+      private
+
       def poll_message
         @_poll_message ||= Contrast::Agent::Reporting::Poll.new
       end
+
+      # Those events which should be sent periodically, rather than on event or request.
+      #
+      # @return [Array<Contrast::Agent::Reporting::ReportingEvent>]
+      def polling_events
+        [
+          Contrast::Agent::Inventory::DependencyUsageAnalysis.instance.generate_library_usage,
+          Contrast::Agent::Reporting::ServerActivity.new,
+          poll_message
+        ].compact
+      end
     end
   end
 end

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

@@ -17,23 +17,16 @@ module Contrast
       # system. Contains data used by TeamServer to render the Flow Map and SCA features.
       #
       # @attr_reader components [Array<Contrast::Agent::Reporting::ArchitectureComponent>]
-      # @attr_reader libraries [Array<Contrast::Agent::Reporting::LibraryDiscovery>]
+      # @attr_accessor libraries [Array<Contrast::Agent::Reporting::LibraryDiscovery>]
       class ApplicationUpdate < Contrast::Agent::Reporting::ApplicationReportingEvent
-        attr_reader :components, :libraries
-
-        class << self
-          # @param app_update_dtm [Contrast::Api::Dtm::ApplicationUpdate]
-          # @return [Contrast::Agent::Reporting::ApplicationUpdate]
-          def convert app_update_dtm
-            report = new
-            report.attach_data(app_update_dtm)
-            report
-          end
-        end
+        attr_reader :components
+        attr_accessor :libraries
 
         def initialize
           @event_method = :PUT
           @event_endpoint = "#{ Contrast::API.api_url }/api/ng/update/application"
+          @components = []
+          @libraries = []
           super
         end
 
@@ -41,18 +34,6 @@ module Contrast
           'update-application'
         end
 
-        # Attach the data from the protobuf models to this reporter so that it can be sent to TeamServer directly.
-        #
-        # @param app_update_dtm [Contrast::Api::Dtm::ApplicationUpdate]
-        def attach_data app_update_dtm
-          @components = app_update_dtm.components.map do |component|
-            Contrast::Agent::Reporting::ArchitectureComponent.convert(component)
-          end
-          @libraries = app_update_dtm.libraries.values.map do |library|
-            Contrast::Agent::Reporting::LibraryDiscovery.convert(library)
-          end
-        end
-
         # Convert the instance variables on the class, and other information, into the identifiers required for
         # TeamServer to process the JSON form of this message.
         #

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

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require 'contrast/api/dtm.pb'
+require 'contrast/components/logger'
 
 module Contrast
   module Agent
@@ -17,6 +18,7 @@ module Contrast
       # @attr_reader url [String] the url used to connect to the component. Required for reporting.
       # @attr_reader vendor [String] the publisher of the component, like MySQL.
       class ArchitectureComponent
+        include Contrast::Components::Logger::InstanceMethods
         # required attributes
         attr_reader :type, :url
         # optional attributes
@@ -55,7 +57,12 @@ module Contrast
         # @return [Hash]
         # @raise [ArgumentError]
         def to_controlled_hash
-          validate
+          begin
+            validate
+          rescue ArgumentError => e
+            logger.error('ArchitectureComponent validation failed with: ', e)
+            return
+          end
           {
               remoteHost: remote_host,
               remotePort: remote_port,