contrast-agent 6.11.0 → 6.12.0

data/lib/contrast/config/config.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 require 'contrast/config/effective_config'
@@ -9,9 +9,11 @@ module Contrast
       # This class is responsible for logging to file the effective Agent configurations after startup.
       class Config
         attr_reader :effective_config
+        # @return [String] Status message of the connection with TS.
+        attr_accessor :config_status
 
         MESSAGE_FAIL = 'Unable to connect to Contrast, configuration details from the Contrast UI will not be included.'
-        MESSAGE_SUCCESSFUL = 'Connected to Contrast.'
+        MESSAGE_SUCCESSFUL = 'Success'
         CONN_STATUS_MSG_FAILURE = 'Unable to connect to Contrast, insufficient connection properties provided.'
 
         def initialize
@@ -21,15 +23,15 @@ module Contrast
 
         # This method will set the status from the request/response cycles
         #
-        # @param response [Contrast::Agent::Reporting::Response]
-        def determine_config_status response
-          return unless response
-          # If we encounter for some of the startup events failure - always return failure
-          return if [MESSAGE_FAIL, CONN_STATUS_MSG_FAILURE].include?(@config_status)
-
-          response_code = response.code.to_s
-          @config_status = response_code.start_with?('2') ? MESSAGE_SUCCESSFUL : MESSAGE_FAIL
-          nil
+        # @param response_code [string]
+        def determine_config_status response_code
+          @config_status = case response_code
+                           when '200', '304'
+                             MESSAGE_SUCCESSFUL
+                           else
+                             MESSAGE_FAIL
+                           end
+          true
         end
 
         # This method will set the status message from the config validation
@@ -38,7 +40,7 @@ module Contrast
         end
 
         def to_controlled_hash
-          @effective_config.to_controlled_hash.merge({ Status: @config_status })
+          @effective_config.to_controlled_hash.merge({ status: @config_status })
         end
       end
     end

data/lib/contrast/config/diagnostics.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 require 'json'
@@ -10,6 +10,7 @@ require 'contrast/utils/object_share'
 require 'contrast/config/config'
 require 'contrast/config/effective_config'
 require 'contrast/config/effective_config_value'
+require 'contrast/utils/duck_utils'
 
 module Contrast
   module Agent
@@ -77,13 +78,21 @@ module Contrast
 
         # Reset the state of the current effective config.
         def reset_config
+          # salvage status if status:
+          status = if Contrast::Utils::DuckUtils.empty_duck?(@_config.config_status)
+                     nil
+                   else
+                     @_config.config_status
+                   end
           @_config = Contrast::Agent::DiagnosticsConfig::Config.new
+          @_config.config_status = status if status
+          @_config
         end
 
         def to_controlled_hash
           {
-              ReportCreate: report_create_time,
-              Config: config.to_controlled_hash
+              report_create: report_create_time,
+              config: config.to_controlled_hash
           }
         end
 

data/lib/contrast/config/diagnostics_tools.rb

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

data/lib/contrast/config/effective_config.rb

@@ -1,13 +1,17 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 require 'contrast/config/effective_config_value'
+require 'contrast/config/diagnostics_tools'
+require 'contrast/utils/object_share'
 
 module Contrast
   module Agent
     module DiagnosticsConfig
       # The current effective config received from all authorized configuration channels.
       class EffectiveConfig
+        NON_COMMON_ENV = %w[CONTRAST_CONFIG_PATH CONTRAST_AGENT_TELEMETRY_OPTOUT].cs__freeze
+
         # Value of effective agent configurations
         #
         # @return [Array]
@@ -19,11 +23,11 @@ module Contrast
 
         def to_controlled_hash
           {
-              EffectiveConfig: { values: @values&.map(&:to_controlled_hash) },
-              File: yaml_config_settings,
-              Environment: environment_settings,
-              CommandLine: command_line_settings,
-              ContrastUI: contrast_ui_settings
+              effective_config: { values: @values&.map(&:to_controlled_hash) },
+              user_configuration_file: yaml_config_settings,
+              environment_variable: environment_settings(ENV).map(&:to_controlled_hash),
+              command_line: command_line_settings.map(&:to_controlled_hash),
+              contrast_ui: contrast_ui_settings.map(&:to_controlled_hash)
           }
         end
 
@@ -31,17 +35,36 @@ module Contrast
 
         def yaml_config_settings
           {
-              Path: Contrast::CONFIG.config_file_path,
-              Values: Contrast::CONFIG.sources.for(Contrast::Components::Config::Sources::YAML)
+              path: Contrast::CONFIG.config_file_path,
+              values: value_to_s(Contrast::CONFIG.sources.for(Contrast::Components::Config::Sources::YAML))
           }
         end
 
         def command_line_settings
-          flatten_settings(Contrast::CONFIG.sources.for(Contrast::Components::Config::Sources::CLI))
+          cli = flatten_settings(Contrast::CONFIG.sources.for(Contrast::Components::Config::Sources::CLI))
+          flat_settings(cli)
         end
 
         def contrast_ui_settings
-          flatten_settings(Contrast::CONFIG.sources.for(Contrast::Components::Config::Sources::CONTRASTUI))
+          ui = flatten_settings(Contrast::CONFIG.sources.for(Contrast::Components::Config::Sources::CONTRASTUI))
+          flat_settings(ui)
+        end
+
+        # @param flats [Array] of flatten configs produced by #flatten_settings
+        # @return [Array]
+        def flat_settings flats
+          ui_settings = []
+          flats.each do |entry|
+            entry.each do |key, value|
+              efc_value = Contrast::Agent::DiagnosticsConfig::EffectiveConfigValue.new.tap do |effective_value|
+                effective_value.canonical_name = Contrast::Utils::ObjectShare::CONTRAST_DOT + key
+                effective_value.name = key
+                effective_value.value = value_to_s(value)
+              end
+              ui_settings << efc_value if efc_value
+            end
+          end
+          ui_settings
         end
 
         def flatten_settings data, path = []
@@ -49,15 +72,58 @@ module Contrast
             if v.cs__is_a?(Hash)
               entries.concat(flatten_settings(v, path.dup.append(k.to_sym)))
             else
-              entries << { "#{ path.join('.') }.#{ k }" => Contrast::CONFIG.config.loaded_config.dig(*path, k) }
+              entries << { "#{ path.join('.') }.#{ k }" => Contrast::CONFIG.config.loaded_config.dig(*path, k).to_s }
             end
           end.flatten # rubocop:disable Style/MethodCalledOnDoEndBlock
         end
 
-        def environment_settings
-          ENV.select { |e| e.to_s.start_with?(Contrast::Components::Config::CONTRAST_ENV_MARKER) }.
-              to_a.
-              map { |e| Hash[*e] }
+        # This method will fill the canonical name for each env var and will check for any uncommon ones.
+        #
+        # @param env [Hash]
+        # @return [Array] array of all the values needed to be written.
+        def environment_settings env
+          env_hash = env.select do |e|
+            e.to_s.start_with?(Contrast::Components::Config::CONTRAST_ENV_MARKER) || NON_COMMON_ENV.include?(e.to_s)
+          end
+          environment_settings = []
+          env_hash.each do |key, value|
+            efc_value = Contrast::Agent::DiagnosticsConfig::EffectiveConfigValue.new.tap do |effective_value|
+              next unless value
+
+              effective_value.canonical_name = if NON_COMMON_ENV.include?(key)
+                                                 key.gsub(Contrast::Utils::ObjectShare::UNDERSCORE,
+                                                          Contrast::Utils::ObjectShare::PERIOD).downcase
+                                               else
+                                                 key.gsub(Contrast::Utils::ObjectShare::DOUBLE_UNDERSCORE,
+                                                          Contrast::Utils::ObjectShare::PERIOD).downcase
+                                               end
+              if effective_value.canonical_name
+                effective_value.name =
+                  effective_value.canonical_name.gsub(Contrast::Utils::ObjectShare::CONTRAST_DOT,
+                                                      Contrast::Utils::ObjectShare::EMPTY_STRING)
+              end
+              effective_value.value = value_to_s(value)
+            end
+            environment_settings << efc_value if efc_value
+          end
+          environment_settings
+        end
+
+        # Recursively converts each value to string.
+        #
+        # @param value [Hash]
+        def value_to_s value
+          return value if value.cs__is_a?(String)
+
+          value.each_with_object({}) do |(k, v), m| # rubocop:disable Style/HashTransformValues
+            m[k] = if v.cs__is_a?(Hash)
+                     value_to_s(v)
+                   elsif v.cs__is_a?(Array)
+                     v.map(&:to_s)
+                   else
+                     v.to_s
+                   end
+          end
         end
       end
     end

data/lib/contrast/config/effective_config_value.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 module Contrast
@@ -21,9 +21,9 @@ module Contrast
           {
               canonical_name: canonical_name,
               name: name, # rubocop:disable Security/Module/Name
-              value: value,
-              Source: source,
-              Filename: filename
+              value: value&.cs__is_a?(Array) ? value.map(&:to_s) : value.to_s,
+              source: source,
+              filename: filename
           }.compact
         end
       end

data/lib/contrast/config/env_variables.rb

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

data/lib/contrast/config/exception_configuration.rb

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

data/lib/contrast/config/protect_rule_configuration.rb

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

data/lib/contrast/config/protect_rules_configuration.rb

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

data/lib/contrast/config/request_audit_configuration.rb

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

data/lib/contrast/config/server_configuration.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 require 'contrast/config/base_configuration'
@@ -15,7 +15,7 @@ module Contrast
       CONFIG_VALUES = %w[tags environment version].cs__freeze
 
       # @return [String, nil]
-      attr_reader :name
+      attr_accessor :name
       # @return [String, nil]
       attr_accessor :path
       # @return [String, nil]

data/lib/contrast/config.rb

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

data/lib/contrast/configuration.rb

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

data/lib/contrast/extension/assess/array.rb

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

data/lib/contrast/extension/assess/erb.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 # This module is used to track propagation through ERB template rendering

data/lib/contrast/extension/assess/eval_trigger.rb

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

data/lib/contrast/extension/assess/exec_trigger.rb

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

data/lib/contrast/extension/assess/fiber.rb

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

data/lib/contrast/extension/assess/hash.rb

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

data/lib/contrast/extension/assess/kernel.rb

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

data/lib/contrast/extension/assess/marshal.rb

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

data/lib/contrast/extension/assess/regexp.rb

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

data/lib/contrast/extension/assess/string.rb

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

data/lib/contrast/extension/assess.rb

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

data/lib/contrast/extension/delegator.rb

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

data/lib/contrast/extension/extension.rb

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

data/lib/contrast/extension/inventory.rb

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

data/lib/contrast/extension/module.rb

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

data/lib/contrast/extension/object.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 # Some developers override various methods on Object, which can often involve

data/lib/contrast/extension/protect/psych.rb

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

data/lib/contrast/extension/protect.rb

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

data/lib/contrast/extension/thread.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 # ensure that we're being loaded with an agent

data/lib/contrast/framework/base_support.rb

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

data/lib/contrast/framework/grape/support.rb

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

data/lib/contrast/framework/manager.rb

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

data/lib/contrast/framework/manager_extend.rb

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

data/lib/contrast/framework/rack/patch/session_cookie.rb

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

data/lib/contrast/framework/rack/patch/support.rb

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

data/lib/contrast/framework/rack/support.rb

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

data/lib/contrast/framework/rails/patch/action_controller_live_buffer.rb

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

data/lib/contrast/framework/rails/patch/assess_configuration.rb

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

data/lib/contrast/framework/rails/patch/rails_application_configuration.rb

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

data/lib/contrast/framework/rails/patch/support.rb

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

data/lib/contrast/framework/rails/railtie.rb

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

data/lib/contrast/framework/rails/support.rb

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

data/lib/contrast/framework/sinatra/patch/encrypted_session_cookie.rb

@@ -0,0 +1,39 @@
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# frozen_string_literal: true
+
+require 'contrast/components/logger'
+require 'contrast/components/scope'
+require 'contrast/framework/rack/patch/session_cookie'
+
+module Contrast
+  module Framework
+    module Sinatra
+      module Patch
+        # Our patch into the Rack::Protection::EncryptedCookie Class, that replaces Rack::Session::Cookie
+        # in Sinatra 3.0, allowing for the runtime detection of insecure configurations on individual cookies
+        # within the application
+        class EncryptedSessionCookie < Contrast::Framework::Rack::Patch::SessionCookie
+          extend Contrast::Components::Logger::InstanceMethods
+          extend Contrast::Components::Scope::InstanceMethods
+
+          class << self
+            include Contrast::Utils::InvalidConfigurationUtil
+
+            def instrument
+              @_instrument ||= begin
+                ::Rack::Protection::EncryptedCookie.class_eval do
+                  alias_method(:cs__patched_initialize, :initialize)
+                  def initialize app, options = {} # rubocop:disable Style/OptionHash, Lint/MissingSuper
+                    Contrast::Framework::Sinatra::Patch::EncryptedSessionCookie.analyze(options)
+                    cs__patched_initialize(app, options)
+                  end
+                end
+                true
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/contrast/framework/sinatra/support.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 require 'contrast/framework/base_support'
@@ -97,6 +97,19 @@ module Contrast
             ::Sinatra::Request.new(env)
           end
 
+          # (See BaseSupport#after_load_patches)
+          def after_load_patches
+            return unless defined?(::Sinatra)
+            return unless Gem::Version.new(version) >= Gem::Version.new('3.0.0')
+
+            Set.new([
+                      Contrast::Agent::Patching::Policy::AfterLoadPatch.new(
+                          'Rack::Protection::EncryptedCookie',
+                          'contrast/framework/sinatra/patch/encrypted_session_cookie',
+                          instrumenting_module: 'Contrast::Framework::Sinatra::Patch::EncryptedSessionCookie')
+                    ])
+          end
+
           private
 
           # Given a controller and a route to match against, find the route_pattern and class that will serve the