contrast-agent 4.13.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 469e09f0e64dcdb68643154ca601b20b8f61d634789dec642a374d6a51671fec
-  data.tar.gz: e4053b76ef09eaf13ee1cf09418d5ae50cd5e518b5e69f611c0a22d15a9bcd4d
+  metadata.gz: 4976ba07d49361d91d44561f93031bfbe6b0aaff32921c62c8a6841e1e9581ad
+  data.tar.gz: 510081d49ac928d43cd2f97ab310b6f6dcd122c1227e52d35c40f6ff5f423723
 SHA512:
-  metadata.gz: 311a76a16c063b1d3afe09921e82efa59ea6367165d78fb26c833ab1dcf1e0daba2c3a0bf3597651cd86d146f4480004e916bb78842c6d8185f824dc768c204d
-  data.tar.gz: 3a4c0db4f013ccd0c7427ef01e451fa2d57b9458de7ce2c23df3444f3fcc4c824a7b841d81bf2aa25ecfd378be2afcea3ea57cded948bd350f4c6516a509477e
+  metadata.gz: e1dff81a71f5162d2f217ef061ae060b77d825a85fc0666e667b845e62f5e209b8d409bb2fe554af774f904d3586461a35c264fedb5c63c4f1d9a1130c7ed0c0
+  data.tar.gz: '013393f427c6539d164f7f647d2b8635ef4c7093e8dbd517631c03ae2ad3a5b7e8529bce82e80cea5f5c3ad630c537abd7114f98042f01b4977059ebb5ad1aaf'

data/.simplecov

@@ -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
 
 SimpleCov.minimum_coverage line: 94.75
 SimpleCov.start do
   add_filter '/spec/'
+  add_filter '/lib/contrast/extension/assess/erb.rb'
   enable_coverage :branch
 end

data/Gemfile

@@ -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
 
 source 'https://rubygems.org'

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright: 2021 Contrast Security, Inc
+Copyright: 2022 Contrast Security, Inc
 Contact: support@contrastsecurity.com
 License: Commercial
 

data/Rakefile

@@ -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
 
 $stdout.sync = true

data/exe/contrast_service

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# 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
 
 def mac?

data/ext/build_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 'fileutils'

data/ext/cs__assess_array/cs__assess_array.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2021 Contrast Security, Inc.  See
+/* Copyright (c) 2022 Contrast Security, Inc.  See
  * https://www.contrastsecurity.com/enduser-terms-0317a for more details. */
 
 #include "cs__assess_array.h"

data/ext/cs__assess_array/extconf.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
 
 $TO_MAKE = File.basename(__dir__)

data/ext/cs__assess_basic_object/cs__assess_basic_object.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2021 Contrast Security, Inc.  See
+/* Copyright (c) 2022 Contrast Security, Inc.  See
  * https://www.contrastsecurity.com/enduser-terms-0317a for more details. */
 
 #include "cs__assess_basic_object.h"

data/ext/cs__assess_basic_object/extconf.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
 
 $TO_MAKE = File.basename(__dir__)

data/ext/cs__assess_fiber_track/cs__assess_fiber_track.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2021 Contrast Security, Inc.  See
+/* Copyright (c) 2022 Contrast Security, Inc.  See
  * https://www.contrastsecurity.com/enduser-terms-0317a for more details. */
 
 #include "cs__assess_fiber_track.h"

data/ext/cs__assess_fiber_track/extconf.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
 
 $TO_MAKE = File.basename(__dir__)

data/ext/cs__assess_hash/cs__assess_hash.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2021 Contrast Security, Inc.  See
+/* Copyright (c) 2022 Contrast Security, Inc.  See
  * https://www.contrastsecurity.com/enduser-terms-0317a for more details. */
 
 #include "cs__assess_hash.h"

data/ext/cs__assess_hash/extconf.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
 
 $TO_MAKE = File.basename(__dir__)

data/ext/cs__assess_kernel/cs__assess_kernel.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2021 Contrast Security, Inc.  See
+/* Copyright (c) 2022 Contrast Security, Inc.  See
  * https://www.contrastsecurity.com/enduser-terms-0317a for more details. */
 
 #include "cs__assess_kernel.h"

data/ext/cs__assess_kernel/extconf.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
 
 $TO_MAKE = File.basename(__dir__)

data/ext/cs__assess_marshal_module/cs__assess_marshal_module.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2021 Contrast Security, Inc.  See
+/* Copyright (c) 2022 Contrast Security, Inc.  See
  * https://www.contrastsecurity.com/enduser-terms-0317a for more details. */
 
 #include "cs__assess_marshal_module.h"

data/ext/cs__assess_marshal_module/extconf.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
 
 $TO_MAKE = File.basename(__dir__)

data/ext/cs__assess_module/cs__assess_module.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2021 Contrast Security, Inc.  See
+/* Copyright (c) 2022 Contrast Security, Inc.  See
  * https://www.contrastsecurity.com/enduser-terms-0317a for more details. */
 
 #include "cs__assess_module.h"

data/ext/cs__assess_module/extconf.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
 
 $TO_MAKE = File.basename(__dir__)

data/ext/cs__assess_regexp/cs__assess_regexp.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2021 Contrast Security, Inc.  See
+/* Copyright (c) 2022 Contrast Security, Inc.  See
  * https://www.contrastsecurity.com/enduser-terms-0317a for more details. */
 
 #include "cs__assess_regexp.h"

data/ext/cs__assess_regexp/extconf.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
 
 $TO_MAKE = File.basename(__dir__)

data/ext/cs__assess_string/cs__assess_string.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2021 Contrast Security, Inc.  See
+/* Copyright (c) 2022 Contrast Security, Inc.  See
  * https://www.contrastsecurity.com/enduser-terms-0317a for more details. */
 
 #include "cs__assess_string.h"

data/ext/cs__assess_string/extconf.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
 
 $TO_MAKE = File.basename(__dir__)

data/ext/cs__assess_string_interpolation26/cs__assess_string_interpolation26.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2021 Contrast Security, Inc.  See
+/* Copyright (c) 2022 Contrast Security, Inc.  See
  * https://www.contrastsecurity.com/enduser-terms-0317a for more details. */
 
 #include "cs__assess_string_interpolation26.h"

data/ext/cs__assess_string_interpolation26/extconf.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
 
 $TO_MAKE = File.basename(__dir__)

data/ext/cs__assess_yield_track/cs__assess_yield_track.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2021 Contrast Security, Inc.  See
+/* Copyright (c) 2022 Contrast Security, Inc.  See
  * https://www.contrastsecurity.com/enduser-terms-0317a for more details. */
 
 #include "cs__assess_yield_track.h"

data/ext/cs__assess_yield_track/extconf.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
 
 $TO_MAKE = File.basename(__dir__)

data/ext/cs__common/cs__common.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2021 Contrast Security, Inc.  See
+/* Copyright (c) 2022 Contrast Security, Inc.  See
  * https://www.contrastsecurity.com/enduser-terms-0317a for more details. */
 
 #include "cs__common.h"

data/ext/cs__common/extconf.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 'mkmf'

data/ext/cs__contrast_patch/cs__contrast_patch.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2021 Contrast Security, Inc.  See
+/* Copyright (c) 2022 Contrast Security, Inc.  See
  * https://www.contrastsecurity.com/enduser-terms-0317a for more details. */
 
 #include "cs__contrast_patch.h"

data/ext/cs__contrast_patch/extconf.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
 
 $TO_MAKE = File.basename(__dir__)

data/ext/cs__os_information/cs__os_information.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2021 Contrast Security, Inc.  See
+/* Copyright (c) 2022 Contrast Security, Inc.  See
  * https://www.contrastsecurity.com/enduser-terms-0317a for more details. */
 
 #include "cs__os_information.h"

data/ext/cs__os_information/extconf.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
 
 $TO_MAKE = File.basename(__dir__)

data/ext/extconf_common.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 'mkmf'

data/lib/contrast/agent/assess/contrast_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/assess/tracking_util'
@@ -42,21 +42,17 @@ module Contrast
           end
         end
 
-        # @param policy_node [Contrast::Agent::Assess::Policy::PolicyNode] the node that governs this event.
-        # @param tagged [Object] the Target to which this event pertains.
-        # @param object [Object] the Object on which the method was invoked
-        # @param ret [Object] the Return of the invoked method
-        # @param args [Array<Object>] the Arguments with which the method was invoked
-        def initialize policy_node, tagged, object, ret, args
-          @policy_node = policy_node
+        # @param event_data [Contrast::Agent::Assess::Events::EventData]
+        def initialize event_data
+          @policy_node = event_data.policy_node
           @time = Contrast::Utils::Timer.now_ms
           @thread = Thread.current.object_id
 
           # These methods rely on the above being set. Don't move them!
           @event_id = Contrast::Agent::Assess::ContrastEvent.next_atomic_id
-          @tags = Contrast::Agent::Assess::Tracker.properties(tagged)&.get_tags
-          find_parent_events!(policy_node, object, ret, args)
-          snapshot!(object, ret, args)
+          @tags = Contrast::Agent::Assess::Tracker.properties(event_data.tagged)&.get_tags
+          find_parent_events!(event_data.policy_node, event_data.object, event_data.ret, event_data.args)
+          snapshot!(event_data.object, event_data.ret, event_data.args)
           capture_stacktrace!
         end
 

data/lib/contrast/agent/assess/contrast_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/class_util'

data/lib/contrast/agent/assess/events/event_data.rb

@@ -0,0 +1,30 @@
+# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# frozen_string_literal: true
+
+module Contrast
+  module Agent
+    module Assess
+      module Events
+        # this class will gather and build event
+        class EventData
+          attr_reader :policy_node, :tagged, :object, :ret, :args
+
+          # Group event data together
+          #
+          # @param policy_node [Contrast::Agent::Assess::Policy::PolicyNode, nil] the node that governs this event
+          # @param tagged      [Object, nil] the Target to which this event pertains
+          # @param object      [Object, nil] the Object on which the method was invoked
+          # @param ret         [Object, nil] the Return of the invoked method
+          # @param args        [Array<Object>, nil] the Arguments with which the method was invoked
+          def initialize policy_node, tagged, object, ret, args
+            @policy_node = policy_node
+            @tagged = tagged
+            @object = object
+            @ret = ret
+            @args = args
+          end
+        end
+      end
+    end
+  end
+end

data/lib/contrast/agent/assess/events/event_factory.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/agent/assess/contrast_event'
 require 'contrast/agent/assess/events/source_event'
+require 'contrast/agent/assess/events/event_data'
 
 module Contrast
   module Agent
@@ -10,13 +11,20 @@ module Contrast
       module Events
         # This module returns the event type appropriate to the given Node
         module EventFactory
-          def self.build policy_node, tagged, object, ret, args, source_type = nil, source_name = nil
-            case policy_node
+          # This method returns the event type appropriate to the given Node
+          #
+          # @param event_data [Contrast::Agent::Assess::Events::EventData]
+          # @param source_type [String] the type of this source, from the
+          #       source_node, or a KEY_TYPE if invoked for a map,
+          # @param source_name [String, nil] the name of this source, i.e.
+          #       the key used to accessed if from a map or nil if a type like,
+          # @return [Contrast::Agent::Assess::Events::SourceEvent, Contrast::Agent::Assess::ContrastEvent]
+          def self.build event_data, source_type = nil, source_name = nil
+            case event_data.policy_node
             when Contrast::Agent::Assess::Policy::SourceNode
-              Contrast::Agent::Assess::Events::SourceEvent.new(policy_node, tagged, object, ret, args, source_type,
-                                                               source_name)
+              Contrast::Agent::Assess::Events::SourceEvent.new(event_data, source_type, source_name)
             when Contrast::Agent::Assess::Policy::PolicyNode
-              Contrast::Agent::Assess::ContrastEvent.new(policy_node, tagged, object, ret, args)
+              Contrast::Agent::Assess::ContrastEvent.new(event_data)
             end
           end
         end

data/lib/contrast/agent/assess/events/source_event.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/agent/assess/contrast_event'
+require 'contrast/agent/reporting/reporting_events/trace_event_source'
 require 'contrast/utils/string_utils'
 
 module Contrast
@@ -19,8 +20,13 @@ module Contrast
         class SourceEvent < Contrast::Agent::Assess::ContrastEvent
           attr_reader :request, :source_name, :source_type
 
-          def initialize policy_node, tagged, object, ret, args, source_type = nil, source_name = nil
-            super(policy_node, tagged, object, ret, args)
+          # @param event_data [Contrast::Agent::Assess::Events::EventData]
+          # @param source_type [String] the type of this source, from the
+          #       source_node, or a KEY_TYPE if invoked for a map,
+          # @param source_name [String, nil] the name of this source, i.e.
+          #       the key used to accessed if from a map or nil if a type like,
+          def initialize event_data, source_type = nil, source_name = nil
+            super(event_data)
             @source_type = source_type
             @source_name = source_name
             @request = Contrast::Agent::REQUEST_TRACKER.current&.request
@@ -61,6 +67,19 @@ module Contrast
             dtm
           end
 
+          # Probably only for source events, but we'll go
+          # with source_type instead. java & .net support source_type
+          # in propagation events, so we'll future proof this
+          def build_event_source
+            # You can have a source w/o a name, but not w/o a type
+            return unless source_type
+
+            trace_event_source = Contrast::Agent::Reporting::TraceEventSource.new
+            trace_event_source.type = forced_source_type
+            trace_event_source.name = forced_source_name
+            trace_event_source
+          end
+
           # We have to do a little work to figure out what our TS appropriate
           # target is. To break this down, the logic is as follows:
           # 1) I'll set the event's source and target to TS values.

data/lib/contrast/agent/assess/finalizers/freeze.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/assess/tracker'

data/lib/contrast/agent/assess/finalizers/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/utils/duck_utils'

data/lib/contrast/agent/assess/policy/dynamic_source_factory.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/method_policy'
@@ -90,12 +90,12 @@ module Contrast
             # @return [Contrast::Agent::Patching::Policy::MethodPolicy] the
             #   policy to apply to the given method
             def build_source_policy method_name, dynamic_source_node
-              method_policy = Contrast::Agent::Patching::Policy::MethodPolicy.new
-              method_policy.method_visibility = :public
-              method_policy.instance_method = true
-              method_policy.method_name = method_name
-              method_policy.source_node = dynamic_source_node
-              method_policy
+              Contrast::Agent::Patching::Policy::MethodPolicy.new({
+                                                                      method_visibility: :public,
+                                                                      instance_method: true,
+                                                                      method_name: method_name,
+                                                                      source_node: dynamic_source_node
+                                                                  })
             end
 
             # @param request [Contrast::Agent::Request] the request during

data/lib/contrast/agent/assess/policy/patcher.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/assess/policy/policy'
@@ -42,40 +42,6 @@ module Contrast
             rescue StandardError => e
               logger.warn('Unable to patch assess during eval', e, module: mod.cs__name)
             end
-
-            # Exposed so that methods can be dynamically patched on creation at
-            # runtime, like those generated by
-            # ActiveRecord::AttributeMethods::Read::ClassMethods#define_method_attribute
-            CLASS_TYPES = [Contrast::Utils::ObjectShare::CLASS, Contrast::Utils::ObjectShare::MODULE].cs__freeze
-            def patch_assess_method mod, method_name
-              # Module.define_method is called a lot in Class and Module. We
-              # currently do not expect these define_methods to result in methods
-              # that require patching, so for the sake of performance, we're going
-              # to skip evaluating them
-              mod = mod.cs__class unless mod.cs__is_a?(Module)
-              class_name = mod.cs__class
-              return if CLASS_TYPES.include?(class_name)
-              return unless ASSESS.enabled?
-
-              source_nodes = Contrast::Agent::Patching::Policy::ModulePolicy.nodes_for_module(policy.sources,
-                                                                                              class_name)
-              return if source_nodes.empty?
-
-              method_array = []
-              method_array << method_name
-              source_nodes.each do |source_node|
-                next unless source_node.method_name.to_s == method_name
-
-                method_policy =
-                  Contrast::Agent::Patching::Policy::MethodPolicy.new(source_node: source_node,
-                                                                      method_name: source_node.method_name,
-                                                                      method_visibility: source_node.method_visibility,
-                                                                      instance_method: true)
-                patcher.patch_method(mod, method_array, method_policy)
-              end
-            rescue StandardError => e
-              logger.warn('Unable to patch assess during define_method_attribute', e, module: mod.cs__name)
-            end
           end
         end
       end

data/lib/contrast/agent/assess/policy/policy.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 'json'

data/lib/contrast/agent/assess/policy/policy_node.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/policy_node'
@@ -135,14 +135,14 @@ module Contrast
 
             converted = []
             markers.split(Contrast::Utils::ObjectShare::COMMA).each do |t|
-              case t
-              when Contrast::Utils::ObjectShare::OBJECT_KEY,
+              converted << case t
+                           when Contrast::Utils::ObjectShare::OBJECT_KEY,
                    Contrast::Utils::ObjectShare::RETURN_KEY
 
-                converted << t
-              else
-                converted << Integer(t[1..-1])
-              end
+                             t
+                           else
+                             Integer(t[1..])
+                           end
             end
             converted
           end

data/lib/contrast/agent/assess/policy/policy_scanner.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'
@@ -32,8 +32,13 @@ module Contrast
               mod = trace_point.self
               return if mod.cs__frozen? || mod.singleton_class?
 
+              different_ruby_version trace_point, provider_values, mod
+            end
+
+            def different_ruby_version trace_point, provider_values, mod
               # TODO: RUBY-1014 - remove non-AST approach
               if RUBY_VERSION >= '2.6.0'
+                # TODO: RUBY-714 EOL 2.5. That check will be removed and the code will be brought back in here.
                 ast = RubyVM::AbstractSyntaxTree.parse_file(trace_point.path)
                 provider_values.each do |provider|
                   provider.parse(trace_point, ast)

data/lib/contrast/agent/assess/policy/preshift.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'