contrast-agent 5.3.0 → 6.1.1

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

@@ -3,9 +3,9 @@
 
 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'
-require 'contrast/agent/reporting/reporting_events/reporting_event'
 require 'contrast/agent/assess/events/event_data'
 require 'contrast/utils/timer'
 
@@ -16,7 +16,7 @@ module Contrast
       # relay this information in the Finding/Trace messages. These findings are used by TeamServer to construct the
       # 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::ReportingEvent
+      class Finding < Contrast::Agent::Reporting::ApplicationReportingEvent
         include Contrast::Components::Logger::InstanceMethods
 
         # @return [Integer] the time, in ms, that this object was initialized
@@ -75,6 +75,10 @@ module Contrast
           super()
         end
 
+        def file_name
+          'traces'
+        end
+
         # Some reports require specific additional headers to be used. To that end, we'll attach them here, letting
         # each handle their own.
         #
@@ -100,7 +104,7 @@ module Contrast
           return unless request
 
           @request = Contrast::Agent::Reporting::FindingRequest.convert(request)
-          @routes << Contrast::Agent::Reporting::RouteDiscovery.convert(request.route)
+          @routes << Contrast::Agent::Reporting::RouteDiscovery.convert(request.route) if request.route
         end
 
         # Attach the data from a Contrast::Api::Dtm::Finding required for property based findings generated during
@@ -148,7 +152,9 @@ module Contrast
         # @raise [ArgumentError]
         def validate
           raise(ArgumentError, "#{ self } did not have a proper rule. Unable to continue.") unless @rule_id
-
+          unless @agent_session_id_value
+            raise(ArgumentError, "#{ self } did not have a proper session id. Unable to continue.")
+          end
           if event_based? && events.empty?
             raise(ArgumentError, "#{ self } did not have proper events for #{ @rule_id }. Unable to continue.")
           end

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

@@ -278,14 +278,12 @@ module Contrast
           unless parent_object_ids
             raise(ArgumentError, "#{ self } did not have a proper parentObjectIds. Unable to continue.")
           end
-          unless taint_ranges && !taint_ranges.empty?
-            raise(ArgumentError, "#{ self } did not have a proper taintRanges. 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 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 && !tags.empty?
+          raise(ArgumentError, "#{ self } did not have a proper tags. Unable to continue.") unless tags
         end
       end
     end

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

@@ -41,7 +41,7 @@ module Contrast
         #
         # @param object [Contrast::Agent::Assess::ContrastObject, nil]
         def attach_data object, truncate
-          @hash = object&.object.__id__
+          @hash = object ? object.tracked_object_id : nil.__id__
           @tracked = !!object&.tracked?
           @value = reportable_value(object&.object, truncate)
         end
@@ -75,9 +75,9 @@ module Contrast
         #
         # @param value [String, nil] the contrast_string of the object this represents.
         # @param truncate [Boolean] if the string should be truncated or not.
-        # @return [String]
+        # @return [String] The strict_encode64 value of the String sent to TeamServer to represent this object.
         def reportable_value value, truncate
-          return Contrast::Utils::ObjectShare::NIL_STRING unless value
+          return Contrast::Utils::ObjectShare::NIL_64_STRING unless value
 
           if truncate && value.length > TRUNCATION_LENGTH
             tmp = []

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

@@ -4,12 +4,12 @@
 module Contrast
   module Agent
     module Reporting
-      #
-      # @attr_accessor id - [String]  - Hash of library as identified by the agent
-      # @attr_accessor names Array[String] - List of file paths that have been loaded out of or executed by the library
-      #
+      # The usage, meaning loaded files, of a library seen during this request
       class LibraryUsageObservation
-        attr_accessor :id, :names
+        # @param [String] Sha256Sum of library as identified by the agent
+        attr_accessor :id
+        # @param [Array<String>] List of file paths that have been loaded out of or executed by the library
+        attr_reader :names
 
         class << self
           # Convert a DTM for SpeedRacer to an Event for TeamServer.

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

@@ -1,7 +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/reporting_event'
+require 'contrast/agent/reporting/reporting_events/application_reporting_event'
 require 'contrast/agent/reporting/reporting_events/library_usage_observation'
 
 module Contrast
@@ -11,7 +11,7 @@ module Contrast
       #
       # @attr_reader observations - Array[Contrast::Agent::Reporting::LibraryUsageObservation]
       #                            - Hash of LibraryUsageObservations
-      class ObservedLibraryUsage < Contrast::Agent::Reporting::ReportingEvent
+      class ObservedLibraryUsage < Contrast::Agent::Reporting::ApplicationReportingEvent
         attr_reader :observations
 
         class << self
@@ -32,6 +32,10 @@ module Contrast
           super
         end
 
+        def file_name
+          'library-observation'
+        end
+
         def to_controlled_hash
           validate
           { observations: @observations.map(&:to_controlled_hash) }

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

@@ -3,7 +3,7 @@
 
 require 'json'
 require 'contrast/components/logger'
-require 'contrast/agent/reporting/reporting_events/reporting_event'
+require 'contrast/agent/reporting/reporting_events/application_reporting_event'
 require 'contrast/utils/object_share'
 
 module Contrast
@@ -15,16 +15,16 @@ module Contrast
       # externally accessible endpoints within the application, as registered to the application framework. This also
       # includes the literal URL and HTTP Verb used to invoke them, as they must have been called at this point to be
       # recorded.
-      #
-      # @attr_accessor signature [String] the method signature used to uniquely identify the coverage report.
-      # @attr_accessor url [String] the normalized URL used to access the method in the route.
-      # @attr_accessor verb [String] the HTTP Verb used  to access the method in the route.
-      # @attr_accessor agent_session_id_value [Integer] the session of this process, as determined from TeamServer on
-      #   application create.
-      # @attr_accessor sources [Array<Contrast::Agent::Reporting::TraceEventSource>] the sources of user input accessed
-      #   during this request. Used for remediation determinations in TeamServer.
-      class ObservedRoute < Contrast::Agent::Reporting::ReportingEvent
-        attr_accessor :sources, :agent_session_id_value, :signature, :verb, :url
+      class ObservedRoute < Contrast::Agent::Reporting::ApplicationReportingEvent
+        # @param [String] the method signature used to uniquely identify the coverage report.
+        attr_accessor :signature
+        # @param [String] the normalized URL used to access the method in the route.
+        attr_accessor :url
+        # @param [String] the HTTP Verb used  to access the method in the route.
+        attr_accessor :verb
+        # @param [Array<Contrast::Agent::Reporting::TraceEventSource>] the sources of user input accessed during this
+        #   request. Used for remediation determinations in TeamServer.
+        attr_reader :sources
 
         def initialize
           @event_endpoint = Contrast::Agent::Reporting::Endpoints.observed_route
@@ -35,6 +35,10 @@ module Contrast
           super()
         end
 
+        def file_name
+          'routes-observed'
+        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.
         #
@@ -44,7 +48,7 @@ module Contrast
           validate
           rc_hash = {
               session_id: @agent_session_id_value,
-              sources: @sources,
+              sources: @sources.map(&:to_controlled_hash),
               signature: @signature,
               verb: @verb,
               url: @url

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

@@ -1,19 +1,23 @@
 # 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/reporting_event'
+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.
-      class Poll < Contrast::Agent::Reporting::ReportingEvent
+      class Poll < Contrast::Agent::Reporting::ApplicationReportingEvent
         def initialize
           @event_type = :heartbeat
           @event_endpoint = Contrast::Agent::Reporting::Endpoints.heartbeat
           super
         end
 
+        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
         #

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

@@ -1,7 +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/reporting_event'
+require 'contrast/agent/reporting/reporting_events/application_reporting_event'
 
 module Contrast
   module Agent
@@ -10,12 +10,10 @@ module Contrast
       # to report a Preflight message to TeamServer. This message represents the identifying information of a
       # collection of Findings/Traces, which TeamServer will use to determine if it requires the full information of
       # any of the Findings/Traces to be reported.
-      #
-      # For our purposes, we'll only ever send one message per request; however, we must use an array to conform to the
-      # specification.
-      #
-      # @attr_reader messages [Array<Contrast::Agent::Reporting::PreflightMessage>]
-      class Preflight < Contrast::Agent::Reporting::ReportingEvent
+      class Preflight < Contrast::Agent::Reporting::ApplicationReportingEvent
+        # For our purposes, we'll only ever send one message per request; however,
+        # we must use an array to conform to the specification.
+        # @return messages [Array<Contrast::Agent::Reporting::PreflightMessage>]
         attr_reader :messages
 
         def initialize
@@ -25,13 +23,17 @@ module Contrast
           super
         end
 
+        def file_name
+          'preflight'
+        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.
         #
         # @return [Hash]
         # @raise [ArgumentError]
         def to_controlled_hash
-          { messages: @messages }
+          { messages: @messages.map(&:to_controlled_hash) }
         end
       end
     end

data/lib/contrast/agent/reporting/reporting_events/preflight_message.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/components/assess'
 require 'contrast/components/logger'
 require 'contrast/agent/reporting/reporting_events/reporting_event'
 
@@ -11,13 +12,13 @@ module Contrast
       # system to report a single message, part of the main Preflight, to TeamServer. This message represents the
       # identifying information of a Finding/Trace, which TeamServer will use to determine if it requires the full
       # information of the Finding/Trace to be reported.
-      #
-      # @attr_accessor data [String] the message identifier; rule_id,hash
-      # @attr_accessor hash_code [String]
-      # @attr_reader routes [Array<Contrast::Agent::Reporting::RouteDiscovery] the route that triggered the finding
-      #   to which this preflight applies.
       class PreflightMessage
-        attr_accessor :data, :hash_code
+        # @return [String] the message identifier; rule_id,hash
+        attr_accessor :data
+        # @return [String] CRC checksum of the finding to which this message pertains
+        attr_accessor :hash_code
+        # @return [Array<Contrast::Agent::Reporting::RouteDiscovery] the route that triggered the finding to which this
+        #   preflight applies.
         attr_reader :routes
 
         # The type of this event, as understood by TeamServer. While TRACE and APPUPDATE are both technically valid, we
@@ -29,7 +30,7 @@ module Contrast
           @app_name = ::Contrast::APP_CONTEXT.app_name
           @app_version = ::Contrast::APP_CONTEXT.app_version
           @routes = []
-          @agent_session_id_value = Contrast::APP_CONTEXT.session_id
+          @agent_session_id_value = ::Contrast::ASSESS.session_id
         end
 
         # Convert the instance variables on the class, and other information, into the identifiers required for
@@ -53,16 +54,12 @@ module Contrast
 
         def validate
           raise(ArgumentError, "#{ cs__class } did not have a proper data. Unable to continue.") unless data
-          raise(ArgumentError, "#{ cs__class } did not have a proper routes. Unable to continue.") if routes.empty?
           unless @app_name
             raise(ArgumentError, "#{ cs__class } did not have a proper application name. Unable to continue.")
           end
           unless @app_language
             raise(ArgumentError, "#{ cs__class } did not have a proper application language. Unable to continue.")
           end
-          unless @app_version
-            raise(ArgumentError, "#{ cs__class } did not have a proper application version. Unable to continue.")
-          end
           unless @agent_session_id_value
             raise(ArgumentError, "#{ cs__class } did not have a proper session id. Unable to continue.")
           end

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

@@ -4,6 +4,7 @@
 require 'contrast/components/logger'
 require 'contrast/utils/assess/trigger_method_utils'
 require 'contrast/agent/reporting/reporting_utilities/endpoints'
+require 'contrast/components/assess'
 
 module Contrast
   module Agent
@@ -19,7 +20,7 @@ module Contrast
         attr_reader :event_method
 
         def initialize
-          @agent_session_id_value = '0' # TODO: RUBY-1514 Contrast::APP_CONTEXT.session_id once we have app start
+          @agent_session_id_value = ::Contrast::ASSESS.session_id
           @event_endpoint ||= nil
           @event_method ||= :POST
         end

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

@@ -15,13 +15,15 @@ module Contrast
       # externally accessible endpoints within the application, as registered to the application framework. This also
       # includes the literal URL and HTTP Verb used to invoke them, as they must have been called at this point to be
       # recorded.
-      #
-      # @attr_accessor route [String] the method signature used to uniquely identify the coverage report.
-      # @attr_accessor url [String] the normalized URL used to access the method in the route.
-      # @attr_accessor verb [String] the HTTP Verb used  to access the method in the route.
-      # @attr_accessor count [Integer] the number of times this was hit; no longer needed as it can be derived.
       class RouteCoverage
-        attr_accessor :route, :url, :verb, :count
+        # @param [String] the method signature used to uniquely identify the coverage report.
+        attr_accessor :route
+        # @param [String] the normalized URL used to access the method in the route.
+        attr_accessor :url
+        # @param [String] the HTTP Verb used  to access the method in the route.
+        attr_accessor :verb
+        # @param [Integer] the number of times this was hit; no longer needed as it can be derived.
+        attr_reader :count
 
         def initialize
           @route = Contrast::Utils::ObjectShare::EMPTY_STRING

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

@@ -1,18 +1,17 @@
 # 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/reporting_event'
+require 'contrast/agent/reporting/reporting_events/server_reporting_event'
 
 module Contrast
   module Agent
     module Reporting
-      # This class will initialize empty ServerActivity body to be send to TS.
-      # The server activity endpoint records actions taken on the serveror process as a whole.
-      # It currently only reports the number of times a defensive action was taken and is most
-      # likely not populated by most agents. The main purpose of sending this message is for its
-      # response, which contains any updated server feature settings from TeamServer.
-      # The new Server Settings endpoint should let us remove this.
-      class ServerActivity < Contrast::Agent::Reporting::ReportingEvent
+      # This class will initialize empty ServerActivity body to be send to TS. The server activity endpoint records
+      # actions taken on the server or process as a whole. It currently only reports the number of times a defensive
+      # action was taken and is most likely not populated by most agents. The main purpose of sending this message is
+      # for its response, which contains any updated server feature settings from TeamServer. The new Server Settings
+      # endpoint should let us remove this.
+      class ServerActivity < Contrast::Agent::Reporting::ServerReportingEvent
         class << self
           # @param _server_activity_dtm [Contrast::Api::Dtm::ServerActivity]
           # @return [Contrast::Agent::Reporting::ServerActivity]
@@ -27,24 +26,17 @@ module Contrast
           super
         end
 
+        def file_name
+          'server-activity'
+        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.
         #
         # @return [Hash]
         # @raise [ArgumentError]
         def to_controlled_hash
-          { lastUpdate: timestamp }
-        end
-
-        private
-
-        # The timestamp field is a bit of a misnomer. It's really the time, in ms, since the settings for this
-        # server have been updated.
-        #
-        # @return [Integer]
-        def timestamp
-          Contrast::Utils::Timer.now_ms -
-              (Contrast::Agent.reporter&.client&.response_handler&.last_server_update_ms || 0)
+          { lastUpdate: since_last_update }
         end
       end
     end

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

@@ -0,0 +1,27 @@
+# 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/reporting_event'
+require 'contrast/utils/timer'
+
+module Contrast
+  module Agent
+    module Reporting
+      # This is the new ServerReportingEvent class which will include all the needed and mutual information for those
+      # events which correspond to Servers, such as Servers Activity.
+      #
+      # @abstract
+      class ServerReportingEvent < Contrast::Agent::Reporting::ReportingEvent
+        protected
+
+        # The timestamp field is a bit of a misnomer. It's really the time, in ms, since the settings for this
+        # application have been updated. If I've never updated, then it's been 0ms since then.
+        #
+        # @return [Integer]
+        def since_last_update
+          (update_time = Contrast::SETTINGS.last_server_update_ms) ? Contrast::Utils::Timer.now_ms - update_time : 0
+        end
+      end
+    end
+  end
+end

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

@@ -22,61 +22,51 @@ module Contrast
         # This method will be handling the auditing of the requests and responses we send to SpeedRacer. If the audit
         # feature is enabled, we'll log to file the request and/or response protobuf objects.
         #
-        # @param event [Contrast::Api::Dtm|Contrast::Agent::Reporting::ReportingEvent] One of the DTMs valid for the
-        #   event field of Contrast::Api::Dtm::Message|Contrast::Agent::Reporting::ReportingEvent
-        # @param response_data [Contrast::Api::Settings::AgentSettings,nil]
+        # @param event [Contrast::Agent::Reporting::ReportingEvent] One of the DTMs valid for the
+        #   event field of Contrast::Agent::Reporting::ReportingEvent
+        # @param response_data [Net::HTTP::Response]
         def audit_event event, response_data = nil
           return unless ::Contrast::API.request_audit_requests? || ::Contrast::API.request_audit_responses?
 
-          type = event.cs__respond_to?(:file_name) ? event.file_name : event.cs__class.cs__name.to_s.downcase
-          if ::Contrast::API.request_audit_requests?
-            data = if event.cs__class < Contrast::Agent::Reporting::ReportingEvent
-                     event.to_controlled_hash.to_json
-                   else # TODO: RUBY-1438 -- remove
-                     event.to_s
-                   end
-            log_data :request, type, data if data
-          end
+          file_name = event.cs__respond_to?(:file_name) ? event.file_name : event.cs__class.cs__name.to_s.downcase
+          data = event.to_controlled_hash.to_json
+          log_data(:request, file_name, data) if data
           return unless ::Contrast::API.request_audit_responses?
 
-          data = response_data.to_s || event.http_response.try(:body) || 'There is no available response'
-          log_data :response, type, data
+          data = response_data&.body || 'There is no available response'
+          log_data(:response, file_name, data)
         end
 
         private
 
         # This method will proceed with passing the data with to the writing method
         # @param type [Symbol] This is the type of the file /:request, :response/
-        # @param data_type[String] DTM type String representation
+        # @param file_name[String] file_name to log
         # @param data[String] String representation if the logged data
-        def log_data type, data_type, data = nil
+        def log_data type, file_name, data = nil
           return unless enabled?
           return unless Contrast::CONTRAST_SERVICE.use_agent_communication?
 
-          write_to_file type, data_type, data
+          logger.debug('logging to file', file_name: file_name) # TODO: RUBY-99999 DO NOT COMMIT THIS
+          write_to_file(type, file_name, data)
         end
 
         # This method will be actually writing to the file
         # @param type [Symbol] This is the type of the file /:request, :response/
-        # @param data_type [String] Data type /Activity/Finding../
+        # @param event_name [String] the type portion of the file to which to write
         # @param data [any] The data to be written to the file
-        def write_to_file type, data_type, data = nil
+        def write_to_file type, event_name, data = nil
           time = Time.now.to_i
           destination = type == :request ? path_for_requests : path_for_responses
           # If the feature is disabled or we have yet to create the directory structure, then we could have a nil
           # destination. In that case, take no action
           return unless destination
 
-          filename = "#{ time }-#{ Thread.current.object_id }-#{ data_type.gsub('::', '_') }-teamserver.json"
+          filename = "#{ time }_#{ Thread.current.object_id }_#{ event_name.gsub('::', '-') }_teamserver_#{ type }.json"
           filepath = File.join(destination, filename)
+          logger.debug('Writing to file', eventname: event_name, filename: filename, filepath: filepath)
           # Here is use append mode, because of a slightly possibility of overwriting an existing file
-          File.open(filepath, 'a') do |f|
-            if data_type.include?('reporting')
-              f.write(Contrast::Utils::StringUtils.force_utf8(data))
-            else
-              f.write({ data_type: Contrast::Utils::StringUtils.force_utf8(data) }.to_json)
-            end
-          end
+          File.open(filepath, 'a') { |f| f.write(Contrast::Utils::StringUtils.force_utf8(data)) }
         rescue StandardError => e
           logger.warn('Saving audit failed', e: e)
         end

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

@@ -0,0 +1,38 @@
+# 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/preflight_message'
+require 'contrast/agent/reporting/reporting_events/preflight'
+require 'contrast/agent/reporting/reporting_events/route_discovery'
+require 'contrast/agent/reporting/reporting_utilities/reporting_storage'
+
+module Contrast
+  module Agent
+    module Reporting
+      # This module will handle the building of new preflights prior to
+      # sending them.
+      module BuildPreflight
+        class << self
+          # @param finding [Contrast::Agent::Reporting::Finding]
+          # @param request [Contrast::Agent::Request] current request
+          def build finding, request
+            return unless finding
+
+            # save the current finding
+            Contrast::Agent::Reporting::ReportingStorage[finding.hash_code] = finding
+
+            new_preflight = Contrast::Agent::Reporting::Preflight.new
+            new_preflight_message = Contrast::Agent::Reporting::PreflightMessage.new
+            if request&.route
+              new_preflight_message.routes << Contrast::Agent::Reporting::RouteDiscovery.convert(request.route)
+            end
+            new_preflight_message.hash_code = finding.hash_code
+            new_preflight_message.data = "#{ finding.rule_id },#{ finding.hash_code }"
+            new_preflight.messages << new_preflight_message
+            new_preflight
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require 'contrast/agent/reporting/reporting_events/server_activity'
+require 'contrast/agent/reporting/reporting_events/application_activity'
 require 'contrast/api/dtm.pb'
 
 module Contrast
@@ -43,6 +44,12 @@ module Contrast
             dtm.cs__is_a?(Contrast::Api::Dtm::Finding)
           end
 
+          # @param dtm [Contrast::Api::Dtm::Finding,Object]
+          # @return [Boolean]
+          def activity? dtm
+            dtm.cs__is_a?(Contrast::Api::Dtm::Activity)
+          end
+
           # Converts DTM message to Reporting Event for those messages that have conversion methods crated. We use this
           # as we work to move away from requiring the Service.
           #
@@ -57,6 +64,7 @@ module Contrast
             return Contrast::Agent::Reporting::ObservedLibraryUsage.convert(dtm) if library_usage?(dtm)
             return Contrast::Agent::Reporting::ApplicationUpdate.convert(dtm) if application_update?(dtm)
             return Contrast::Agent::Reporting::Finding.convert(dtm) if finding?(dtm)
+            return Contrast::Agent::Reporting::ApplicationActivity.convert(dtm) if activity?(dtm)
 
             nil
           end

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

@@ -43,6 +43,12 @@ module Contrast
             end
           end
 
+          def application_activity
+            with_rescue do
+              NG_ENDPOINTS[:application_activity].cs__freeze
+            end
+          end
+
           # @return [String,nil]
           def library_usage
             with_rescue do

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

@@ -13,11 +13,10 @@ module Contrast
         attr_reader :app_name, :api_key, :agent_version, :app_language, :app_path, :app_version, :authorization,
                     :server_name, :server_path, :server_type, :content_type, :encoding
 
+        include Contrast::Utils::ObjectShare
         ENCODING = 'base64'
         CONTENT_TYPE = 'application/json'
 
-        include Contrast::Utils::ObjectShare
-
         def initialize
           @app_name = Base64.strict_encode64(Contrast::APP_CONTEXT.app_name)
           @api_key = Contrast::API.api_key