contrast-agent 4.13.1 → 5.1.0

data/lib/contrast/framework/manager.rb

@@ -1,12 +1,15 @@
-# 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/reporting/reporting_events/application_update'
+require 'contrast/agent/reporting/reporting_events/application_inventory'
 require 'contrast/components/logger'
 require 'contrast/extension/module'
+require 'contrast/framework/grape/support'
+require 'contrast/framework/manager_extend'
 require 'contrast/framework/platform_version'
 require 'contrast/framework/rack/support'
 require 'contrast/framework/rails/support'
-require 'contrast/framework/grape/support'
 require 'contrast/framework/sinatra/support'
 require 'contrast/utils/class_util'
 
@@ -15,6 +18,7 @@ module Contrast
     # Allows access to framework specific information
     class Manager
       include Contrast::Components::Logger::InstanceMethods
+      include Contrast::Framework::ManagerExtend
 
       # Order here does matter as the first framework listed will be the first one we pull information from Rack will
       # be a special case that may involve updating some logic to handle only applying Rack if Rails/Sinatra do not
@@ -65,6 +69,10 @@ module Contrast
         Contrast::Framework::PlatformVersion.from_string(framework_version)
       end
 
+      def platform_version_string
+        first_framework_result :version, ''
+      end
+
       def server_type
         first_framework_result :server_type, 'rack'
       end
@@ -116,7 +124,18 @@ module Contrast
       # @param request [Contrast::Agent::Request] the current request.
       # @return [Contrast::Api::Dtm::RouteCoverage] the current route as a Dtm.
       def get_route_dtm request
-        @_frameworks.lazy.map { |framework_support| framework_support.current_route(request) }.reject(&:nil?).first
+        @_frameworks.lazy.map { |framework_support| framework_support.current_route(request) }.
+            reject(&:nil?).first
+      end
+
+      # Iterate through current frameworks and return the current request's route. This will be the first non-nil
+      # result.
+      #
+      # @param request [Contrast::Agent::Request] the current request.
+      # @return [Contrast::Agent::Reporting::RouteCoverage] the current route as a Dtm.
+      def get_route_information request
+        @_frameworks.lazy.map { |framework_support| framework_support.current_route_coverage(request) }.
+            reject(&:nil?).first
       end
 
       # Sometimes the framework we want to instrument is loaded after our agent code. To catch that case, we'll detect
@@ -124,7 +143,6 @@ module Contrast
       # have support enabled, we'll enable it now. We'll also need to catch up on any other startup actions that we've
       # missed. Most likely, this is only necessary for those applications which have applications mounted on them.
       #
-      # TODO: RUBY-1354
       # TODO: RUBY-1356
       #
       # @param mod [Module] the module or class that was just loaded
@@ -139,8 +157,18 @@ module Contrast
 
           @_frameworks << framework
           # Report the registered routes of that framework now that we know we need to find them
+          # TODO: RUBY-1438 -- remove and build ReportingEvent directly
           app_update_msg = Contrast::Api::Dtm::ApplicationUpdate.build
-          Contrast::Agent.messaging_queue.send_event_eventually(app_update_msg)
+          if Contrast::Agent.reporter
+            report = Contrast::Agent::Reporting::DtmMessage.dtm_to_event(app_update_msg)
+            Contrast::Agent.reporter.send_event(report)
+
+            # This is being reported separately because we extract the data from the same message
+            inventory_report = Contrast::Agent::Reporting::ApplicationInventory.convert(app_update_msg)
+            Contrast::Agent.reporter.send_event(inventory_report)
+          else
+            Contrast::Agent.messaging_queue.send_event_eventually(app_update_msg)
+          end
           logger.info('Framework detected after initialization. Enabling support.',
                       framework: framework.detection_class,
                       frameworks: @_frameworks)
@@ -149,37 +177,6 @@ module Contrast
       rescue StandardError => e
         logger.warn('Unable to register a late framework', e, module: mod.cs__name)
       end
-
-      private
-
-      def enable_framework_support? klass
-        Contrast::Utils::ClassUtil.truly_defined?(klass)
-      end
-
-      def routes_for_all_frameworks
-        data_for_all_frameworks :collect_routes
-      end
-
-      # This returns an array of all data from each framework in a flat, no-nil values array
-      #
-      # @param method_name [Symbol] the method to call on each FrameworkSupport class
-      # @return [Array]
-      def data_for_all_frameworks method_name
-        @_frameworks.flat_map { |framework| framework.send(method_name) }.compact
-      end
-
-      # This returns a single object from the first framework to successfully respond
-      #
-      # @param method_name [Symbol] the method to call on each FrameworkSupport class
-      # @return [Object] - Determined by method to be invoked
-      def first_framework_result method_name, default_value
-        result = nil
-        @_frameworks.each do |framework|
-          result = framework.send(method_name)
-          break if result
-        end
-        result || default_value
-      end
     end
   end
 end

data/lib/contrast/framework/manager_extend.rb

@@ -0,0 +1,50 @@
+# 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'
+require 'contrast/extension/module'
+require 'contrast/framework/platform_version'
+require 'contrast/framework/rack/support'
+require 'contrast/framework/rails/support'
+require 'contrast/framework/grape/support'
+require 'contrast/framework/sinatra/support'
+require 'contrast/utils/class_util'
+
+module Contrast
+  module Framework
+    # Allows access to framework specific information
+    module ManagerExtend
+      private
+
+      def enable_framework_support? klass
+        Contrast::Utils::ClassUtil.truly_defined?(klass)
+      end
+
+      def routes_for_all_frameworks
+        data_for_all_frameworks :collect_routes
+      end
+
+      # This returns an array of all data from each framework in a flat, no-nil values array
+      #
+      # @param method_name [Symbol] the method to call on each FrameworkSupport class
+      # @return [Array]
+      def data_for_all_frameworks method_name
+        @_frameworks.flat_map { |framework| framework.send(method_name) }.
+            compact
+      end
+
+      # This returns a single object from the first framework to successfully respond
+      #
+      # @param method_name [Symbol] the method to call on each FrameworkSupport class
+      # @return [Object] - Determined by method to be invoked
+      def first_framework_result method_name, default_value
+        result = nil
+        @_frameworks.each do |framework|
+          result = framework.send(method_name)
+          break if result
+        end
+        result || default_value
+      end
+    end
+  end
+end

data/lib/contrast/framework/platform_version.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/framework/rack/patch/session_cookie.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'

data/lib/contrast/framework/rack/patch/support.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/patching/policy/after_load_patch'

data/lib/contrast/framework/rack/support.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/framework/base_support'

data/lib/contrast/framework/rails/patch/action_controller_live_buffer.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/framework/rails/patch/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
 
 require 'contrast/utils/invalid_configuration_util'

data/lib/contrast/framework/rails/patch/rails_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/framework/rails/patch/assess_configuration'

data/lib/contrast/framework/rails/patch/support.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/framework/rails/patch/rails_application_configuration'

data/lib/contrast/framework/rails/railtie.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/job_servers_running'
@@ -14,7 +14,7 @@ module Contrast
         initializer 'Contrast Ruby Agent Initializer' do |app|
           log_rails = defined?(Rails) && defined?(Rails.logger)
 
-          Rails.logger.debug("In railtie ::#{ app.middleware.inspect }") if log_rails
+          Rails.logger.debug { "In railtie ::#{ app.middleware.inspect }" } if log_rails
 
           if ::Contrast::APP_CONTEXT.instrument_middleware_stack?
             ::Contrast::AGENT.insert_middleware(app)

data/lib/contrast/framework/rails/support.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'
@@ -10,7 +10,7 @@ module Contrast
   module Framework
     module Rails
       # Used when Rails is present to define framework specific behavior
-      class Support
+      class Support # rubocop:disable Metrics/ClassLength
         extend Contrast::Framework::BaseSupport
         extend Contrast::Framework::Rails::Patch::Support
         include Contrast::Components::Logger::InstanceMethods
@@ -78,6 +78,38 @@ module Contrast
             nil
           end
 
+          # Find the current route, based on the provided Request wrapper
+          #
+          # @param request[Contrast::Agent::Request]
+          # @return [Contrast::Agent::Reporting::RouteCoverage, nil] a Dtm describing the route
+          # matched to the request if a match was found.
+          def current_route_coverage request
+            return unless ::Rails.cs__respond_to?(:application)
+
+            # ActionDispatch::Journey::Path::Pattern::MatchData, Hash, ActionDispatch::Journey::Route, Array<String>
+            match, _params, route, path = get_full_route(request.rack_request)
+            unless route
+              logger.warn('Unable to determine the current route of this request')
+              return
+            end
+
+            original_url = request.rack_request.path_info
+            mounted_app = route&.app&.app
+            # Route is either the final rails route, or a router that points to a Sinatra controller.
+            if mounted_app && Contrast::Framework::Sinatra::Support.sinatra_controller?(mounted_app)
+              return mounted_new_sinatra_route(request, match, path, route, original_url)
+            end
+            if mounted_app && Contrast::Framework::Grape::Support.grape_controller?(mounted_app)
+              return mounted_new_grape_route(request, match, path, route, original_url)
+            end
+
+            new_route_coverage = Contrast::Agent::Reporting::RouteCoverage.new
+            new_route_coverage.attach_rails_data route, original_url
+          rescue StandardError => e
+            logger.warn('Unable to determine the current route of this request', e)
+            nil
+          end
+
           # Copy a request for modification.
           #
           # @param env [::ActionDispatch::Request] original env.
@@ -155,6 +187,12 @@ module Contrast
             Contrast::Framework::Sinatra::Support.current_route(new_req, route.app.app, original_url)
           end
 
+          # @return [Contrast::Agent::Reporting::RouteCoverage, nil]
+          def mounted_new_sinatra_route request, match, path, route, original_url
+            new_req = unmounted_route(request, match, path)
+            Contrast::Framework::Sinatra::Support.current_route_coverage(new_req, route.app.app, original_url)
+          end
+
           # @param request[Contrast::Agent::Request]
           # @param match [ActionDispatch::Journey::Path::Pattern::MatchData]
           # @param path [Array<String>] the path of this request, built out from each nested
@@ -167,6 +205,12 @@ module Contrast
             Contrast::Framework::Grape::Support.current_route(new_req, route.app.app, original_url)
           end
 
+          # @return [Contrast::Agent::Reporting::RouteCoverage, nil]
+          def mounted_new_grape_route request, match, path, route, original_url
+            new_req = unmounted_route(request, match, path)
+            Contrast::Framework::Grape::Support.current_route_coverage(new_req, route.app.app, original_url)
+          end
+
           # Create a request copied from current request, but with the base path removed from path_info, as that's
           # the mount.
           #

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

@@ -1,7 +1,8 @@
-# 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/framework/base_support'
+require 'contrast/agent/reporting/report'
 
 module Contrast
   module Framework
@@ -82,6 +83,27 @@ module Contrast
             Contrast::Api::Dtm::RouteCoverage.from_sinatra_route(final_controller, method, route_pattern, full_route)
           end
 
+          # Given the current request - return a RouteCoverage object
+
+          # @param request [Contrast::Agent::Request] a contrast tracked request.
+          # @param controller [::Sinatra::Base] optionally use this controller instead of global ::Sinatra::Base.
+          # @return [Contrast::Agent::Reporting::RouteCoverage, nil] a Dtm describing the route
+          # matched to the request if a match was found.
+          def current_route_coverage request, controller = ::Sinatra::Base, full_route = nil
+            return unless sinatra_controller?(controller)
+
+            method = request.env[::Rack::REQUEST_METHOD] # GET, PUT, POST, etc...
+
+            # Find route match--checking superclasses if necessary.
+            final_controller, route_pattern = _route_recurse(controller, method, _cleaned_route(request))
+            return unless final_controller
+
+            full_route ||= request.env[::Rack::PATH_INFO]
+
+            new_route_coverage = Contrast::Agent::Reporting::RouteCoverage.new
+            new_route_coverage.attach_rack_based_data final_controller, method, route_pattern, full_route
+          end
+
           # Search object space for sinatra controllers--any class that subclasses ::Sinatra::Base.
           #
           # @return [Array<::Sinatra::Base>] sinatra controlelrs
@@ -100,13 +122,14 @@ module Contrast
           #
           # @param controller [Sinatra::Base, #routes] a Sinatra application.
           # @param method [::Rack::REQUEST_METHOD] GET, POST, PUT, etc...
-          # @param method [String] the relative route passed from Rack.
+          # @param route [String] the relative route passed from Rack.
           # @return [Array[Sinatra::Base, Mustermann::Sinatra], nil] Either the controller that
           # will handle the route along with the route pattern or nil if no match.
           def _route_recurse controller, method, route
             return if controller.nil? || controller.cs__class == NilClass
 
-            route_patterns = controller.routes.fetch(method) { [] }.map(&:first)
+            route_patterns = controller.routes.fetch(method) { [] }.
+                map(&:first)
             route_pattern = route_patterns&.find do |matcher|
               matcher.params(route) # ::Mustermann::Sinatra match.
             end

data/lib/contrast/funchook/funchook.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'
@@ -17,26 +17,29 @@ module Funchook
 
   AGENT_ROOT = File.join(__dir__, '..', '..', '..')
 
-  def self.resolve_path!
-    actual_path_segments = SEARCH_DIRS.product(ACCEPTABLE_FILES).find do |potential_funchook_path|
-      load_path = absolute_path(potential_funchook_path)
-      File.exist?(load_path)
+  class << self
+    def resolve_path!
+      actual_path_segments = SEARCH_DIRS.product(ACCEPTABLE_FILES).find do |potential_funchook_path|
+        load_path = absolute_path(potential_funchook_path)
+        File.exist?(load_path)
+      end
+
+      if actual_path_segments.nil?
+        logger.warn('Unable to find funchook')
+      else
+        @path = absolute_path(actual_path_segments)
+        logger.info('Funchook found', path: @path)
+      end
+      @path
     end
 
-    if actual_path_segments.nil?
-      logger.warn('Unable to find funchook')
-    else
-      @path = absolute_path(actual_path_segments)
-      logger.info('Funchook found', path: @path)
+    def absolute_path path_array
+      File.absolute_path(File.join(AGENT_ROOT, *path_array))
     end
-    @path
-  end
-
-  def self.absolute_path path_array
-    File.absolute_path(File.join(AGENT_ROOT, *path_array))
-  end
 
-  def self.available?
-    @_available ||= !!resolve_path!
+    def available?
+      @_available = !!resolve_path! if @_available.nil?
+      @_available
+    end
   end
 end

data/lib/contrast/logger/application.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/exclude_key'

data/lib/contrast/logger/format.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 'ougai'

data/lib/contrast/logger/log.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 'logger'
@@ -11,6 +11,7 @@ require 'contrast/logger/format'
 require 'contrast/logger/request'
 require 'contrast/logger/time'
 require 'contrast/components/config'
+require 'contrast/utils/log_utils'
 
 module Contrast
   # This module allows us to dynamically weave timing into our code, so that only when the time is actually needed do
@@ -26,9 +27,9 @@ module Contrast
     # Add a method to the list of methods to be trace timed if logger set to TRACE. Enables trace timing after if
     # logger set to TRACE.
     #
-    # @params: clazz [Class] the class of the method to time.
-    # @params: method [Symbol] the method to time.
-    # @params: method [String] optional custom logging message.
+    # @param: clazz [Class] the class of the method to time.
+    # @param: method [Symbol] the method to time.
+    # @param: method [String] optional custom logging message.
     def add_method_to_trace_timing clazz, method, msg = nil
       methods_to_time.append(METHOD_INFO.new(clazz, method, msg, false))
       enable_trace_timing if logger.level == ::Ougai::Logging::TRACE
@@ -37,9 +38,9 @@ module Contrast
     # Add a method to the list of methods to be trace timed if logger set to TRACE. Enables trace timing after if
     # logger set to TRACE.
     #
-    # @params: method_spec [METHOD_INFO] specs about the method to be timed.
-    # @params: class_method [Boolean] whether this is or isn't a class/module method.
-    def trace_time_class_method meth_spec, class_method
+    # @param: meth_spec [METHOD_INFO] specs about the method to be timed.
+    # @param: class_method [Boolean] whether this is or isn't a class/module method.
+    def trace_time_class_method meth_spec, class_method # rubocop:disable Metrics/AbcSize
       untimed_func_symbol = "untimed_#{ meth_spec.method_name }".to_sym
       send_to = class_method ? meth_spec.clazz.cs__singleton_class : meth_spec.clazz
       meth_spec.clazz.class_eval do
@@ -105,12 +106,7 @@ module Contrast
     class Log
       include Singleton
       include ::Contrast::TraceTiming
-
-      DEFAULT_NAME     = 'contrast.log'
-      DEFAULT_LEVEL    = ::Ougai::Logging::Severity::INFO
-      VALID_LEVELS     = ::Ougai::Logging::Severity::SEV_LABEL
-      STDOUT_STR       = 'STDOUT'
-      STDERR_STR       = 'STDERR'
+      include Contrast::Utils::LogUtils
 
       attr_reader :previous_path, :previous_level
 
@@ -167,97 +163,6 @@ module Contrast
         dir_name = File.dirname(File.absolute_path(path))
         File.writable?(dir_name)
       end
-
-      private
-
-      def build path: STDOUT_STR, level_const: DEFAULT_LEVEL
-        logger = case path
-                 when STDOUT_STR, STDERR_STR
-                   ::Ougai::Logger.new(Object.cs__const_get(path))
-                 else
-                   ::Ougai::Logger.new(path)
-                 end
-        add_contrast_loggers(logger)
-        logger.progname = 'Contrast Agent'
-        logger.level = level_const
-        logger.formatter = Contrast::Logger::Format.new
-        logger.formatter.datetime_format = '%Y-%m-%dT%H:%M:%S.%L%z'
-        logger
-      end
-
-      def add_contrast_loggers logger
-        logger.extend(Contrast::Logger::Application)
-        logger.extend(Contrast::Logger::Request)
-        logger.extend(Contrast::Logger::Time)
-      end
-
-      # Determine the valid path to which to log, given the precedence of config > settings > default.
-      #
-      # @param log_file [String, nil] the file to which to log as provided by the settings retrieved from the
-      #   TeamServer.
-      # @return [String] the path to which to log or STDOUT / STDERR if one of those values provided.
-      def find_valid_path log_file
-        config = ::Contrast::CONFIG.root.agent.logger
-        config_path = config&.path&.length.to_i.positive? ? config.path : nil
-        valid_path(config_path || log_file)
-      end
-
-      def valid_path path
-        path = path.nil? ? Contrast::Utils::ObjectShare::EMPTY_STRING : path
-        return path if path == STDOUT_STR
-        return path if path == STDERR_STR
-
-        path = DEFAULT_NAME if path.empty?
-        if write_permission?(path)
-          path
-        elsif write_permission?(DEFAULT_NAME)
-          # Log once when the path is invalid. We'll change to this path, so no
-          # need to log again.
-          if previous_path != DEFAULT_NAME
-            puts "[!] Unable to write to '#{ path }'. Writing to default log '#{ DEFAULT_NAME }' instead."
-          end
-          DEFAULT_NAME
-        else
-          # Log once when the path is invalid. We'll change to this path, so no
-          # need to log again.
-          puts "[!] Unable to write to '#{ path }'. Writing to standard out instead." if previous_path != STDOUT_STR
-          STDOUT_STR
-        end
-      end
-
-      # Determine the valid level to which to log, given the precedence of config > settings > default.
-      #
-      # @param log_level [String, nil] the level at which to log as provided by the settings retrieved from the
-      #   TeamServer.
-      # @return [::Ougai::Logging::Severity] the level at which to log
-      def find_valid_level log_level
-        config = ::Contrast::CONFIG.root.agent.logger
-        config_level = config&.level&.length&.positive? ? config.level : nil
-
-        valid_level(config_level || log_level)
-      end
-
-      def valid_level level
-        level ||= DEFAULT_LEVEL
-        level = level.upcase
-        if VALID_LEVELS.include?(level)
-          Object.cs__const_get("::Ougai::Logging::Severity::#{ level }")
-        else
-          DEFAULT_LEVEL
-        end
-      rescue StandardError
-        DEFAULT_LEVEL
-      end
-
-      # Log that the Agent log has changed and include some default information at the start of the log.
-      def log_update
-        logger.debug('Initialized new contrast agent logger')
-        logger.debug_with_time('middleware: log environment') do
-          logger.application_environment
-          logger.application_configuration
-          logger.application_libraries
-        end
-      end
     end
   end
 end

data/lib/contrast/logger/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/utils/timer'

data/lib/contrast/logger/time.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/security_exception.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/tasks/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 'yaml'

data/lib/contrast/tasks/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 'contrast/utils/os'

data/lib/contrast/utils/assess/propagation_method_utils.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