contrast-agent 4.14.1 → 5.0.0

data/lib/contrast/utils/tag_util.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
 
 module Contrast
@@ -136,6 +136,7 @@ module Contrast
         def smallerize tags
           smallered = []
           curr = nil
+          tags.sort_by! { |tag| [tag.start_idx, tag.end_idx] }
           tags.each do |tag|
             if curr && tag.start_idx <= curr.end_idx
               curr.update_end(tag.end_idx) if tag.end_idx > curr.end_idx

data/lib/contrast/utils/telemetry.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/telemetry'

data/lib/contrast/utils/telemetry_client.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 'net/http'

data/lib/contrast/utils/telemetry_identifier.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/telemetry'

data/lib/contrast/utils/thread_tracker.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
 
 module Contrast

data/lib/contrast/utils/timer.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
 
 module Contrast

data/lib/contrast-agent.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
 
 # We need this to make bundler happy since it's the name of the gem, unless we

data/lib/contrast.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
 
 # Used to prevent deprecation warnings from flooding stdout

data/ruby-agent.gemspec

@@ -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_relative './lib/contrast/agent/version'
@@ -22,7 +22,7 @@ end
 def self.add_dev_dependencies spec
   add_builders(spec)
   add_debuggers(spec)
-  add_linters(spec) # if RUBY_VERSION >= '2.6.0' # TODO: RUBY-714 remove guard w/ EOL of 2.5
+  add_linters(spec)
   add_specs(spec)
   add_custom_dependencies(spec)
 end
@@ -59,7 +59,7 @@ def self.add_linters spec
   spec.add_development_dependency 'debride', '1.8.2'
   spec.add_development_dependency 'fasterer', '0.9.0'
   spec.add_development_dependency 'flay', '2.12.1'
-  # spec.add_development_dependency 'steep', '0.44.1' # TODO: RUBY-714 uncomment w/ EOL of 2.5
+  spec.add_development_dependency 'steep', '0.44.1'
   add_rubocop(spec)
 end
 
@@ -113,7 +113,6 @@ end
 # corresponding update to the fake gem server data in TeamServer.
 def self.add_dependencies spec
   spec.add_dependency 'ougai', '~> 1.8'
-  spec.add_dependency 'parser', '>= 2.6' # if RUBY_VERSION < '2.6.0' # TODO: RUBY-714 remove guard w/ EOL of 2.5
   spec.add_dependency 'protobuf', '~> 3.10'
   spec.add_dependency 'rack', '~> 2.0'
 end
@@ -174,7 +173,7 @@ Gem::Specification.new do |spec|
     'Testing and Protection.'
   spec.homepage     = 'https://www.contrastsecurity.com'
   spec.license      = 'CONTRAST SECURITY (see license file)'
-  spec.required_ruby_version = ['>= 2.5.0', '< 3.1.0']
+  spec.required_ruby_version = ['>= 2.6.0', '< 3.1.0']
 
   spec.bindir        = 'exe'
   spec.executables   = ['contrast_service']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contrast-agent
 version: !ruby/object:Gem::Version
-  version: 4.14.1
+  version: 5.0.0
 platform: ruby
 authors:
 - galen.palmer@contrastsecurity.com
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-17 00:00:00.000000000 Z
+date: 2022-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -141,6 +141,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.12.1
+- !ruby/object:Gem::Dependency
+  name: steep
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.44.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.44.1
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -567,20 +581,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: parser
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: protobuf
   requirement: !ruby/object:Gem::Requirement
@@ -622,7 +622,6 @@ extensions:
 - ext/cs__assess_string/extconf.rb
 - ext/cs__assess_regexp/extconf.rb
 - ext/cs__assess_yield_track/extconf.rb
-- ext/cs__assess_active_record_named/extconf.rb
 - ext/cs__contrast_patch/extconf.rb
 - ext/cs__assess_kernel/extconf.rb
 - ext/cs__assess_hash/extconf.rb
@@ -646,9 +645,6 @@ files:
 - Rakefile
 - exe/contrast_service
 - ext/build_funchook.rb
-- ext/cs__assess_active_record_named/cs__active_record_named.c
-- ext/cs__assess_active_record_named/cs__active_record_named.h
-- ext/cs__assess_active_record_named/extconf.rb
 - ext/cs__assess_array/cs__assess_array.c
 - ext/cs__assess_array/cs__assess_array.h
 - ext/cs__assess_array/extconf.rb
@@ -829,6 +825,7 @@ files:
 - lib/contrast/agent/assess.rb
 - lib/contrast/agent/assess/contrast_event.rb
 - lib/contrast/agent/assess/contrast_object.rb
+- lib/contrast/agent/assess/events/event_data.rb
 - lib/contrast/agent/assess/events/event_factory.rb
 - lib/contrast/agent/assess/events/source_event.rb
 - lib/contrast/agent/assess/finalizers/freeze.rb
@@ -860,8 +857,8 @@ files:
 - lib/contrast/agent/assess/policy/propagator/splat.rb
 - lib/contrast/agent/assess/policy/propagator/split.rb
 - lib/contrast/agent/assess/policy/propagator/substitution.rb
+- lib/contrast/agent/assess/policy/propagator/substitution_utils.rb
 - lib/contrast/agent/assess/policy/propagator/trim.rb
-- lib/contrast/agent/assess/policy/rewriter_patch.rb
 - lib/contrast/agent/assess/policy/source_method.rb
 - lib/contrast/agent/assess/policy/source_node.rb
 - lib/contrast/agent/assess/policy/source_validation/cross_site_validator.rb
@@ -882,10 +879,11 @@ files:
 - lib/contrast/agent/assess/rule/provider/hardcoded_key.rb
 - lib/contrast/agent/assess/rule/provider/hardcoded_password.rb
 - lib/contrast/agent/assess/rule/provider/hardcoded_value_rule.rb
+- lib/contrast/agent/assess/rule/response/autocomplete_rule.rb
+- lib/contrast/agent/assess/rule/response/base_rule.rb
 - lib/contrast/agent/assess/tag.rb
 - lib/contrast/agent/assess/tracker.rb
 - lib/contrast/agent/at_exit_hook.rb
-- lib/contrast/agent/class_reopener.rb
 - lib/contrast/agent/deadzone/policy/deadzone_node.rb
 - lib/contrast/agent/deadzone/policy/policy.rb
 - lib/contrast/agent/disable_reaction.rb
@@ -944,19 +942,53 @@ files:
 - lib/contrast/agent/reaction_processor.rb
 - lib/contrast/agent/reporting/report.rb
 - lib/contrast/agent/reporting/reporter.rb
+- lib/contrast/agent/reporting/reporting_events/application_inventory.rb
+- lib/contrast/agent/reporting/reporting_events/application_update.rb
+- lib/contrast/agent/reporting/reporting_events/architecture_component.rb
+- lib/contrast/agent/reporting/reporting_events/discovered_route.rb
 - lib/contrast/agent/reporting/reporting_events/finding.rb
+- lib/contrast/agent/reporting/reporting_events/finding_event.rb
+- lib/contrast/agent/reporting/reporting_events/finding_event_source.rb
+- lib/contrast/agent/reporting/reporting_events/finding_object.rb
+- lib/contrast/agent/reporting/reporting_events/finding_request.rb
+- lib/contrast/agent/reporting/reporting_events/finding_signature.rb
+- lib/contrast/agent/reporting/reporting_events/finding_stack.rb
+- lib/contrast/agent/reporting/reporting_events/finding_taint_range.rb
+- lib/contrast/agent/reporting/reporting_events/library_discovery.rb
+- lib/contrast/agent/reporting/reporting_events/library_usage_observation.rb
+- lib/contrast/agent/reporting/reporting_events/observed_library_usage.rb
+- lib/contrast/agent/reporting/reporting_events/observed_route.rb
 - lib/contrast/agent/reporting/reporting_events/preflight.rb
 - lib/contrast/agent/reporting/reporting_events/preflight_message.rb
 - lib/contrast/agent/reporting/reporting_events/reporting_event.rb
+- lib/contrast/agent/reporting/reporting_events/route_coverage.rb
+- lib/contrast/agent/reporting/reporting_events/route_discovery.rb
+- lib/contrast/agent/reporting/reporting_events/route_discovery_observation.rb
+- lib/contrast/agent/reporting/reporting_events/server_activity.rb
+- lib/contrast/agent/reporting/reporting_events/trace_event_source.rb
 - lib/contrast/agent/reporting/reporting_utilities/audit.rb
+- lib/contrast/agent/reporting/reporting_utilities/dtm_message.rb
+- lib/contrast/agent/reporting/reporting_utilities/endpoints.rb
+- lib/contrast/agent/reporting/reporting_utilities/headers.rb
 - lib/contrast/agent/reporting/reporting_utilities/reporter_client.rb
+- lib/contrast/agent/reporting/reporting_utilities/reporter_client_utils.rb
 - lib/contrast/agent/reporting/reporting_utilities/reporting_storage.rb
+- lib/contrast/agent/reporting/reporting_utilities/response.rb
+- lib/contrast/agent/reporting/reporting_utilities/response_handler.rb
+- lib/contrast/agent/reporting/reporting_utilities/response_handler_utils.rb
+- lib/contrast/agent/reporting/settings/application_settings.rb
+- lib/contrast/agent/reporting/settings/assess.rb
+- lib/contrast/agent/reporting/settings/assess_server_feature.rb
+- lib/contrast/agent/reporting/settings/exclusions.rb
+- lib/contrast/agent/reporting/settings/protect.rb
+- lib/contrast/agent/reporting/settings/protect_server_feature.rb
+- lib/contrast/agent/reporting/settings/reaction.rb
+- lib/contrast/agent/reporting/settings/server_features.rb
 - lib/contrast/agent/request.rb
 - lib/contrast/agent/request_context.rb
 - lib/contrast/agent/request_context_extend.rb
 - lib/contrast/agent/request_handler.rb
 - lib/contrast/agent/response.rb
-- lib/contrast/agent/rewriter.rb
 - lib/contrast/agent/rule_set.rb
 - lib/contrast/agent/scope.rb
 - lib/contrast/agent/service_heartbeat.rb
@@ -987,6 +1019,7 @@ files:
 - lib/contrast/api/decorators/application_settings.rb
 - lib/contrast/api/decorators/application_startup.rb
 - lib/contrast/api/decorators/application_update.rb
+- lib/contrast/api/decorators/architecture_component.rb
 - lib/contrast/api/decorators/finding.rb
 - lib/contrast/api/decorators/http_request.rb
 - lib/contrast/api/decorators/input_analysis.rb
@@ -1076,10 +1109,6 @@ files:
 - lib/contrast/framework/rails/patch/rails_application_configuration.rb
 - lib/contrast/framework/rails/patch/support.rb
 - lib/contrast/framework/rails/railtie.rb
-- lib/contrast/framework/rails/rewrite/action_controller_railties_helper_inherited.rb
-- lib/contrast/framework/rails/rewrite/active_record_attribute_methods_read.rb
-- lib/contrast/framework/rails/rewrite/active_record_named.rb
-- lib/contrast/framework/rails/rewrite/active_record_time_zone_inherited.rb
 - lib/contrast/framework/rails/support.rb
 - lib/contrast/framework/sinatra/support.rb
 - lib/contrast/funchook/funchook.rb
@@ -1095,6 +1124,7 @@ files:
 - 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/split_utils.rb
 - lib/contrast/utils/assess/tracking_util.rb
 - lib/contrast/utils/assess/trigger_method_utils.rb
 - lib/contrast/utils/class_util.rb
@@ -1122,11 +1152,9 @@ files:
 - lib/contrast/utils/request_utils.rb
 - lib/contrast/utils/resource_loader.rb
 - lib/contrast/utils/response_utils.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/substitution_utils.rb
 - lib/contrast/utils/tag_util.rb
 - lib/contrast/utils/telemetry.rb
 - lib/contrast/utils/telemetry_client.rb
@@ -1162,7 +1190,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
   - - "<"
     - !ruby/object:Gem::Version
       version: 3.1.0

data/ext/cs__assess_active_record_named/cs__active_record_named.c

@@ -1,46 +0,0 @@
-/* Copyright (c) 2021 Contrast Security, Inc.  See
- * https://www.contrastsecurity.com/enduser-terms-0317a for more details. */
-
-#include "cs__active_record_named.h"
-#include "../cs__common/cs__common.h"
-#include <ruby.h>
-
-VALUE contrast_assess_active_record_scope(const int argc, const VALUE *argv,
-                                          const VALUE self) {
-    /*
-     * The ActiveRecord::Scoping::Named::ClassMethods#scope method allows for
-     * the creation of methods at runtime. In order to trigger on interpolation
-     * within that new method, we must rewrite the method body BEFORE it can be
-     * used in the original #scope method, replacing interpolations with our
-     * String append logic. As this deviates from standard Assess behavior
-     * (changes the application behavior and acts on an input BEFORE it can be
-     * passed to the original method), I think it deserves to be in a custom
-     * call. -HM
-     */
-    VALUE new_body, ret;
-    VALUE new_args[3];
-    new_body = rb_funcall(active_record_named, rb_sym_assess_rewrite, 3, self,
-                          argv[0], argv[1]);
-    new_args[0] = argv[0];
-    if (NIL_P(new_body)) {
-        new_args[1] = argv[1];
-    } else {
-        new_args[1] = new_body;
-    }
-    new_args[2] = argv[2];
-    ret = rb_funcall2(self, rb_sym_assess_scope, argc, new_args);
-    return ret;
-}
-
-void Init_cs__assess_active_record_named(void) {
-    VALUE framework, rails, rewrite;
-    framework = rb_define_module_under(contrast, "Framework");
-    rails = rb_define_module_under(framework, "Rails");
-    rewrite = rb_define_module_under(rails, "Rewrite");
-    active_record_named =
-        rb_define_class_under(rewrite, "ActiveRecordNamed", rb_cObject);
-    rb_sym_assess_rewrite = rb_intern("rewrite");
-    rb_sym_assess_scope =
-        contrast_register_patch("ActiveRecord::Scoping::Named::ClassMethods",
-                                "scope", contrast_assess_active_record_scope);
-}

data/ext/cs__assess_active_record_named/cs__active_record_named.h

@@ -1,11 +0,0 @@
-#include <ruby.h>
-
-static VALUE active_record_named;
-static VALUE rb_sym_assess_rewrite;
-static VALUE rb_sym_assess_scope;
-
-void contrast_alias_method(const VALUE target, const char *to,
-                           const char *from);
-
-VALUE contrast_assess_active_record_scope(const int argc, const VALUE *argv,
-                                          const VALUE self);

data/ext/cs__assess_active_record_named/extconf.rb

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

data/lib/contrast/agent/assess/policy/rewriter_patch.rb

@@ -1,95 +0,0 @@
-# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
-# frozen_string_literal: true
-
-return unless RUBY_VERSION < '2.6.0' # TODO: RUBY-714 remove guard w/ EOL of 2.5
-
-require 'contrast/agent/patching/policy/patch_status'
-require 'contrast/agent/module_data'
-require 'contrast/agent/rewriter'
-require 'contrast/components/logger'
-require 'contrast/utils/object_share'
-
-module Contrast
-  module Agent
-    module Assess
-      module Policy
-        # This is our interface from the Patcher to the Rewriter
-        # functionality
-        #
-        # TODO: RUBY-714 remove w/ EOL of 2.5
-        # @deprecated Changes to this class are discouraged as this approach is
-        #   being phased out with support for those language versions.
-        module RewriterPatch
-          extend Contrast::Components::Logger::InstanceMethods
-
-          class << self
-            def rewrite_interpolations
-              return unless agent_should_rewrite?
-
-              logger.debug_with_time('Running Assess interpolation rewrite') do
-                ObjectSpace.each_object(Module) do |mod|
-                  rewrite_interpolation(mod)
-                end
-              end
-            end
-
-            def rewrite_interpolation mod, redo_rewrite = false
-              return unless should_rewrite?(mod)
-
-              status = Contrast::Agent::Patching::Policy::PatchStatus.get_status(mod)
-              return if (status&.rewritten? || status&.rewriting?) && !redo_rewrite
-
-              module_name = mod.cs__name
-              return unless module_name
-
-              if module_name.start_with?(Contrast::Utils::ObjectShare::CONTRAST_MODULE_START,
-                                         Contrast::Utils::ObjectShare::ANONYMOUS_CLASS_MARKER)
-
-                status.no_rewrite!
-                return
-
-              end
-              module_data = Contrast::Agent::ModuleData.new(mod, module_name)
-              logger.trace_with_time('Rewriting module', module: module_name) do
-                Contrast::Agent::Rewriter.rewrite_class(module_data, redo_rewrite)
-              end
-            rescue StandardError => e
-              logger.error('Unable to patch for assess', e, module: mod)
-            end
-
-            private
-
-            # Rails is being a jerk, again. It passes in a class before it is
-            # done being defined. There is a state where the files have been
-            # loaded, but the class definition is not complete, so the
-            # methods of the class are not defined despite the class existing
-            #
-            # To get around this, we have those methods tell us the class
-            # isn't ready
-            def mid_defining? mod
-              mod.instance_variable_defined?(:@cs__defining_class) && mod.instance_variable_get(:@cs__defining_class)
-            end
-
-            def agent_should_rewrite?
-              return false unless ::Contrast::ASSESS.enabled?
-              return false unless ::Contrast::AGENT.rewrite_interpolation?
-              return false unless ::Contrast::AGENT.interpolation_enabled?
-
-              true
-            end
-
-            def should_rewrite? mod
-              return false unless agent_should_rewrite?
-              return false if ::Contrast::AGENT.skip_instrumentation? mod.cs__name
-              return false if mod.cs__frozen?
-              return false if mod.singleton_class?
-              return false if mid_defining?(mod)
-
-              true
-            end
-          end
-        end
-      end
-    end
-  end
-end