contrast-agent 6.11.0 → 6.12.0

data/lib/contrast/agent/telemetry/{events/startup_metrics_event.rb → startup_metrics_event.rb}

@@ -1,8 +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/metrics_hash'
-require 'contrast/agent/telemetry/events/metric_event'
+require 'contrast/agent/telemetry/metric_event'
 require 'contrast/agent/version'
 require 'contrast/utils/os'
 

data/lib/contrast/{utils → agent}/telemetry.rb

@@ -1,12 +1,12 @@
-# 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/telemetry/base'
-require 'contrast/utils/telemetry_identifier'
+require 'contrast/agent/telemetry/identifier'
 require 'contrast/config/env_variables'
 
 module Contrast
-  module Utils
+  module Agent
     # Tools for supporting the Telemetry feature
     module Telemetry
       DIR = '/etc/contrast/ruby-agent/'.cs__freeze

data/lib/contrast/agent/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
 
 require 'contrast/components/scope'

data/lib/contrast/agent/thread_watcher.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'
@@ -28,7 +28,6 @@ module Contrast
       attr_reader :reporter_app_settings_worker
 
       def initialize
-        @pids = {}
         @heapdump_util = Contrast::Utils::HeapDumpUtil.new
         @reporter = Contrast::Agent::Reporter.new
         @reporter_heartbeat = Contrast::Agent::ReportingWorkers::ReporterHeartbeat.new
@@ -40,48 +39,24 @@ module Contrast
 
       # @return [Hash, nil] map of process to thread startup status
       def startup!
+        check_before_start
+
         return unless ::Contrast::AGENT.enabled?
 
         logger.debug('ThreadWatcher started threads')
 
-        @pids[Process.pid] = reporter_threads
-        if Contrast::Agent::Telemetry::Base.enabled?
-          telemetry_status = init_thread(telemetry_queue)
-          @pids[Process.pid] = @pids[Process.pid] && telemetry_status
-        end
-        unless protect_disabled?
-          worth_watching_analyzer_status = init_thread(worth_watching_analyzer)
-          @pids[Process.pid] = @pids[Process.pid] && worth_watching_analyzer_status
+        desired_threads.each do |thread|
+          init_thread(thread)
         end
-        @pids
-      end
-
-      def reporter_threads
-        init_thread(reporter) && init_thread(reporter_heartbeat) &&
-            init_thread(reporter_settings_worker) && init_thread(reporter_app_settings_worker)
       end
 
       def ensure_running?
-        return if @pids[Process.pid] == true
+        return if desired_threads.all?(&:running?)
 
         logger.debug('ThreadWatcher - threads not running')
         startup!
       end
 
-      # This method will check the config and if the config is invalid - it will kill the agent
-      def self.check_before_start
-        return if Contrast::CONFIG.send(:validate)
-
-        @_diagnostics = Contrast::Agent::DiagnosticsConfig::Diagnostics.new(Contrast::AGENT.logger.path ||
-                                                                            Contrast::Components::Config::CONTRAST_LOG)
-        @_diagnostics.config.populate_fail_connection
-        @_diagnostics.write_to_file_logic(false, reset: false)
-        # kill agent
-        Contrast::AGENT.disable_agent!
-        # TODO: RUBY-1822
-        # set the in_application_scope to 1 so we short circuit it
-      end
-
       def shutdown!
         heapdump_util&.stop!
         telemetry_queue&.stop!
@@ -99,6 +74,16 @@ module Contrast
 
       private
 
+      # Retrieve a list of the desired threads.
+      #
+      # @return [Array<Contrast::Agent::WorkerThread>]
+      def desired_threads
+        [reporter, reporter_heartbeat, reporter_settings_worker, reporter_app_settings_worker].tap do |entries|
+          entries.push(telemetry_queue) if Contrast::Agent::Telemetry::Base.enabled?
+          entries.push(worth_watching_analyzer) unless protect_disabled?
+        end
+      end
+
       # Start the thread governed by the given watcher
       #
       # @param watcher [Contrast::Agent::ThreadWatcher]
@@ -118,6 +103,18 @@ module Contrast
       def protect_disabled?
         ::Contrast::PROTECT.forcibly_disabled?
       end
+
+      # This method will check the config and if the config is invalid - it will kill the agent
+      def check_before_start
+        return if Contrast::CONFIG.send(:validate)
+
+        @_diagnostics = Contrast::Agent::DiagnosticsConfig::Diagnostics.new(Contrast::AGENT.logger.path ||
+                                                                            Contrast::Components::Config::CONTRAST_LOG)
+        @_diagnostics.config.populate_fail_connection
+        @_diagnostics.write_to_file_logic(false, reset: false)
+        # kill agent
+        Contrast::AGENT.disable_agent!
+      end
     end
   end
 end

data/lib/contrast/agent/tracepoint_hook.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/agent/version.rb

@@ -1,8 +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
 
 module Contrast
   module Agent
-    VERSION = '6.11.0'
+    VERSION = '6.12.0'
   end
 end

data/lib/contrast/agent/worker_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
 
 require 'contrast/components/logger'

data/lib/contrast/agent.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 'English'
@@ -43,6 +43,7 @@ require 'contrast/utils/thread_tracker'
 require 'contrast/framework/manager'
 
 require 'contrast/agent/thread_watcher'
+require 'contrast/utils/silence_maker'
 
 module Contrast
   # Top namespace of the Agent section. Holds tracking contexts that will be
@@ -92,7 +93,10 @@ module Contrast
     def self.reinitialize_with_log
       return if Contrast::AGENT_LIB.enable_log
 
-      Contrast.cs__const_set(:AGENT_LIB, Contrast::AgentLib::Interface.new(true, 2, nil))
+      # Silence warning about reinit AgentLib
+      Contrast::Utils::SilenceMaker.hush do
+        Contrast.cs__const_set(:AGENT_LIB, Contrast::AgentLib::Interface.new(true, 2, nil))
+      end
     end
   end
 end

data/lib/contrast/agent_lib/api/command_injection.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: false
 
 require 'ffi'

data/lib/contrast/agent_lib/api/init.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: false
 
 require 'ffi'

data/lib/contrast/agent_lib/api/input_tracing.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: false
 
 require 'ffi'

data/lib/contrast/agent_lib/api/panic.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: false
 
 require 'ffi'

data/lib/contrast/agent_lib/api/path_semantic_file_security_bypass.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: false
 
 require 'ffi'

data/lib/contrast/agent_lib/interface.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_lib/api/init'

data/lib/contrast/agent_lib/interface_base.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-lib'
@@ -104,7 +104,7 @@ module Contrast
         LOG_DIR
       end
 
-      # This method extracts constats from the AgentLib gem, from specific module.
+      # This method extracts constants from the AgentLib gem, from specific module.
       # If the to_rule_id flag is set the constant names would be transformed from
       # Symbols to string protect rule ids: e.g. CMD_INJECTIONS => cmd-injection.
       #

data/lib/contrast/agent_lib/return_types/eval_result.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_lib/interface'

data/lib/contrast/agent_lib/test.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: false
 
 require_relative 'api/init'

data/lib/contrast/components/agent.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 'rubygems/version'

data/lib/contrast/components/api.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/components/app_context.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 'rubygems/version'

data/lib/contrast/components/app_context_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
 
 module Contrast

data/lib/contrast/components/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
 
 require 'contrast/components/base'

data/lib/contrast/components/assess_rules.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'

data/lib/contrast/components/base.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/diagnostics_tools'

data/lib/contrast/components/config/sources.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/env_configuration_item'

data/lib/contrast/components/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/utils/env_configuration_item'

data/lib/contrast/components/heap_dump.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/components/inventory.rb

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

data/lib/contrast/components/logger.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/logger/log'

data/lib/contrast/components/polling.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'
@@ -11,15 +11,15 @@ module Contrast
         include Contrast::Components::ComponentBase
 
         # @return [Integer, nil]
-        attr_reader :server_settings_ms
+        attr_accessor :server_settings_ms
         # @return [Integer, nil]
-        attr_reader :app_settings_ms
+        attr_accessor :app_settings_ms
         # @return [String]
         attr_reader :canon_name
         # @return [Array]
         attr_reader :config_values
         # @return [Integer, nil]
-        attr_reader :batch_reporting_interval_ms
+        attr_accessor :batch_reporting_interval_ms
 
         CANON_NAME = 'agent.polling'
         CONFIG_VALUES = %w[server_settings_ms app_settings_ms batch_reporting_interval_ms].cs__freeze

data/lib/contrast/components/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
 
 require 'contrast/components/base'

data/lib/contrast/components/ruby_component.rb

@@ -1,15 +1,15 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 require 'contrast/components/base'
+require 'contrast/components/scope'
 
 module Contrast
   module Components
     module Ruby
       # A wrapper build around the Common Agent Configuration project to allow
-      # for access of the values contained in its
-      # parent_configuration_spec.yaml.
-      # Those in this section pertain to the specific settings that apply to Ruby
+      # for access of the values contained in its parent_configuration_spec.yaml.
+      # Those in this section pertain to the specific settings that apply to Ruby.
       class Interface
         include Contrast::Components::ComponentBase
 
@@ -31,10 +31,36 @@ module Contrast
           propagate_yield require_scan
           non_request_tracking
           uninstrument_namespace
+          application_scope
         ].cs__freeze
 
-        attr_writer :disabled_agent_rake_tasks, :exceptions, :propagate_yield, :require_scan,
-                    :non_request_tracking, :uninstrument_namespace
+        # Set a comma-separated string of rake tasks in which to disable agent operation.
+        #
+        # @return [Array]
+        attr_writer :disabled_agent_rake_tasks
+        # @return [ExceptionConfiguration]
+        attr_writer :exceptions
+        # Controls whether or not we patch the rb_yield block to track split propagation
+        #
+        # @return [Boolean]
+        attr_writer :propagate_yield
+        # Controls the scan of the given trace_point, built from an :end event, to determine
+        # where the loaded code lives and scanning that code for policy any violations.
+        # @return [Boolean]
+        attr_writer :require_scan
+        # Controls whether the agent should track outside request
+        #
+        # @return [Boolean]
+        attr_writer :non_request_tracking
+        # listed module names for skipping instrumentation.
+        #
+        # @return [Array]
+        attr_writer :uninstrument_namespace
+        # Controls if the agent should instrument only the application code
+        #
+        # @return[Boolean]
+        attr_accessor :application_scope
+
         # @return [String]
         attr_reader :canon_name
         # @return [Array]
@@ -51,6 +77,9 @@ module Contrast
           @require_scan = hsh[:require_scan]
           @non_request_tracking = hsh[:non_request_tracking]
           @uninstrument_namespace = hsh[:uninstrument_namespace]
+          # This value must only be read form ENV. The cs__with_app_scope? method handles the
+          # validation of the set Application Scope Flag.
+          @application_scope = Contrast::Components::Scope.cs__with_app_scope? == 1
         end
 
         # These commands being detected will result the agent disabling instrumentation, generally any command
@@ -90,6 +119,16 @@ module Contrast
         def uninstrument_namespace
           @uninstrument_namespace.nil? ? DEFAULT_UNINSTRUMENTED_NAMESPACES : @uninstrument_namespace
         end
+
+        # Checks to see if we support with_app_scope for the current Agent Startup.
+        # Defaults to false if configuration is not set.
+        #
+        # @return [Boolean]
+        def start_with_application_scope?
+          return application_scope if application_scope
+
+          false
+        end
       end
     end
   end

data/lib/contrast/components/sampling.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'
@@ -107,15 +107,15 @@ module Contrast
         CONFIG_VALUES = %w[enable baseline request_frequency response_frequency window_ms].cs__freeze
 
         # @return [Integer, nil]
-        attr_reader :baseline
+        attr_accessor :baseline
         # @return [Integer, nil]
-        attr_reader :request_frequency
+        attr_accessor :request_frequency
         # @return [Integer, nil]
-        attr_reader :response_frequency
+        attr_accessor :response_frequency
         # @return [Integer, nil]
-        attr_reader :window_ms
+        attr_accessor :window_ms
         # @return [String]
-        attr_reader :canon_name
+        attr_accessor :canon_name
 
         def initialize hsh = {}
           @canon_name = CANON_NAME

data/lib/contrast/components/scope.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 'fiber'
@@ -129,6 +129,14 @@ module Contrast
         ensure
           scope_for_current_ec.exit_split_scope!
         end
+
+        # Enter app scope
+        def with_app_scope
+          scope_for_current_ec.exit_contrast_scope!
+          yield
+        ensure
+          scope_for_current_ec.enter_contrast_scope!
+        end
       end
 
       ClassMethods = InstanceMethods

data/lib/contrast/components/security_logger.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/components/settings.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2023 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 require 'contrast/agent/excluder'
@@ -85,10 +85,6 @@ module Contrast
           reset_state
         end
 
-        def code_exclusions
-          excluder&.exclusions&.select(&:code?)
-        end
-
         # @param features_response [Contrast::Agent::Reporting::Response]
         def update_from_server_features features_response # rubocop:disable Metrics/AbcSize
           return unless (server_features = features_response&.server_features)
@@ -116,7 +112,7 @@ module Contrast
           # update via response header. We receive header from TS with last update info, setting the
           # next request's header with the same time will save needless update of settings if there
           # are no new server features updates after the said time.
-          @server_settings_last_httpdate = header_last_update
+          @server_settings_last_httpdate = header_server_last_update
         rescue StandardError => e
           logger.warn('The following error occurred from server update: ', e: e)
         end
@@ -168,7 +164,7 @@ module Contrast
           new_session_id = app_settings.assess.session_id
           @assess_state.session_id = new_session_id if new_session_id && !new_session_id.blank?
           @last_app_update_ms = Contrast::Utils::Timer.now_ms
-          @app_settings_last_httpdate = header_last_update
+          @app_settings_last_httpdate = header_application_last_update
         end
 
         # Wipe state to zero.
@@ -223,9 +219,6 @@ module Contrast
           exclusions.input_exclusions.each do |exclusion|
             matchers << Contrast::Agent::ExclusionMatcher.new(exclusion)
           end
-          exclusions.code_exclusions.each do |exclusion|
-            matchers << Contrast::Agent::ExclusionMatcher.new(exclusion)
-          end
           @excluder = Contrast::Agent::Excluder.new(matchers)
         end
 
@@ -260,14 +253,22 @@ module Contrast
           false
         end
 
-        # update via response header.
+        # update server last updated via response header.
         # Used to build the next request header.
         #
         # @return [String]
-        def header_last_update
+        def header_server_last_update
           Contrast::Agent.reporter.client.response_handler.last_server_modified
         end
 
+        # update application last updated via response header.
+        # Used to build the next request header.
+        #
+        # @return [String]
+        def header_application_last_update
+          Contrast::Agent.reporter.client.response_handler.last_application_modified
+        end
+
         # Update the stored config values to ensure that we know about the correct values,
         # and that the sources are correct for entries updated from the UI.
         #

data/lib/contrast/config/api_proxy_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
 
 module Contrast

data/lib/contrast/config/base_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 'forwardable'

data/lib/contrast/config/certification_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'