contrast-agent 4.3.1 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 678a3040ff60cf9b6222cab4a57115dc1c9d0df11c5238da4a6eaae0406d72a0
-  data.tar.gz: 792a68efe04d8c44f518a6d326b7b1c4a5377fce03b203752348c73352dc4a5b
+  metadata.gz: f9748bb3a9e7e6ce4722edc88dbb3bd8d3a59b11dd691f47ac29b3ee9e6a00ba
+  data.tar.gz: d5b5ff651f2914bff6da5cbd2fdcdc28a2dd1a2ea8ad4eced6c416cbab72b632
 SHA512:
-  metadata.gz: 2bfca960a571eb7b9df1ae5017938be4de75c4b337ab4d35c33101a719c68a66b90fdfc0f777cadcd1ce1861d4c7b4e48cbc56f3e6d9b81cb02728c2718011d6
-  data.tar.gz: 250cae84e05ea4ea686de38c72ed1760ecd8a2d1787fa33d62a929c9869ed31e4445ef6cd30fcc95b99a57adb9d70b229767f8c9ed337f8f2312f09d5584ec4a
+  metadata.gz: 6e03ec0934d333e79f957515dfdc851861d395e9c768d09ffdfbf56b6e818d27361cffb2f010985f6da2182b1a4b070ef2291b86ccd9280fb117c4125611ae8f
+  data.tar.gz: bb60224de8c19b547f311aca8d78a2b99593e329696ab6acbaf59336316109be5e9419d02e6e4cd06d0714627c0942fea6d1c0872a6c69faff531838e1dbc359

data/.simplecov

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 SimpleCov.minimum_coverage line: 94.75

data/Gemfile

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2021 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: 2020 Contrast Security, Inc
+Copyright: 2021 Contrast Security, Inc
 Contact: support@contrastsecurity.com
 License: Commercial
 

data/Rakefile

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2021 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) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2021 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) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 require 'fileutils'

data/ext/cs__assess_active_record_named/cs__active_record_named.c

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

data/ext/cs__assess_active_record_named/extconf.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2021 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_array/cs__assess_array.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2020 Contrast Security, Inc.  See
+/* Copyright (c) 2021 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) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2021 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) 2020 Contrast Security, Inc.  See
+/* Copyright (c) 2021 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) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2021 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) 2020 Contrast Security, Inc.  See
+/* Copyright (c) 2021 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) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2021 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) 2020 Contrast Security, Inc.  See
+/* Copyright (c) 2021 Contrast Security, Inc.  See
  * https://www.contrastsecurity.com/enduser-terms-0317a for more details. */
 
 #include "cs__assess_hash.h"
@@ -17,6 +17,7 @@ static VALUE contrast_assess_hash_bracket_constructor(const int argc,
                                                       const VALUE hash) {
     VALUE result;
 
+
     /* Array of Arrays: Hash[ [ [key, value], ... ] ]   -> new_hash */
     if (RB_TYPE_P(argv[0], T_ARRAY)) {
         int i;
@@ -33,12 +34,13 @@ static VALUE contrast_assess_hash_bracket_constructor(const int argc,
         }
     }
 
+    const VALUE * argv_final = argv;
     /* unhandled case - shouldn't need it since issue is only unfrozen
      * String keys
      * # Hash[ object ]                  -> new_hash
      */
     result =
-        rb_funcall2(hash, rb_sym_assess_hash_bracket_constructor, argc, argv);
+        rb_funcall2(hash, rb_sym_assess_hash_bracket_constructor, argc, argv_final);
 
     return result;
 }

data/ext/cs__assess_hash/extconf.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2021 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) 2020 Contrast Security, Inc.  See
+/* Copyright (c) 2021 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) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2021 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) 2020 Contrast Security, Inc.  See
+/* Copyright (c) 2021 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) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2021 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) 2020 Contrast Security, Inc.  See
+/* Copyright (c) 2021 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) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2021 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) 2020 Contrast Security, Inc.  See
+/* Copyright (c) 2021 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) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2021 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) 2020 Contrast Security, Inc.  See
+/* Copyright (c) 2021 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) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2021 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) 2020 Contrast Security, Inc.  See
+/* Copyright (c) 2021 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) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2021 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) 2020 Contrast Security, Inc.  See
+/* Copyright (c) 2021 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) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2021 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) 2020 Contrast Security, Inc.  See
+/* Copyright (c) 2021 Contrast Security, Inc.  See
  * https://www.contrastsecurity.com/enduser-terms-0317a for more details. */
 
 #include "cs__common.h"
@@ -59,7 +59,7 @@ VALUE contrast_patcher() {
 }
 
 VALUE contrast_register_patch(const char *module_name, const char *method_name,
-                              VALUE(c_fn)(const int, const VALUE *,
+                              VALUE(c_fn)(const int, VALUE *,
                                           const VALUE)) {
     return _contrast_register_patch(module_name, method_name, c_fn,
                                     IMPL_ALIAS_INSTANCE);
@@ -67,7 +67,7 @@ VALUE contrast_register_patch(const char *module_name, const char *method_name,
 
 VALUE contrast_register_singleton_patch(const char *module_name,
                                         const char *method_name,
-                                        VALUE(c_fn)(const int, const VALUE *,
+                                        VALUE(c_fn)(const int, VALUE *,
                                                     const VALUE)) {
     return _contrast_register_patch(module_name, method_name, c_fn,
                                     IMPL_ALIAS_SINGLETON);
@@ -75,14 +75,14 @@ VALUE contrast_register_singleton_patch(const char *module_name,
 
 VALUE contrast_register_singleton_prepend_patch(
     const char *module_name, const char *method_name,
-    VALUE(c_fn)(const int, const VALUE *, const VALUE)) {
+    VALUE(c_fn)(const int, VALUE *, const VALUE)) {
     return _contrast_register_patch(module_name, method_name, c_fn,
                                     IMPL_PREPEND);
 }
 
 static VALUE
 _contrast_register_patch(const char *module_name, const char *method_name,
-                         VALUE(c_fn)(const int, const VALUE *, const VALUE),
+                         VALUE(c_fn)(const int, VALUE *, const VALUE),
                          patch_impl patch) {
     VALUE contrast_bind_module = rb_funcall(rb_cModule, rb_intern("new"), 0);
     VALUE unbound_method = Qnil;

data/ext/cs__common/cs__common.h

@@ -38,21 +38,21 @@ void contrast_alias_method(const VALUE target, const char *to,
                            const char *from);
 
 VALUE contrast_register_patch(const char *module_name, const char *method_name,
-                              VALUE(c_fn)(const int, const VALUE *,
+                              VALUE(c_fn)(const int, VALUE *,
                                           const VALUE));
 
 VALUE contrast_register_singleton_patch(const char *module_name,
                                         const char *method_name,
-                                        VALUE(c_fn)(const int, const VALUE *,
+                                        VALUE(c_fn)(const int, VALUE *,
                                                     const VALUE));
 
 VALUE contrast_register_singleton_prepend_patch(
     const char *module_name, const char *method_name,
-    VALUE(c_fn)(const int, const VALUE *, const VALUE));
+    VALUE(c_fn)(const int, VALUE *, const VALUE));
 
 static VALUE
 _contrast_register_patch(const char *module_name, const char *method_name,
-                         VALUE(c_fn)(const int, const VALUE *, const VALUE),
+                         VALUE(c_fn)(const int, VALUE *, const VALUE),
                          patch_impl patch_impl);
 
 VALUE contrast_patcher();

data/ext/cs__common/extconf.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2021 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) 2020 Contrast Security, Inc.  See
+/* Copyright (c) 2021 Contrast Security, Inc.  See
  * https://www.contrastsecurity.com/enduser-terms-0317a for more details. */
 
 #include "cs__contrast_patch.h"
@@ -38,12 +38,21 @@ VALUE contrast_patch_call_original(const VALUE *args) {
      * change Ruby method scope (always call this function from C, not Ruby),
      * which is the point of this C call.
      */
-    if (rb_block_given_p()) {
-        return rb_funcall_with_block(object, method_id, argc, params,
-                                     rb_block_proc());
-    } else {
-        return rb_funcall2(object, method_id, argc, params);
-    }
+    /* Ruby >= 2.7 */
+    #ifdef RB_PASS_CALLED_KEYWORDS
+        if (rb_block_given_p()) {
+            return rb_funcall_with_block_kw(object, method_id, argc, params, rb_block_proc(), RB_PASS_CALLED_KEYWORDS);
+        } else {
+            return rb_funcallv_kw(object, method_id, argc, params, RB_PASS_CALLED_KEYWORDS); 
+        }
+    /* Ruby < 2.7 */
+    #else
+        if (rb_block_given_p()) {
+            return rb_funcall_with_block(object, method_id, argc, params, rb_block_proc());
+        } else {
+            return rb_funcall2(object, method_id, argc, params);
+        }
+    #endif
 }
 
 VALUE contrast_call_pre_patch(const VALUE method_policy, const VALUE method,
@@ -110,8 +119,7 @@ VALUE contrast_call_super(const VALUE *args) {
 }
 
 VALUE contrast_run_patches(const VALUE *wrapped_args) {
-    VALUE impl, method, method_policy, object, original_args, original_ret,
-        preshift, transformed_ret;
+    VALUE impl, method, method_policy, object, original_args, original_ret, preshift, transformed_ret;
     int argc;
     VALUE *argv;
     VALUE rescue_args[6];
@@ -266,14 +274,6 @@ VALUE contrast_patch_dispatch(const int argc, const VALUE *argv,
     } else if (!RTEST(method_policy)) {
         /* nothing to be done without a method policy */
         do_contrast = 0;
-    } else if (!RTEST(rb_funcall(contrast_patcher(), rb_sym_in_request_context,
-                                 0))) {
-        /* (RUBY-290, checking for a request_context is to be deprecated)
-         * if we're not within a request context, don't analyze (by fiat)
-         * We reset scope at the end of request contexts right now, don't remove
-         * this check without also handling that code.
-         */
-        do_contrast = 0;
     }
 
     original_args[0] = INT2NUM(argc);
@@ -311,14 +311,14 @@ VALUE contrast_patch_dispatch(const int argc, const VALUE *argv,
     wrapped_args[5] = INT2NUM(argc);
     wrapped_args[6] = (VALUE)argv;
 
-    return rb_ensure(contrast_run_patches, (VALUE)wrapped_args,
-                     contrast_ensure_function, method_policy);
+    return rb_ensure(contrast_run_patches, (VALUE)wrapped_args, contrast_ensure_function, method_policy);
 
 call_original:
 
     /* exit scope */
     contrast_ensure_function(method_policy);
 
+
     switch (impl) {
     case IMPL_ALIAS_INSTANCE:
     case IMPL_ALIAS_SINGLETON:
@@ -343,13 +343,10 @@ VALUE contrast_prepend_patch(const int argc, const VALUE *argv,
     return contrast_patch_dispatch(argc, argv, IMPL_PREPEND, object);
 }
 
-VALUE contrast_patch_define_method(const VALUE self, const VALUE clazz,
-                                   const VALUE method_policy,
+VALUE contrast_patch_define_method(const VALUE self, const VALUE clazz, const VALUE method_policy,
                                    const VALUE cs_method) {
-    const VALUE original_method_name =
-        rb_funcall(method_policy, rb_sym_method_name, 0);
-    const VALUE is_instance_method =
-        rb_funcall(method_policy, rb_sym_instance_method, 0);
+    const VALUE original_method_name = rb_funcall(method_policy, rb_sym_method_name, 0);
+    const VALUE is_instance_method = rb_funcall(method_policy, rb_sym_instance_method, 0);
     char *cStr;
     VALUE str;
     rb_funcall(patch_status, rb_sym_set_info_for, 5, clazz,

data/ext/cs__contrast_patch/extconf.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2021 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__protect_kernel/cs__protect_kernel.c

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

data/ext/cs__protect_kernel/extconf.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2021 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) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
 require 'mkmf'