contrast-agent 4.14.0 → 5.2.0

data/lib/contrast/config/ruby_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
@@ -6,9 +6,6 @@ module Contrast
     # Common Configuration settings. Those in this section pertain to the
     # specific settings that apply to Ruby
     class RubyConfiguration < BaseConfiguration
-      # These commands being detected will result the agent disabling instrumentation, generally any command
-      # that doesn't result in the application listening on a port can be added here, this normally includes tasks
-      # that are ran pre-startup(like migrations) or to show information about the application(such as routes)
       DISABLED_RAKE_TASK_LIST = %w[
         about assets:clean assets:clobber assets:environment
         assets:precompile assets:precompile:all db:create db:drop db:fixtures:load db:migrate
@@ -22,22 +19,102 @@ module Contrast
 
       DEFAULT_UNINSTRUMENTED_NAMESPACES = %w[FactoryGirl FactoryBot].cs__freeze
 
-      KEYS = {
-          disabled_agent_rake_tasks: DISABLED_RAKE_TASK_LIST,
-          exceptions: Contrast::Config::ExceptionConfiguration,
-          # controls whether or not we patch interpolation, either by rewrite or by funchook
-          interpolate: Contrast::Utils::ObjectShare::TRUE,
-          # controls whether or not we patch the rb_yield block to track split propagation
-          propagate_yield: Contrast::Utils::ObjectShare::TRUE,
-          # control whether or not we run file scanning rules on require
-          require_scan: Contrast::Utils::ObjectShare::TRUE,
-          # controls whether or not we track frozen Strings by replacing them
-          track_frozen_sources: Contrast::Utils::ObjectShare::TRUE,
-          uninstrument_namespace: DEFAULT_UNINSTRUMENTED_NAMESPACES
-      }.cs__freeze
-
-      def initialize hsh
-        super(hsh, KEYS)
+      attr_writer :disabled_agent_rake_tasks, :exceptions, :interpolate, :propagate_yield, :require_scan,
+                  :track_frozen_sources, :non_request_tracking, :uninstrument_namespace
+
+      def initialize hsh = {}
+        @disabled_agent_rake_tasks = traverse_config(hsh, :disabled_agent_rake_tasks)
+        @exceptions = Contrast::Config::ExceptionConfiguration.new(traverse_config(hsh, :exceptions))
+        @interpolate = traverse_config(hsh, :interpolate)
+        @propagate_yield = traverse_config(hsh, :propagate_yield)
+        @require_scan = traverse_config(hsh, :require_scan)
+        @track_frozen_sources = traverse_config(hsh, :track_frozen_sources)
+        @non_request_tracking = traverse_config(hsh, :non_request_tracking)
+        @uninstrument_namespace = traverse_config(hsh, :uninstrument_namespace)
+        @configuration_map = {}
+        build_configuration_map
+      end
+
+      # These commands being detected will result the agent disabling instrumentation, generally any command
+      # that doesn't result in the application listening on a port can be added here, this normally includes tasks
+      # that are ran pre-startup(like migrations) or to show information about the application(such as routes)
+      # @return [Array, DISABLED_RAKE_TASK_LIST]
+      def disabled_agent_rake_tasks
+        @disabled_agent_rake_tasks.nil? ? DISABLED_RAKE_TASK_LIST : @disabled_agent_rake_tasks
+      end
+
+      # @return [Contrast::Config::ExceptionConfiguration]
+      def exceptions
+        @exceptions ||= Contrast::Config::ExceptionConfiguration.new
+      end
+
+      # controls whether or not we patch interpolation, either by rewrite or by funchook
+      # @return [Boolean, Contrast::Utils::ObjectShare::TRUE]
+      def interpolate
+        @interpolate.nil? ? Contrast::Utils::ObjectShare::TRUE : @interpolate
+      end
+
+      # controls whether or not we patch the rb_yield block to track split propagation
+      # @return [Boolean, Contrast::Utils::ObjectShare::TRUE]
+      def propagate_yield
+        @propagate_yield.nil? ? Contrast::Utils::ObjectShare::TRUE : @propagate_yield
+      end
+
+      # control whether or not we run file scanning rules on require
+      # @return [Boolean, Contrast::Utils::ObjectShare::TRUE]
+      def require_scan
+        @require_scan.nil? ?  Contrast::Utils::ObjectShare::TRUE  : @require_scan
+      end
+
+      # controls whether or not we track frozen Strings by replacing them
+      # @return [Boolean, Contrast::Utils::ObjectShare::TRUE]
+      def track_frozen_sources
+        @track_frozen_sources.nil? ?  Contrast::Utils::ObjectShare::TRUE : @track_frozen_sources
+      end
+
+      # controls tracking outside of request
+      # @return [Boolean, Contrast::Utils::ObjectShare::FALSE]
+      def non_request_tracking
+        @non_request_tracking.nil? ?  Contrast::Utils::ObjectShare::FALSE : @non_request_tracking
+      end
+
+      # @return [Array, DEFAULT_UNINSTRUMENTED_NAMESPACES]
+      def uninstrument_namespace
+        @uninstrument_namespace.nil? ? DEFAULT_UNINSTRUMENTED_NAMESPACES : @uninstrument_namespace
+      end
+
+      # TODO: RUBY-1493 MOVE TO BASE CONFIG
+
+      def []= key, value
+        instance_variable_set("@#{ key }".to_sym, value)
+        @configuration_map[key] = value
+      end
+
+      def [] key
+        send(key.to_sym)
+      end
+
+      # Traverse the given entity to build out the configuration graph.
+      #
+      # The values will be either a hash, indicating internal nodes to
+      # traverse, or a value to set or the EMPTY_VALUE symbol, indicating a
+      # leaf node.
+      #
+      # The spec_key are the Contrast defined keys based on the instance variables of
+      # a given configuration.
+      def traverse_config values, spec_key
+        internal_nodes = values.cs__respond_to?(:has_key?)
+        val = internal_nodes ? value_from_key_config(spec_key, values) : nil
+        val == EMPTY_VALUE ? nil : val
+      end
+
+      def build_configuration_map
+        instance_variables.each do |key|
+          str_key = key.to_s.tr('@', '')
+          next if str_key == 'configuration_map'
+
+          @configuration_map[str_key] = send(str_key.to_sym)
+        end
       end
     end
   end

data/lib/contrast/config/sampling_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
@@ -6,16 +6,82 @@ module Contrast
     # Common Configuration settings. Those in this section pertain to the
     # sampling functionality of the Agent.
     class SamplingConfiguration < BaseConfiguration
-      KEYS = {
-          enable: EMPTY_VALUE,
-          baseline: EMPTY_VALUE,
-          request_frequency: EMPTY_VALUE,
-          response_frequency: EMPTY_VALUE,
-          window_ms: EMPTY_VALUE
-      }.cs__freeze
-
-      def initialize hsh
-        super(hsh, KEYS)
+      # @return [Integer, nil]
+      attr_reader :baseline
+      # @return [Integer, nil]
+      attr_reader :request_frequency
+      # @return [Integer, nil]
+      attr_reader :response_frequency
+      # @return [Integer, nil]
+      attr_reader :window_ms
+
+      def initialize hsh = {}
+        @enable = traverse_config(hsh, :enable)
+        @baseline = traverse_config(hsh, :baseline)
+        @request_frequency = traverse_config(hsh, :request_frequency)
+        @response_frequency = traverse_config(hsh, :response_frequency)
+        @window_ms = traverse_config(hsh, :window_ms)
+        @configuration_map = {}
+        build_configuration_map
+      end
+
+      # @return [Boolean, false]
+      def enable
+        @enable.nil? ? false : @enable
+      end
+
+      def enable= value
+        self['enable'] = value
+      end
+
+      def baseline= value
+        self['baseline'] = value
+      end
+
+      def request_frequency= value
+        self['request_frequency'] = value
+      end
+
+      def response_frequency= value
+        self['response_frequency'] = value
+      end
+
+      def window_ms= value
+        self['window_ms'] = value
+      end
+
+      # TODO: RUBY-1493 MOVE TO BASE CONFIG
+
+      def []= key, value
+        instance_variable_set("@#{ key }".to_sym, value)
+        @configuration_map[key] = value
+      end
+
+      def [] key
+        send(key.to_sym)
+      end
+
+      # Traverse the given entity to build out the configuration graph.
+      #
+      # The values will be either a hash, indicating internal nodes to
+      # traverse, or a value to set or the EMPTY_VALUE symbol, indicating a
+      # leaf node.
+      #
+      # The spec_key are the Contrast defined keys based on the instance variables of
+      # a given configuration.
+      def traverse_config values, spec_key
+        internal_nodes = values.cs__respond_to?(:has_key?)
+        val = internal_nodes ? value_from_key_config(spec_key, values) : nil
+        val == EMPTY_VALUE ? nil : val
+      end
+
+      def build_configuration_map
+        instance_variables.each do |key|
+          str_key = key.to_s.tr('@', '')
+          next if str_key == 'configuration_map'
+
+          @configuration_map[str_key] = send(str_key.to_sym)
+        end
       end
     end
   end

data/lib/contrast/config/server_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
@@ -6,17 +6,62 @@ module Contrast
     # Common Configuration settings. Those in this section pertain to the
     # server identification functionality of the Agent.
     class ServerConfiguration < BaseConfiguration
-      KEYS = {
-          name: EMPTY_VALUE,
-          path: EMPTY_VALUE,
-          type: EMPTY_VALUE,
-          tags: EMPTY_VALUE,
-          environment: EMPTY_VALUE,
-          version: EMPTY_VALUE
-      }.cs__freeze
-
-      def initialize hsh
-        super(hsh, KEYS)
+      # @return [String, nil]
+      attr_accessor :name
+      # @return [String, nil]
+      attr_accessor :path
+      # @return [String, nil]
+      attr_accessor :type
+      # @return [Array, nil]
+      attr_accessor :tags
+      # @return [String, nil]
+      attr_accessor :environment
+      # @return [String, nil]
+      attr_accessor :version
+
+      def initialize hsh = {}
+        @path = traverse_config(hsh, :path)
+        @name = traverse_config(hsh, :name)
+        @type = traverse_config(hsh, :type)
+        @tags = traverse_config(hsh, :tags)
+        @environment = traverse_config(hsh, :environment)
+        @version = traverse_config(hsh, :version)
+        @configuration_map = {}
+        build_configuration_map
+      end
+
+      # TODO: RUBY-1493 MOVE TO BASE CONFIG
+
+      def []= key, value
+        instance_variable_set("@#{ key }".to_sym, value)
+        @configuration_map[key] = value
+      end
+
+      def [] key
+        send(key.to_sym)
+      end
+
+      # Traverse the given entity to build out the configuration graph.
+      #
+      # The values will be either a hash, indicating internal nodes to
+      # traverse, or a value to set or the EMPTY_VALUE symbol, indicating a
+      # leaf node.
+      #
+      # The spec_key are the Contrast defined keys based on the instance variables of
+      # a given configuration.
+      def traverse_config values, spec_key
+        internal_nodes = values.cs__respond_to?(:has_key?)
+        val = internal_nodes ? value_from_key_config(spec_key, values) : nil
+        val == EMPTY_VALUE ? nil : val
+      end
+
+      def build_configuration_map
+        instance_variables.each do |key|
+          str_key = key.to_s.tr('@', '')
+          next if str_key == 'configuration_map'
+
+          @configuration_map[str_key] = send(str_key.to_sym)
+        end
       end
     end
   end

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

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

data/lib/contrast/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 'yaml'
@@ -217,10 +217,13 @@ module Contrast
     def convert_to_hash convert = root, hash = {}
       case convert
       when Contrast::Config::BaseConfiguration
-        convert.cs__class::KEYS.each_key do |key|
-          next if Contrast::Utils::ExcludeKey.excludable? key.to_s
+        # to_hash returns @configuration_map
+        convert.to_hash.each_key do |key|
+          next if Contrast::Utils::ExcludeKey.excludable?(key.to_s)
 
-          hash[key] = convert_to_hash(convert.send(key), {})
+          # keys can contain '-' but methods getters cannot
+          # clean_key = key.to_s.tr('-', '_')
+          hash[key] = convert_to_hash(convert.send(key.to_sym), {})
         end
         hash
       else

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

@@ -1,9 +1,10 @@
-# 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/patch'
 require 'contrast/agent/patching/policy/patcher'
 require 'contrast/components/scope'
+require 'contrast/agent/assess/events/event_data'
 
 module Contrast
   module Extension
@@ -52,7 +53,8 @@ module Contrast
               return ret unless Contrast::Agent::Assess::Tracker.tracked?(ret)
 
               properties.cleanup_tags
-              properties.build_event(ARRAY_JOIN_NODE, ret, ary, ret, [separator])
+              event_data = Contrast::Agent::Assess::Events::EventData.new ARRAY_JOIN_NODE, ret, ary, ret, [separator]
+              properties.build_event(event_data)
               properties.event.instance_variable_set(:@_parent_events, parent_events)
               ret
             end

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

@@ -1,9 +1,16 @@
-# 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
 
 # This module is used to track propagation through ERB template rendering
 module ERBPropagator
   class << self
+    # After ERB#result method is called we need to take the tags to the target and keep the
+    # propagation.
+    #
+    # @param patcher [Contrast::Agent::Assess::Policy::PolicyNode] the node that governs this event
+    # @param preshift [Contrast::Agent::Assess::Preshift] Saved state before the propagation
+    # @param ret [the Return of the invoked method]
+    # @param _block [&block, nil] block passed
     def result_tagger patcher, preshift, ret, _block
       return unless preshift.args.length >= 1
       return unless (properties = Contrast::Agent::Assess::Tracker.properties!(ret))
@@ -13,6 +20,30 @@ module ERBPropagator
 
       erb_pre_result = preshift.object.src
       parent_events = []
+      binding_variable_set binding_variable_set, used_binding, erb_pre_result, properties, parent_events, ret
+      properties.build_event(Contrast::Agent::Assess::Events::EventData.new(patcher,
+                                                                            ret,
+                                                                            preshift.object,
+                                                                            ret,
+                                                                            preshift.args), 1)
+      properties.event.instance_variable_set(:@_parent_events, parent_events)
+
+      ret
+    end
+
+    private
+
+    # Checks if binded variables set includes the object we track and proceed to update tags in the returned value
+    #
+    # @param binding_variable_set [Array<Symbol>] list of local variables used in the binding of params
+    # @param used_binding [Binding] the binding in of the current event, saved as preshift argument
+    # @param erb_pre_result [String] the source saved in the preshift
+    # @param properties [Contrast::Agent::Assess::Properties] properties of the target if none create new
+    # @param parent_events [Array<Contrast::Agent::Assess::ContrastEvent>] parents event extracted from the source
+    #                                                                      properties
+    # @param ret [String] the Return of the invoked method
+    # @return [Array<Symbol>]
+    def binding_variable_set binding_variable_set, used_binding, erb_pre_result, properties, parent_events, ret
       binding_variable_set.each do |bound_var_symbol|
         bound_variable_value = used_binding.local_variable_get(bound_var_symbol)
         next unless Contrast::Agent::Assess::Tracker.tracked?(bound_variable_value)
@@ -25,10 +56,6 @@ module ERBPropagator
         parent_event = Contrast::Agent::Assess::Tracker.properties(bound_variable_value)&.event
         parent_events << parent_event if parent_event
       end
-      properties.build_event(patcher, ret, preshift.object, ret, preshift.args, 1)
-      properties.event.instance_variable_set(:@_parent_events, parent_events)
-
-      ret
     end
   end
 end

data/lib/contrast/extension/assess/eval_trigger.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'
@@ -23,6 +23,8 @@ module Contrast
           end
 
           def apply_trigger obj, source, ret, clazz, method
+            return unless ::Contrast::ASSESS.non_request_tracking? || Contrast::Agent::REQUEST_TRACKER.current
+
             # Since we know this is the source of the trigger, we can do some
             # optimization here and return when it is not tracked
             return unless Contrast::Utils::Assess::TrackingUtil.tracked?(source)

data/lib/contrast/extension/assess/exec_trigger.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/at_exit_hook'
@@ -11,6 +11,7 @@ module Contrast
       # the trigger at the start in order to account for the process hand off.
       module ExecTrigger
         def apply_trigger source
+          return unless ::Contrast::ASSESS.non_request_tracking? || Contrast::Agent::REQUEST_TRACKER.current
           # Since we know this is the source of the trigger, we can do some
           # optimization here and return when it is not tracked
           return unless Contrast::Utils::Assess::TrackingUtil.tracked?(source)

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

@@ -1,9 +1,10 @@
-# 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/assess/policy/propagation_node'
 require 'contrast/components/logger'
 require 'contrast/components/scope'
+require 'contrast/agent/assess/events/event_data'
 
 # In order to instrument some difficult methods like String#gsub, as it
 # returns an enumerator, we need to instrument methods on Fiber.
@@ -64,7 +65,8 @@ module Contrast
                 next unless (result_properties = Contrast::Agent::Assess::Tracker.properties!(result))
 
                 result_properties.splat_from(fiber, result)
-                result_properties.build_event(FIBER_YIELD_NODE, result, fiber, result, [])
+                event_data = Contrast::Agent::Assess::Events::EventData.new(FIBER_YIELD_NODE, result, fiber, result, [])
+                result_properties.build_event(event_data)
               end
             end
           rescue Exception => e # rubocop:disable Lint/RescueException
@@ -80,7 +82,8 @@ module Contrast
               return unless properties
 
               properties.splat_from(underlying, fiber)
-              properties.build_event(FIBER_NEW_NODE, fiber, underlying, fiber, [])
+              event_data = Contrast::Agent::Assess::Events::EventData.new(FIBER_NEW_NODE, fiber, underlying, fiber, [])
+              properties.build_event(event_data)
             end
           rescue Exception => e # rubocop:disable Lint/RescueException
             logger.error('Unable to propagate during Fiber.new', e)

data/lib/contrast/extension/assess/hash.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/extension/assess/kernel.rb

@@ -1,8 +1,9 @@
-# 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/extension/assess/exec_trigger'
 require 'contrast/components/logger'
+require 'contrast/agent/assess/events/event_data'
 
 module Contrast
   module Extension
@@ -45,8 +46,12 @@ module Contrast
 
             parent_events = []
             track_sprintf(ret, format_string, args, parent_events)
-
-            properties.build_event(patcher, ret, preshift.object, ret, preshift.args, 1)
+            event_data = Contrast::Agent::Assess::Events::EventData.new(patcher,
+                                                                        ret,
+                                                                        preshift.object,
+                                                                        ret,
+                                                                        preshift.args)
+            properties.build_event(event_data, 1)
 
             properties.event.instance_variable_set(:@_parent_events, parent_events)
             ret

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

@@ -1,8 +1,9 @@
-# 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'
 require 'contrast/components/scope'
+require 'contrast/agent/assess/events/event_data'
 
 module Contrast
   module Extension
@@ -29,6 +30,8 @@ module Contrast
 
           def cs__load_assess source, ret
             with_contrast_scope do
+              return unless ::Contrast::ASSESS.non_request_tracking? || Contrast::Agent::REQUEST_TRACKER.current
+
               args = [source]
               # source might not be all the args passed in, but it is the one we care
               # about. we could pass in all the args in the last param here if it
@@ -40,7 +43,8 @@ module Contrast
               properties.copy_from(source, ret)
 
               node = Contrast::Agent::Assess::Policy::Policy.instance.find_propagator_node('Marshal', :load, false)
-              properties.build_event(node, ret, self, ret, args)
+              event_data = Contrast::Agent::Assess::Events::EventData.new node, ret, self, ret, args
+              properties.build_event(event_data)
             rescue StandardError => e
               logger.error('Unable to run Assess for Marshal.load', e)
             end

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

@@ -1,9 +1,10 @@
-# 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/assess/policy/propagation_node'
 require 'contrast/components/logger'
 require 'contrast/components/scope'
+require 'contrast/agent/assess/events/event_data'
 
 module Contrast
   module Extension
@@ -53,7 +54,12 @@ module Contrast
               return unless (properties = Contrast::Agent::Assess::Tracker.properties!(target))
 
               properties.splat_from(string, target)
-              properties.build_event(REGEXP_EQUAL_SQUIGGLE_NODE, target, self, result, [string])
+              event_data = Contrast::Agent::Assess::Events::EventData.new(REGEXP_EQUAL_SQUIGGLE_NODE,
+                                                                          target,
+                                                                          self,
+                                                                          result,
+                                                                          [string])
+              properties.build_event(event_data)
             end
           rescue Exception => e # rubocop:disable Lint/RescueException
             logger.error('Unable to propagate during Regexp#=~', e)

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

@@ -1,9 +1,10 @@
-# 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/assess/policy/propagation_node'
 require 'contrast/components/logger'
 require 'contrast/components/scope'
+require 'contrast/agent/assess/events/event_data'
 
 module Contrast
   module Extension
@@ -46,7 +47,12 @@ module Contrast
                 parent_event = Contrast::Agent::Assess::Tracker.properties(input)&.event
                 parent_events << parent_event if parent_event
               end
-              properties.build_event(INTERPOLATION_NODE, result, inputs, result, inputs)
+              event_data = Contrast::Agent::Assess::Events::EventData.new(INTERPOLATION_NODE,
+                                                                          result,
+                                                                          inputs,
+                                                                          result,
+                                                                          inputs)
+              properties.build_event(event_data)
               properties.event.instance_variable_set(:@_parent_events, parent_events)
             end
           rescue StandardError => e

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

data/lib/contrast/extension/delegator.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
 
 # Some developers override various methods on Delegator, which can often

data/lib/contrast/extension/extension.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'
@@ -36,10 +36,8 @@ module Contrast
           # conditions
           def assign_value path
             case path
-            when /fiber/
+            when /fiber/, /interpolation26/
               require path if Funchook.available?
-            when /interpolation26/
-              require path if ::Contrast::AGENT.patch_interpolation? && Funchook.available?
             else
               require path
             end

data/lib/contrast/extension/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