contrast-agent 4.9.1 → 4.13.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contrast-agent
 version: !ruby/object:Gem::Version
-  version: 4.9.1
+  version: 4.13.0
 platform: ruby
 authors:
 - galen.palmer@contrastsecurity.com
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-15 00:00:00.000000000 Z
+date: 2021-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,6 +71,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: ruby-debug-ide
   requirement: !ruby/object:Gem::Requirement
@@ -211,6 +225,26 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.21.2
+- !ruby/object:Gem::Dependency
+  name: grape
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: rack-protection
   requirement: !ruby/object:Gem::Requirement
@@ -407,6 +441,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: parallel_tests
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -463,6 +511,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: tzinfo-data
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: warning
   requirement: !ruby/object:Gem::Requirement
@@ -478,7 +540,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tzinfo-data
+  name: zlib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -555,20 +617,20 @@ executables:
 - contrast_service
 extensions:
 - ext/cs__common/extconf.rb
-- ext/cs__assess_string/extconf.rb
-- ext/cs__assess_fiber_track/extconf.rb
-- ext/cs__assess_marshal_module/extconf.rb
-- ext/cs__protect_kernel/extconf.rb
+- ext/cs__os_information/extconf.rb
+- ext/cs__assess_regexp/extconf.rb
 - ext/cs__assess_string_interpolation26/extconf.rb
-- ext/cs__assess_basic_object/extconf.rb
+- ext/cs__contrast_patch/extconf.rb
 - ext/cs__assess_active_record_named/extconf.rb
-- ext/cs__assess_yield_track/extconf.rb
-- ext/cs__assess_kernel/extconf.rb
+- ext/cs__assess_module/extconf.rb
 - ext/cs__assess_array/extconf.rb
-- ext/cs__assess_regexp/extconf.rb
+- ext/cs__assess_kernel/extconf.rb
+- ext/cs__assess_basic_object/extconf.rb
 - ext/cs__assess_hash/extconf.rb
-- ext/cs__contrast_patch/extconf.rb
-- ext/cs__assess_module/extconf.rb
+- ext/cs__assess_fiber_track/extconf.rb
+- ext/cs__assess_marshal_module/extconf.rb
+- ext/cs__assess_string/extconf.rb
+- ext/cs__assess_yield_track/extconf.rb
 extra_rdoc_files: []
 files:
 - ".clang-format"
@@ -577,6 +639,7 @@ files:
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"
+- ".rspec_parallel"
 - ".simplecov"
 - Gemfile
 - LICENSE.txt
@@ -625,9 +688,9 @@ files:
 - ext/cs__contrast_patch/cs__contrast_patch.c
 - ext/cs__contrast_patch/cs__contrast_patch.h
 - ext/cs__contrast_patch/extconf.rb
-- ext/cs__protect_kernel/cs__protect_kernel.c
-- ext/cs__protect_kernel/cs__protect_kernel.h
-- ext/cs__protect_kernel/extconf.rb
+- ext/cs__os_information/cs__os_information.c
+- ext/cs__os_information/cs__os_information.h
+- ext/cs__os_information/extconf.rb
 - ext/extconf_common.rb
 - funchook/LICENSE
 - funchook/Makefile.in
@@ -828,12 +891,14 @@ files:
 - lib/contrast/agent/disable_reaction.rb
 - lib/contrast/agent/exclusion_matcher.rb
 - lib/contrast/agent/inventory.rb
+- lib/contrast/agent/inventory/database_config.rb
 - lib/contrast/agent/inventory/dependencies.rb
 - lib/contrast/agent/inventory/dependency_analysis.rb
 - lib/contrast/agent/inventory/dependency_usage_analysis.rb
 - lib/contrast/agent/inventory/policy/datastores.rb
 - lib/contrast/agent/inventory/policy/policy.rb
 - lib/contrast/agent/inventory/policy/trigger_node.rb
+- lib/contrast/agent/metric_telemetry_event.rb
 - lib/contrast/agent/middleware.rb
 - lib/contrast/agent/module_data.rb
 - lib/contrast/agent/patching/policy/after_load_patch.rb
@@ -865,6 +930,7 @@ files:
 - lib/contrast/agent/protect/rule/no_sqli.rb
 - lib/contrast/agent/protect/rule/no_sqli/mongo_no_sql_scanner.rb
 - lib/contrast/agent/protect/rule/path_traversal.rb
+- lib/contrast/agent/protect/rule/sql_sample_builder.rb
 - lib/contrast/agent/protect/rule/sqli.rb
 - lib/contrast/agent/protect/rule/sqli/default_sql_scanner.rb
 - lib/contrast/agent/protect/rule/sqli/mysql_sql_scanner.rb
@@ -883,7 +949,10 @@ files:
 - lib/contrast/agent/rule_set.rb
 - lib/contrast/agent/scope.rb
 - lib/contrast/agent/service_heartbeat.rb
+- lib/contrast/agent/startup_metrics_telemetry_event.rb
 - lib/contrast/agent/static_analysis.rb
+- lib/contrast/agent/telemetry.rb
+- lib/contrast/agent/telemetry_event.rb
 - lib/contrast/agent/thread.rb
 - lib/contrast/agent/thread_watcher.rb
 - lib/contrast/agent/tracepoint_hook.rb
@@ -925,6 +994,7 @@ files:
 - lib/contrast/api/dtm.pb.rb
 - lib/contrast/api/settings.pb.rb
 - lib/contrast/components/agent.rb
+- lib/contrast/components/api.rb
 - lib/contrast/components/app_context.rb
 - lib/contrast/components/assess.rb
 - lib/contrast/components/base.rb
@@ -939,11 +1009,13 @@ files:
 - lib/contrast/components/settings.rb
 - lib/contrast/config.rb
 - lib/contrast/config/agent_configuration.rb
+- lib/contrast/config/api_configuration.rb
 - lib/contrast/config/application_configuration.rb
 - lib/contrast/config/assess_configuration.rb
 - lib/contrast/config/assess_rules_configuration.rb
 - lib/contrast/config/base_configuration.rb
 - lib/contrast/config/default_value.rb
+- lib/contrast/config/env_variables.rb
 - lib/contrast/config/exception_configuration.rb
 - lib/contrast/config/heap_dump_configuration.rb
 - lib/contrast/config/inventory_configuration.rb
@@ -969,14 +1041,15 @@ files:
 - lib/contrast/extension/assess/regexp.rb
 - lib/contrast/extension/assess/string.rb
 - lib/contrast/extension/delegator.rb
+- lib/contrast/extension/extension.rb
 - lib/contrast/extension/inventory.rb
 - lib/contrast/extension/kernel.rb
 - lib/contrast/extension/module.rb
 - lib/contrast/extension/protect.rb
-- lib/contrast/extension/protect/kernel.rb
 - lib/contrast/extension/protect/psych.rb
 - lib/contrast/extension/thread.rb
 - lib/contrast/framework/base_support.rb
+- lib/contrast/framework/grape/support.rb
 - lib/contrast/framework/manager.rb
 - lib/contrast/framework/platform_version.rb
 - lib/contrast/framework/rack/patch/session_cookie.rb
@@ -1002,26 +1075,37 @@ files:
 - lib/contrast/security_exception.rb
 - lib/contrast/tasks/config.rb
 - lib/contrast/tasks/service.rb
+- lib/contrast/utils/assess/propagation_method_utils.rb
+- lib/contrast/utils/assess/property/tagged_utils.rb
 - lib/contrast/utils/assess/sampling_util.rb
+- lib/contrast/utils/assess/source_method_utils.rb
 - lib/contrast/utils/assess/tracking_util.rb
+- lib/contrast/utils/assess/trigger_method_utils.rb
 - lib/contrast/utils/class_util.rb
 - lib/contrast/utils/duck_utils.rb
 - lib/contrast/utils/env_configuration_item.rb
+- lib/contrast/utils/exclude_key.rb
 - lib/contrast/utils/hash_digest.rb
 - lib/contrast/utils/heap_dump_util.rb
 - lib/contrast/utils/invalid_configuration_util.rb
-- lib/contrast/utils/inventory_util.rb
 - lib/contrast/utils/io_util.rb
 - lib/contrast/utils/job_servers_running.rb
+- lib/contrast/utils/lru_cache.rb
+- lib/contrast/utils/metrics_hash.rb
 - lib/contrast/utils/object_share.rb
 - lib/contrast/utils/os.rb
+- lib/contrast/utils/patching/policy/patch_utils.rb
+- lib/contrast/utils/patching/policy/patcher_utils.rb
 - lib/contrast/utils/preflight_util.rb
+- lib/contrast/utils/requests_client.rb
 - lib/contrast/utils/resource_loader.rb
 - lib/contrast/utils/ruby_ast_rewriter.rb
 - lib/contrast/utils/sha256_builder.rb
 - lib/contrast/utils/stack_trace_utils.rb
 - lib/contrast/utils/string_utils.rb
 - lib/contrast/utils/tag_util.rb
+- lib/contrast/utils/telemetry.rb
+- lib/contrast/utils/telemetry_identifier.rb
 - lib/contrast/utils/thread_tracker.rb
 - lib/contrast/utils/timer.rb
 - resources/assess/policy.json

data/ext/cs__protect_kernel/cs__protect_kernel.c

@@ -1,47 +0,0 @@
-/* Copyright (c) 2021 Contrast Security, Inc.  See
- * https://www.contrastsecurity.com/enduser-terms-0317a for more details. */
-
-#include "cs__protect_kernel.h"
-#include "../cs__common/cs__common.h"
-#include <ruby.h>
-
-static VALUE contrast_protect_fork(const int argc, const VALUE *argv,
-                                   const VALUE self) {
-    VALUE ret;
-    if (rb_block_given_p()) {
-        /* We call our hook, but it's a little complicated.
-         * We wrap the fork block with our own lambda in
-         * order to instrument it.  There are no public
-         * methods in the Ruby C API to set the prevailing
-         * block, so we have to use rb_funcall_with_block.
-         * Also, rb_funcall_with_block does a public call,
-         * and our method is private.
-         * So we (as a hack) temporarily set it to public.
-         */
-        VALUE wrapper;
-        wrapper =
-            rb_funcall_with_block(kernel_protect, rb_sym_protect_kernel_wrapper,
-                                  0, NULL, rb_block_proc());
-        rb_funcall(rb_mKernel, rb_intern("public"), 1,
-                   ID2SYM(rb_sym_protect_kernel_fork));
-        ret = rb_funcall_with_block(self, rb_sym_protect_kernel_fork, argc,
-                                    argv, wrapper);
-        rb_funcall(rb_mKernel, rb_intern("private"), 1,
-                   ID2SYM(rb_sym_protect_kernel_fork));
-    } else {
-        ret = rb_funcall2(self, rb_sym_protect_kernel_fork, argc, argv);
-    }
-    return ret;
-}
-
-void Init_cs__protect_kernel(void) {
-    VALUE core_protect = rb_define_module_under(core_extensions, "Protect");
-    kernel_protect = rb_define_module_under(core_protect, "Kernel");
-    rb_sym_protect_kernel_wrapper = rb_intern("build_wrapper");
-
-    rb_sym_protect_kernel_fork =
-        contrast_register_patch("Kernel", "fork", &contrast_protect_fork);
-
-    rb_sym_protect_kernel_fork = contrast_register_singleton_patch(
-        "Kernel", "fork", &contrast_protect_fork);
-}

data/ext/cs__protect_kernel/cs__protect_kernel.h

@@ -1,12 +0,0 @@
-#include <ruby.h>
-
-extern VALUE rb_vm_top_self(void);
-
-static VALUE kernel_protect;
-static VALUE rb_sym_protect_kernel_fork;
-static VALUE rb_sym_protect_kernel_wrapper;
-
-static VALUE contrast_protect_fork(const int argc, const VALUE *argv,
-                                   const VALUE self);
-
-void Init_cs__protect_kernel(void);

data/lib/contrast/extension/protect/kernel.rb

@@ -1,39 +0,0 @@
-# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
-# frozen_string_literal: true
-
-module Contrast
-  module Extension
-    module Protect
-      # This Module functions as our patch into the Kernel class for Protect,
-      # allowing us to track activity as it crosses spawned processes.
-      module Kernel
-        class << self
-          def build_wrapper
-            lambda {
-              proc_start
-              yield
-              # AtExitHook handles sending any messages generated in the new forked process
-            }
-          end
-
-          def proc_start
-            context = Contrast::Agent::REQUEST_TRACKER.current
-            return unless context
-
-            context.reset_activity
-          end
-
-          def instrument
-            @_instrument ||= begin
-              require 'cs__protect_kernel/cs__protect_kernel'
-              true
-            end
-          rescue StandardError, LoadError => e
-            logger.error('Error loading kernel protect patch', e)
-            false
-          end
-        end
-      end
-    end
-  end
-end

data/lib/contrast/utils/inventory_util.rb

@@ -1,113 +0,0 @@
-# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
-# frozen_string_literal: true
-
-require 'contrast/utils/timer'
-require 'contrast/utils/object_share'
-require 'contrast/components/logger'
-
-module Contrast
-  module Utils
-    # Utilities for getting inventory information from the application
-    class InventoryUtil
-      extend Contrast::Components::Logger::InstanceMethods
-
-      # TeamServer only accepts certain values for ArchitectureComponents.
-      # DO NOT CHANGE THIS!
-      AC_TYPE_DB = 'db'
-      # TeamServer only accepts certain values for FlowMap Services.
-      # DO NOT CHANGE THIS
-      ADAPTER = 'adapter'
-      HOST = 'host'
-      PORT = 'port'
-      DATABASE = 'database'
-      DEFAULT = 'default'
-      LOCALHOST = 'localhost'
-
-      def self.active_record_config
-        return @_active_record_config if instance_variable_defined?(:@_active_record_config)
-
-        @_active_record_config = ActiveRecord::Base.connection_config rescue nil # rubocop:disable Style/RescueModifier
-      end
-
-      def self.append_db_config activity_or_update, hash_or_str = Contrast::Utils::InventoryUtil.active_record_config
-        arr = build_from_db_config(hash_or_str)
-        return unless arr&.any?
-
-        arr.each do |a|
-          next unless a
-
-          if activity_or_update.is_a?(Contrast::Api::Dtm::Activity)
-            activity_or_update.architectures << a
-          else
-            activity_or_update.components << a
-          end
-        end
-      rescue StandardError => e
-        logger.error('Unable to append db config', e)
-        nil
-      end
-
-      def self.build_from_db_config hash_or_str
-        return unless hash_or_str
-
-        if hash_or_str.is_a?(Hash)
-          build_from_db_hash(hash_or_str)
-        else
-          build_from_db_string(hash_or_str.to_s)
-        end
-      end
-
-      def self.build_from_db_hash hash
-        ac = Contrast::Api::Dtm::ArchitectureComponent.new
-        ac.vendor = hash[:adapter] || hash[ADAPTER] || Contrast::Utils::ObjectShare::EMPTY_STRING
-        ac.remote_host = host_from_hash(hash)
-        ac.remote_port = port_from_hash(hash)
-        ac.type = AC_TYPE_DB
-        ac.url = hash[:database] || hash[DATABASE] || DEFAULT
-        [ac]
-      end
-
-      def self.host_from_hash hash
-        hash[:host] || hash[HOST] || Contrast::Utils::ObjectShare::EMPTY_STRING
-      end
-
-      def self.port_from_hash hash
-        p = hash[:port] || hash[PORT] || Contrast::Utils::ObjectShare::EMPTY_STRING
-        p.to_i
-      end
-
-      # Examples:
-      # mongodb://[user:pass@]host1[:port1][,host2[:port2],[,hostN[:portN]]][/[database][?options]]
-      # postgresql://scott:tiger@localhost/mydatabase
-      # mysql+mysqlconnector://scott:tiger@localhost/foo
-      def self.build_from_db_string str
-        adapter, hosts, database = split_connection_str(str)
-        acs = []
-        hosts.split(Contrast::Utils::ObjectShare::COMMA).map do |s|
-          host, port = s.split(Contrast::Utils::ObjectShare::COLON)
-
-          ac = Contrast::Api::Dtm::ArchitectureComponent.new
-          ac.vendor = Contrast::Utils::StringUtils.force_utf8(adapter)
-          ac.remote_host = Contrast::Utils::StringUtils.force_utf8(host)
-          ac.remote_port = port.to_i
-          ac.type = AC_TYPE_DB
-          ac.url = Contrast::Utils::StringUtils.force_utf8(database)
-          acs << ac
-        end
-        acs
-      end
-
-      def self.split_connection_str str
-        adapter, str = str.split(Contrast::Utils::ObjectShare::COLON_SLASH_SLASH)
-        _auth, str = str.split(Contrast::Utils::ObjectShare::AT)
-        # Not currently used
-        # user, pass = auth.split(Contrast::Utils::ObjectShare::COLON)
-        hosts, db_and_options = str.split(Contrast::Utils::ObjectShare::SLASH)
-        hosts << LOCALHOST if hosts.empty?
-        database, _options = db_and_options.split(Contrast::Utils::ObjectShare::QUESTION_MARK)
-
-        [adapter, hosts, database]
-      end
-    end
-  end
-end