contrast-agent 5.3.0 → 6.1.1

data/ext/cs__scope/cs__scope.c

@@ -1,8 +1,8 @@
 /* Copyright (c) 2022 Contrast Security, Inc.  See
  * https://www.contrastsecurity.com/enduser-terms-0317a for more details. */
 
-#include "../cs__common/cs__common.h"
 #include "cs__scope.h"
+#include "../cs__common/cs__common.h"
 #include <ruby.h>
 
 /* Calls to Contrast modules and classes */
@@ -26,8 +26,7 @@ VALUE get_ec() {
     keys = rb_const_get(scope_mod, rb_intern(rb_const_ec_keys));
     fiber = rb_fiber_current();
 
-    if (RB_TYPE_P(scope_inst, T_NIL))
-    {
+    if (RB_TYPE_P(scope_inst, T_NIL)) {
         new_inst = rb_new_c_scope();
         rb_ary_push(keys, fiber);
         rb_hash_aset(ec, fiber, new_inst);
@@ -57,17 +56,19 @@ int scope_decrease(int scope) {
 }
 
 VALUE is_in_scope(int scope) {
-    if (scope > 0)
-    {
+    if (scope > 0) {
         return Qtrue;
     } else if (scope <= 0) {
         return Qfalse;
     }
 }
 
- /* default: raise NoMethodError, "Scope '#{ name.inspect }' is not registered as a scope." */
+/* default: raise NoMethodError, "Scope '#{ name.inspect }' is not registered as
+ * a scope." */
 void rb_raise_scope_no_method_err(const VALUE method_scope_sym) {
-    rb_raise(rb_eNoMethodError, "Scope ':%"PRIsVALUE"' is not registered as a scope.", rb_sym_to_s(method_scope_sym));
+    rb_raise(rb_eNoMethodError,
+             "Scope ':%" PRIsVALUE "' is not registered as a scope.",
+             rb_sym_to_s(method_scope_sym));
 }
 
 /*
@@ -254,8 +255,9 @@ VALUE split_scope_depth(VALUE self, VALUE args) {
 }
 
 /*
- * Static methods to be used, the cases are defined by the usage from the above methods
- * if more methods are added - please extend the case statements as they are no longed dynamic
+ * Static methods to be used, the cases are defined by the usage from the above
+ * methods if more methods are added - please extend the case statements as they
+ * are no longed dynamic
  */
 
 /*
@@ -274,9 +276,8 @@ VALUE split_scope_depth(VALUE self, VALUE args) {
  *    when :split
  *      in_split_scope?
  *    else
- *      raise NoMethodError, "Scope '#{ name.inspect }' is not registered as a scope."
- *    end
- * end
+ *      raise NoMethodError, "Scope '#{ name.inspect }' is not registered as a
+ * scope." end end
  */
 VALUE scope_klass_in_scope(VALUE self, VALUE method_scope_sym) {
     VALUE in_scope = Qnil;
@@ -313,9 +314,8 @@ VALUE scope_klass_in_scope(VALUE self, VALUE method_scope_sym) {
  *    when :split
  *      enter_split_scope!
  *    else
- *      raise NoMethodError, "Scope '#{ name.inspect }' is not registered as a scope."
- *    end
- * end
+ *      raise NoMethodError, "Scope '#{ name.inspect }' is not registered as a
+ * scope." end end
  */
 VALUE scope_klass_enter_scope(VALUE self, VALUE method_scope_sym) {
     VALUE enter_scope = Qnil;
@@ -349,9 +349,8 @@ VALUE scope_klass_enter_scope(VALUE self, VALUE method_scope_sym) {
  *    when :split
  *      exit_split_scope!
  *    else
- *      raise NoMethodError, "Scope '#{ name.inspect }' is not registered as a scope."
- *    end
- * end
+ *      raise NoMethodError, "Scope '#{ name.inspect }' is not registered as a
+ * scope." end end
  */
 VALUE scope_klass_exit_scope(VALUE self, VALUE method_scope_sym) {
     VALUE exit_scope = Qnil;
@@ -392,8 +391,9 @@ VALUE contrast_scope_interface_init(VALUE self, VALUE args) {
 /*
  * @method #scope_for_current_ec
  *
- * This returns the scope governing the current execution context. Use this sparingly, preferring the instance
- * & class methods to access and query scope, rather than interacting with the scope object directly.
+ * This returns the scope governing the current execution context. Use this
+ * sparingly, preferring the instance & class methods to access and query scope,
+ * rather than interacting with the scope object directly.
  *
  * Alternative to Monitor => mutex.synchronize
  * rb_mutex_new(void)
@@ -425,8 +425,8 @@ VALUE contrast_scope_for_current_ec(VALUE self, VALUE args) {
  *
  * Iterates over the method policy's scopes and enters in each one.
  *
- *     @param scopes_to_enter   [Array<Symbol>] Scopes form method_policy#scopes_to_enter
- *                             for the scope current method policy
+ *     @param scopes_to_enter   [Array<Symbol>] Scopes form
+ * method_policy#scopes_to_enter for the scope current method policy
  *     @return scopes_to_enter [Array<Symbol>]
  *
  * [Ruby definition]
@@ -438,17 +438,17 @@ VALUE contrast_scope_for_current_ec(VALUE self, VALUE args) {
  *    end
  */
 VALUE inst_methods_enter_method_scope(VALUE self, VALUE scopes_to_enter) {
-   VALUE scopes_ary, scope;
+    VALUE scopes_ary, scope;
 
-   scopes_ary = rb_ary_dup(scopes_to_enter);
-   scope = rb_ary_pop(scopes_ary);
+    scopes_ary = rb_ary_dup(scopes_to_enter);
+    scope = rb_ary_pop(scopes_ary);
 
-   while(!RB_TYPE_P(scope, T_NIL)){
-       inst_methods_enter_scope(self, scope);
-       scope = rb_ary_pop(scopes_ary);
-   }
+    while (!RB_TYPE_P(scope, T_NIL)) {
+        inst_methods_enter_scope(self, scope);
+        scope = rb_ary_pop(scopes_ary);
+    }
 
-  return scopes_to_enter;
+    return scopes_to_enter;
 }
 
 /*
@@ -456,8 +456,8 @@ VALUE inst_methods_enter_method_scope(VALUE self, VALUE scopes_to_enter) {
  *
  * Iterates over the method policy's scopes and exits each one.
  *
- *     @param scopes_to_exit   [Array<Symbol>] Scopes form method_policy#scopes_to_exit
- *                             for the scope current method policy
+ *     @param scopes_to_exit   [Array<Symbol>] Scopes form
+ * method_policy#scopes_to_exit for the scope current method policy
  *     @return scopes_to_exit [Array<Symbol>]
  *
  * [Ruby definition]
@@ -469,58 +469,68 @@ VALUE inst_methods_enter_method_scope(VALUE self, VALUE scopes_to_enter) {
  *    end
  */
 VALUE inst_methods_exit_method_scope(VALUE self, VALUE scopes_to_exit) {
-   VALUE scopes_ary, scope;
+    VALUE scopes_ary, scope;
 
-   scopes_ary = rb_ary_dup(scopes_to_exit);
-   scope = rb_ary_pop(scopes_ary);
+    scopes_ary = rb_ary_dup(scopes_to_exit);
+    scope = rb_ary_pop(scopes_ary);
 
-   while(!RB_TYPE_P(scope, T_NIL)){
-       inst_methods_exit_scope(self, scope);
-       scope = rb_ary_pop(scopes_ary);
-   }
+    while (!RB_TYPE_P(scope, T_NIL)) {
+        inst_methods_exit_scope(self, scope);
+        scope = rb_ary_pop(scopes_ary);
+    }
 
-  return scopes_to_exit;
+    return scopes_to_exit;
 }
 
-/* For the InstanceMethods we need to call all the scope methods from the current ec context
- * All methods bellow are with same names as Contrast::Agent::Scope class with the difference
- * that they act as forwarders:
+/* For the InstanceMethods we need to call all the scope methods from the
+ * current ec context All methods bellow are with same names as
+ * Contrast::Agent::Scope class with the difference that they act as forwarders:
  * exp:
  *    def in_contrast_scope?
  *      scope_for_current_ec.in_contrast_scope?
  *    end
  */
 VALUE inst_methods_in_cntr_scope(VALUE self, VALUE args) {
-    return is_in_scope(FIX2INT(rb_iv_get(contrast_scope_for_current_ec(self, 0), rb_iv_cntr_scope)));
+    return is_in_scope(FIX2INT(
+        rb_iv_get(contrast_scope_for_current_ec(self, 0), rb_iv_cntr_scope)));
 }
 
 VALUE inst_methods_enter_cntr_scope(VALUE self, VALUE args) {
-    int scope = FIX2INT(rb_iv_get(contrast_scope_for_current_ec(self, 0), rb_iv_cntr_scope));
-    rb_iv_set(contrast_scope_for_current_ec(self, 0), rb_iv_cntr_scope, scope_increase(scope));
+    int scope = FIX2INT(
+        rb_iv_get(contrast_scope_for_current_ec(self, 0), rb_iv_cntr_scope));
+    rb_iv_set(contrast_scope_for_current_ec(self, 0), rb_iv_cntr_scope,
+              scope_increase(scope));
 
     return rb_iv_get(contrast_scope_for_current_ec(self, 0), rb_iv_cntr_scope);
 }
 
 VALUE inst_methods_exit_cntr_scope(VALUE self, VALUE args) {
-    int scope = FIX2INT(rb_iv_get(contrast_scope_for_current_ec(self, 0), rb_iv_cntr_scope));
-    rb_iv_set(contrast_scope_for_current_ec(self, 0), rb_iv_cntr_scope, scope_decrease(scope));
+    int scope = FIX2INT(
+        rb_iv_get(contrast_scope_for_current_ec(self, 0), rb_iv_cntr_scope));
+    rb_iv_set(contrast_scope_for_current_ec(self, 0), rb_iv_cntr_scope,
+              scope_decrease(scope));
 
     return rb_iv_get(contrast_scope_for_current_ec(self, 0), rb_iv_cntr_scope);
 }
 
 VALUE inst_methods_in_split_scope(VALUE self, VALUE args) {
-    return is_in_scope(FIX2INT(rb_iv_get(contrast_scope_for_current_ec(self, 0), rb_iv_split_scope)));
+    return is_in_scope(FIX2INT(
+        rb_iv_get(contrast_scope_for_current_ec(self, 0), rb_iv_split_scope)));
 }
 
 VALUE inst_methods_enter_split_scope(VALUE self, VALUE args) {
-    int scope = FIX2INT(rb_iv_get(contrast_scope_for_current_ec(self, 0), rb_iv_split_scope));
+    int scope = FIX2INT(
+        rb_iv_get(contrast_scope_for_current_ec(self, 0), rb_iv_split_scope));
 
-    return  rb_iv_set(contrast_scope_for_current_ec(self, 0), rb_iv_split_scope, scope_increase(scope));
+    return rb_iv_set(contrast_scope_for_current_ec(self, 0), rb_iv_split_scope,
+                     scope_increase(scope));
 }
 
 VALUE inst_methods_exit_split_scope(VALUE self, VALUE args) {
-    int scope = FIX2INT(rb_iv_get(contrast_scope_for_current_ec(self, 0), rb_iv_split_scope));
-    rb_iv_set(contrast_scope_for_current_ec(self, 0), rb_iv_split_scope, scope_decrease(scope));
+    int scope = FIX2INT(
+        rb_iv_get(contrast_scope_for_current_ec(self, 0), rb_iv_split_scope));
+    rb_iv_set(contrast_scope_for_current_ec(self, 0), rb_iv_split_scope,
+              scope_decrease(scope));
 
     return rb_iv_get(contrast_scope_for_current_ec(self, 0), rb_iv_split_scope);
 }
@@ -530,19 +540,24 @@ VALUE inst_methods_split_scope_depth(VALUE self, VALUE args) {
 }
 
 VALUE inst_methods_in_dsrl_scope(VALUE self, VALUE args) {
-    return is_in_scope(FIX2INT(rb_iv_get(contrast_scope_for_current_ec(self, 0), rb_iv_dslr_scope)));
+    return is_in_scope(FIX2INT(
+        rb_iv_get(contrast_scope_for_current_ec(self, 0), rb_iv_dslr_scope)));
 }
 
 VALUE inst_methods_enter_dsrl_scope(VALUE self, VALUE args) {
-    int scope = FIX2INT(rb_iv_get(contrast_scope_for_current_ec(self, 0), rb_iv_dslr_scope));
-    rb_iv_set(contrast_scope_for_current_ec(self, 0), rb_iv_dslr_scope, scope_increase(scope));
+    int scope = FIX2INT(
+        rb_iv_get(contrast_scope_for_current_ec(self, 0), rb_iv_dslr_scope));
+    rb_iv_set(contrast_scope_for_current_ec(self, 0), rb_iv_dslr_scope,
+              scope_increase(scope));
 
     return rb_iv_get(contrast_scope_for_current_ec(self, 0), rb_iv_dslr_scope);
 }
 
 VALUE inst_methods_exit_dsrl_scope(VALUE self, VALUE args) {
-    int scope = FIX2INT(rb_iv_get(contrast_scope_for_current_ec(self, 0), rb_iv_dslr_scope));
-    rb_iv_set(contrast_scope_for_current_ec(self, 0), rb_iv_dslr_scope, scope_decrease(scope));
+    int scope = FIX2INT(
+        rb_iv_get(contrast_scope_for_current_ec(self, 0), rb_iv_dslr_scope));
+    rb_iv_set(contrast_scope_for_current_ec(self, 0), rb_iv_dslr_scope,
+              scope_decrease(scope));
 
     return rb_iv_get(contrast_scope_for_current_ec(self, 0), rb_iv_dslr_scope);
 }
@@ -561,7 +576,7 @@ VALUE inst_methods_in_scope(VALUE self, VALUE method_scope_sym) {
 
 VALUE inst_methods_enter_scope(VALUE self, VALUE method_scope_sym) {
     if (method_scope_sym == rb_sym_contrast) {
-         inst_methods_enter_cntr_scope(self, 0);
+        inst_methods_enter_cntr_scope(self, 0);
     } else if (method_scope_sym == rb_sym_deserialization) {
         inst_methods_enter_dsrl_scope(self, 0);
     } else if (method_scope_sym == rb_sym_split) {
@@ -586,9 +601,10 @@ VALUE inst_methods_exit_scope(VALUE self, VALUE method_scope_sym) {
 /*
  *   @module Contrast::Components::Scope
  *
- *   TODO: RUBY-534, #sweep_dead_ecs compensates for a lack of weak tables. when we can use WeakRef, we should
- *   investigate removing this call and instead use the WeakRef for the Execution Context's Keys or using our
- *   Finalizers Hash for Fibers
+ *   TODO: RUBY-534, #sweep_dead_ecs compensates for a lack of weak tables. when
+ * we can use WeakRef, we should investigate removing this call and instead use
+ * the WeakRef for the Execution Context's Keys or using our Finalizers Hash for
+ * Fibers
  *
  *   [Ruby definition]
  *
@@ -614,14 +630,14 @@ VALUE scope_mod_sweep_dead_ecs(VALUE self, VALUE args) {
         key = rb_ary_entry(ec_keys, i);
         test = key;
         if (!RB_TYPE_P(key, T_NIL)) {
-            if(!rb_fiber_alive_p(key)) {
+            if (!rb_fiber_alive_p(key)) {
                 rb_hash_delete(ec, key);
             }
         }
     }
 
     return ec;
- }
+}
 
 void Init_cs__scope() {
     /* ivs */
@@ -676,29 +692,45 @@ void Init_cs__scope() {
      */
 
     /* Instance methods: */
-    rb_define_method(scope_klass, rb_method_name_init, contrast_scope_klass_init, 0);
-    rb_define_method(scope_klass, rb_method_name_in_cntr_scope, in_cntr_scope, 0);
-    rb_define_method(scope_klass, rb_method_name_enter_cntr_scope, enter_cntr_scope, 0);
-    rb_define_method(scope_klass, rb_method_name_exit_cntr_scope, exit_cntr_scope, 0);
-    rb_define_method(scope_klass, rb_method_name_in_dslr_scope, in_dslr_scope, 0);
-    rb_define_method(scope_klass, rb_method_name_enter_dslr_scope, enter_dsrl_scope, 0);
-    rb_define_method(scope_klass, rb_method_name_exit_dslr_scope, exit_dsrl_scope, 0);
-    rb_define_method(scope_klass, rb_method_name_in_split_scope, in_split_scope, 0);
-    rb_define_method(scope_klass, rb_method_name_enter_split_scope, enter_split_scope, 0);
-    rb_define_method(scope_klass, rb_method_name_exit_split_scope, exit_split_scope, 0);
-    rb_define_method(scope_klass, rb_method_name_split_scope_depth, split_scope_depth, 0);
-    rb_define_method(scope_klass, rb_method_name_in_scope, scope_klass_in_scope, 1);
-    rb_define_method(scope_klass, rb_method_name_enter_scope, scope_klass_enter_scope, 1);
-    rb_define_method(scope_klass, rb_method_name_exit_scope, scope_klass_exit_scope, 1);
+    rb_define_method(scope_klass, rb_method_name_init,
+                     contrast_scope_klass_init, 0);
+    rb_define_method(scope_klass, rb_method_name_in_cntr_scope, in_cntr_scope,
+                     0);
+    rb_define_method(scope_klass, rb_method_name_enter_cntr_scope,
+                     enter_cntr_scope, 0);
+    rb_define_method(scope_klass, rb_method_name_exit_cntr_scope,
+                     exit_cntr_scope, 0);
+    rb_define_method(scope_klass, rb_method_name_in_dslr_scope, in_dslr_scope,
+                     0);
+    rb_define_method(scope_klass, rb_method_name_enter_dslr_scope,
+                     enter_dsrl_scope, 0);
+    rb_define_method(scope_klass, rb_method_name_exit_dslr_scope,
+                     exit_dsrl_scope, 0);
+    rb_define_method(scope_klass, rb_method_name_in_split_scope, in_split_scope,
+                     0);
+    rb_define_method(scope_klass, rb_method_name_enter_split_scope,
+                     enter_split_scope, 0);
+    rb_define_method(scope_klass, rb_method_name_exit_split_scope,
+                     exit_split_scope, 0);
+    rb_define_method(scope_klass, rb_method_name_split_scope_depth,
+                     split_scope_depth, 0);
+    rb_define_method(scope_klass, rb_method_name_in_scope, scope_klass_in_scope,
+                     1);
+    rb_define_method(scope_klass, rb_method_name_enter_scope,
+                     scope_klass_enter_scope, 1);
+    rb_define_method(scope_klass, rb_method_name_exit_scope,
+                     scope_klass_exit_scope, 1);
 
     /*
      * @class Contrast::Components::Interface
      */
 
     /* Interface#initialize */
-    rb_define_method(scope_interface, rb_method_name_init, contrast_scope_interface_init, 0);
+    rb_define_method(scope_interface, rb_method_name_init,
+                     contrast_scope_interface_init, 0);
     /* Interface#scope_for_current_ec */
-    rb_define_method(scope_interface, rb_method_name_scope_for_current_ec, contrast_scope_for_current_ec, 0);
+    rb_define_method(scope_interface, rb_method_name_scope_for_current_ec,
+                     contrast_scope_for_current_ec, 0);
 
     /*
      * @module Contrast::Components::Scope
@@ -718,30 +750,47 @@ void Init_cs__scope() {
      */
 
     /* InstanceMethods#scope_for_current_ec */
-    rb_define_method(scope_inst_methods, rb_method_name_scope_for_current_ec, contrast_scope_for_current_ec, 0);
+    rb_define_method(scope_inst_methods, rb_method_name_scope_for_current_ec,
+                     contrast_scope_for_current_ec, 0);
     /* Forwarders */
-    rb_define_method(scope_inst_methods, rb_method_name_in_cntr_scope, inst_methods_in_cntr_scope, 0);
-    rb_define_method(scope_inst_methods, rb_method_name_enter_cntr_scope, inst_methods_enter_cntr_scope, 0);
-    rb_define_method(scope_inst_methods, rb_method_name_exit_cntr_scope, inst_methods_exit_cntr_scope, 0);
-    rb_define_method(scope_inst_methods, rb_method_name_in_dslr_scope, inst_methods_in_dsrl_scope, 0);
-    rb_define_method(scope_inst_methods, rb_method_name_enter_dslr_scope, inst_methods_enter_dsrl_scope, 0);
-    rb_define_method(scope_inst_methods, rb_method_name_exit_dslr_scope, inst_methods_exit_dsrl_scope, 0);
-    rb_define_method(scope_inst_methods, rb_method_name_in_split_scope, inst_methods_in_split_scope, 0);
-    rb_define_method(scope_inst_methods, rb_method_name_enter_split_scope, inst_methods_enter_split_scope, 0);
-    rb_define_method(scope_inst_methods, rb_method_name_exit_split_scope, inst_methods_exit_split_scope, 0);
-    rb_define_method(scope_inst_methods, rb_method_name_split_scope_depth, inst_methods_split_scope_depth, 0);
-    rb_define_method(scope_inst_methods, rb_method_name_in_scope, inst_methods_in_scope, 1);
-    rb_define_method(scope_inst_methods, rb_method_name_enter_scope, inst_methods_enter_scope, 1);
-    rb_define_method(scope_inst_methods, rb_method_name_exit_scope, inst_methods_exit_scope, 1);
+    rb_define_method(scope_inst_methods, rb_method_name_in_cntr_scope,
+                     inst_methods_in_cntr_scope, 0);
+    rb_define_method(scope_inst_methods, rb_method_name_enter_cntr_scope,
+                     inst_methods_enter_cntr_scope, 0);
+    rb_define_method(scope_inst_methods, rb_method_name_exit_cntr_scope,
+                     inst_methods_exit_cntr_scope, 0);
+    rb_define_method(scope_inst_methods, rb_method_name_in_dslr_scope,
+                     inst_methods_in_dsrl_scope, 0);
+    rb_define_method(scope_inst_methods, rb_method_name_enter_dslr_scope,
+                     inst_methods_enter_dsrl_scope, 0);
+    rb_define_method(scope_inst_methods, rb_method_name_exit_dslr_scope,
+                     inst_methods_exit_dsrl_scope, 0);
+    rb_define_method(scope_inst_methods, rb_method_name_in_split_scope,
+                     inst_methods_in_split_scope, 0);
+    rb_define_method(scope_inst_methods, rb_method_name_enter_split_scope,
+                     inst_methods_enter_split_scope, 0);
+    rb_define_method(scope_inst_methods, rb_method_name_exit_split_scope,
+                     inst_methods_exit_split_scope, 0);
+    rb_define_method(scope_inst_methods, rb_method_name_split_scope_depth,
+                     inst_methods_split_scope_depth, 0);
+    rb_define_method(scope_inst_methods, rb_method_name_in_scope,
+                     inst_methods_in_scope, 1);
+    rb_define_method(scope_inst_methods, rb_method_name_enter_scope,
+                     inst_methods_enter_scope, 1);
+    rb_define_method(scope_inst_methods, rb_method_name_exit_scope,
+                     inst_methods_exit_scope, 1);
 
     /*
      * @module Contrast::Components::Scope
      */
-    rb_define_singleton_method(scope_mod, "sweep_dead_ecs", scope_mod_sweep_dead_ecs, 0);
+    rb_define_singleton_method(scope_mod, "sweep_dead_ecs",
+                               scope_mod_sweep_dead_ecs, 0);
 
     /*
      * @module Contrast::Components::Scope::InstanceMethods
      */
-    rb_define_method(scope_inst_methods, "contrast_enter_method_scopes!", inst_methods_enter_method_scope, 1);
-    rb_define_method(scope_inst_methods, "contrast_exit_method_scopes!", inst_methods_exit_method_scope, 1);
+    rb_define_method(scope_inst_methods, "contrast_enter_method_scopes!",
+                     inst_methods_enter_method_scope, 1);
+    rb_define_method(scope_inst_methods, "contrast_exit_method_scopes!",
+                     inst_methods_exit_method_scope, 1);
 }

data/ext/cs__tests/cs__tests.c

@@ -0,0 +1,12 @@
+/* Copyright (c) 2022 Contrast Security, Inc.  See
+ * https://www.contrastsecurity.com/enduser-terms-0317a for more details. */
+
+#include "cs__tests.h"
+#include "../cs__common/cs__common.h"
+#include <ruby.h>
+
+/* Define any tests functions here, you could call a patch function and define
+ * it in Ruby */
+
+void Init_cs__tests(void) {
+}

data/ext/cs__tests/cs__tests.h

@@ -0,0 +1,3 @@
+#include <ruby.h>
+
+void Init_cs__tests(void);

data/ext/cs__tests/extconf.rb

@@ -0,0 +1,5 @@
+# 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__)
+require_relative '../extconf_common'

data/ext/extconf_common.rb

@@ -5,7 +5,7 @@ require 'mkmf'
 require_relative '../lib/contrast/agent/version'
 
 def make!
-  create_makefile "#{ $TO_MAKE }/#{ $TO_MAKE }"
+  create_makefile("#{ $TO_MAKE }/#{ $TO_MAKE }")
 end
 
 def ext_path

data/lib/contrast/agent/assess/contrast_object.rb

@@ -8,24 +8,22 @@ require 'contrast/agent/assess/tracker'
 module Contrast
   module Agent
     module Assess
-      # This class is a convenient holder of our version of an Object. It
-      # creates a String version of the Object from the original provided
-      # and keeps reference to the original's Tags, letting us determine if it
-      # was tracked when we try to report to TeamServer.
+      # This class is a convenient holder of our version of an Object. It creates a String version of the Object from
+      # the original provided and keeps reference to the original's Tags, letting us determine if it was tracked when
+      # we try to report to TeamServer.
       #
-      # @attr_reader object [String, nil] the Contrast string representing the
-      #   object.
-      # @attr_reader object_type [String] the name of the object's module.
-      # @attr_reader tags [Hash{String => Contrast::Agent::Assess::Tag}, nil]
-      #   the tags on the object before it was captured.
-      #
-      # TODO: RUBY-1083 determine if this is expensive and/or worth not storing
-      #   these values directly on ContrastEvent and passing them around. Args
-      #   probably make the argument for wrapping them b/c otherwise we'll have
-      #   to keep two arrays in synch or make an array of arrays, at which
-      #   point, we may as well make this.
+      # TODO: RUBY-1083 determine if this is expensive and/or worth not storing these values directly on ContrastEvent
+      #   and passing them around. Args probably make the argument for wrapping them b/c otherwise we'll have to keep
+      #   two arrays in synch or make an array of arrays, at which point, we may as well make this.
       class ContrastObject
-        attr_reader :object, :object_type, :tags
+        # @return [String] the Contrast String representation of the Object.
+        attr_reader :object
+        # @return [Integer] the __id__ of the original Object.
+        attr_reader :tracked_object_id
+        # @return [String] the name of the Class/Module of the Object.
+        attr_reader :object_type
+        # @return [Hash<Contrast::Agent::Assess::Tag>] the tags on the original Object.
+        attr_reader :tags
 
         # Capture the details about the object which we need to render it in
         # TeamServer.
@@ -34,10 +32,12 @@ module Contrast
         def initialize object
           if object
             @object = Contrast::Utils::ClassUtil.to_contrast_string(object)
+            @tracked_object_id = object.__id__
             @object_type = object.cs__class.cs__name
             @tags = Contrast::Agent::Assess::Tracker.properties(object)&.get_tags
           else
             @object = Contrast::Utils::ObjectShare::NIL_STRING
+            @tracked_object_id = nil.__id__
             @object_type = nil.cs__class.cs__name
           end
         end

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

@@ -9,22 +9,22 @@ module Contrast
   module Agent
     module Assess
       module Events
-        # This class holds the data about an event in the application
-        # We'll use it to build an event that TeamServer can consume if
-        # the object to which this event belongs ends in a trigger.
-        #
-        # @attr_reader request [Contrast::Agent::Request] our wrapper around the Rack::Request at the time this source
-        #  was created
-        # @attr_reader source_name [String] the name of the source if it comes from a map-like entity
-        # @attr_reader source_type [String] the TeamServer understood type of source; i.e. parameter
+        # This class holds the data about an event in the application. We'll use it to build an event that TeamServer
+        # can consume if the object to which this event belongs ends in a trigger.
         class SourceEvent < Contrast::Agent::Assess::ContrastEvent
-          attr_reader :request, :source_name, :source_type
+          # @return [Contrast::Agent::Request] our wrapper around the Rack::Request at the time this source
+          #   was created
+          attr_reader :request
+          # @return [String] the name of the source if it comes from a map-like entity
+          attr_reader :source_name
+          # @return [String] the TeamServer understood type of source; i.e. parameter
+          attr_reader :source_type
 
           # @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,
+          # @param source_type [String] the type of this source, from the source_node, or a KEY_TYPE if invoked for a
+          #   Hash
+          # @param source_name [String, nil] the name of this source, i.e. the key used to accessed if from a Hash or
+          #   nil if a type like
           def initialize event_data, source_type = nil, source_name = nil
             super(event_data)
             @source_type = source_type
@@ -54,8 +54,7 @@ module Contrast
             @_forced_source_name ||= Contrast::Utils::StringUtils.force_utf8(source_name)
           end
 
-          # Probably only for source events, but we'll go
-          # with source_type instead. java & .net support source_type
+          # 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_dtm
             # You can have a source w/o a name, but not w/o a type
@@ -67,8 +66,7 @@ module Contrast
             dtm
           end
 
-          # Probably only for source events, but we'll go
-          # with source_type instead. java & .net support source_type
+          # 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
@@ -80,8 +78,8 @@ module Contrast
             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:
+          # 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.
           # 2) Return the first source/target as the taint target.
           def determine_taint_target event_dtm

data/lib/contrast/agent/assess/finalizers/hash.rb

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require 'contrast/utils/duck_utils'
+require 'contrast/agent/assess/policy/propagation_method'
 
 module Contrast
   module Agent
@@ -21,11 +22,11 @@ module Contrast
             else
               ObjectSpace.define_finalizer(key, finalizing_proc)
             end
-            super key.__id__, obj
+            super(key.__id__, obj)
           end
 
           def [] key
-            super key.__id__
+            super(key.__id__)
           end
 
           # Something is trackable if it is not a collection and either not frozen or it was frozen after we put a
@@ -66,6 +67,7 @@ module Contrast
           def finalizing_proc
             @_finalizing_proc ||= proc do |key_id|
               FROZEN_FINALIZED_IDS.delete(key_id)
+              Contrast::Agent::Assess::Policy::PropagationMethod.instance_variable_get(:@properties).delete(key_id)
               delete(key_id)
             end
           end