contrast-agent 6.11.0 → 6.13.0

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 module Contrast

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

@@ -1,12 +1,11 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 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/telemetry/events/exceptions/telemetry_exceptions'
-require 'contrast/agent/telemetry/events/exceptions/obfuscate'
+require 'contrast/agent/telemetry/exception'
 
 module Contrast
   module Agent
@@ -81,7 +80,9 @@ module Contrast
         queue << event
       end
 
-      # Use this to bypass the messaging queue and leave response processing to the caller
+      # Use this to bypass the messaging queue and leave response processing to the caller.
+      # Do not use this in separate threads since this will create a race condition, when
+      # two threads need to use the same OpenSSL::SSL::SSLSocket raising frozen error.
       #
       # @param event [Contrast::Agent::Reporting::ReportingEvent]
       # @return [Net::HTTPResponse, nil]
@@ -138,13 +139,13 @@ module Contrast
         logger.error('[Reporter] Could not send message to TeamServer from reporting queue.', e)
       end
 
-      # @return [Contrast::Agent::Telemetry::TelemetryException::Event]
+      # @return [Contrast::Agent::Telemetry::Exception::Event]
       def queue_limit_telemetry_event
-        message_exception = Contrast::Agent::Telemetry::TelemetryException::MessageException.build(
+        message_exception = Contrast::Agent::Telemetry::Exception::MessageException.build(
             'String',
             "[Reporter] Maximum queue size (#{ MAX_QUEUE_SIZE }) reached for reporting events", nil, stack_frame)
-        message = Contrast::Agent::Telemetry::TelemetryException::Message.build({}, [message_exception])
-        Contrast::Agent::Telemetry::TelemetryException::Event.new(message)
+        message = Contrast::Agent::Telemetry::Exception::Message.build({}, [message_exception])
+        Contrast::Agent::Telemetry::Exception::Event.new(message)
       end
 
       def stack_frame
@@ -155,7 +156,7 @@ module Contrast
                              stack_trace[1].path.delete_prefix(Dir.pwd)
                            end
         stack_frame_function = stack_trace.nil? || stack_trace[1].nil? ? 'none' : stack_trace[1].label
-        Contrast::Agent::Telemetry::TelemetryException::StackFrame.build(stack_frame_function, stack_frame_type, nil)
+        Contrast::Agent::Telemetry::Exception::StackFrame.build(stack_frame_function, stack_frame_type, nil)
       end
     end
   end

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 require 'contrast/agent/reporting/reporting_events/server_reporting_event'
@@ -14,7 +14,7 @@ module Contrast
           @event_method = :PUT
           @event_endpoint = Contrast::Agent::Reporting::Endpoints::NG_ENDPOINTS[:agent_startup]
           @event_type = :agent_startup
-          super
+          super()
         end
 
         def file_name

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 require 'contrast/components/logger'
@@ -23,13 +23,14 @@ module Contrast
         # @return [Contrast::Agent::Response]
         attr_accessor :response
 
-        def initialize
+        def initialize ia_request: nil
           @routes = []
           @query_count = 0
           @event_method = :PUT
           @event_type = :application_activity
           @event_endpoint = Contrast::Agent::Reporting::Endpoints.application_activity
-          super
+          @_request = FindingRequest.convert(ia_request) if ia_request
+          super()
         end
 
         # @return [Contrast::Agent::Reporting::FindingRequest] Current context's request
@@ -40,7 +41,7 @@ module Contrast
         # @return [Contrast::Agent::Reporting::ApplicationDefendActivity] main
         # activity for all protect rules.
         def defend
-          @_defend ||= Contrast::Agent::Reporting::ApplicationDefendActivity.new
+          @_defend ||= Contrast::Agent::Reporting::ApplicationDefendActivity.new(ia_request: request)
         end
 
         # @return [Contrast::Agent::Reporting::ApplicationInventoryActivity] main

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

@@ -1,25 +1,27 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 require 'contrast/components/logger'
 require 'contrast/agent/reporting/reporting_events/application_defend_attacker_activity'
+require 'contrast/utils/duck_utils'
+require 'contrast/agent/reporting/reporting_events/reporting_event'
 
 module Contrast
   module Agent
     module Reporting
       # This is the new ApplicationDefendActivity class which includes information about the defense of the application
       # which was discovered during exercise of the application during this activity period.
-      class ApplicationDefendActivity
+      class ApplicationDefendActivity < Contrast::Agent::Reporting::ReportingEvent
+        include Contrast::Components::Logger::InstanceMethods
+
         # @return [Array<Contrast::Agent::Reporting::ApplicationDefendAttackerActivity>]
         attr_reader :attackers
 
-        # @return [Boolean]
-        attr_reader :existing_attacker_activity
-
-        def initialize
+        def initialize ia_request: nil
           @attackers = []
-          @existing_attacker_activity = false
           @event_type = :application_defend_activity
+          @request = ia_request
+          super()
         end
 
         def to_controlled_hash
@@ -30,14 +32,16 @@ module Contrast
         end
 
         def validate
-          raise(ArgumentError, 'Attackers data must be populated') if existing_attacker_activity && attackers.empty?
+          return unless Contrast::Utils::DuckUtils.empty_duck?(attackers)
+
+          raise(ArgumentError, 'Attackers data must be populated')
         end
 
         # @param attack_result [Contrast::Agent::Reporting::AttackResult]
         def attach_data attack_result
           return unless attack_result&.cs__is_a?(Contrast::Agent::Reporting::AttackResult)
 
-          attacker_activity = Contrast::Agent::Reporting::ApplicationDefendAttackerActivity.new
+          attacker_activity = Contrast::Agent::Reporting::ApplicationDefendAttackerActivity.new(ia_request: @request)
           attacker_activity.attach_data(attack_result)
 
           @existing_attacker_activity = true

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

@@ -1,15 +1,15 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 require 'contrast/components/logger'
 require 'contrast/agent/reporting/reporting_events/application_defend_attack_sample_activity'
+require 'contrast/agent/reporting/reporting_events/reportable_hash'
 
 module Contrast
   module Agent
     module Reporting
       # This is the new ApplicationDefendAttackActivity class which will include the attacks sent by the source.
-      class ApplicationDefendAttackActivity
-        include Contrast::Components::Logger::InstanceMethods
+      class ApplicationDefendAttackActivity < Contrast::Agent::Reporting::ReportableHash
         # @return [Contrast::Agent::Reporting::ApplicationDefendAttackSampleActivity]
         attr_accessor :blocked
         # @return [Contrast::Agent::Reporting::ApplicationDefendAttackSampleActivity]
@@ -25,6 +25,7 @@ module Contrast
 
         def initialize
           @start_time = start_time
+          super()
         end
 
         def to_controlled_hash
@@ -33,7 +34,6 @@ module Contrast
           ineffective_hash = ineffective&.to_controlled_hash || Contrast::Utils::ObjectShare::EMPTY_HASH
           suspicious_hash = suspicious&.to_controlled_hash || Contrast::Utils::ObjectShare::EMPTY_HASH
           validate(blocked_hash, exploited_hash, ineffective_hash, suspicious_hash)
-
           {
               startTime: @start_time,
               blocked: blocked_hash,
@@ -44,10 +44,9 @@ module Contrast
         end
 
         def validate blocked_hash, exploited_hash, ineffective_hash, suspicious_hash
+          raise(ArgumentError, 'Start Time for is not presented') unless @start_time
           return unless [blocked_hash, exploited_hash, ineffective_hash, suspicious_hash].all?(&:empty?)
 
-          raise(ArgumentError, 'Start Time for is not presented') unless start_time
-
           raise(ArgumentError, 'At least one of the samples must be populated')
         end
 

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 require 'contrast/agent/protect/rule/cmd_injection'

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

@@ -1,16 +1,16 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
-require 'contrast/components/logger'
 require 'contrast/utils/timer'
 require 'contrast/agent/reporting/reporting_events/application_defend_attack_sample'
+require 'contrast/agent/reporting/reporting_events/reportable_hash'
 
 module Contrast
   module Agent
     module Reporting
       # This is the new AttackerSampleActivity class which will include Sample of the given attacks in the activity
       # period.
-      class ApplicationDefendAttackSampleActivity
+      class ApplicationDefendAttackSampleActivity < Contrast::Agent::Reporting::ReportableHash
         # @return [Array<Contrast::Agent::Reporting::ApplicationDefendAttackSample>]
         attr_reader :samples
         # @return [Hash<Integer,Integer>] map of time from start in seconds to number of attacks in that second
@@ -21,6 +21,7 @@ module Contrast
           @start_time = Contrast::Agent::REQUEST_TRACKER.current&.timer&.start_ms || 0 # in ms
           @event_type = :application_defend_attack_sample_activity
           @time_map = Hash.new { |h, k| h[k] = 0 }
+          super()
         end
 
         def to_controlled_hash

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 module Contrast

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

@@ -1,8 +1,10 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 require 'contrast/components/logger'
 require 'contrast/utils/object_share'
+require 'contrast/utils/duck_utils'
+require 'contrast/agent/reporting/reporting_events/reportable_hash'
 require 'contrast/agent/reporting/reporting_events/application_defend_attack_activity'
 
 module Contrast
@@ -10,8 +12,7 @@ module Contrast
     module Reporting
       # This is the new AttackerActivity class which will includes the attacker information discovered during this
       # activity period.
-      class ApplicationDefendAttackerActivity
-        include Contrast::Components::Logger::InstanceMethods
+      class ApplicationDefendAttackerActivity < Contrast::Agent::Reporting::ReportableHash
         # @return [Hash<String,Contrast::Agent::Reporting::ApplicationDefendAttackActivity>] map of rule-id to violated
         #   samples for that rule
         attr_accessor :protection_rules
@@ -22,22 +23,23 @@ module Contrast
         #   identify unique attackers
         attr_reader :source_forwarded_for
 
-        def initialize
+        # @param ia_request [Contrast::Agent::Reporting::FindingRequest, nil] Worthwatching worker input_analysis
+        # saved request.
+        def initialize ia_request: nil
           @protection_rules = {}
-          req = Contrast::Agent::REQUEST_TRACKER.current&.request
+          req = ia_request || Contrast::Agent::REQUEST_TRACKER.current&.request
           if req
             @source_ip = req.ip || Contrast::Utils::ObjectShare::EMPTY_STRING
             @source_forwarded_for = req.headers['X-Forwarded-For']
           end
           @event_type = :application_defend_attacker_activity
+          super()
         end
 
         def to_controlled_hash
-          processed_rules = process_protection_rules
-          validate(processed_rules)
-
+          validate
           {
-              protectionRules: processed_rules,
+              protectionRules: process_protection_rules,
               source: {
                   ip: source_ip,
                   xForwardedFor: source_forwarded_for
@@ -45,9 +47,14 @@ module Contrast
           }
         end
 
-        def validate processed_rules
-          raise(ArgumentError, 'Protection Rules are not presented') if processed_rules.empty?
-          raise(ArgumentError, 'Source is not presented') unless source_ip
+        def validate
+          if Contrast::Utils::DuckUtils.empty_duck?(protection_rules) # rubocop:disable Style/GuardClause
+            raise(ArgumentError, 'Protection Rules are not presented')
+          elsif Contrast::Utils::DuckUtils.empty_duck?(source_ip)
+            raise(ArgumentError, 'Source  is not presented')
+          end
+
+          nil
         end
 
         # @param attack_result [Contrast::Agent::Reporting::AttackResult]

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 require 'contrast/components/logger'
@@ -23,7 +23,7 @@ module Contrast
           @event_endpoint = Contrast::Agent::Reporting::Endpoints.application_inventory
           # The API spec limits us to 500 routes, so we'll enforce that here to not hold on to superfulous data.
           @routes = Contrast::Agent.framework_manager.find_route_discovery_data&.take(500)
-          super
+          super()
         end
 
         def file_name

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 require 'contrast/components/logger'
@@ -22,7 +22,7 @@ module Contrast
           @event_type = :application_inventory_activity
           @browsers = []
           @components = []
-          super
+          super()
         end
 
         def to_controlled_hash

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 require 'contrast/agent/reporting/reporting_events/reporting_event'

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 require 'contrast/agent/reporting/reporting_events/application_reporting_event'
@@ -14,7 +14,7 @@ module Contrast
         def initialize
           @event_method = :GET
           @event_endpoint = Contrast::Agent::Reporting::Endpoints.application_settings
-          super
+          super()
         end
 
         def file_name

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 require 'contrast/agent/reporting/reporting_events/application_reporting_event'
@@ -15,7 +15,7 @@ module Contrast
         def initialize
           @event_method = :PUT
           @event_endpoint = Contrast::Agent::Reporting::Endpoints::NG_ENDPOINTS[:application_create]
-          super
+          super()
         end
 
         def file_name

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 require 'contrast/components/protect'

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 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'
@@ -6,7 +6,6 @@ require 'contrast/agent/reporting/reporting_events/application_reporting_event'
 require 'contrast/agent/reporting/reporting_events/library_discovery'
 require 'contrast/agent/reporting/reporting_events/reporting_event'
 require 'contrast/agent/reporting/reporting_events/route_discovery'
-require 'contrast/components/logger'
 
 module Contrast
   module Agent
@@ -25,7 +24,7 @@ module Contrast
           @event_endpoint = "#{ Contrast::API.api_url }/api/ng/update/application"
           @components = []
           @libraries = []
-          super
+          super()
         end
 
         def file_name

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

@@ -1,7 +1,7 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
-require 'contrast/components/logger'
+require 'contrast/agent/reporting/reporting_events/reportable_hash'
 
 module Contrast
   module Agent
@@ -16,8 +16,7 @@ module Contrast
       # @attr_reader type [String] the type of the component. Only ::VALID_TYPES can be used. Required for reporting.
       # @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
+      class ArchitectureComponent < Contrast::Agent::Reporting::ReportableHash
         # required attributes
         attr_accessor :type, :url
         # optional attributes
@@ -42,12 +41,7 @@ module Contrast
         # @return [Hash]
         # @raise [ArgumentError]
         def to_controlled_hash
-          begin
-            validate
-          rescue ArgumentError => e
-            logger.error('ArchitectureComponent validation failed with: ', e)
-            return
-          end
+          validate
           {
               remoteHost: remote_host,
               remotePort: remote_port,

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

@@ -1,8 +1,7 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 require 'json'
-require 'contrast/components/logger'
 require 'contrast/agent/reporting/reporting_events/reporting_event'
 require 'contrast/utils/object_share'
 require 'contrast/utils/duck_utils'
@@ -18,8 +17,6 @@ module Contrast
       # recorded.
       class DiscoveredRoute < Contrast::Agent::Reporting::ObservedRoute
         class << self
-          include Contrast::Components::Logger::InstanceMethods
-
           # @param obj [Regexp, Object]
           # @return [String]
           def source_or_string obj
@@ -99,18 +96,13 @@ module Contrast
         attr_accessor :verb
 
         def initialize
-          super
           @event_type = :discovered_route
           @verb = Contrast::Utils::ObjectShare::EMPTY_STRING
+          super()
         end
 
         def to_controlled_hash
-          begin
-            validate
-          rescue ArgumentError => e
-            logger.error('DiscoveredRoute validation failed with: ', e)
-            return
-          end
+          validate
           { session_id: ::Contrast::ASSESS.session_id, signature: @signature, verb: @verb, url: @url }.compact
         end
 

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

@@ -1,8 +1,7 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 require 'json'
-require 'contrast/components/logger'
 require 'contrast/agent/reporting/reporting_events/application_reporting_event'
 require 'contrast/agent/reporting/reporting_events/finding_event'
 require 'contrast/agent/reporting/reporting_events/finding_request'
@@ -17,8 +16,6 @@ module Contrast
       # vulnerability information for the assess feature. They represent those parts of the application, either through
       # configuration, method invocation, or dataflow, which are determined to be insecure.
       class Finding < Contrast::Agent::Reporting::ApplicationReportingEvent
-        include Contrast::Components::Logger::InstanceMethods
-
         # @return [Integer] the time, in ms, that this object was initialized
         attr_reader :created
         # @return [String] the ID of the rule associated with this finding
@@ -102,13 +99,7 @@ module Contrast
         # @return [Hash]
         # @raise [ArgumentError]
         def to_controlled_hash
-          begin
-            validate
-          rescue ArgumentError => e
-            logger.error('Finding event validation failed with: ', e)
-            return
-          end
-
+          validate
           hsh = base_hash
           hsh[:events] = events.map(&:to_controlled_hash) if events.any?
           hsh[:properties] = properties if properties.any?

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 require 'contrast/agent/reporting/reporting_events/finding_event_object'
@@ -16,7 +16,7 @@ require 'contrast/utils/object_share'
 require 'contrast/utils/stack_trace_utils'
 require 'contrast/utils/string_utils'
 require 'contrast/utils/timer'
-require 'contrast/components/logger'
+require 'contrast/agent/reporting/reporting_events/reportable_hash'
 
 module Contrast
   module Agent
@@ -25,9 +25,7 @@ module Contrast
       # to relay this information in the Finding/Trace messages. These FindingEvents are used by TeamServer to
       # construct the vulnerability information for the assess feature. They represent the operation the application
       # underwent that transformed data during the dataflow.
-      class FindingEvent
-        include Contrast::Components::Logger::InstanceMethods
-
+      class FindingEvent < Contrast::Agent::Reporting::ReportableHash
         # @return [Symbol] what the event did; CREATION, A2O, A2P, A2A, A2R, O2A, O2O, O2P, O2R, P2A, P2O, P2P, P2R,
         #   TAG, TRIGGER.
         attr_reader :action
@@ -105,6 +103,7 @@ module Contrast
           @thread = Thread.current.object_id.to_s
           @event_id = Contrast::Agent::Reporting::FindingEvent.next_atomic_id
           initialize_routine(event_data, source_type, source_name)
+          super()
         end
 
         # Init routine to find parents events, capture stack trace and retrieve object, args, ret and properties.
@@ -188,13 +187,7 @@ module Contrast
         # @return [Hash]
         # @raise [ArgumentError]
         def to_controlled_hash # rubocop:disable Metrics/AbcSize
-          begin
-            validate
-          rescue ArgumentError => e
-            logger.error('FindingEvent validation failed with: ', e)
-            return
-          end
-
+          validate
           {
               action: action,
               args: reportable_args.map(&:to_controlled_hash),

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

@@ -1,9 +1,9 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 require 'base64'
 require 'contrast/agent/assess/contrast_object'
-require 'contrast/components/logger'
+require 'contrast/agent/reporting/reporting_events/reportable_hash'
 
 module Contrast
   module Agent
@@ -12,9 +12,7 @@ module Contrast
       # system to relay this information in the Finding/Trace messages. These FindingEventObjects are used by
       # TeamServer to construct the vulnerability information for the assess feature. They represent those parts of the
       # objects that were acted on in a Dataflow Finding.
-      class FindingEventObject
-        include Contrast::Components::Logger::InstanceMethods
-
+      class FindingEventObject < Contrast::Agent::Reporting::ReportableHash
         # @return [Integer] the id of the Object this represents.
         attr_reader :hash
         # @return [Boolean] if the Object is tracked or not
@@ -55,13 +53,7 @@ module Contrast
         # @return [Hash]
         # @raise [ArgumentError]
         def to_controlled_hash
-          begin
-            validate
-          rescue ArgumentError => e
-            logger.error('FindingEventObject validation failed with: ', e)
-            return
-          end
-
+          validate
           {
               hash: hash,
               tracked: tracked,