contrast-agent 4.3.2 → 4.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09fcc059f5c03c966c230f4576d93399f6a35bc15a42cfd4a5a9541d5e292f95'
-  data.tar.gz: 96d58e585f42c42599744e9170d1051263e661671ae88ea9ca972a9c9be2f954
+  metadata.gz: 8b3d1ce6b9794d3923d2054d9a20bd31989fd0c6b4df2883f81ad3e740c04de5
+  data.tar.gz: 894505c04e850858f83e2207c52cc944f738ce19183051d9530cfdaf09f72ab7
 SHA512:
-  metadata.gz: d789f3aa5577188dabc62847c921a2a00f0dec9016dc10d6d8bb8ebe6c74c69c485ee81ae0a95e99ef3d82030e620167f3d433220120de611bf021947fb1ab67
-  data.tar.gz: 55e07ffd5112cbdde2e97b7eab565c24c811318927c13c55bde4f93a9ac4e78ba00bdb25e18d275700bb0433eeb50cee6d5dc4fa704a8526e71ba2d0ce4a99d4
+  metadata.gz: 4df81e8b3d03efcdc952e9fce5330b34c6af6a965701ec7bbe02cf3dbd5b8a3c98d8d0745da91d7b0a43be6b03ac763ffb6e9eafb9f2b857bd2a76d325d10ad2
+  data.tar.gz: 0015e74007146cf741e6b7f6274460a948a147df54109de959856f0ff883262260685f74eff8767e6ae845847eaf3d8a17dfbd54061d5b9f561952a8c6b90fef

data/.gitmodules

@@ -1,6 +1,6 @@
 [submodule "agent-service-api"]
 	path = agent-service-api
-	url = git@bitbucket.org:contrastsecurity/agent-service-api
+	url = git@github.com:Contrast-Security-Inc/agent-service-api.git
 [submodule "funchook"]
 	path = funchook
 	url = https://github.com/kubo/funchook.git

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
@@ -23,8 +23,7 @@ task :contrast_pb_compile do
   # do some stuff before compile
 
   # Invoke the protobuf compile task with your sensible defaults
-  ::Rake::Task['protobuf:compile'].invoke('lib',
-                                          './agent-service-api/protobuf ./agent-service-api/protobuf/dtm.proto',
+  ::Rake::Task['protobuf:compile'].invoke('lib', './agent-service-api/protobuf ./agent-service-api/protobuf/dtm.proto',
                                           'lib/contrast/api',
                                           nil)
 

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'
@@ -10,7 +10,8 @@ unless find_header('funchook.h', ext_path)
   COMMANDS = ['./autogen.sh', './configure', 'make clean', 'make'].freeze
   bundler_install_target_paths = []
 
-  possible_gem_paths = Gem.path # .path and .paths diverge in their return type - .path returns strings, .paths returns PathSupports
+  # .path and .paths diverge in their return type - .path returns strings, .paths returns PathSupports
+  possible_gem_paths = Gem.path
   possible_gem_paths.each do |base_path|
     contrast_gem_dir_search = File.join(base_path, 'extensions', '**', '*', 'contrast-agent-*')
     extension_paths = Dir[contrast_gem_dir_search]
@@ -31,8 +32,7 @@ unless find_header('funchook.h', ext_path)
   end
 
   SOURCE_PATHS = [
-    File.join('include', 'funchook.h'),
-    File.join('src', 'libfunchook.dylib'),
+    File.join('include', 'funchook.h'), File.join('src', 'libfunchook.dylib'),
     File.join('src', 'libfunchook.so')
   ].freeze
 

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,