contrast-agent 4.13.0 → 5.0.0

data/lib/contrast/api/communication/response_processor.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 require 'contrast/agent/reaction_processor'
@@ -7,10 +7,17 @@ require 'contrast/components/logger'
 module Contrast
   module Api
     module Communication
-      # Handles processing deferred messages
+      # Handles processing deferred messages sent to SpeedRacer.
+      #
+      # @attr_reader last_app_update_ms [Integer] the time, in ms, that application settings last changed
+      # @attr_reader last_server_update_ms [Integer] the time, in ms, that server settings last changed
       class ResponseProcessor
         include Contrast::Components::Logger::InstanceMethods
+        attr_reader :last_app_update_ms, :last_server_update_ms
 
+        # Use the given response to update the Agent's server features and application settings, allowing it to reflect
+        # the latest options configured by the user in TeamServer
+        #
         # @param response [Contrast::Api::Settings::AgentSettings]
         def process response
           logger.debug('Received a response', sent_ms: response&.sent_ms)
@@ -18,8 +25,8 @@ module Contrast
           server_features = process_server_response(response)
           app_settings = process_application_response(response)
 
-          # ReactionProcessor is a design pattern from TeamServer.
-          # Right now, there's one potential reaction, which is disabling the agent
+          # ReactionProcessor is a design pattern from TeamServer. Right now, there's one potential reaction, which is
+          # disabling the agent
           Contrast::Agent::ReactionProcessor.process(response&.application_settings)
 
           Contrast::Logger::Log.instance.update(server_features&.log_file, server_features&.log_level)
@@ -30,10 +37,10 @@ module Contrast
 
         private
 
-        # Given some protobuf messages, update server features.
-        # This is the bridge between Contrast Service <-> Settings.
+        # Given some protobuf messages, update server features. This is the bridge between SpeedRacer <-> Settings.
         #
         # @param response [Contrast::Api::Settings::AgentSettings]
+        # @return [Contrast::Api::Settings::ServerFeatures]
         def process_server_response response
           server_features = response&.server_features
           return unless server_features
@@ -41,14 +48,15 @@ module Contrast
           logger.trace('Agent: Received updated server features')
 
           ::Contrast::SETTINGS.update_from_server_features(server_features)
-
+          @last_server_update_ms = Contrast::Utils::Timer.now_ms
           server_features
         end
 
-        # Given some protobuf messages, update application settings.
-        # This is the bridge between Contrast Service <-> Settings.
+        # Given some protobuf messages, update application settings. This is the bridge between SpeedRacer <->
+        # Settings.
         #
         # @param response [Contrast::Api::Settings::AgentSettings]
+        # @return [Contrast::Api::Settings::ApplicationSettings]
         def process_application_response response
           app_settings = response&.application_settings
           return unless app_settings
@@ -56,12 +64,15 @@ module Contrast
           logger.debug('Agent: Received updated application settings')
 
           ::Contrast::SETTINGS.update_from_application_settings(app_settings)
-
+          @last_app_update_ms = Contrast::Utils::Timer.now_ms
           app_settings
         end
 
         # This can't go in the Settings component because protect and assess depend on settings
-        # I don't think it should go into contrast_service because that only handles connection specific data
+        # I don't think it should go into contrast_service because that only handles connection specific data.
+        #
+        # @param server_features [Contrast::Api::Settings::AgentSettings, Array]
+        # @param app_settings [Contrast::Api::Settings::ApplicationSettings, Array]
         def update_features server_features, app_settings
           return unless !!(server_features || app_settings)
           return unless ::Contrast::AGENT.enabled?

data/lib/contrast/api/communication/service_lifecycle.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# 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'
@@ -13,6 +13,10 @@ module Contrast
 
         private
 
+        # Attempt to start up a local process with SpeedRacer. This will ensure the process isn't just a zombie and is
+        # a real functioning process.
+        #
+        # @return [Boolean] Did the SpeedRacer process start?
         def attempt_local_service_startup
           zombie_check
           service_starter_thread.join(5)
@@ -25,8 +29,8 @@ module Contrast
           is_service_started
         end
 
-        # check if there's a zombie service that exists, and wait on it if so. currently, this only happens when trying
-        # to initialize speedracer
+        # Check if there's a zombie service that exists, and wait on it if so. Currently, this only happens when trying
+        # to initialize SpeedRacer. If there is a zombie, we'll wait until the zombie completes.
         def zombie_check
           zombie_pid_list = Contrast::Utils::OS.zombie_pids
           zombie_pid_list.each do |pid|
@@ -36,6 +40,10 @@ module Contrast
           end
         end
 
+        # Determine the options used to set up the SpeedRacer process. Specifically, this handles if we need to adjust
+        # where the process needs to log.
+        #
+        # @return [Hash] options used to spawn the SpeedRacer process
         def determine_startup_options
           return { out: :out, err: :out } if ::Contrast::CONTRAST_SERVICE.logger_path == 'STDOUT'
           return { out: :err, err: :err } if ::Contrast::CONTRAST_SERVICE.logger_path == 'STDERR'
@@ -43,13 +51,15 @@ module Contrast
           { out: File::NULL, err: File::NULL }
         end
 
-        # This is a separate method so we can overwrite it globally in specs
+        # Create a new process for the SpeedRacer. This is a separate method so we can overwrite it globally in specs.
         def spawn_service
           options = determine_startup_options
           logger.debug('Spawning service')
           spawn 'contrast_service', options
         end
 
+        # Create a thread to start the SpeedRacer, making calls to spawn until one starts successfully. As soon as the
+        # SpeedRacer process starts, this thread terminates.
         def service_starter_thread
           Contrast::Agent::Thread.new do
             # Always check to see if it already started

data/lib/contrast/api/communication/socket.rb

@@ -1,19 +1,18 @@
-# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 module Contrast
   module Api
     module Communication
-      # Behavior common to all sockets used
-      # to communicate with the Contrast Service.
+      # Behavior common to all sockets used to communicate with the Contrast Service.
       module Socket
         SOCKET_MONITOR = Monitor.new
 
         # Send a message across the socket and read back the response.
-        # @param marshaled [String] some marshaled form of data to be sent across
-        #   the socket. Typically an encoded form of Contrast::Api::Dtm::Message.
-        # @return [String] some marshalled form of data returned by the socket.
-        #   Typically an encoded form of Contrast::Api::Settings::AgentSettings.
+        # @param marshaled [String] some marshaled form of data to be sent across the socket. Typically an encoded form
+        #   of Contrast::Api::Dtm::Message.
+        # @return [String] some marshalled form of data returned by the socket. Typically an encoded form of
+        #   Contrast::Api::Settings::AgentSettings.
         def send_marshaled marshaled
           SOCKET_MONITOR.synchronize do
             socket = new_socket
@@ -34,8 +33,7 @@ module Contrast
           end
         end
 
-        # Override this method to return a socket.
-        # Should be interface compatible with TCPSocket, UNIXSocket, etc.
+        # Override this method to return a socket. Should be interface compatible with TCPSocket, UNIXSocket, etc.
         def new_socket
           raise NoMethodError, 'This is abstract, override it.'
         end

data/lib/contrast/api/communication/socket_client.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 require 'socket'
@@ -11,8 +11,8 @@ require 'contrast/components/logger'
 module Contrast
   module Api
     module Communication
-      # SocketClient acts as a interface between the agent and the service. It instantiates a
-      # service proxy and tracks the state of that proxy.
+      # SocketClient acts as a interface between the agent and the service. It instantiates a service proxy and tracks
+      # the state of that proxy.
       class SocketClient
         include Contrast::Components::Logger::InstanceMethods
 
@@ -20,12 +20,13 @@ module Contrast
           @socket = init_connection
         end
 
-        # Wrap the given DTM in a Contrast::Api::Dtm::Message and send it to the
-        # Service for processing
+        # Wrap the given DTM in a Contrast::Api::Dtm::Message and send it to the SpeedRacer for processing. The
+        # Message is the top level object required to communicate to SpeedRacer as it encompasses the information
+        # needed to find this process' context.
         #
         # @param event [Contrast::Api::Dtm] One of the DTMs valid for the event field of
         #   Contrast::Api::Dtm::Message
-        # @return [Contrast::Api::Settings::AgentSettings]
+        # @return [Contrast::Api::Settings::AgentSettings, nil]
         def send_one event
           msg = Contrast::Api::Dtm::Message.build(event)
           send_message(msg)
@@ -33,6 +34,12 @@ module Contrast
 
         private
 
+        # Initialize the connection to the SpeedRacer process based on the configuration provided by the user. This can
+        # be either TCP or UDP. Note that unlike the Go and the Node Agents, we cannot use the GRPC communication
+        # option as we cannot use Google's protobuf gems; they do not compile reliably and result in segmentation
+        # faults in customer environments.
+        #
+        # @return [Contrast::Api::Communication::TcpSocket, Contrast::Api::Communication::UnixSocket]
         def init_connection
           log_connection
           if ::Contrast::CONTRAST_SERVICE.use_tcp?
@@ -43,6 +50,7 @@ module Contrast
           end
         end
 
+        # Log information about the connection being used to communicate between the Agent and SpeedRacer.
         def log_connection
           # The socket is set,
           if ::Contrast::CONFIG.root.agent.service.socket
@@ -72,19 +80,24 @@ module Contrast
         def log_connection_error_msg
           if ::Contrast::CONFIG.root.agent.service.host
             'Missing a required connection value to the Contrast Service. ' \
-            '`agent.service.port` is not set. ' \
-            'Falling back to default TCP socket port.'
+              '`agent.service.port` is not set. ' \
+              'Falling back to default TCP socket port.'
           elsif ::Contrast::CONFIG.root.agent.service.port
             'Missing a required connection value to the Contrast Service. ' \
-            '`agent.service.host` is not set. ' \
-            'Falling back to default TCP socket host.'
+              '`agent.service.host` is not set. ' \
+              'Falling back to default TCP socket host.'
           else
             'Missing a required connection value to the Contrast Service. ' \
-            'Neither `agent.service.socket` nor the pair of `agent.service.host` and `agent.service.port` are set. '\
-            'Falling back to default TCP socket.'
+              'Neither `agent.service.socket` nor the pair of `agent.service.host` and `agent.service.port` are set. '\
+              'Falling back to default TCP socket.'
           end
         end
 
+        # Send the given message to SpeedRacer and return the response from it.
+        #
+        # @param msg [Contrast::Api::Dtm::Message] the packaged message to send to SpeedRacer
+        # @return [Contrast::Api::Settings::AgentSettings, nil]
+        # @raise [StandardError] if unable to send a message to SpeedRacer
         def send_message msg
           return unless msg
 
@@ -92,15 +105,22 @@ module Contrast
           to_service = Contrast::Api::Dtm::Message.encode(msg)
           from_service = send_marshaled(to_service)
           response = Contrast::Api::Settings::AgentSettings.decode(from_service)
+          logger.debug('RESPONSE FROM TS')
+          logger.debug(from_service)
+          logger.debug('RESPONSE FROM TS')
           logger.debug('Received response.', msg_id: msg.__id__, p_id: msg.pid, msg_count: msg.message_count,
                                              response_id: response&.__id__)
           response
         rescue StandardError => e
           logger.error('Sending failed for message.', e, msg_id: msg.__id__, p_id: msg.pid,
                                                          msg_count: msg.message_count, response_id: response&.__id__)
-          raise e # reraise to let Speedracer manage the connection
+          raise e # reraise to let SpeedRacer manage the connection
         end
 
+        # Send the marshaled Contrast::Api::Dtm::Message across the socket used to talk to SpeedRacer
+        #
+        # @param marshaled [String]
+        # @return [String] the marshaled from of Contrast::Api::Settings::AgentSettings
         def send_marshaled marshaled
           @socket.send_marshaled(marshaled)
         end

data/lib/contrast/api/communication/speedracer.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# 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'
@@ -6,7 +6,10 @@ require 'contrast/components/logger'
 module Contrast
   module Api
     module Communication
-      # Wraps all connection data to speedracer
+      # Wraps all connection data to SpeedRacer. SpeedRacer, also known as the Contrast Service, is a standalone
+      # executable that sits between the Agent and TeamServer. It handles converting our Protobuf messages into a
+      # format consumable by TeamServer. The Agent requires a SpeedRacer process to be running somewhere to which it
+      # can connect, as specified by the user configuration, in order to function.
       class Speedracer
         include Contrast::Api::Communication::ServiceLifecycle
         include Contrast::Components::Logger::InstanceMethods
@@ -20,6 +23,14 @@ module Contrast
           @ensure_running = Mutex.new
         end
 
+        # If there is not a SpeedRacer at the location specified by the configuration of this Agent and the Agent is
+        # set such that it should manage one, start up a new child process to run the SpeedRacer executable. If a
+        # connection has not already been made to that process, after starting it, this method will also send the
+        # messages necessary to create a context for this Agent process in the SpeedRacer as well as trigger
+        # SpeedRacer's sending of startup messages which will return features and settings from TeamServer.
+        #
+        # This operation is synchronous and blocking, so it will only happen one at a time per process and will halt
+        # Thread execution here until completion.
         def ensure_startup!
           return if status.connected?
 
@@ -40,12 +51,24 @@ module Contrast
           end
         end
 
+        # Send the given Event to SpeedRacer, returning the response from it. This response will either be new settings
+        # if anything's changed in TeamServer meaning the Agent needs to replace its current settings or there is
+        # Protect analysis information or nil if the current Agent settings do not need updating.
+        #
+        # @param event [Contrast::Api::Dtm] One of the DTMs valid for the event field of
+        # Contrast::Api::Dtm::Message|Contrast::Api::Dtm::Activity
+        # @return [Contrast::Api::Settings::AgentSettings,nil]
         def return_response event
           send_to_speedracer(event) do |response|
             return response
           end
         end
 
+        # Send the given Event to SpeedRacer and pass the result to our Contrast::Api::Communication::ResponseProcessor
+        # as there is no immediate action required from sending this Event.
+        #
+        # @param event [Contrast::Api::Dtm] One of the DTMs valid for the event field of
+        # Contrast::Api::Dtm::Message|Contrast::Api::Dtm::Activity
         def process_internally event
           send_to_speedracer(event) do |response|
             response_processor.process(response)
@@ -54,6 +77,12 @@ module Contrast
 
         private
 
+        # Ensure there is a running SpeedRacer and then send the given Event to it. It is necessary to ensure the
+        # SpeedRacer is running as, if the process has crashed or restarted, we must rebuild our context there.
+        #
+        # @param event [Contrast::Api::Dtm] One of the DTMs valid for the event field of
+        # Contrast::Api::Dtm::Message|Contrast::Api::Dtm::Activity
+        # @return [Contrast::Api::Settings::AgentSettings, nil]
         def send_to_speedracer event
           ensure_startup!
 
@@ -68,6 +97,9 @@ module Contrast
           nil
         end
 
+        # Send those messages which are required to build a context for this Agent process on SpeedRacer as well as
+        # report server and application startup to TeamServer. With these messages, the SpeedRacer will be able to
+        # retrieve settings from TeamServer and provide those for the Agent to complete its initialization.
         def send_initialization_messages
           agent_startup_msg = ::Contrast::APP_CONTEXT.build_agent_startup_message
 
@@ -97,6 +129,10 @@ module Contrast
           nil
         end
 
+        # Log the startup message we're sending to SpeedRacer
+        #
+        # @param event [Contrast::Api::Dtm] One of the DTMs valid for the event field of
+        # Contrast::Api::Dtm::Message|Contrast::Api::Dtm::Activity
         def log_send_event event
           logger.debug('Immediately sending event.', event_id: event.__id__, event_type: event.cs__class.cs__name)
         end

data/lib/contrast/api/communication/tcp_socket.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 require 'contrast/api/communication/socket'
@@ -6,15 +6,15 @@ require 'contrast/api/communication/socket'
 module Contrast
   module Api
     module Communication
-      # This class allows us to create a TCP Socket to communicate to the Service
-      # (Speed Racer). Either it or the Unix Socket will be used, as determined
-      # by the configuration options set for Service communication.
+      # This class allows us to create a TCP Socket to communicate to the Service (Speed Racer). Either it or the Unix
+      # Socket will be used, as determined by the configuration options set for Service communication.
       class TcpSocket
         include Contrast::Api::Communication::Socket
 
         attr_reader :host, :port
 
         # Create the socket
+        #
         # @param host [String] socket target hostname or IP address
         # @param port [String,Integer] socket target port
         def initialize host, port
@@ -22,6 +22,7 @@ module Contrast
           @port = port.to_i
         end
 
+        # @return [::TCPSocket]
         def new_socket
           ::TCPSocket.new(host, port)
         end

data/lib/contrast/api/communication/unix_socket.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 require 'contrast/api/communication/socket'
@@ -18,6 +18,7 @@ module Contrast
           @path = path
         end
 
+        # @return [::UNIXSocket]
         def new_socket
           ::UNIXSocket.new(path)
         end

data/lib/contrast/api/communication.rb

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

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# 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'

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# 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'

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

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

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# 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'

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

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

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

@@ -0,0 +1,36 @@
+# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# frozen_string_literal: true
+
+require 'contrast/utils/string_utils'
+
+module Contrast
+  module Api
+    module Decorators
+      # Used to decorate the {Contrast::Api::Dtm::ArchitectureComponent} protobuf model so it can own some of the data
+      # massaging required for AppUpdate and Activity dtms.
+      module ArchitectureComponent
+        def self.included klass
+          klass.extend(ClassMethods)
+        end
+
+        # Used to add class methods to the ApplicationUpdate class on inclusion of the decorator
+        module ClassMethods
+          # TeamServer only accepts certain values for ArchitectureComponents.
+          # DO NOT CHANGE THIS!
+          AC_TYPE_DB = 'db'
+
+          # Create a Contrast::Api::Dtm::ArchitectureComponent of the database type.
+          #
+          # @return [Contrast::Api::Dtm::ArchitectureComponent]
+          def build_database
+            msg = Contrast::Api::Dtm::ArchitectureComponent.new
+            msg.type = AC_TYPE_DB
+            msg
+          end
+        end
+      end
+    end
+  end
+end
+
+Contrast::Api::Dtm::ArchitectureComponent.include(Contrast::Api::Decorators::ArchitectureComponent)

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

@@ -0,0 +1,29 @@
+# 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/base'
+
+module Contrast
+  module Api
+    module Decorators
+      # Used to decorate the {Contrast::Api::Dtm::Finding} protobuf
+      # model so it can own the request which its data is for.
+      module Finding
+        def self.included klass
+          klass.extend(ClassMethods)
+        end
+
+        # Used to add class methods to the AgentStartup class on inclusion of the decorator
+        module ClassMethods
+          def build
+            new
+          end
+        end
+      end
+    end
+  end
+end
+
+Contrast::Api::Dtm::Finding.include(Contrast::Api::Decorators::Finding)

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# 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'
@@ -33,9 +33,10 @@ module Contrast
         # @param request [Contrast::Agent::Request]
         def append_connection request
           self.protocol = Contrast::Utils::StringUtils.force_utf8(request.scheme)
-          self.version = '1.1' # currently not in rack request; hard-coding
+          self.version = Contrast::Utils::StringUtils.force_utf8(request.version)
           self.method = Contrast::Utils::StringUtils.force_utf8(request.request_method)
           self.raw = Contrast::Utils::StringUtils.force_utf8(request.rack_request.path_info)
+          self.uri = Contrast::Utils::StringUtils.force_utf8(request.rack_request.path_info)
         end
 
         # Append the parameters to self, using the preferred

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

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

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# 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'

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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