contrast-agent 4.14.1 → 5.0.0

data/lib/contrast/api/decorators/finding.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'
@@ -20,22 +20,6 @@ module Contrast
           def build
             new
           end
-
-          def to_controlled_hash finding, *_args
-            {
-                hash_code: finding.hash_code,
-                platform: finding.platform,
-                rule_id: finding.rule_id,
-                evidence: finding.evidence,
-                properties: finding.properties,
-                events: finding.events,
-                tags: finding.tags,
-                version: finding.version,
-                routes: finding.routes,
-                session_id: finding.session_id,
-                teamserver_url: ::Contrast::API.api_url
-            }
-          end
         end
       end
     end

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'

data/lib/contrast/api/decorators/trace_taint_range_tags.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/user_input.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.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
@@ -13,6 +13,7 @@ require 'contrast/api/decorators/message'
 require 'contrast/api/decorators/agent_startup'
 require 'contrast/api/decorators/application_startup'
 require 'contrast/api/decorators/application_update'
+require 'contrast/api/decorators/architecture_component'
 require 'contrast/api/decorators/input_analysis'
 require 'contrast/api/decorators/application_settings'
 require 'contrast/api/decorators/server_features'

data/lib/contrast/api.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/components/agent.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 'rubygems/version'
@@ -33,31 +33,22 @@ module Contrast
         end
 
         def ruleset
-          @_ruleset ||= Contrast::Agent::RuleSet.new(retrieve_protect_ruleset&.values)
+          @_ruleset ||= Contrast::Agent::RuleSet.new(retrieve_protect_ruleset.values)
         end
 
         def reset_ruleset
           @_ruleset = nil
         end
 
-        def patch_interpolation?
-          interpolation_patch_possible?
-        end
-
-        def rewrite_interpolation?
-          !interpolation_patch_possible?
-        end
-
         def patch_yield?
           @_patch_yield = !false?(::Contrast::CONFIG.root.agent.ruby.propagate_yield) if @_patch_yield.nil?
           @_patch_yield
         end
 
         def interpolation_enabled?
-          if @_interpolation_enabled.nil?
-            @_interpolation_enabled = !false?(::Contrast::CONFIG.root.agent.ruby.interpolate)
-          end
-          @_interpolation_enabled
+          return @_interpolation_enabled unless @_interpolation_enabled.nil?
+
+          @_interpolation_enabled = !false?(::Contrast::CONFIG.root.agent.ruby.interpolate)
         end
 
         def omit_body?
@@ -93,16 +84,6 @@ module Contrast
 
         protected
 
-        INTERPOLATION_HOOKABLE_VERSION = Gem::Version.new('2.6.0')
-        # Ruby exposed the C method for interpolation in version 2.6.0, meaning
-        # we can attempt to patch using Funchook for that version and later.
-        def interpolation_patch_possible?
-          if @_interpolation_patch_possible.nil?
-            @_interpolation_patch_possible = Gem::Version.new(RUBY_VERSION) >= INTERPOLATION_HOOKABLE_VERSION
-          end
-          @_interpolation_patch_possible
-        end
-
         def retrieve_protect_ruleset
           return {} unless enabled? && ::Contrast::PROTECT.enabled?
 

data/lib/contrast/components/api.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/base'
@@ -14,7 +14,11 @@ module Contrast
         include Contrast::Components::ComponentBase
 
         def api_url
-          @_api_url ||= ::Contrast::CONFIG.root.api.url
+          @_api_url ||= begin
+            tmp = ::Contrast::CONFIG.root.api.url
+            tmp += '/Contrast' unless tmp.end_with?('/Contrast')
+            tmp
+          end
         end
 
         def api_key
@@ -30,25 +34,28 @@ module Contrast
         end
 
         def proxy_enabled?
-          @_proxy_enabled = true?(::Contrast::CONFIG.root.api.proxy.enable) if @_proxy_enabled.nil?
-          @_proxy_enabled
+          return @_proxy_enabled unless @_proxy_enabled.nil?
+
+          @_proxy_enabled = true?(::Contrast::CONFIG.root.api.proxy.enable)
         end
 
         def proxy_url
           @_proxy_url ||= ::Contrast::CONFIG.root.api.proxy.url
         end
 
-        def request_audit_enable
-          @_request_audit_enable ||= true?(::Contrast::CONFIG.root.api.request_audit.enable)
+        def request_audit_enable?
+          return @_request_audit_enable unless @_request_audit_enable.nil?
+
+          @_request_audit_enable = true?(::Contrast::CONFIG.root.api.request_audit.enable)
         end
 
-        def request_audit_requests
+        def request_audit_requests?
           return @_request_audit_requests unless @_request_audit_requests.nil?
 
           @_request_audit_requests = true?(::Contrast::CONFIG.root.api.request_audit.requests)
         end
 
-        def request_audit_responses
+        def request_audit_responses?
           return @_request_audit_responses unless @_request_audit_responses.nil?
 
           @_request_audit_responses = true?(::Contrast::CONFIG.root.api.request_audit.responses)
@@ -59,7 +66,9 @@ module Contrast
         end
 
         def certification_enabled?
-          @_certification_enabled ||= certification_truly_enabled?(::Contrast::CONFIG.root.api.certificate)
+          return @_certification_enabled unless @_certification_enabled.nil?
+
+          @_certification_enabled = certification_truly_enabled?(::Contrast::CONFIG.root.api.certificate)
         end
 
         def certification_ca_file

data/lib/contrast/components/app_context.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 'rubygems/version'
@@ -59,6 +59,7 @@ module Contrast
         def path
           @_path ||= begin
             tmp = ::Contrast::CONFIG.root.application.path
+            tmp = Contrast::Agent.framework_manager.application_root unless Contrast::Utils::StringUtils.present?(tmp)
             Contrast::Utils::StringUtils.truncate(tmp, DEFAULT_APP_PATH)
           rescue StandardError
             DEFAULT_APP_PATH

data/lib/contrast/components/app_context_extend.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/components/assess.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/base'
@@ -77,9 +77,8 @@ module Contrast
         end
 
         def track_frozen_sources?
-          if @_track_frozen_sources.nil?
-            @_track_frozen_sources = !false?(::Contrast::CONFIG.root.agent.ruby.track_frozen_sources)
-          end
+          @_track_frozen_sources = !false?(::Contrast::CONFIG.root.agent.ruby.track_frozen_sources) if
+            @_track_frozen_sources.nil?
           @_track_frozen_sources
         end
 
@@ -89,10 +88,15 @@ module Contrast
         end
 
         def require_dynamic_sources?
-          if @_require_dynamic_sources.nil?
-            @_require_dynamic_sources = !false?(::Contrast::CONFIG.root.assess.enable_dynamic_sources)
-          end
-          @_require_dynamic_sources
+          return @_require_dynamic_sources unless @_require_dynamic_sources.nil?
+
+          @_require_dynamic_sources = !false?(::Contrast::CONFIG.root.assess.enable_dynamic_sources)
+        end
+
+        def non_request_tracking?
+          @_non_request_tracking = true?(::Contrast::CONFIG.root.agent.ruby.non_request_tracking) if
+            @_non_request_tracking.nil?
+          @_non_request_tracking
         end
 
         def tags

data/lib/contrast/components/base.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/components/config.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/env_configuration_item'
@@ -80,27 +80,42 @@ module Contrast
         API_KEY = "Invalid configuration. Missing a required connection value 'api_key' is not set."
         API_SERVICE_KEY = "Invalid configuration. Missing a required connection value 'service_tag' is not set."
         API_USERNAME = "Invalid configuration. Missing a required connection value 'user_name' is not set."
+        # The config has information about how to construct the logger. If the config is invalid, and you want to know
+        # about it, then you have a circular dependency if you try to log it, so we use basic proto_logger to do this
+        # job.
         def validate
-          # The config has information about how to construct the logger.
-          # If the config is invalid, and you want to know about it, then
-          # you have a circular dependency if you try to log it,
-          # so we use basic proto_logger to do this job.
-          if !session_id.empty? && !session_metadata.empty?
+          return false unless valid_session_metadata?
+
+          valid_api?
+        end
+
+        # The use can set either the application's session id or session metadata or neither, but never both.
+        #
+        # @return [boolean]
+        def valid_session_metadata?
+          if !session_id&.empty? && !session_metadata&.empty?
             proto_logger.error(SESSION_VARIABLES)
             return false
           end
-          if bypass
-            msg = []
-            msg << API_URL unless api_url
-            msg << API_KEY unless api_key
-            msg << API_SERVICE_KEY unless api_service_key
-            msg << API_USERNAME unless api_username
-            msg.any? { |m| proto_logger.error(m) }
-            return false unless msg.empty?
-          end
           true
         end
 
+        # If the agent is to use the bypass to communicate with TeamServer directly, than it must have the
+        # configuration values required for that connection.
+        #
+        # @return [boolean]
+        def valid_api?
+          return true unless bypass
+
+          msg = []
+          msg << API_URL unless api_url
+          msg << API_KEY unless api_key
+          msg << API_SERVICE_KEY unless api_service_key
+          msg << API_USERNAME unless api_username
+          msg.any? { |m| proto_logger.error(m) }
+          msg.empty?
+        end
+
         def env_overrides
           # For env variables resembling CONTRAST__WHATEVER__NESTED_VALUE
           # override raw.whatever.nested_value

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

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

data/lib/contrast/components/inventory.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
@@ -21,6 +21,10 @@ module Contrast
           @_analyze_libraries = !false?(::Contrast::CONFIG.root.inventory.analyze_libraries) if @_analyze_libraries.nil?
           @_analyze_libraries
         end
+
+        def tags
+          ::Contrast::CONFIG.root.inventory&.tags
+        end
       end
     end
   end

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

data/lib/contrast/components/protect.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/base'
@@ -54,12 +54,16 @@ module Contrast
         end
 
         def forcibly_disabled?
-          @_forcibly_disabled ||= false?(::Contrast::CONFIG.root.protect.enable)
+          return @_forcibly_disabled unless @_forcibly_disabled.nil?
+
+          @_forcibly_disabled = false?(::Contrast::CONFIG.root.protect.enable)
         end
 
         private
 
         def forcibly_enabled?
+          return @_forcibly_enabled unless @_forcibly_enabled.nil?
+
           @_forcibly_enabled ||= true?(::Contrast::CONFIG.root.protect.enable)
         end
       end

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

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

data/lib/contrast/components/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/api/settings.pb'
@@ -36,19 +36,32 @@ module Contrast
           @application_state.exclusion_matchers.select(&:code?)
         end
 
-        # @param server_features [Contrast::Api::Settings::ServerFeatures]
-        def update_from_server_features server_features
-          @protect_state.enabled = server_features.protect_enabled?
-          @assess_state.enabled = server_features.assess_enabled?
-          @assess_state.sampling_settings = server_features.assess.sampling
+        # @param features [Contrast::Api::Settings::ServerFeatures, Contrast::Agent::Reporting::Response]
+        def update_from_server_features features
+          if features&.class == Contrast::Agent::Reporting::Response
+            @protect_state.enabled = features.server_features.protect.enabled?
+            @assess_state.enabled = features.server_features.assess.enabled?
+            @assess_state.sampling_settings = features.server_features.assess.sampling
+          else
+            @protect_state.enabled = features.protect_enabled?
+            @assess_state.enabled = features.assess_enabled?
+            @assess_state.sampling_settings = features.assess.sampling
+          end
         end
 
-        # @param application_settings [Contrast::Api::Settings::ApplicationSettings]
-        def update_from_application_settings application_settings
-          new_vals = application_settings.application_state_translation
-          @application_state.modes_by_id = new_vals[:modes_by_id]
-          @application_state.exclusion_matchers = new_vals[:exclusion_matchers]
-          @assess_state.disabled_assess_rules = new_vals[:disabled_assess_rules]
+        # @param features [Contrast::Api::Settings::ApplicationSettings, Contrast::Agent::Reporting::Response]
+        def update_from_application_settings features
+          if features&.class == Contrast::Agent::Reporting::Response
+            @application_state.modes_by_id = features.application_settings.protect.protection_rules_to_settings_hash
+            # TODO: RUBY-1438 this needs to be translated
+            # @application_state.exclusion_matchers = new_vals[:exclusion_matchers]
+            @assess_state.disabled_assess_rules = features.application_settings.assess.disabled_rules
+          else
+            new_vals = features.application_state_translation
+            @application_state.modes_by_id = new_vals[:modes_by_id]
+            @application_state.exclusion_matchers = new_vals[:exclusion_matchers]
+            @assess_state.disabled_assess_rules = new_vals[:disabled_assess_rules]
+          end
         end
 
         # Wipe state to zero.

data/lib/contrast/config/agent_configuration.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/config/api_configuration.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/config/api_proxy_configuration'
@@ -9,7 +9,7 @@ module Contrast
   module Config
     # Api keys configuration
     class ApiConfiguration < BaseConfiguration
-      URL = 'https://app.contrastsecurity.com/contrast'
+      URL = 'https://app.contrastsecurity.com/Contrast'
       KEYS = {
           api_key: EMPTY_VALUE,
           url: URL,

data/lib/contrast/config/api_proxy_configuration.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/config/application_configuration.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/config/assess_configuration.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/config/assess_rules_configuration.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/config/base_configuration.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 'forwardable'

data/lib/contrast/config/certification_configuration.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/config/env_variables.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