contrast-agent 4.4.0 → 4.8.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitmodules +1 -1
- data/.simplecov +1 -1
- data/Gemfile +1 -1
- data/LICENSE.txt +1 -1
- data/Rakefile +2 -3
- data/exe/contrast_service +1 -1
- data/ext/build_funchook.rb +4 -4
- data/ext/cs__assess_active_record_named/cs__active_record_named.c +1 -1
- data/ext/cs__assess_active_record_named/extconf.rb +1 -1
- data/ext/cs__assess_array/cs__assess_array.c +1 -1
- data/ext/cs__assess_array/extconf.rb +1 -1
- data/ext/cs__assess_basic_object/cs__assess_basic_object.c +1 -1
- data/ext/cs__assess_basic_object/extconf.rb +1 -1
- data/ext/cs__assess_fiber_track/cs__assess_fiber_track.c +1 -1
- data/ext/cs__assess_fiber_track/extconf.rb +1 -1
- data/ext/cs__assess_hash/cs__assess_hash.c +4 -2
- data/ext/cs__assess_hash/extconf.rb +1 -1
- data/ext/cs__assess_kernel/cs__assess_kernel.c +1 -1
- data/ext/cs__assess_kernel/extconf.rb +1 -1
- data/ext/cs__assess_marshal_module/cs__assess_marshal_module.c +1 -1
- data/ext/cs__assess_marshal_module/extconf.rb +1 -1
- data/ext/cs__assess_module/cs__assess_module.c +1 -1
- data/ext/cs__assess_module/extconf.rb +1 -1
- data/ext/cs__assess_regexp/cs__assess_regexp.c +1 -1
- data/ext/cs__assess_regexp/extconf.rb +1 -1
- data/ext/cs__assess_string/cs__assess_string.c +1 -1
- data/ext/cs__assess_string/extconf.rb +1 -1
- data/ext/cs__assess_string_interpolation26/cs__assess_string_interpolation26.c +1 -1
- data/ext/cs__assess_string_interpolation26/extconf.rb +1 -1
- data/ext/cs__assess_yield_track/cs__assess_yield_track.c +1 -1
- data/ext/cs__assess_yield_track/extconf.rb +1 -1
- data/ext/cs__common/cs__common.c +5 -5
- data/ext/cs__common/cs__common.h +4 -4
- data/ext/cs__common/extconf.rb +1 -1
- data/ext/cs__contrast_patch/cs__contrast_patch.c +22 -25
- data/ext/cs__contrast_patch/extconf.rb +1 -1
- data/ext/cs__protect_kernel/cs__protect_kernel.c +1 -1
- data/ext/cs__protect_kernel/extconf.rb +1 -1
- data/ext/extconf_common.rb +2 -6
- data/lib/contrast-agent.rb +1 -1
- data/lib/contrast.rb +20 -1
- data/lib/contrast/agent.rb +1 -3
- data/lib/contrast/agent/assess.rb +2 -2
- data/lib/contrast/agent/assess/contrast_event.rb +54 -69
- data/lib/contrast/agent/assess/contrast_object.rb +3 -3
- data/lib/contrast/agent/assess/events/event_factory.rb +3 -2
- data/lib/contrast/agent/assess/events/source_event.rb +7 -2
- data/lib/contrast/agent/assess/finalizers/freeze.rb +1 -1
- data/lib/contrast/agent/assess/finalizers/hash.rb +26 -34
- data/lib/contrast/agent/assess/policy/dynamic_source_factory.rb +24 -20
- data/lib/contrast/agent/assess/policy/patcher.rb +11 -18
- data/lib/contrast/agent/assess/policy/policy.rb +1 -1
- data/lib/contrast/agent/assess/policy/policy_node.rb +26 -34
- data/lib/contrast/agent/assess/policy/policy_scanner.rb +1 -1
- data/lib/contrast/agent/assess/policy/preshift.rb +4 -2
- data/lib/contrast/agent/assess/policy/propagation_method.rb +8 -21
- data/lib/contrast/agent/assess/policy/propagation_node.rb +20 -9
- data/lib/contrast/agent/assess/policy/propagator.rb +2 -1
- data/lib/contrast/agent/assess/policy/propagator/append.rb +1 -1
- data/lib/contrast/agent/assess/policy/propagator/base.rb +1 -1
- data/lib/contrast/agent/assess/policy/propagator/center.rb +3 -2
- data/lib/contrast/agent/assess/policy/propagator/custom.rb +1 -1
- data/lib/contrast/agent/assess/policy/propagator/database_write.rb +1 -1
- data/lib/contrast/agent/assess/policy/propagator/insert.rb +4 -2
- data/lib/contrast/agent/assess/policy/propagator/keep.rb +1 -1
- data/lib/contrast/agent/assess/policy/propagator/match_data.rb +3 -2
- data/lib/contrast/agent/assess/policy/propagator/next.rb +1 -1
- data/lib/contrast/agent/assess/policy/propagator/prepend.rb +1 -1
- data/lib/contrast/agent/assess/policy/propagator/rack_protection.rb +73 -0
- data/lib/contrast/agent/assess/policy/propagator/remove.rb +23 -19
- data/lib/contrast/agent/assess/policy/propagator/replace.rb +1 -1
- data/lib/contrast/agent/assess/policy/propagator/reverse.rb +1 -1
- data/lib/contrast/agent/assess/policy/propagator/select.rb +3 -13
- data/lib/contrast/agent/assess/policy/propagator/splat.rb +1 -1
- data/lib/contrast/agent/assess/policy/propagator/split.rb +4 -8
- data/lib/contrast/agent/assess/policy/propagator/substitution.rb +2 -8
- data/lib/contrast/agent/assess/policy/propagator/trim.rb +64 -45
- data/lib/contrast/agent/assess/policy/rewriter_patch.rb +7 -4
- data/lib/contrast/agent/assess/policy/source_method.rb +92 -81
- data/lib/contrast/agent/assess/policy/source_node.rb +1 -1
- data/lib/contrast/agent/assess/policy/source_validation/cross_site_validator.rb +8 -6
- data/lib/contrast/agent/assess/policy/source_validation/source_validation.rb +2 -4
- data/lib/contrast/agent/assess/policy/trigger/reflected_xss.rb +7 -3
- data/lib/contrast/agent/assess/policy/trigger/xpath.rb +7 -8
- data/lib/contrast/agent/assess/policy/trigger_method.rb +102 -74
- data/lib/contrast/agent/assess/policy/trigger_node.rb +5 -4
- data/lib/contrast/agent/assess/policy/trigger_validation/redos_validator.rb +5 -4
- data/lib/contrast/agent/assess/policy/trigger_validation/ssrf_validator.rb +2 -3
- data/lib/contrast/agent/assess/policy/trigger_validation/trigger_validation.rb +1 -1
- data/lib/contrast/agent/assess/policy/trigger_validation/xss_validator.rb +2 -9
- data/lib/contrast/agent/assess/properties.rb +1 -1
- data/lib/contrast/agent/assess/property/evented.rb +9 -6
- data/lib/contrast/agent/assess/property/tagged.rb +1 -1
- data/lib/contrast/agent/assess/property/updated.rb +1 -1
- data/lib/contrast/agent/assess/rule/provider.rb +1 -1
- data/lib/contrast/agent/assess/rule/provider/hardcoded_key.rb +12 -6
- data/lib/contrast/agent/assess/rule/provider/hardcoded_password.rb +5 -2
- data/lib/contrast/agent/assess/rule/provider/hardcoded_value_rule.rb +4 -6
- data/lib/contrast/agent/assess/tag.rb +1 -1
- data/lib/contrast/agent/assess/tracker.rb +1 -1
- data/lib/contrast/agent/at_exit_hook.rb +1 -1
- data/lib/contrast/agent/class_reopener.rb +4 -2
- data/lib/contrast/agent/deadzone/policy/deadzone_node.rb +1 -1
- data/lib/contrast/agent/deadzone/policy/policy.rb +7 -3
- data/lib/contrast/agent/disable_reaction.rb +2 -4
- data/lib/contrast/agent/exclusion_matcher.rb +6 -12
- data/lib/contrast/agent/inventory.rb +1 -2
- data/lib/contrast/agent/inventory/dependencies.rb +3 -1
- data/lib/contrast/agent/inventory/dependency_analysis.rb +1 -1
- data/lib/contrast/agent/inventory/dependency_usage_analysis.rb +35 -23
- data/lib/contrast/agent/inventory/policy/datastores.rb +1 -1
- data/lib/contrast/agent/inventory/policy/policy.rb +1 -1
- data/lib/contrast/agent/inventory/policy/trigger_node.rb +1 -1
- data/lib/contrast/agent/middleware.rb +38 -67
- data/lib/contrast/agent/module_data.rb +4 -4
- data/lib/contrast/agent/patching/policy/after_load_patch.rb +1 -1
- data/lib/contrast/agent/patching/policy/after_load_patcher.rb +9 -4
- data/lib/contrast/agent/patching/policy/method_policy.rb +7 -3
- data/lib/contrast/agent/patching/policy/module_policy.rb +15 -8
- data/lib/contrast/agent/patching/policy/patch.rb +23 -29
- data/lib/contrast/agent/patching/policy/patch_status.rb +7 -8
- data/lib/contrast/agent/patching/policy/patcher.rb +23 -22
- data/lib/contrast/agent/patching/policy/policy.rb +14 -21
- data/lib/contrast/agent/patching/policy/policy_node.rb +15 -5
- data/lib/contrast/agent/patching/policy/trigger_node.rb +22 -9
- data/lib/contrast/agent/protect/policy/applies_command_injection_rule.rb +2 -2
- data/lib/contrast/agent/protect/policy/applies_deserialization_rule.rb +2 -2
- data/lib/contrast/agent/protect/policy/applies_no_sqli_rule.rb +2 -2
- data/lib/contrast/agent/protect/policy/applies_path_traversal_rule.rb +3 -4
- data/lib/contrast/agent/protect/policy/applies_sqli_rule.rb +2 -2
- data/lib/contrast/agent/protect/policy/applies_xxe_rule.rb +6 -10
- data/lib/contrast/agent/protect/policy/policy.rb +1 -1
- data/lib/contrast/agent/protect/policy/rule_applicator.rb +6 -6
- data/lib/contrast/agent/protect/policy/trigger_node.rb +1 -1
- data/lib/contrast/agent/protect/rule.rb +1 -1
- data/lib/contrast/agent/protect/rule/base.rb +19 -33
- data/lib/contrast/agent/protect/rule/base_service.rb +10 -6
- data/lib/contrast/agent/protect/rule/cmd_injection.rb +15 -19
- data/lib/contrast/agent/protect/rule/default_scanner.rb +1 -1
- data/lib/contrast/agent/protect/rule/deserialization.rb +7 -14
- data/lib/contrast/agent/protect/rule/http_method_tampering.rb +4 -15
- data/lib/contrast/agent/protect/rule/no_sqli.rb +7 -3
- data/lib/contrast/agent/protect/rule/no_sqli/mongo_no_sql_scanner.rb +2 -4
- data/lib/contrast/agent/protect/rule/path_traversal.rb +6 -6
- data/lib/contrast/agent/protect/rule/sqli.rb +3 -3
- data/lib/contrast/agent/protect/rule/sqli/default_sql_scanner.rb +1 -1
- data/lib/contrast/agent/protect/rule/sqli/mysql_sql_scanner.rb +1 -1
- data/lib/contrast/agent/protect/rule/sqli/postgres_sql_scanner.rb +2 -2
- data/lib/contrast/agent/protect/rule/sqli/sqlite_sql_scanner.rb +1 -1
- data/lib/contrast/agent/protect/rule/unsafe_file_upload.rb +2 -2
- data/lib/contrast/agent/protect/rule/xss.rb +2 -2
- data/lib/contrast/agent/protect/rule/xxe.rb +6 -13
- data/lib/contrast/agent/protect/rule/xxe/entity_wrapper.rb +2 -3
- data/lib/contrast/agent/reaction_processor.rb +12 -11
- data/lib/contrast/agent/request.rb +25 -24
- data/lib/contrast/agent/request_context.rb +13 -23
- data/lib/contrast/agent/request_handler.rb +1 -1
- data/lib/contrast/agent/response.rb +1 -1
- data/lib/contrast/agent/rewriter.rb +6 -4
- data/lib/contrast/agent/rule_set.rb +3 -3
- data/lib/contrast/agent/scope.rb +1 -1
- data/lib/contrast/agent/service_heartbeat.rb +3 -4
- data/lib/contrast/agent/static_analysis.rb +1 -1
- data/lib/contrast/agent/thread.rb +1 -1
- data/lib/contrast/agent/thread_watcher.rb +1 -1
- data/lib/contrast/agent/tracepoint_hook.rb +2 -2
- data/lib/contrast/agent/version.rb +2 -2
- data/lib/contrast/agent/worker_thread.rb +1 -1
- data/lib/contrast/api.rb +1 -1
- data/lib/contrast/api/communication.rb +1 -1
- data/lib/contrast/api/communication/connection_status.rb +1 -1
- data/lib/contrast/api/communication/messaging_queue.rb +1 -1
- data/lib/contrast/api/communication/response_processor.rb +5 -7
- data/lib/contrast/api/communication/service_lifecycle.rb +5 -3
- data/lib/contrast/api/communication/socket.rb +1 -1
- data/lib/contrast/api/communication/socket_client.rb +9 -22
- data/lib/contrast/api/communication/speedracer.rb +6 -10
- data/lib/contrast/api/communication/tcp_socket.rb +1 -1
- data/lib/contrast/api/communication/unix_socket.rb +1 -1
- data/lib/contrast/api/decorators.rb +1 -1
- data/lib/contrast/api/decorators/address.rb +1 -1
- data/lib/contrast/api/decorators/agent_startup.rb +1 -1
- data/lib/contrast/api/decorators/application_settings.rb +1 -1
- data/lib/contrast/api/decorators/application_startup.rb +10 -4
- data/lib/contrast/api/decorators/application_update.rb +1 -1
- data/lib/contrast/api/decorators/http_request.rb +1 -1
- data/lib/contrast/api/decorators/input_analysis.rb +1 -1
- data/lib/contrast/api/decorators/instrumentation_mode.rb +37 -0
- data/lib/contrast/api/decorators/library.rb +9 -7
- data/lib/contrast/api/decorators/library_usage_update.rb +1 -1
- data/lib/contrast/api/decorators/message.rb +4 -4
- data/lib/contrast/api/decorators/rasp_rule_sample.rb +1 -1
- data/lib/contrast/api/decorators/route_coverage.rb +1 -1
- data/lib/contrast/api/decorators/server_features.rb +1 -1
- data/lib/contrast/api/decorators/trace_event.rb +4 -2
- data/lib/contrast/api/decorators/trace_event_object.rb +2 -4
- data/lib/contrast/api/decorators/trace_event_signature.rb +1 -1
- data/lib/contrast/api/decorators/trace_taint_range.rb +1 -1
- data/lib/contrast/api/decorators/trace_taint_range_tags.rb +2 -7
- data/lib/contrast/api/decorators/user_input.rb +1 -1
- data/lib/contrast/components/agent.rb +14 -15
- data/lib/contrast/components/app_context.rb +7 -7
- data/lib/contrast/components/assess.rb +6 -11
- data/lib/contrast/components/config.rb +3 -2
- data/lib/contrast/components/contrast_service.rb +8 -9
- data/lib/contrast/components/heap_dump.rb +1 -1
- data/lib/contrast/components/interface.rb +4 -3
- data/lib/contrast/components/inventory.rb +1 -1
- data/lib/contrast/components/logger.rb +1 -1
- data/lib/contrast/components/protect.rb +11 -14
- data/lib/contrast/components/sampling.rb +9 -3
- data/lib/contrast/components/scope.rb +2 -1
- data/lib/contrast/components/settings.rb +27 -98
- data/lib/contrast/config.rb +1 -1
- data/lib/contrast/config/agent_configuration.rb +1 -1
- data/lib/contrast/config/application_configuration.rb +1 -1
- data/lib/contrast/config/assess_configuration.rb +1 -1
- data/lib/contrast/config/assess_rules_configuration.rb +2 -4
- data/lib/contrast/config/base_configuration.rb +5 -6
- data/lib/contrast/config/default_value.rb +1 -1
- data/lib/contrast/config/exception_configuration.rb +2 -6
- data/lib/contrast/config/heap_dump_configuration.rb +13 -7
- data/lib/contrast/config/inventory_configuration.rb +1 -1
- data/lib/contrast/config/logger_configuration.rb +2 -6
- data/lib/contrast/config/protect_configuration.rb +1 -1
- data/lib/contrast/config/protect_rule_configuration.rb +23 -1
- data/lib/contrast/config/protect_rules_configuration.rb +1 -1
- data/lib/contrast/config/root_configuration.rb +1 -1
- data/lib/contrast/config/ruby_configuration.rb +1 -1
- data/lib/contrast/config/sampling_configuration.rb +1 -1
- data/lib/contrast/config/server_configuration.rb +1 -1
- data/lib/contrast/config/service_configuration.rb +1 -1
- data/lib/contrast/configuration.rb +4 -15
- data/lib/contrast/delegators/input_analysis.rb +12 -0
- data/lib/contrast/extension/assess.rb +1 -1
- data/lib/contrast/extension/assess/array.rb +2 -7
- data/lib/contrast/extension/assess/erb.rb +2 -8
- data/lib/contrast/extension/assess/eval_trigger.rb +3 -11
- data/lib/contrast/extension/assess/exec_trigger.rb +4 -14
- data/lib/contrast/extension/assess/fiber.rb +3 -13
- data/lib/contrast/extension/assess/hash.rb +1 -1
- data/lib/contrast/extension/assess/kernel.rb +3 -10
- data/lib/contrast/extension/assess/marshal.rb +3 -11
- data/lib/contrast/extension/assess/regexp.rb +2 -7
- data/lib/contrast/extension/assess/string.rb +4 -2
- data/lib/contrast/extension/delegator.rb +1 -1
- data/lib/contrast/extension/inventory.rb +1 -1
- data/lib/contrast/extension/kernel.rb +5 -3
- data/lib/contrast/extension/module.rb +1 -1
- data/lib/contrast/extension/protect.rb +1 -1
- data/lib/contrast/extension/protect/kernel.rb +1 -1
- data/lib/contrast/extension/protect/psych.rb +1 -1
- data/lib/contrast/extension/thread.rb +1 -1
- data/lib/contrast/framework/base_support.rb +1 -1
- data/lib/contrast/framework/manager.rb +5 -9
- data/lib/contrast/framework/platform_version.rb +1 -1
- data/lib/contrast/framework/rack/patch/session_cookie.rb +6 -19
- data/lib/contrast/framework/rack/patch/support.rb +7 -5
- data/lib/contrast/framework/rack/support.rb +1 -1
- data/lib/contrast/framework/rails/patch/action_controller_live_buffer.rb +1 -1
- data/lib/contrast/framework/rails/patch/assess_configuration.rb +8 -3
- data/lib/contrast/framework/rails/patch/rails_application_configuration.rb +4 -4
- data/lib/contrast/framework/rails/patch/support.rb +6 -4
- data/lib/contrast/framework/rails/railtie.rb +32 -0
- data/lib/contrast/framework/rails/rewrite/action_controller_railties_helper_inherited.rb +5 -2
- data/lib/contrast/framework/rails/rewrite/active_record_attribute_methods_read.rb +3 -1
- data/lib/contrast/framework/rails/rewrite/active_record_named.rb +3 -1
- data/lib/contrast/framework/rails/rewrite/active_record_time_zone_inherited.rb +3 -1
- data/lib/contrast/framework/rails/support.rb +3 -3
- data/lib/contrast/framework/sinatra/support.rb +4 -2
- data/lib/contrast/funchook/funchook.rb +2 -6
- data/lib/contrast/logger/application.rb +13 -10
- data/lib/contrast/logger/format.rb +3 -6
- data/lib/contrast/logger/log.rb +5 -4
- data/lib/contrast/logger/request.rb +2 -3
- data/lib/contrast/logger/time.rb +1 -1
- data/lib/contrast/security_exception.rb +2 -2
- data/lib/contrast/tasks/config.rb +1 -1
- data/lib/contrast/tasks/service.rb +6 -2
- data/lib/contrast/utils/assess/sampling_util.rb +1 -1
- data/lib/contrast/utils/assess/tracking_util.rb +2 -3
- data/lib/contrast/utils/class_util.rb +15 -11
- data/lib/contrast/utils/duck_utils.rb +1 -1
- data/lib/contrast/utils/env_configuration_item.rb +1 -1
- data/lib/contrast/utils/hash_digest.rb +16 -24
- data/lib/contrast/utils/heap_dump_util.rb +1 -1
- data/lib/contrast/utils/invalid_configuration_util.rb +1 -1
- data/lib/contrast/utils/inventory_util.rb +1 -1
- data/lib/contrast/utils/io_util.rb +2 -2
- data/lib/contrast/utils/job_servers_running.rb +10 -5
- data/lib/contrast/utils/object_share.rb +1 -1
- data/lib/contrast/utils/os.rb +3 -2
- data/lib/contrast/utils/preflight_util.rb +1 -1
- data/lib/contrast/utils/resource_loader.rb +1 -1
- data/lib/contrast/utils/ruby_ast_rewriter.rb +3 -2
- data/lib/contrast/utils/sha256_builder.rb +1 -1
- data/lib/contrast/utils/stack_trace_utils.rb +1 -1
- data/lib/contrast/utils/string_utils.rb +1 -1
- data/lib/contrast/utils/tag_util.rb +1 -1
- data/lib/contrast/utils/thread_tracker.rb +1 -1
- data/lib/contrast/utils/timer.rb +1 -1
- data/resources/assess/policy.json +60 -2
- data/resources/deadzone/policy.json +7 -23
- data/ruby-agent.gemspec +22 -20
- data/service_executables/VERSION +1 -1
- data/service_executables/linux/contrast-service +0 -0
- data/service_executables/mac/contrast-service +0 -0
- data/sonar-project.properties +9 -0
- metadata +94 -50
- data/lib/contrast/agent/inventory/gemfile_digest_cache.rb +0 -38
- data/lib/contrast/agent/railtie.rb +0 -31
- data/lib/contrast/common_agent_configuration.rb +0 -87
@@ -1,4 +1,4 @@
|
|
1
|
-
# Copyright (c)
|
1
|
+
# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
|
2
2
|
# frozen_string_literal: true
|
3
3
|
|
4
4
|
module Contrast
|
@@ -31,7 +31,8 @@ module Contrast
|
|
31
31
|
return unless sources[1]
|
32
32
|
|
33
33
|
original_end_index = original_start_index + source1.length - 1
|
34
|
-
handle_incoming_tags(target, propagation_node, sources[1], preshift, original_start_index,
|
34
|
+
handle_incoming_tags(target, propagation_node, sources[1], preshift, original_start_index,
|
35
|
+
original_end_index)
|
35
36
|
end
|
36
37
|
|
37
38
|
private
|
@@ -1,4 +1,4 @@
|
|
1
|
-
# Copyright (c)
|
1
|
+
# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
|
2
2
|
# frozen_string_literal: true
|
3
3
|
|
4
4
|
require 'contrast/extension/module'
|
@@ -1,4 +1,4 @@
|
|
1
|
-
# Copyright (c)
|
1
|
+
# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
|
2
2
|
# frozen_string_literal: true
|
3
3
|
|
4
4
|
require 'contrast/components/interface'
|
@@ -1,4 +1,4 @@
|
|
1
|
-
# Copyright (c)
|
1
|
+
# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
|
2
2
|
# frozen_string_literal: true
|
3
3
|
|
4
4
|
module Contrast
|
@@ -33,7 +33,9 @@ module Contrast
|
|
33
33
|
# point on which all tags need to be adjusted
|
34
34
|
# If the insertion point is the end of the string, preshift length is returned
|
35
35
|
# https://stackoverflow.com/questions/31714522/find-the-first-differing-character-between-two-strings-in-ruby
|
36
|
-
insert_point = (0...preshift_target.length).find
|
36
|
+
insert_point = (0...preshift_target.length).find do |i|
|
37
|
+
preshift_target[i] != target[i]
|
38
|
+
end || preshift_target.length
|
37
39
|
# Depending what's inserted, we might be wrong. For instance, inserting 'foo'
|
38
40
|
# into 'asdfasdf' could result in 'asdfoofasdf'. we'd be off by one b/c of the 'f'
|
39
41
|
insert_point = target.rindex(source, insert_point)
|
@@ -1,4 +1,4 @@
|
|
1
|
-
# Copyright (c)
|
1
|
+
# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
|
2
2
|
# frozen_string_literal: true
|
3
3
|
|
4
4
|
module Contrast
|
@@ -1,4 +1,4 @@
|
|
1
|
-
# Copyright (c)
|
1
|
+
# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
|
2
2
|
# frozen_string_literal: true
|
3
3
|
|
4
4
|
module Contrast
|
@@ -76,7 +76,8 @@ module Contrast
|
|
76
76
|
applicable_tags.each do |tag_name, tag_ranges|
|
77
77
|
return_properties.set_tags(tag_name, tag_ranges)
|
78
78
|
end
|
79
|
-
return_properties.build_event(propagation_node, return_value, preshift.object, return_value,
|
79
|
+
return_properties.build_event(propagation_node, return_value, preshift.object, return_value,
|
80
|
+
preshift.args)
|
80
81
|
end
|
81
82
|
end
|
82
83
|
end
|
@@ -1,4 +1,4 @@
|
|
1
|
-
# Copyright (c)
|
1
|
+
# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
|
2
2
|
# frozen_string_literal: true
|
3
3
|
|
4
4
|
module Contrast
|
@@ -1,4 +1,4 @@
|
|
1
|
-
# Copyright (c)
|
1
|
+
# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
|
2
2
|
# frozen_string_literal: true
|
3
3
|
|
4
4
|
module Contrast
|
@@ -0,0 +1,73 @@
|
|
1
|
+
# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
|
2
|
+
# frozen_string_literal: true
|
3
|
+
|
4
|
+
module Contrast
|
5
|
+
module Agent
|
6
|
+
module Assess
|
7
|
+
module Policy
|
8
|
+
module Propagator
|
9
|
+
# Rack::Protection offers several protections against vulnerabilities. Of these, some apply to dataflow and
|
10
|
+
# need to be accounted for in order to properly tag data. Others apply to configurations and may be used to
|
11
|
+
# suppress configuration vulnerabilities in the future.
|
12
|
+
class RackProtection < Contrast::Agent::Assess::Policy::Propagator::Base
|
13
|
+
class << self
|
14
|
+
# Our custom instrumentation for the Rack::Protection::EscapedParams#escape_string method
|
15
|
+
# @param propagation_node [Contrast::Agent::Assess::Policy::PropagationNode] the node that governs this
|
16
|
+
# propagation event.
|
17
|
+
# @param preshift [Contrast::Agent::Assess::PreShift] The capture of the state of the code just prior to
|
18
|
+
# the invocation of the patched method.
|
19
|
+
# @param ret [nil, String] the target to which to propagate.
|
20
|
+
# @return [nil, String] ret
|
21
|
+
def escaped_params propagation_node, preshift, ret, _block
|
22
|
+
Contrast::Agent::Assess::Policy::Propagator::Splat.propagate(propagation_node, preshift, ret)
|
23
|
+
apply_escaper_tags(preshift.object, ret)
|
24
|
+
ret
|
25
|
+
end
|
26
|
+
|
27
|
+
private
|
28
|
+
|
29
|
+
# Rack::Protection::EscapedParams can be configured such that it only applies certain escape. We need
|
30
|
+
# to account for the configuration of the individual escapes when applying tags.
|
31
|
+
#
|
32
|
+
# @param escaper [Rack::Protection::EscapedParams] the instance of Rack::Protection::EscapedParams
|
33
|
+
# applying the escape_string
|
34
|
+
# @param ret [String] the result of the escape
|
35
|
+
def apply_escaper_tags escaper, ret
|
36
|
+
# I don't know how this could not be an instance of Rack::Protection::EscapedParams, but I don't want
|
37
|
+
# to chance it.
|
38
|
+
return unless escaper.cs__is_a?(Rack::Protection::EscapedParams)
|
39
|
+
return unless (properties = Contrast::Agent::Assess::Tracker.properties(ret))
|
40
|
+
|
41
|
+
tags = []
|
42
|
+
untags = []
|
43
|
+
if escaper.instance_variable_get(:@html)
|
44
|
+
tags << 'HTML_ENCODED'
|
45
|
+
untags << 'HTML_DECODED'
|
46
|
+
end
|
47
|
+
|
48
|
+
if escaper.instance_variable_get(:@javascript)
|
49
|
+
tags << 'JAVASCRIPT_ENCODED'
|
50
|
+
untags << 'JAVASCRIPT_DECODED'
|
51
|
+
end
|
52
|
+
|
53
|
+
if escaper.instance_variable_get(:@url)
|
54
|
+
tags << 'URL_ENCODED'
|
55
|
+
untags << 'URL_DECODED'
|
56
|
+
end
|
57
|
+
|
58
|
+
length = Contrast::Utils::StringUtils.ret_length(ret)
|
59
|
+
tags.each do |tag|
|
60
|
+
properties.add_tag(tag, 0...length)
|
61
|
+
end
|
62
|
+
|
63
|
+
untags.each do |tag|
|
64
|
+
properties.delete_tags(tag)
|
65
|
+
end
|
66
|
+
end
|
67
|
+
end
|
68
|
+
end
|
69
|
+
end
|
70
|
+
end
|
71
|
+
end
|
72
|
+
end
|
73
|
+
end
|
@@ -1,4 +1,4 @@
|
|
1
|
-
# Copyright (c)
|
1
|
+
# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
|
2
2
|
# frozen_string_literal: true
|
3
3
|
|
4
4
|
module Contrast
|
@@ -6,28 +6,35 @@ module Contrast
|
|
6
6
|
module Assess
|
7
7
|
module Policy
|
8
8
|
module Propagator
|
9
|
-
# Propagation that results in all the tags of the source being
|
10
|
-
#
|
11
|
-
#
|
12
|
-
# tags. The target's preexisting tags are also updated by this
|
13
|
-
# removal.
|
9
|
+
# Propagation that results in all the tags of the source being applied to the totality of the target and then
|
10
|
+
# those sections which have been removed from the target are removed from the tags. The target's preexisting
|
11
|
+
# tags are also updated by this removal.
|
14
12
|
class Remove < Contrast::Agent::Assess::Policy::Propagator::Base
|
15
13
|
class << self
|
16
|
-
# For the source, append its tags to the target.
|
17
|
-
#
|
18
|
-
# Unlike additive propagation, this currently only supports one source
|
14
|
+
# For the source, append its tags to the target. Once the tag is applied, remove the section that was
|
15
|
+
# removed by the delete. Unlike additive propagation, this currently only supports one source.
|
19
16
|
def propagate propagation_node, preshift, target
|
20
17
|
return unless (properties = Contrast::Agent::Assess::Tracker.properties!(target))
|
21
18
|
|
22
19
|
source = find_source(propagation_node.sources[0], preshift)
|
23
20
|
properties.copy_from(source, target, 0, propagation_node.untags)
|
24
|
-
|
25
|
-
handle_removal(source_chars, target)
|
21
|
+
handle_removal(propagation_node, source, target)
|
26
22
|
end
|
27
23
|
|
28
|
-
def handle_removal
|
24
|
+
def handle_removal propagation_node, source, target
|
25
|
+
return unless source
|
29
26
|
return unless (properties = Contrast::Agent::Assess::Tracker.properties!(target))
|
30
27
|
|
28
|
+
source_string = source.is_a?(String) ? source : source.to_s
|
29
|
+
|
30
|
+
# If the lengths are the same, we should just copy the tags because nothing was removed, but a new
|
31
|
+
# instance could have been created. copy_from will handle the case where the source is the target.
|
32
|
+
if source_string.length == target.length
|
33
|
+
properties.copy_from(source, target, 0, propagation_node.untags)
|
34
|
+
return
|
35
|
+
end
|
36
|
+
|
37
|
+
source_chars = source_string.chars
|
31
38
|
source_idx = 0
|
32
39
|
|
33
40
|
target_chars = target.chars
|
@@ -36,10 +43,8 @@ module Contrast
|
|
36
43
|
remove_ranges = []
|
37
44
|
start = nil
|
38
45
|
|
39
|
-
# loop over the target, the result of the delete
|
40
|
-
#
|
41
|
-
# represents a section that was deleted. these sections
|
42
|
-
# need to have their tags updated
|
46
|
+
# loop over the target, the result of the delete every range of characters that it differs from the
|
47
|
+
# source represents a section that was deleted. these sections need to have their tags updated
|
43
48
|
target_len = target_chars.length
|
44
49
|
while target_idx < target_len
|
45
50
|
target_char = target_chars[target_idx]
|
@@ -56,9 +61,8 @@ module Contrast
|
|
56
61
|
source_idx += 1
|
57
62
|
end
|
58
63
|
|
59
|
-
# once we're done looping over the target, anything left
|
60
|
-
#
|
61
|
-
# applying to it need to be removed.
|
64
|
+
# once we're done looping over the target, anything left over is extra from the source that was
|
65
|
+
# deleted. tags applying to it need to be removed.
|
62
66
|
remove_ranges << (source_idx...source_chars.length) if source_idx != source_chars.length
|
63
67
|
|
64
68
|
# handle deleting the removed ranges
|
@@ -1,4 +1,4 @@
|
|
1
|
-
# Copyright (c)
|
1
|
+
# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
|
2
2
|
# frozen_string_literal: true
|
3
3
|
|
4
4
|
module Contrast
|
@@ -1,4 +1,4 @@
|
|
1
|
-
# Copyright (c)
|
1
|
+
# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
|
2
2
|
# frozen_string_literal: true
|
3
3
|
|
4
4
|
module Contrast
|
@@ -1,4 +1,4 @@
|
|
1
|
-
# Copyright (c)
|
1
|
+
# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
|
2
2
|
# frozen_string_literal: true
|
3
3
|
|
4
4
|
module Contrast
|
@@ -21,22 +21,12 @@ module Contrast
|
|
21
21
|
# Additionally, an empty string is returned when the starting index for
|
22
22
|
# a character range is at the end of the string. Let's just skip that
|
23
23
|
# and only track a string that has length
|
24
|
-
unless ret &&
|
25
|
-
!ret.empty? &&
|
26
|
-
Contrast::Agent::Assess::Tracker.tracked?(source)
|
27
|
-
|
28
|
-
return
|
29
|
-
end
|
24
|
+
return unless ret && !ret.empty? && Contrast::Agent::Assess::Tracker.tracked?(source)
|
30
25
|
|
31
26
|
return unless (source_properties = Contrast::Agent::Assess::Tracker.properties(source))
|
32
27
|
return unless (properties = Contrast::Agent::Assess::Tracker.properties!(ret))
|
33
28
|
|
34
|
-
properties.build_event(
|
35
|
-
patcher,
|
36
|
-
ret,
|
37
|
-
source,
|
38
|
-
ret,
|
39
|
-
args)
|
29
|
+
properties.build_event(patcher, ret, source, ret, args)
|
40
30
|
|
41
31
|
range = determine_select_range(source, args)
|
42
32
|
return unless range
|
@@ -1,4 +1,4 @@
|
|
1
|
-
# Copyright (c)
|
1
|
+
# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
|
2
2
|
# frozen_string_literal: true
|
3
3
|
|
4
4
|
module Contrast
|
@@ -1,4 +1,4 @@
|
|
1
|
-
# Copyright (c)
|
1
|
+
# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
|
2
2
|
# frozen_string_literal: true
|
3
3
|
|
4
4
|
require 'contrast/agent/assess/policy/preshift'
|
@@ -31,9 +31,7 @@ module Contrast
|
|
31
31
|
# @return [nil] so as not to risk changing the result of the propagation.
|
32
32
|
|
33
33
|
def propagate propagation_node, preshift, target
|
34
|
-
logger.trace('Propagation detected',
|
35
|
-
node_id: propagation_node.id,
|
36
|
-
target_id: target.__id__)
|
34
|
+
logger.trace('Propagation detected', node_id: propagation_node.id, target_id: target.__id__)
|
37
35
|
|
38
36
|
source = find_source(propagation_node.sources[0], preshift)
|
39
37
|
return unless (source_properties = Contrast::Agent::Assess::Tracker.properties(source))
|
@@ -162,10 +160,8 @@ module Contrast
|
|
162
160
|
#
|
163
161
|
# @return [Contrast::Agent::Assess::Policy::PropagationNode] String#split node
|
164
162
|
def split_node
|
165
|
-
@_split_node ||=
|
166
|
-
|
167
|
-
node.class_name == 'String' && node.method_name == :split && node.instance_method?
|
168
|
-
end
|
163
|
+
@_split_node ||= Contrast::Agent::Assess::Policy::Policy.instance.propagators.find do |node|
|
164
|
+
node.class_name == 'String' && node.method_name == :split && node.instance_method?
|
169
165
|
end
|
170
166
|
end
|
171
167
|
end
|
@@ -1,4 +1,4 @@
|
|
1
|
-
# Copyright (c)
|
1
|
+
# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
|
2
2
|
# frozen_string_literal: true
|
3
3
|
|
4
4
|
require 'contrast/components/interface'
|
@@ -186,13 +186,7 @@ module Contrast
|
|
186
186
|
|
187
187
|
properties = Contrast::Agent::Assess::Tracker.properties(ret)
|
188
188
|
args = preshift.args
|
189
|
-
properties.build_event(
|
190
|
-
patcher,
|
191
|
-
ret,
|
192
|
-
preshift.object,
|
193
|
-
ret,
|
194
|
-
args,
|
195
|
-
2)
|
189
|
+
properties.build_event(patcher, ret, preshift.object, ret, args, 2)
|
196
190
|
properties.event.instance_variable_set(:@_parent_events, parent_events)
|
197
191
|
end
|
198
192
|
end
|
@@ -1,4 +1,4 @@
|
|
1
|
-
# Copyright (c)
|
1
|
+
# Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
|
2
2
|
# frozen_string_literal: true
|
3
3
|
|
4
4
|
module Contrast
|
@@ -8,50 +8,24 @@ module Contrast
|
|
8
8
|
module Propagator
|
9
9
|
# This class is specifically for String#tr(_s) propagation
|
10
10
|
#
|
11
|
-
# Disclaimer: there may be a better way, but we're
|
12
|
-
#
|
13
|
-
# a 'get it right' state soon.
|
11
|
+
# Disclaimer: there may be a better way, but we're in a 'get it work' state. hopefully, we'll be in a 'get it
|
12
|
+
# right' state soon.
|
14
13
|
module Trim
|
15
14
|
class << self
|
16
|
-
|
15
|
+
# @param policy_node [Contrast::Agent::Assess::Policy::PropagationNode] the node that governs this
|
16
|
+
# propagation event.
|
17
|
+
# @param preshift [Contrast::Agent::Assess::PreShift] The capture of the state of the code just prior to
|
18
|
+
# the invocation of the patched method.
|
19
|
+
# @param ret [nil, String] the target to which to propagate.
|
20
|
+
# @return [nil, String] ret
|
21
|
+
def tr_tagger policy_node, preshift, ret, _block
|
17
22
|
return ret unless ret && !ret.empty?
|
18
23
|
return ret unless (properties = Contrast::Agent::Assess::Tracker.properties!(ret))
|
19
24
|
|
20
|
-
|
21
|
-
|
22
|
-
properties.copy_from(source, ret)
|
23
|
-
replace_string = args[1]
|
24
|
-
source_chars = source.chars
|
25
|
-
# if the replace string is empty, then there's a bunch of deletes. this
|
26
|
-
# functions the same as the Removal propagation.
|
27
|
-
if replace_string == Contrast::Utils::ObjectShare::EMPTY_STRING
|
28
|
-
Contrast::Agent::Assess::Policy::Propagator::Remove.handle_removal(source_chars, ret)
|
29
|
-
else
|
30
|
-
remove_ranges = []
|
31
|
-
ret_chars = ret.chars
|
32
|
-
start = nil
|
33
|
-
source_chars.each_with_index do |char, idx|
|
34
|
-
if ret_chars[idx] == char
|
35
|
-
next unless start
|
25
|
+
properties.copy_from(preshift.object, ret)
|
26
|
+
handle_tr(policy_node, preshift, ret, properties)
|
36
27
|
|
37
|
-
|
38
|
-
start = nil
|
39
|
-
else
|
40
|
-
start ||= idx
|
41
|
-
end
|
42
|
-
end
|
43
|
-
# account for the last char being different
|
44
|
-
remove_ranges << (start...source_chars.length) if start
|
45
|
-
properties.delete_tags_at_ranges(remove_ranges, false)
|
46
|
-
end
|
47
|
-
|
48
|
-
properties.build_event(
|
49
|
-
patcher,
|
50
|
-
ret,
|
51
|
-
source,
|
52
|
-
ret,
|
53
|
-
args,
|
54
|
-
1)
|
28
|
+
properties.build_event(policy_node, ret, preshift.object, ret, preshift.args, 1)
|
55
29
|
ret
|
56
30
|
end
|
57
31
|
|
@@ -62,14 +36,59 @@ module Contrast
|
|
62
36
|
source = preshift.object
|
63
37
|
args = preshift.args
|
64
38
|
properties.splat_from(source, ret)
|
65
|
-
properties.build_event(
|
66
|
-
patcher,
|
67
|
-
ret,
|
68
|
-
source,
|
69
|
-
ret,
|
70
|
-
args)
|
39
|
+
properties.build_event(patcher, ret, source, ret, args)
|
71
40
|
ret
|
72
41
|
end
|
42
|
+
|
43
|
+
private
|
44
|
+
|
45
|
+
# @param policy_node [Contrast::Agent::Assess::Policy::PropagationNode] the node that governs this
|
46
|
+
# propagation event.
|
47
|
+
# @param preshift [Contrast::Agent::Assess::PreShift] The capture of the state of the code just prior to
|
48
|
+
# the invocation of the patched method.
|
49
|
+
# @param ret [String] the target to which to propagate.
|
50
|
+
# @param properties [Contrast::Agent::Assess::Properties] the properties of the ret
|
51
|
+
def handle_tr policy_node, preshift, ret, properties
|
52
|
+
source = preshift.object
|
53
|
+
replace_string = preshift.args[1]
|
54
|
+
|
55
|
+
# if the replace string is empty, then there's a bunch of deletes. this functions the same as the
|
56
|
+
# Removal propagation.
|
57
|
+
if replace_string == Contrast::Utils::ObjectShare::EMPTY_STRING
|
58
|
+
Contrast::Agent::Assess::Policy::Propagator::Remove.handle_removal(policy_node, source, ret)
|
59
|
+
return
|
60
|
+
end
|
61
|
+
|
62
|
+
# Otherwise, we need to target each insertion point. Based on the spec for #tr & #tr_s, the find is
|
63
|
+
# treated as a regexp range, excepting the `\` character, which we'll need to escape. This converts to
|
64
|
+
# that form, wrapping the input in `[]`.
|
65
|
+
find_string = preshift.args[0]
|
66
|
+
find_string += '\\' if find_string.end_with?('\\')
|
67
|
+
find_regexp = Regexp.new("[#{ find_string }]")
|
68
|
+
|
69
|
+
# Find the first instance to be replaced. If there isn't one, than nothing changed here.
|
70
|
+
idx = source.index(find_regexp)
|
71
|
+
return unless idx
|
72
|
+
|
73
|
+
# Iterate over each change and record where it happened. B/c this is a one to one replace, the index of
|
74
|
+
# the replacement is always one; however, there may be adjacent replacements which become a single
|
75
|
+
# range.
|
76
|
+
start = idx
|
77
|
+
stop = idx + 1
|
78
|
+
remove_ranges = []
|
79
|
+
while (idx = source.index(find_regexp, idx + 1))
|
80
|
+
# If the previous range ends at this index, we can expand that range to include this index.
|
81
|
+
# Otherwise, we need to record the held range and start a new one.
|
82
|
+
if stop != idx
|
83
|
+
remove_ranges << (start...stop)
|
84
|
+
start = idx
|
85
|
+
end
|
86
|
+
stop = idx + 1
|
87
|
+
end
|
88
|
+
# Be sure to capture the last range in the holder.
|
89
|
+
remove_ranges << (start...stop)
|
90
|
+
properties.delete_tags_at_ranges(remove_ranges, false)
|
91
|
+
end
|
73
92
|
end
|
74
93
|
end
|
75
94
|
end
|