contrast-agent 6.7.0 → 6.9.0

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

@@ -5,9 +5,17 @@ require 'contrast/agent/reporting/reporting_events/finding_event_object'
 require 'contrast/agent/reporting/reporting_events/finding_event_parent_object'
 require 'contrast/agent/reporting/reporting_events/finding_event_property'
 require 'contrast/agent/reporting/reporting_events/finding_event_signature'
-require 'contrast/agent/reporting/reporting_events/finding_event_source'
 require 'contrast/agent/reporting/reporting_events/finding_event_stack'
 require 'contrast/agent/reporting/reporting_events/finding_event_taint_range'
+require 'contrast/agent/reporting/reporting_events/finding_event_source'
+require 'contrast/agent/assess/contrast_object'
+require 'contrast/utils/assess/tracking_util'
+require 'contrast/utils/class_util'
+require 'contrast/utils/duck_utils'
+require 'contrast/utils/object_share'
+require 'contrast/utils/stack_trace_utils'
+require 'contrast/utils/string_utils'
+require 'contrast/utils/timer'
 require 'contrast/components/logger'
 
 module Contrast
@@ -24,23 +32,39 @@ module Contrast
         #   TAG, TRIGGER.
         attr_reader :action
         # @return [Array<Contrast::Agent::Reporting::FindingEventObject>] the arguments passed to the method.
+        attr_reader :reportable_args
+        # @return [Array<Contrast::Agent::Assess::ContrastObject, nil>] the safe representation of the Arguments with
+        #   which the method was invoked
         attr_reader :args
         # @return [nil] unused.
         attr_reader :code
         # @return [Integer] the id of this event.
         attr_reader :event_id
-        # @return [Array<Contrast::Agent::Reporting::FindingEventSource>] the source of taint
+        # @return [Array<Contrast::Agent::Reporting::EventSource>] the source of taint
         attr_reader :event_sources
+        # @return [String, nil]
+        attr_reader :source_type
+        # @return [String, nil]
+        attr_reader :source_name
         # @return [nil] unused.
         attr_reader :field_name
         # @return [Contrast::Agent::Reporting::FindingEventObject] the object this method was invoked on.
+        attr_reader :reportable_object
+        # @return [Contrast::Agent::Request, nil] our wrapper around the Rack::Request for this context
+        attr_reader :request
+        # @return [Contrast::Agent::Assess::ContrastObject] the safe representation of the Object on which the method
+        #   was invoked
         attr_reader :object
-        # @@return [Array<Contrast::Agent::Reporting::FindingEventParentObject>] the ids of all the events directly
+        # @return [Array<Contrast::Agent::Reporting::FindingEventParentObject>] the ids of all the events directly
         #   preceding this
         attr_reader :parent_object_ids
+        # @return [Contrast::Agent::Assess::Policy::PolicyNode] the node that governs this event.
+        attr_reader :policy_node
         # @return [Array<Contrast::Agent::Reporting::FindingEventProperty>]
         attr_reader :properties
         # @return  [Contrast::Agent::Reporting::FindingEventObject] the return of the method.
+        attr_reader :reportable_ret
+        # @return [Contrast::Agent::Assess::ContrastObject] the safe representation of the Return of the invoked method
         attr_reader :ret
         # @return [Contrast::Agent::Reporting::FindingEventSignature] the signature of the method.
         attr_reader :signature
@@ -49,6 +73,8 @@ module Contrast
         # @return [Array<Contrast::Agent::Reporting::FindingEventStack>]
         attr_reader :stack
         # @return [String] comma separated list of descriptions of what's happened to the data
+        attr_reader :reportable_tags
+        # @return [Hash<Contrast::Agent::Assess::Tag>]
         attr_reader :tags
         # @return [Array<Contrast::Agent::Reporting::FindingEventTaintRange>] the tags and spans of the source that are
         #   tracked
@@ -61,6 +87,70 @@ module Contrast
         attr_reader :time
         # @return [String] the type of event; METHOD, PROPAGATION, TAG
         attr_reader :type
+        # @return [Array<String>] the execution stack at the time the method for this event was invoked
+        attr_reader :stack_trace
+
+        # Creates new FindingEvent.
+        #
+        # @param event_data [Contrast::Agent::Assess::Events::EventData]
+        # @param source_type [String, nil] the type of this source, from the
+        #       source_node, or a KEY_TYPE if invoked for a map,
+        # @param source_name [String, nil] the name of this source, i.e.
+        #       the key used to accessed if from a map or nil if a type like,
+        # @return [Contrast::Agent::Reporting::FindingEvent]
+        def initialize event_data = nil, source_type = nil, source_name = nil
+          @event_sources = []
+          @stack = []
+          @time = Contrast::Utils::Timer.now_ms
+          @thread = Thread.current.object_id.to_s
+          @event_id = Contrast::Agent::Reporting::FindingEvent.next_atomic_id
+          initialize_routine(event_data, source_type, source_name)
+        end
+
+        # Init routine to find parents events, capture stack trace and retrieve object, args, ret and properties.
+        #
+        # @param event_data [Contrast::Agent::Assess::Events::EventData]
+        # @param source_type [String, nil] the type of this source, from the
+        #       source_node, or a KEY_TYPE if invoked for a map,
+        # @param source_name [String, nil] the name of this source, i.e.
+        #       the key used to accessed if from a map or nil if a type like,
+        def initialize_routine event_data, source_type = nil, source_name = nil
+          return unless event_data&.cs__is_a?(Contrast::Agent::Assess::Events::EventData)
+
+          # Initialize source event:
+          if event_data.policy_node.cs__class == Contrast::Agent::Assess::Policy::SourceNode
+            build_source_event(source_type, source_name)
+          end
+
+          @policy_node = event_data.policy_node
+          @tags = Contrast::Agent::Assess::Tracker.properties(event_data.tagged)&.get_tags
+          find_parent_events!(event_data.policy_node, event_data.object, event_data.ret, event_data.args)
+          snapshot!(event_data.object, event_data.ret, event_data.args)
+          display_params!
+          capture_stacktrace!
+          stack!
+          properties!
+          # following methods must be called after snapshot!
+          dataflow!
+          @signature = Contrast::Agent::Reporting::FindingEventSignature.new(policy_node, args, ret)
+        end
+
+        # We need this to track the parent id's of events to build up a flow chart of the finding
+        @atomic_id = 0
+        @atomic_mutex = Mutex.new
+        def self.next_atomic_id
+          @atomic_mutex.synchronize do
+            @atomic_id += 1
+            # Rollover things
+          rescue StandardError
+            @atomic_id = 1
+          end
+        end
+
+        # @return [Array<Contrast::Agent::Reporting::FindingEvent>]
+        def parent_events
+          @_parent_events ||= []
+        end
 
         class << self
           # Find all the events leading up to the given source and return an array of FindingEvents
@@ -73,21 +163,13 @@ module Contrast
             build_events([], props.event) if props.event
           end
 
-          # @param event [Contrast::Agent::Assess::ContrastEvent]
-          # @return [Contrast::Agent::Reporting::FindingEvent]
-          def convert event
-            report = new
-            report.attach_data(event)
-            report
-          end
-
           private
 
           # Pull the parent events from the given event, generating an array of FindingEvents, passing back the given
           # array of events after populating it.
           #
           # @param events [Array<Contrast::Agent::Reporting::FindingEvent>]
-          # @param event [Contrast::Agent::Assess::ContrastEvent]
+          # @param event [Contrast::Agent::Reporting::FindingEvent]
           # @return [Array<Contrast::Agent::Reporting::FindingEvent>]
           def build_events events, event
             return unless event
@@ -95,32 +177,11 @@ module Contrast
             event.parent_events&.each do |parent_event|
               build_events(events, parent_event)
             end
-            events << convert(event)
+            events << event
             events
           end
         end
 
-        def initialize
-          @event_sources = []
-        end
-
-        # Parse the data from a Contrast::Agent::Assess::ContrastEvent to attach what is required for reporting to
-        # TeamServer to this Contrast::Agent::Reporting::FindingEvent
-        #
-        # @param event [Contrast::Agent::Assess::ContrastEvent]
-        def attach_data event
-          @event_id = event.event_id
-          @time = event.time.to_i
-          @thread = event.thread.to_s
-          display_params!(event)
-          dataflow!(event)
-          event_sources!(event)
-          @signature = Contrast::Agent::Reporting::FindingEventSignature.convert(event)
-          stack!(event)
-          parent_ids!(event)
-          properties!(event)
-        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.
         #
@@ -136,19 +197,19 @@ module Contrast
 
           {
               action: action,
-              args: args.map(&:to_controlled_hash),
+              args: reportable_args.map(&:to_controlled_hash),
               # code: code, # Unused by our agent
               objectId: event_id,
               eventSources: event_sources.map(&:to_controlled_hash),
               # fieldName: field_name, # Unused by our agent
-              object: object.to_controlled_hash,
+              object: reportable_object.to_controlled_hash,
               parentObjectIds: parent_object_ids.map(&:to_controlled_hash),
               properties: properties.map(&:to_controlled_hash),
-              ret: ret&.to_controlled_hash,
+              ret: reportable_ret&.to_controlled_hash,
               signature: signature.to_controlled_hash,
               source: source || '',
               stack: stack.map(&:to_controlled_hash),
-              tags: tags.join(','),
+              tags: reportable_tags.join(','),
               taintRanges: taint_ranges.map(&:to_controlled_hash),
               target: target || '',
               thread: thread,
@@ -165,13 +226,22 @@ module Contrast
 
         private
 
+        # @param source_type [String, nil] the type of this source, from the
+        #       source_node, or a KEY_TYPE if invoked for a map,
+        # @param source_name [String, nil] the name of this source, i.e.
+        #       the key used to accessed if from a map or nil if a type like,
+        def build_source_event source_type = nil, source_name = nil
+          @source_type = Contrast::Utils::StringUtils.force_utf8(source_type)
+          @source_name = Contrast::Utils::StringUtils.force_utf8(source_name)
+          @event_sources << Contrast::Agent::Reporting::FindingEventSource.new(@source_type, @source_name)
+          @request = Contrast::Agent::REQUEST_TRACKER.current&.request
+        end
+
         # Find the action and type of this event, used by TeamServer to display type of the event and the
         # transformation if made.
-        #
-        # @param event [Contrast::Agent::Assess::ContrastEvent]
-        def display_params! event
-          @action = event.policy_node.build_action
-          @type = case event.policy_node.node_type
+        def display_params!
+          @action = policy_node.build_action
+          @type = case policy_node.node_type
                   when :TYPE_TAG
                     'TAG'
                   when :TYPE_PROPAGATION
@@ -182,65 +252,59 @@ module Contrast
         end
 
         # Build the dataflow components of this FindingEvent.
-        #
-        # @param event [Contrast::Agent::Assess::ContrastEvent]
-        def dataflow! event
-          taint_target = taint_target!(event)
+        def dataflow!
+          taint_target = taint_target!
           truncate_obj = Contrast::Utils::ObjectShare::OBJECT_KEY != taint_target
-          @object = Contrast::Agent::Reporting::FindingEventObject.convert(event.object, truncate_obj)
+          @reportable_object = Contrast::Agent::Reporting::FindingEventObject.convert(@object, truncate_obj)
           truncate_ret = Contrast::Utils::ObjectShare::RETURN_KEY != taint_target
-          @ret = Contrast::Agent::Reporting::FindingEventObject.convert(event.ret, truncate_ret)
-          event_args!(event, taint_target)
-          taint_ranges!(event)
+          @reportable_ret = Contrast::Agent::Reporting::FindingEventObject.convert(@ret, truncate_ret)
+          event_args!(taint_target)
+          taint_ranges!
         end
 
         # Convert the arguments of the given ContrastEvent to the reportable form for this FindingEvent. We'll
         # truncate any argument that isn't the taint target of this event.
         #
-        # @param event [Contrast::Agent::Assess::ContrastEvent]
         # @param taint_target [String,nil] the target of the taint in this event.
-        def event_args! event, taint_target
-          @args = []
+        def event_args!taint_target
+          @reportable_args = []
+          return unless args
+
           idx = 0
-          while idx < event.args.length
-            @args << Contrast::Agent::Reporting::FindingEventObject.convert(event.args[idx], taint_target != idx)
+          while idx < args.length
+            @reportable_args << Contrast::Agent::Reporting::FindingEventObject.convert(args[idx], taint_target != idx)
             idx += 1
           end
         end
 
-        # Convert the sources of the event to sources here
-        #
-        # @param event [Contrast::Agent::Assess::ContrastEvent]
-        def event_sources! event
-          return unless event.cs__is_a?(Contrast::Agent::Assess::Events::SourceEvent)
-
-          event_sources << event.event_source if event.event_source
-        end
-
         # Convert the parent id's of the given ContrastEvent to the reportable form for this FindingEvent.
-        #
-        # @param event [Contrast::Agent::Assess::ContrastEvent]
-        def parent_ids! event
+        def parent_ids!
           @parent_object_ids = []
-          event.parent_events&.each do |parent_event|
+          parent_events&.each do |parent_event|
             parent_object_ids << Contrast::Agent::Reporting::FindingEventParentObject.new(parent_event.event_id.to_i)
           end
         end
 
-        # Convert the properties of the given ContrastEvent to the reportable form for this FindingEvent.
+        # A set of properties that pertain to this event. This is not required for all rules.
+        # Dataflow rules can safely omit this property from their report. The properties are set
+        # by properties based rules on build_evidence method ( evidence - legacy, now new rules use properties).
+        # It returns a key-value pair of properties on each violated rule. The build finding does not create event,
+        # since it checks for violation and if there is a violation in the response it is reported, and properties
+        # are populated only for Contrast::Agent::Reporting::Finding.
         # TODO: RUBY-99999 How do properties get to events? Do they? I thought Stored-XSS needed it.
         #
-        # @param _event [Contrast::Agent::Assess::ContrastEvent]
-        def properties! _event
+        # @return [Array<Contrast::Agent::Reporting::FindingEventProperty>]
+        def properties!
           @properties = []
         end
 
-        # Convert the stack of the given ContrastEvent to the reportable form for this FindingEvent.
+        # Capture stack traces only as configured. We'll use this to grab the start of the call stack as if the
+        # instrumented method were the caller. This means we'll start at the entry just after the first block of
+        # Contrast code.
         #
-        # @param event [Contrast::Agent::Assess::ContrastEvent]
-        def stack! event
-          @stack = if event.stack_trace
-                     event.stack_trace.compact.map! do |stack_event|
+        def stack!
+          @stack = if stack_trace
+                     stack_trace.compact.map! do |stack_event|
                        Contrast::Agent::Reporting::FindingEventStack.new(stack_event)
                      end
                    else
@@ -249,13 +313,13 @@ module Contrast
         end
 
         # Convert the taint ranges of the given ContrastEvent to the reportable form for this FindingEvent.
-        #
-        # @param event [Contrast::Agent::Assess::ContrastEvent]
-        def taint_ranges! event
-          @tags = []
+        def taint_ranges!
+          @reportable_tags = []
           @taint_ranges = []
-          event&.tags&.each_pair do |tag_key, tag_ranges|
-            tags << tag_key
+          return unless tags
+
+          tags.each_pair do |tag_key, tag_ranges|
+            reportable_tags << tag_key
             tag_ranges.each do |range|
               taint_ranges << Contrast::Agent::Reporting::FindingEventTaintRange.convert(range)
             end
@@ -264,16 +328,98 @@ module Contrast
 
         # Find the source and target for this FindingEvent based on the provided event.
         #
-        # @param event [Contrast::Agent::Assess::ContrastEvent]
         # @return [String,nil] the target of the taint in this event.
-        def taint_target! event
-          return unless (node = event.policy_node)
+        def taint_target!
+          return unless policy_node
+
+          @source = policy_node.source_string if policy_node.source_string
+          @target = policy_node.target_string if policy_node.target_string
+          return policy_node.targets[0] if policy_node.targets&.any?
+
+          policy_node.sources[0] if policy_node.sources&.any?
+        end
+
+        # Parent events are the events of all the sources of this event which were tracked prior to this event
+        # occurring. Depending on which, if any of the sources were tracked, there may be more than one parent.
+        #
+        # All events except for [Contrast::Agent::Assess::Events::SourceEvent] will have at least one parent.
+        #
+        # We set those events to this event's instance variables.
+        #
+        # @param policy_node [Contrast::Agent::Assess::Policy::PolicyNode] the node that governs this event.
+        # @param object [Object] the Object on which the method was invoked
+        # @param ret [Object] the Return of the invoked method
+        # @param args [Array<Object>] the Arguments with which the method was invoked
+        # @return event [Contrast::Agent::Reporting::FindingEvent]
+        def find_parent_events! policy_node, object, ret, args
+          policy_node.sources.each do |source_marker|
+            source = value_of_source(source_marker, object, ret, args)
+            next unless source
 
-          @source = node.source_string if node.source_string
-          @target = node.target_string if node.target_string
-          return node.targets[0] if node.targets&.any?
+            event = Contrast::Agent::Assess::Tracker.properties(source)&.event
+            parent_events << event if event
+          end
+          parent_ids!
+        end
+
+        # @param source [String] the marker for the source type
+        # @param object [Object] the Object on which the method was invoked
+        # @param ret [Object] the Return of the invoked method
+        # @param args [Array<Object>] the Arguments with which the method was invoked
+        # @return [Object,nil] the literal value of the source indicated by the given marker
+        def value_of_source source, object, ret, args
+          case source
+          when Contrast::Utils::ObjectShare::OBJECT_KEY
+            object
+          when Contrast::Utils::ObjectShare::RETURN_KEY
+            ret
+          else
+            args[source]
+          end
+        end
+
+        # Everything* is mutable in Ruby. As such, to ensure we can accurately report the application state at the time
+        # of this method's invocation, we have to snapshot the given values, making safe representations of them for
+        # our later use. We set those safe values to this event's instance variables.
+        #
+        # @param object [Object] the Object on which the method was invoked
+        # @param ret [Object] the Return of the invoked method
+        # @param args [Array<Object>] the Arguments with which the method was invoked
+        def snapshot! object, ret, args
+          @object = Contrast::Agent::Assess::ContrastObject.new(object) if object
+          @ret = Contrast::Agent::Assess::ContrastObject.new(ret) if ret
+          @args = safe_args_representation(args)
+          self
+        end
+
+        # Given an array of arguments, copy them into a safe, meaning String, format that we can use to send to SR and
+        # TS for rendering.
+        #
+        # @param args [Array<Object>] the arguments to translate
+        # @return [Array<Contrast::Agent::Assess::ContrastObject>] the String forms of those Objects, as determined by
+        #   Contrast::Utils::ClassUtil.to_contrast_string
+        def safe_args_representation args
+          return unless args
+          return Contrast::Utils::ObjectShare::EMPTY_ARRAY if args.empty?
+
+          args.map { |arg| arg ? Contrast::Agent::Assess::ContrastObject.new(arg) : nil }
+        end
+
+        # Capture stack traces only as configured. We'll use this to grab the start of the call stack as if the
+        # instrumented method were the caller. This means we'll start at the entry just after the first block of
+        # Contrast code.
+        def capture_stacktrace!
+          # If we're configured to not capture the stacktrace, usually for performance reasons, then don't and return an
+          # empty array instead
+          unless ::Contrast::ASSESS.capture_stacktrace?(policy_node)
+            @stack_trace = Contrast::Utils::ObjectShare::EMPTY_ARRAY
+            return
+          end
 
-          node.sources[0] if node.sources&.any?
+          # Otherwise, find where in the stack the application / Ruby code starts
+          start = caller(0, 20)&.find_index { |stack| !stack.include?('/lib/contrast') }
+          # And then use that to build out the reported stacktrace, or a fallback if we couldn't find it.
+          @stack_trace = start ? caller(start + 1, 20) : caller(20, 20)
         end
 
         # @raise [ArgumentError]
@@ -291,11 +437,11 @@ module Contrast
             raise(ArgumentError, "#{ self } did not have a proper parentObjectIds. Unable to continue.")
           end
           raise(ArgumentError, "#{ self } did not have a proper taintRanges. Unable to continue.") unless taint_ranges
-          raise(ArgumentError, "#{ self } did not have a proper args. Unable to continue.") unless args
-          raise(ArgumentError, "#{ self } did not have a proper object. Unable to continue.") unless object
+          raise(ArgumentError, "#{ self } did not have a proper args. Unable to continue.") unless reportable_args
+          raise(ArgumentError, "#{ self } did not have a proper object. Unable to continue.") unless reportable_object
           raise(ArgumentError, "#{ self } did not have a proper signature. Unable to continue.") unless signature
           raise(ArgumentError, "#{ self } did not have a proper stack. Unable to continue.") unless stack
-          raise(ArgumentError, "#{ self } did not have a proper tags. Unable to continue.") unless tags
+          raise(ArgumentError, "#{ self } did not have a proper tags. Unable to continue.") unless reportable_tags
         end
       end
     end

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

@@ -36,38 +36,25 @@ module Contrast
         # @return [Boolean] if the method is void or not; may be different for each invocation of the method.
         attr_reader :void_method
 
-        class << self
-          # @param event [Contrast::Agent::Assess::ContrastEvent] the event to build a signature for
-          # @return [Contrast::Agent::Reporting::FindingEventSignature]
-          def convert event
-            report = new
-            report.attach_data(event)
-            report
-          end
-        end
-
-        # Parse the data from a Contrast::Agent::Assess::ContrastEvent to attach what is required for reporting to
-        # TeamServer to this Contrast::Agent::Reporting::FindingEventSignature
-        #
-        # @param event [Contrast::Agent::Assess::ContrastEvent]
-        def attach_data event
-          node = event.policy_node
+        # @param policy_node [Contrast::Agent::Assess::Policy::PolicyNode] the node that governs this event.
+        # @param args[Array<Contrast::Agent::Assess::ContrastObject, nil>] the safe representation of the Arguments with
+        #   which the method was invoked
+        # @param ret [Contrast::Agent::Assess::ContrastObject] the safe representation of the Return of the
+        # invoked method
+        def initialize policy_node, args, ret
+          node = policy_node
           @arg_types = []
-          event.args&.each do |arg|
-            arg_types << type_name(arg)
-          end
+          args&.each { |arg| arg_types << type_name(arg) }
           @class_name = node.class_name
           @constructor = node.method_name == :new || node.method_name == :initialize
           # 8 is STATIC in Java... we have to placate them for now it has been requested that flags be removed since it
           # isn't used
           @flags = 8 unless node.instance_method?
           @method_name = node.method_name.to_s
-          @return_type = type_name(event.ret)
+          @return_type = type_name(ret)
           # if there's a ret, then this method isn't nil. not 100% full proof since you can return nil, but this is the
           # best we've got currently.
-          @void_method = event.ret.nil? ||
-              event.ret.object.nil? ||
-              event.ret.object == Contrast::Utils::ObjectShare::NIL_STRING
+          @void_method = ret.nil? || ret.object.nil? || ret.object == Contrast::Utils::ObjectShare::NIL_STRING
         end
 
         # Convert the instance variables on the class, and other information, into the identifiers required for

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

@@ -15,15 +15,15 @@ module Contrast
         include Contrast::Components::Logger::InstanceMethods
 
         # @return [String] the name of the source
-        attr_reader :name
+        attr_reader :source_name
         # @return [String] the type of the source
-        attr_reader :type
+        attr_reader :source_type
 
         # @param type [String]
         # @param name [String]
         def initialize type, name
-          @type = type
-          @name = name
+          @source_type = type
+          @source_name = name
         end
 
         # Convert the instance variables on the class, and other information, into the identifiers required for
@@ -40,8 +40,8 @@ module Contrast
           end
 
           {
-              sourceName: name, # rubocop:disable Security/Module/Name
-              sourceType: type
+              sourceName: source_name,
+              sourceType: source_type
           }
         end
 
@@ -58,14 +58,15 @@ module Contrast
           end
 
           {
-              name: name, # rubocop:disable Security/Module/Name
-              type: type
+              name: source_name,
+              type: source_type
           }
         end
 
         # @raise [ArgumentError]
         def validate
-          raise(ArgumentError, "#{ self } did not have a proper type. Unable to continue.") unless type && !type.empty?
+          raise(ArgumentError, "#{ self } did not have a proper type. Unable to continue.") unless source_type &&
+              !source_type.empty?
         end
       end
     end

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

@@ -39,9 +39,6 @@ module Contrast
         attr_accessor :body_binary
         # @return [Hash]
         attr_reader :cookies
-        # REMOVE_DTM_REQUEST
-        # @return [Contrast::Api::Dtm::HttpRequest]
-        attr_reader :dtm
 
         class << self
           # @param request [Contrast::Agent::Request]
@@ -60,8 +57,6 @@ module Contrast
         #
         # @param request [Contrast::Agent::Request]
         def attach_data request
-          # REMOVE_DTM_REQUEST
-          @dtm = request.dtm
           @body = request.body
           @headers = {}
           extract_headers(request)

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

@@ -1,7 +1,6 @@
 # Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
-require 'contrast/api/dtm.pb'
 require 'contrast/utils/string_utils'
 require 'contrast/components/logger'
 

data/lib/contrast/agent/reporting/reporting_events/observed_route.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 'digest'
 require 'json'
 require 'contrast/components/logger'
 require 'contrast/agent/reporting/reporting_events/application_reporting_event'
@@ -63,6 +64,17 @@ module Contrast
           }.compact
         end
 
+        # Generates a hash id for the observed route, based on the sources, signature, verb, and url.
+        #
+        # @return [String]
+        #
+        def hash_id
+          hashable_data = to_controlled_hash.except(:session_id)
+          hashable_data[:sources] = hashable_data[:sources].sort_by { |s| s[:name] }
+
+          Digest::SHA2.new(256).hexdigest(hashable_data.to_s)
+        end
+
         # @raise [ArgumentError]
         def validate
           raise(ArgumentError, "#{ self } did not have a proper sources. Unable to continue.") if @sources.nil?

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

@@ -6,7 +6,7 @@ require 'contrast/agent/reporting/reporting_events/application_reporting_event'
 module Contrast
   module Agent
     module Reporting
-      # This is the new Poll class for the Heartbeat Service.
+      # This is the new Poll class for the Heartbeat to TeamServer.
       class Poll < Contrast::Agent::Reporting::ApplicationReportingEvent
         def initialize
           @event_type = :heartbeat
@@ -17,16 +17,6 @@ module Contrast
         def file_name
           'applications-heartbeat'
         end
-
-        # This is commented out as I am not aware if we're supposed to send some information and/or parse it to hash
-        # In https://github.com/Contrast-Security-Inc/contrast-service/blob/next/reporting/tsreporter.go
-        #
-        # Convert the instance variables on the class, and other information, into the identifiers required for
-        # TeamServer to process the JSON form of this message.
-        #
-        # @return [Hash]
-        # @raise [ArgumentError]
-        # def to_controlled_hash; end
       end
     end
   end