contrast-agent 3.10.1 → 3.12.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.flayignore +1 -0
- data/.simplecov +5 -2
- data/ext/build_funchook.rb +13 -17
- data/ext/cs__assess_active_record_named/cs__active_record_named.c +12 -14
- data/ext/cs__assess_active_record_named/cs__active_record_named.h +1 -0
- data/ext/cs__assess_active_record_named/extconf.rb +3 -0
- data/ext/cs__assess_array/cs__assess_array.c +5 -6
- data/ext/cs__assess_array/cs__assess_array.h +1 -0
- data/ext/cs__assess_array/extconf.rb +3 -0
- data/ext/cs__assess_basic_object/cs__assess_basic_object.c +13 -11
- data/ext/cs__assess_basic_object/cs__assess_basic_object.h +2 -1
- data/ext/cs__assess_basic_object/extconf.rb +3 -0
- data/ext/cs__assess_fiber_track/cs__assess_fiber_track.c +4 -3
- data/ext/cs__assess_fiber_track/cs__assess_fiber_track.h +3 -3
- data/ext/cs__assess_fiber_track/extconf.rb +3 -0
- data/ext/cs__assess_hash/cs__assess_hash.c +40 -17
- data/ext/cs__assess_hash/cs__assess_hash.h +4 -6
- data/ext/cs__assess_hash/extconf.rb +3 -0
- data/ext/cs__assess_kernel/cs__assess_kernel.c +11 -9
- data/ext/cs__assess_kernel/cs__assess_kernel.h +1 -0
- data/ext/cs__assess_kernel/extconf.rb +3 -0
- data/ext/cs__assess_marshal_module/cs__assess_marshal_module.c +3 -6
- data/ext/cs__assess_marshal_module/extconf.rb +3 -0
- data/ext/cs__assess_module/cs__assess_module.c +16 -14
- data/ext/cs__assess_module/cs__assess_module.h +3 -0
- data/ext/cs__assess_module/extconf.rb +3 -0
- data/ext/cs__assess_regexp/cs__assess_regexp.c +13 -9
- data/ext/cs__assess_regexp/cs__assess_regexp.h +1 -0
- data/ext/cs__assess_regexp/extconf.rb +3 -0
- data/ext/cs__assess_string/cs__assess_string.c +5 -8
- data/ext/cs__assess_string/cs__assess_string.h +2 -1
- data/ext/cs__assess_string/extconf.rb +3 -0
- data/ext/cs__assess_string_interpolation26/cs__assess_string_interpolation26.c +2 -2
- data/ext/cs__assess_string_interpolation26/cs__assess_string_interpolation26.h +3 -3
- data/ext/cs__assess_string_interpolation26/extconf.rb +3 -0
- data/ext/cs__assess_yield_track/cs__assess_yield_track.h +1 -1
- data/ext/cs__assess_yield_track/extconf.rb +3 -0
- data/ext/cs__common/cs__common.c +80 -1
- data/ext/cs__common/cs__common.h +34 -0
- data/ext/cs__common/extconf.rb +9 -8
- data/ext/cs__contrast_patch/cs__contrast_patch.h +1 -6
- data/ext/cs__contrast_patch/extconf.rb +3 -0
- data/ext/cs__protect_kernel/cs__protect_kernel.c +23 -12
- data/ext/cs__protect_kernel/cs__protect_kernel.h +1 -0
- data/ext/cs__protect_kernel/extconf.rb +3 -0
- data/ext/extconf_common.rb +10 -8
- data/funchook/autom4te.cache/output.0 +1 -13
- data/funchook/autom4te.cache/requests +50 -51
- data/funchook/autom4te.cache/traces.0 +0 -3
- data/funchook/config.log +378 -217
- data/funchook/config.status +23 -24
- data/funchook/configure +1 -13
- data/funchook/src/Makefile +7 -7
- data/funchook/src/config.h +2 -2
- data/funchook/src/decoder.o +0 -0
- data/funchook/src/distorm.o +0 -0
- data/funchook/src/funchook.o +0 -0
- data/funchook/src/funchook_io.o +0 -0
- data/funchook/src/funchook_syscall.o +0 -0
- data/funchook/src/funchook_unix.o +0 -0
- data/funchook/src/funchook_x86.o +0 -0
- data/funchook/src/instructions.o +0 -0
- data/funchook/src/insts.o +0 -0
- data/funchook/src/libfunchook.dylib +0 -0
- data/funchook/src/mnemonics.o +0 -0
- data/funchook/src/operands.o +0 -0
- data/funchook/src/os_func.o +0 -0
- data/funchook/src/os_func_unix.o +0 -0
- data/funchook/src/prefix.o +0 -0
- data/funchook/src/printf_base.o +0 -0
- data/funchook/src/textdefs.o +0 -0
- data/funchook/src/wstring.o +0 -0
- data/funchook/test/Makefile +2 -2
- data/funchook/test/funchook_test +0 -0
- data/funchook/test/libfunchook_test.so +0 -0
- data/funchook/test/libfunchook_test.so.dSYM/Contents/Info.plist +20 -0
- data/funchook/test/libfunchook_test.so.dSYM/Contents/Resources/DWARF/libfunchook_test.so +0 -0
- data/funchook/test/test_main.o +0 -0
- data/funchook/test/x86_64_test.o +0 -0
- data/lib/contrast.rb +1 -1
- data/lib/contrast/agent.rb +32 -29
- data/lib/contrast/agent/assess.rb +1 -11
- data/lib/contrast/agent/assess/adjusted_span.rb +3 -1
- data/lib/contrast/agent/assess/contrast_event.rb +16 -62
- data/lib/contrast/agent/assess/events/event_factory.rb +25 -0
- data/lib/contrast/agent/assess/events/source_event.rb +83 -0
- data/lib/contrast/agent/assess/insulator.rb +0 -4
- data/lib/contrast/agent/assess/policy/patcher.rb +6 -2
- data/lib/contrast/agent/assess/policy/policy_node.rb +1 -8
- data/lib/contrast/agent/assess/policy/policy_scanner.rb +2 -2
- data/lib/contrast/agent/assess/policy/preshift.rb +1 -1
- data/lib/contrast/agent/assess/policy/propagation_method.rb +68 -33
- data/lib/contrast/agent/assess/policy/propagation_node.rb +2 -1
- data/lib/contrast/agent/assess/policy/propagator.rb +1 -0
- data/lib/contrast/agent/assess/policy/propagator/custom.rb +1 -1
- data/lib/contrast/agent/assess/policy/propagator/database_write.rb +1 -3
- data/lib/contrast/agent/assess/policy/propagator/match_data.rb +80 -0
- data/lib/contrast/agent/assess/policy/propagator/select.rb +35 -22
- data/lib/contrast/agent/assess/policy/propagator/split.rb +26 -6
- data/lib/contrast/agent/assess/policy/propagator/substitution.rb +2 -0
- data/lib/contrast/agent/assess/policy/rewriter_patch.rb +37 -26
- data/lib/contrast/agent/assess/policy/source_method.rb +20 -20
- data/lib/contrast/agent/assess/policy/source_node.rb +0 -15
- data/lib/contrast/agent/assess/policy/trigger/reflected_xss.rb +90 -0
- data/lib/contrast/agent/assess/policy/trigger/xpath.rb +57 -0
- data/lib/contrast/agent/assess/policy/trigger_method.rb +30 -45
- data/lib/contrast/agent/assess/policy/trigger_node.rb +7 -7
- data/lib/contrast/agent/assess/policy/trigger_validation/ssrf_validator.rb +2 -31
- data/lib/contrast/agent/assess/properties.rb +5 -3
- data/lib/contrast/agent/assess/rule/base.rb +1 -20
- data/lib/contrast/agent/assess/rule/provider/hardcoded_value_rule.rb +23 -6
- data/lib/contrast/agent/assess/rule/redos.rb +4 -5
- data/lib/contrast/agent/assess/tag.rb +24 -14
- data/lib/contrast/agent/at_exit_hook.rb +16 -13
- data/lib/contrast/agent/class_reopener.rb +23 -8
- data/lib/contrast/agent/deadzone/policy/policy.rb +2 -2
- data/lib/contrast/agent/disable_reaction.rb +3 -4
- data/lib/contrast/agent/exclusion_matcher.rb +7 -48
- data/lib/contrast/agent/inventory/policy/datastores.rb +54 -0
- data/lib/contrast/agent/inventory/policy/policy.rb +1 -1
- data/lib/contrast/agent/middleware.rb +101 -260
- data/lib/contrast/agent/module_data.rb +2 -1
- data/lib/contrast/agent/patching/policy/after_load_patch.rb +13 -3
- data/lib/contrast/agent/patching/policy/after_load_patcher.rb +59 -47
- data/lib/contrast/agent/patching/policy/method_policy.rb +3 -3
- data/lib/contrast/agent/patching/policy/module_policy.rb +0 -25
- data/lib/contrast/agent/patching/policy/patch.rb +97 -23
- data/lib/contrast/agent/patching/policy/patcher.rb +28 -30
- data/lib/contrast/agent/patching/policy/policy.rb +7 -7
- data/lib/contrast/agent/patching/policy/policy_node.rb +3 -11
- data/lib/contrast/agent/patching/policy/trigger_node.rb +2 -5
- data/lib/contrast/agent/protect/policy/applies_command_injection_rule.rb +63 -0
- data/lib/contrast/agent/protect/policy/applies_deserialization_rule.rb +52 -0
- data/lib/contrast/agent/protect/policy/applies_no_sqli_rule.rb +68 -0
- data/lib/contrast/agent/protect/policy/applies_path_traversal_rule.rb +117 -0
- data/lib/contrast/agent/protect/policy/applies_sqli_rule.rb +54 -0
- data/lib/contrast/agent/protect/policy/applies_xxe_rule.rb +129 -0
- data/lib/contrast/agent/protect/policy/policy.rb +6 -6
- data/lib/contrast/agent/protect/policy/rule_applicator.rb +51 -0
- data/lib/contrast/agent/protect/rule.rb +0 -5
- data/lib/contrast/agent/protect/rule/base.rb +19 -37
- data/lib/contrast/agent/protect/rule/base_service.rb +3 -1
- data/lib/contrast/agent/protect/rule/cmd_injection.rb +12 -15
- data/lib/contrast/agent/protect/rule/default_scanner.rb +0 -13
- data/lib/contrast/agent/protect/rule/deserialization.rb +2 -0
- data/lib/contrast/agent/protect/rule/http_method_tampering.rb +2 -2
- data/lib/contrast/agent/protect/rule/no_sqli.rb +4 -4
- data/lib/contrast/agent/protect/rule/path_traversal.rb +6 -10
- data/lib/contrast/agent/protect/rule/sqli.rb +5 -4
- data/lib/contrast/agent/protect/rule/unsafe_file_upload.rb +2 -0
- data/lib/contrast/agent/protect/rule/xss.rb +2 -0
- data/lib/contrast/agent/protect/rule/xxe.rb +10 -4
- data/lib/contrast/agent/railtie.rb +3 -8
- data/lib/contrast/agent/reaction_processor.rb +5 -5
- data/lib/contrast/agent/request.rb +11 -18
- data/lib/contrast/agent/request_context.rb +16 -19
- data/lib/contrast/agent/request_handler.rb +35 -0
- data/lib/contrast/agent/response.rb +39 -86
- data/lib/contrast/agent/rewriter.rb +22 -10
- data/lib/contrast/agent/rule_set.rb +49 -0
- data/lib/contrast/agent/scope.rb +0 -6
- data/lib/contrast/agent/service_heartbeat.rb +3 -4
- data/lib/contrast/agent/socket_client.rb +25 -19
- data/lib/contrast/agent/static_analysis.rb +41 -0
- data/lib/contrast/agent/thread.rb +1 -1
- data/lib/contrast/agent/tracepoint_hook.rb +1 -5
- data/lib/contrast/agent/version.rb +1 -1
- data/lib/contrast/api.rb +1 -1
- data/lib/contrast/api/decorators.rb +14 -0
- data/lib/contrast/api/decorators/application_settings.rb +37 -0
- data/lib/contrast/api/decorators/application_update.rb +66 -0
- data/lib/contrast/api/decorators/input_analysis.rb +17 -0
- data/lib/contrast/api/decorators/server_features.rb +24 -0
- data/lib/contrast/api/speedracer.rb +28 -24
- data/lib/contrast/api/tcp_socket.rb +0 -2
- data/lib/contrast/components/agent.rb +34 -24
- data/lib/contrast/components/app_context.rb +45 -38
- data/lib/contrast/components/assess.rb +25 -15
- data/lib/contrast/components/config.rb +7 -5
- data/lib/contrast/components/contrast_service.rb +23 -71
- data/lib/contrast/components/heap_dump.rb +12 -8
- data/lib/contrast/components/interface.rb +15 -22
- data/lib/contrast/components/inventory.rb +5 -1
- data/lib/contrast/components/logger.rb +3 -68
- data/lib/contrast/components/protect.rb +40 -4
- data/lib/contrast/components/sampling.rb +22 -11
- data/lib/contrast/components/scope.rb +2 -52
- data/lib/contrast/components/settings.rb +42 -23
- data/lib/contrast/config/base_configuration.rb +1 -0
- data/lib/contrast/config/default_value.rb +1 -0
- data/lib/contrast/config/protect_rule_configuration.rb +0 -14
- data/lib/contrast/config/protect_rules_configuration.rb +0 -1
- data/lib/contrast/configuration.rb +2 -2
- data/lib/contrast/{extensions/ruby_core → extension}/assess.rb +12 -15
- data/lib/contrast/extension/assess/array.rb +77 -0
- data/lib/contrast/{extensions/ruby_core → extension}/assess/assess_extension.rb +29 -24
- data/lib/contrast/{extensions/ruby_core → extension}/assess/erb.rb +0 -8
- data/lib/contrast/extension/assess/eval_trigger.rb +78 -0
- data/lib/contrast/{extensions/ruby_core → extension}/assess/exec_trigger.rb +7 -9
- data/lib/contrast/extension/assess/fiber.rb +113 -0
- data/lib/contrast/extension/assess/hash.rb +39 -0
- data/lib/contrast/extension/assess/kernel.rb +110 -0
- data/lib/contrast/extension/assess/regexp.rb +84 -0
- data/lib/contrast/{extensions/ruby_core → extension}/assess/string.rb +18 -10
- data/lib/contrast/{extensions/ruby_core → extension}/delegator.rb +0 -0
- data/lib/contrast/{extensions/ruby_core → extension}/inventory.rb +2 -2
- data/lib/contrast/extension/kernel.rb +54 -0
- data/lib/contrast/{extensions/ruby_core → extension}/module.rb +0 -0
- data/lib/contrast/{extensions/ruby_core → extension}/protect.rb +2 -2
- data/lib/contrast/extension/protect/kernel.rb +44 -0
- data/lib/contrast/{extensions/ruby_core → extension}/protect/psych.rb +1 -1
- data/lib/contrast/{extensions/ruby_core → extension}/thread.rb +0 -0
- data/lib/contrast/framework/base_support.rb +32 -0
- data/lib/contrast/framework/manager.rb +59 -8
- data/lib/contrast/framework/platform_version.rb +1 -0
- data/lib/contrast/framework/rack/patch/session_cookie.rb +126 -0
- data/lib/contrast/framework/rack/patch/support.rb +24 -0
- data/lib/contrast/framework/rack/support.rb +22 -0
- data/lib/contrast/framework/rails/patch/action_controller_live_buffer.rb +43 -0
- data/lib/contrast/framework/rails/patch/assess_configuration.rb +103 -0
- data/lib/contrast/framework/rails/patch/rails_application_configuration.rb +31 -0
- data/lib/contrast/framework/rails/patch/support.rb +67 -0
- data/lib/contrast/framework/rails/rewrite/action_controller_railties_helper_inherited.rb +34 -0
- data/lib/contrast/framework/rails/rewrite/active_record_attribute_methods_read.rb +39 -0
- data/lib/contrast/framework/rails/rewrite/active_record_named.rb +73 -0
- data/lib/contrast/framework/rails/rewrite/active_record_time_zone_inherited.rb +33 -0
- data/lib/contrast/framework/rails/support.rb +115 -0
- data/lib/contrast/framework/sinatra/application_helper.rb +51 -0
- data/lib/contrast/framework/sinatra/patch/base.rb +83 -0
- data/lib/contrast/framework/sinatra/patch/support.rb +27 -0
- data/lib/contrast/framework/sinatra/support.rb +109 -0
- data/lib/contrast/framework/view_technologies_descriptor.rb +1 -0
- data/lib/contrast/logger/application.rb +80 -0
- data/lib/contrast/logger/log.rb +143 -0
- data/lib/contrast/logger/time.rb +50 -0
- data/lib/contrast/tasks/config.rb +54 -0
- data/lib/contrast/tasks/service.rb +3 -13
- data/lib/contrast/utils/assess/sampling_util.rb +4 -9
- data/lib/contrast/utils/assess/tracking_util.rb +7 -1
- data/lib/contrast/utils/boolean_util.rb +2 -2
- data/lib/contrast/utils/cache.rb +0 -11
- data/lib/contrast/utils/class_util.rb +24 -3
- data/lib/contrast/utils/gemfile_reader.rb +7 -5
- data/lib/contrast/utils/hash_digest.rb +2 -11
- data/lib/contrast/utils/heap_dump_util.rb +12 -11
- data/lib/contrast/utils/invalid_configuration_util.rb +4 -4
- data/lib/contrast/utils/inventory_util.rb +2 -2
- data/lib/contrast/utils/io_util.rb +1 -11
- data/lib/contrast/utils/job_servers_running.rb +6 -4
- data/lib/contrast/utils/object_share.rb +1 -28
- data/lib/contrast/utils/os.rb +1 -25
- data/lib/contrast/utils/service_response_util.rb +36 -60
- data/lib/contrast/utils/service_sender_util.rb +84 -23
- data/lib/contrast/utils/sinatra_helper.rb +0 -6
- data/lib/contrast/utils/stack_trace_utils.rb +86 -182
- data/lib/contrast/utils/string_utils.rb +18 -2
- data/lib/contrast/utils/tag_util.rb +11 -1
- data/lib/contrast/utils/thread_tracker.rb +2 -2
- data/lib/contrast/utils/timer.rb +0 -40
- data/resources/assess/policy.json +42 -71
- data/resources/inventory/policy.json +2 -2
- data/resources/protect/policy.json +15 -15
- data/ruby-agent.gemspec +11 -4
- data/service_executables/VERSION +1 -1
- data/service_executables/linux/contrast-service +0 -0
- data/service_executables/mac/contrast-service +0 -0
- metadata +126 -113
- data/ext/cs__assess_regexp_track/cs__assess_regexp_track.c +0 -63
- data/ext/cs__assess_regexp_track/cs__assess_regexp_track.h +0 -29
- data/ext/cs__assess_regexp_track/extconf.rb +0 -2
- data/funchook/src/libfunchook.so +0 -0
- data/lib/contrast/agent/assess/frozen_properties.rb +0 -41
- data/lib/contrast/agent/assess/rule/csrf.rb +0 -66
- data/lib/contrast/agent/assess/rule/csrf/csrf_action.rb +0 -28
- data/lib/contrast/agent/assess/rule/csrf/csrf_applicator.rb +0 -73
- data/lib/contrast/agent/assess/rule/csrf/csrf_watcher.rb +0 -132
- data/lib/contrast/agent/assess/rule/response_scanning_rule.rb +0 -47
- data/lib/contrast/agent/assess/rule/response_watcher.rb +0 -36
- data/lib/contrast/agent/assess/rule/watcher.rb +0 -36
- data/lib/contrast/agent/feature_state.rb +0 -376
- data/lib/contrast/agent/logger_manager.rb +0 -116
- data/lib/contrast/agent/protect/rule/csrf.rb +0 -118
- data/lib/contrast/agent/protect/rule/csrf/csrf_evaluator.rb +0 -103
- data/lib/contrast/agent/protect/rule/csrf/csrf_token_injector.rb +0 -85
- data/lib/contrast/agent/settings_state.rb +0 -152
- data/lib/contrast/delegators.rb +0 -9
- data/lib/contrast/delegators/application_update.rb +0 -32
- data/lib/contrast/extensions/framework/rack/cookie.rb +0 -24
- data/lib/contrast/extensions/framework/rack/request.rb +0 -24
- data/lib/contrast/extensions/framework/rack/response.rb +0 -23
- data/lib/contrast/extensions/framework/rails/action_controller_railties_helper_inherited.rb +0 -20
- data/lib/contrast/extensions/framework/rails/active_record.rb +0 -26
- data/lib/contrast/extensions/framework/rails/active_record_named.rb +0 -53
- data/lib/contrast/extensions/framework/rails/active_record_time_zone_inherited.rb +0 -21
- data/lib/contrast/extensions/framework/rails/buffer.rb +0 -28
- data/lib/contrast/extensions/framework/rails/configuration.rb +0 -27
- data/lib/contrast/extensions/framework/sinatra/base.rb +0 -59
- data/lib/contrast/extensions/ruby_core/assess/array.rb +0 -59
- data/lib/contrast/extensions/ruby_core/assess/basic_object.rb +0 -15
- data/lib/contrast/extensions/ruby_core/assess/fiber.rb +0 -124
- data/lib/contrast/extensions/ruby_core/assess/hash.rb +0 -22
- data/lib/contrast/extensions/ruby_core/assess/kernel.rb +0 -95
- data/lib/contrast/extensions/ruby_core/assess/module.rb +0 -14
- data/lib/contrast/extensions/ruby_core/assess/regexp.rb +0 -206
- data/lib/contrast/extensions/ruby_core/assess/tilt_template_trigger.rb +0 -73
- data/lib/contrast/extensions/ruby_core/assess/xpath_library_trigger.rb +0 -40
- data/lib/contrast/extensions/ruby_core/eval_trigger.rb +0 -52
- data/lib/contrast/extensions/ruby_core/inventory/datastores.rb +0 -37
- data/lib/contrast/extensions/ruby_core/protect/applies_command_injection_rule.rb +0 -72
- data/lib/contrast/extensions/ruby_core/protect/applies_deserialization_rule.rb +0 -60
- data/lib/contrast/extensions/ruby_core/protect/applies_no_sqli_rule.rb +0 -83
- data/lib/contrast/extensions/ruby_core/protect/applies_path_traversal_rule.rb +0 -123
- data/lib/contrast/extensions/ruby_core/protect/applies_sqli_rule.rb +0 -65
- data/lib/contrast/extensions/ruby_core/protect/applies_xxe_rule.rb +0 -143
- data/lib/contrast/extensions/ruby_core/protect/kernel.rb +0 -30
- data/lib/contrast/framework/rails_support.rb +0 -88
- data/lib/contrast/framework/sinatra_application_helper.rb +0 -49
- data/lib/contrast/framework/sinatra_support.rb +0 -94
- data/lib/contrast/utils/comment_range.rb +0 -19
- data/lib/contrast/utils/data_store_util.rb +0 -23
- data/lib/contrast/utils/environment_util.rb +0 -81
- data/lib/contrast/utils/performs_logging.rb +0 -152
- data/lib/contrast/utils/rack_assess_session_cookie.rb +0 -104
- data/lib/contrast/utils/rails_assess_configuration.rb +0 -95
- data/lib/contrast/utils/random_util.rb +0 -22
- data/resources/csrf/inject.js +0 -44
- data/resources/factory-bot-spec/spec_helper.rb +0 -30
- data/resources/rubocops/kernel/catch_cop.rb +0 -37
- data/resources/rubocops/kernel/require_cop.rb +0 -37
- data/resources/rubocops/kernel/require_relative_cop.rb +0 -33
- data/resources/rubocops/module/autoload_cop.rb +0 -37
- data/resources/rubocops/module/const_defined_cop.rb +0 -37
- data/resources/rubocops/module/const_get_cop.rb +0 -37
- data/resources/rubocops/module/const_set_cop.rb +0 -37
- data/resources/rubocops/module/constants_cop.rb +0 -37
- data/resources/rubocops/module/name_cop.rb +0 -37
- data/resources/rubocops/object/class_cop.rb +0 -37
- data/resources/rubocops/object/freeze_cop.rb +0 -37
- data/resources/rubocops/object/frozen_cop.rb +0 -37
- data/resources/rubocops/object/is_a_cop.rb +0 -37
- data/resources/rubocops/object/method_cop.rb +0 -37
- data/resources/rubocops/object/respond_to_cop.rb +0 -37
- data/resources/rubocops/object/singleton_class_cop.rb +0 -37
- data/resources/rubocops/regexp/spelling_cop.rb +0 -44
- data/resources/rubocops/thread/new_cop.rb +0 -39
- data/resources/ruby-spec/ancestors_spec.rb +0 -70
- data/resources/ruby-spec/modulo_spec.rb +0 -831
- data/resources/ruby-spec/parameters_spec.rb +0 -261
- data/resources/ruby-spec/ruby_spec_spec_helper.rb +0 -35
@@ -9,9 +9,6 @@ module Contrast
|
|
9
9
|
# duplication.
|
10
10
|
class ObjectShare
|
11
11
|
# Strings
|
12
|
-
AND = '&'
|
13
|
-
OR = '||'
|
14
|
-
PIPE = '|'
|
15
12
|
ASTERISK = '*'
|
16
13
|
BACK_SLASH = '\\'
|
17
14
|
EMPTY_STRING = ''
|
@@ -27,8 +24,7 @@ module Contrast
|
|
27
24
|
NEW_LINE = "\n"
|
28
25
|
NIL_STRING = 'nil'
|
29
26
|
PERIOD = '.'
|
30
|
-
|
31
|
-
POUND_SIGN = HASH_CHAR = '#'
|
27
|
+
POUND_SIGN = '#'
|
32
28
|
QUESTION_MARK = '?'
|
33
29
|
RETURN = "\r"
|
34
30
|
SEMICOLON = ';'
|
@@ -39,35 +35,17 @@ module Contrast
|
|
39
35
|
DOUBLE_UNDERSCORE = '__'
|
40
36
|
AT = '@'
|
41
37
|
LEFT_ANGLE = '<'
|
42
|
-
RIGHT_ANGLE = '>'
|
43
|
-
LEFT_BRACKET = '['
|
44
|
-
RIGHT_BRACKET = ']'
|
45
|
-
LEFT_PAREN = '('
|
46
|
-
RIGHT_PAREN = ')'
|
47
38
|
COLON_SLASH_SLASH = '://'
|
48
|
-
TICK = '`'
|
49
|
-
BACK_TICK = '`'
|
50
|
-
LEFT_CURLY = '{'
|
51
|
-
RIGHT_CURLY = '}'
|
52
39
|
DOLLAR_SIGN = '$'
|
53
40
|
CARROT = '^'
|
54
|
-
PERCENT = '%'
|
55
|
-
LETTER_Q = 'Q'
|
56
|
-
OR_STRING = 'or'
|
57
41
|
|
58
|
-
DOUBLE_QUOTE_ESCAPED = '"'
|
59
|
-
|
60
|
-
READ_FLAG = 'r'
|
61
42
|
WRITE_FLAG = 'w'
|
62
|
-
READ_WRITE_FLAG = 'rw'
|
63
43
|
|
64
44
|
PARENT_PATH = '..'
|
65
45
|
|
66
46
|
RUBY = 'Ruby'
|
67
47
|
CACHE = 'cache'
|
68
|
-
GEM_SUFFIX = '.gem'
|
69
48
|
|
70
|
-
CONTRAST_METHOD_START = 'cs__'
|
71
49
|
CONTRAST_PATCHED_METHOD_START = 'cs__patched_'
|
72
50
|
CONTRAST_MODULE_START = 'Contrast::'
|
73
51
|
ANONYMOUS_CLASS_MARKER = '#<'
|
@@ -75,13 +53,11 @@ module Contrast
|
|
75
53
|
|
76
54
|
EMPTY_ARRAY = [].freeze
|
77
55
|
EMPTY_HASH = {}.freeze
|
78
|
-
EMPTY_TRIPLE = [EMPTY_STRING, EMPTY_STRING, EMPTY_STRING].freeze
|
79
56
|
|
80
57
|
# RegExps
|
81
58
|
DIGIT_REGEXP = /[[:digit:]]/.freeze
|
82
59
|
WHITE_SPACE_REGEXP = /\s/.freeze
|
83
60
|
NOT_WHITE_SPACE_REGEXP = /[^\s]/.freeze
|
84
|
-
WINDOWS_REGEXP = /cygwin|mswin|mingw|bccwin|wince|emx/.freeze
|
85
61
|
|
86
62
|
# Messages
|
87
63
|
OVERRIDE_MESSAGE = 'A security filter prevented original response from being returned.'
|
@@ -93,10 +69,7 @@ module Contrast
|
|
93
69
|
CLASS = 'Class'
|
94
70
|
MODULE = 'Module'
|
95
71
|
|
96
|
-
BRACKET_INTERPOLATION_START = '#{'
|
97
|
-
|
98
72
|
OBJECT_KEY = 'O'
|
99
|
-
PARAMETER_KEY = 'P'
|
100
73
|
RETURN_KEY = 'R'
|
101
74
|
UNKNOWN = 'unknown'
|
102
75
|
|
data/lib/contrast/utils/os.rb
CHANGED
@@ -8,32 +8,8 @@ module Contrast
|
|
8
8
|
# Utility memozies to avoid multiple lookups.
|
9
9
|
module OS
|
10
10
|
class << self
|
11
|
-
def windows?
|
12
|
-
@_windows = !(/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM).nil? if @_windows.nil?
|
13
|
-
@_windows
|
14
|
-
end
|
15
|
-
|
16
|
-
def mac?
|
17
|
-
@_mac ||= !(/darwin/ =~ RUBY_PLATFORM).nil? if @_mac.nil?
|
18
|
-
@_mac
|
19
|
-
end
|
20
|
-
|
21
|
-
def unix?
|
22
|
-
@unix ||= !windows? if @_unix.nil?
|
23
|
-
@unix
|
24
|
-
end
|
25
|
-
|
26
|
-
def linux?
|
27
|
-
@_linux ||= unix? && !OS.mac? if @_linux.nil?
|
28
|
-
@_linux
|
29
|
-
end
|
30
|
-
|
31
11
|
def running?
|
32
|
-
process =
|
33
|
-
`tasklist /fi "imagename eq contrast-service.exe"`
|
34
|
-
else
|
35
|
-
`ps aux | grep contrast-servic[e]`
|
36
|
-
end
|
12
|
+
process = `ps aux | grep contrast-servic[e]`
|
37
13
|
process != ''
|
38
14
|
end
|
39
15
|
|
@@ -1,108 +1,84 @@
|
|
1
1
|
# Copyright (c) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
|
2
2
|
# frozen_string_literal: true
|
3
3
|
|
4
|
+
cs__scoped_require 'contrast/logger/log'
|
5
|
+
cs__scoped_require 'contrast/agent/reaction_processor'
|
6
|
+
cs__scoped_require 'contrast/components/interface'
|
7
|
+
cs__scoped_require 'contrast/utils/assess/sampling_util'
|
8
|
+
|
4
9
|
module Contrast
|
5
10
|
module Utils
|
6
11
|
# Utility class for processing responses from the Contrast Service. Specifically, this class
|
7
12
|
# processes Server and Application settings and updates the Settings component.
|
8
13
|
module ServiceResponseUtil
|
9
14
|
include Contrast::Components::Interface
|
10
|
-
access_component :
|
15
|
+
access_component :agent, :analysis, :logging, :settings
|
11
16
|
|
12
17
|
class << self
|
13
|
-
#
|
18
|
+
# Return true if the agent has processed a response from the service
|
19
|
+
def update_received?
|
20
|
+
@_last_update.nil?
|
21
|
+
end
|
22
|
+
|
14
23
|
def process_response response
|
15
|
-
|
16
|
-
|
24
|
+
@_last_update = response&.sent_ms
|
25
|
+
|
17
26
|
server_features = process_server_response(response)
|
18
27
|
app_settings = process_application_response(response)
|
19
28
|
|
20
29
|
# ReactionProcessor is a design pattern from TeamServer.
|
21
30
|
# Right now, there's one potential reaction, which is disabling the agent
|
22
31
|
Contrast::Agent::ReactionProcessor.process(response&.application_settings)
|
23
|
-
# Determine new accumulator state
|
24
|
-
if (new_accum = response&.accumulator_settings)
|
25
|
-
SETTINGS.accumulator_settings.replace(new_accum)
|
26
|
-
end
|
27
32
|
|
28
|
-
|
33
|
+
Contrast::Logger::Log.instance.update(server_features&.log_file, server_features&.log_level)
|
29
34
|
update_features(server_features, app_settings)
|
30
|
-
logger.
|
35
|
+
logger.trace(
|
36
|
+
'Agent settings updated in response to Service',
|
37
|
+
protect_on: PROTECT.enabled?,
|
38
|
+
assess_on: ASSESS.enabled?)
|
31
39
|
end
|
32
40
|
|
33
41
|
private
|
34
42
|
|
35
43
|
# Given some protobuf messages, update settings.
|
36
44
|
# This is the bridge between Contrast Service <-> Settings.
|
37
|
-
LOG_SERVER_SETTINGS_UPDATE = 'Agent: Received updated server features'
|
38
|
-
LOG_UPDATE_PROTECT = 'Updating Protect state'
|
39
|
-
LOG_UPDATE_ASSESS = 'Updating Assess state'
|
40
45
|
def process_server_response response
|
41
46
|
server_features = response&.server_features
|
42
47
|
return unless server_features
|
43
48
|
|
44
|
-
logger.
|
45
|
-
# 'defend' is legacy for 'protect' in the dtm.
|
46
|
-
protect = server_features.defend
|
47
|
-
assess = server_features.assess
|
48
|
-
|
49
|
-
protect_enable = !!protect.enabled
|
50
|
-
assess_enable = !!assess.enabled
|
49
|
+
logger.trace('Agent: Received updated server features')
|
51
50
|
|
52
|
-
|
53
|
-
begin
|
54
|
-
logger.debug(LOG_UPDATE_PROTECT)
|
55
|
-
SETTINGS.protect_state[:enabled] = protect_enable
|
56
|
-
end
|
57
|
-
|
58
|
-
# assess
|
59
|
-
begin
|
60
|
-
logger.debug(LOG_UPDATE_ASSESS)
|
61
|
-
SETTINGS.assess_state[:enabled] = assess_enable
|
62
|
-
SETTINGS.assess_state[:sampling_settings] = assess.sampling
|
63
|
-
end
|
51
|
+
SETTINGS.update_from_server_features(server_features)
|
64
52
|
|
65
53
|
server_features
|
66
54
|
end
|
67
55
|
|
68
|
-
MODE_WHITELIST = %i[NO_ACTION BLOCK_AT_PERIMETER MONITOR BLOCK].cs__freeze
|
69
|
-
LOG_APP_SETTINGS_UPDATE = 'Agent: Received updated application settings'
|
70
56
|
def process_application_response response
|
71
57
|
app_settings = response&.application_settings
|
72
58
|
return unless app_settings
|
73
59
|
|
74
|
-
logger.debug(
|
75
|
-
|
76
|
-
|
77
|
-
protection_rules.select! { |(_id, mode)| MODE_WHITELIST.include? mode }
|
78
|
-
modes_by_id = protection_rules.to_h
|
79
|
-
SETTINGS.application_state.merge!(
|
80
|
-
modes_by_id: modes_by_id,
|
81
|
-
exclusion_matchers: exclusion_matchers,
|
82
|
-
disabled_assess_rules: app_settings.disabled_assess_rules,
|
83
|
-
session_id: app_settings.session_id)
|
60
|
+
logger.debug('Agent: Received updated application settings')
|
61
|
+
|
62
|
+
SETTINGS.update_from_application_settings(app_settings)
|
84
63
|
|
85
64
|
app_settings
|
86
65
|
end
|
87
66
|
|
88
|
-
# This
|
89
|
-
#
|
90
|
-
LOG_INFO_RULE_SETTINGS = 'Current rule settings:'
|
67
|
+
# This can't go in the Settings component because protect and assess depend on settings
|
68
|
+
# I don't think it should go into contrast_service because that only handles connection specific data
|
91
69
|
def update_features server_features, app_settings
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
ASSESS.rules.each { |k, v| logger.info(".. assess: #{ k } (#{ v.enabled? })") }
|
100
|
-
end
|
101
|
-
end
|
70
|
+
return unless !!(server_features || app_settings)
|
71
|
+
return unless AGENT.enabled?
|
72
|
+
|
73
|
+
logger.trace_with_time('Rebuilding rule modes') do
|
74
|
+
SETTINGS.build_protect_rules if PROTECT.enabled?
|
75
|
+
SETTINGS.build_assess_rules if ASSESS.enabled?
|
76
|
+
AGENT.reset_ruleset
|
102
77
|
|
103
|
-
|
104
|
-
|
105
|
-
|
78
|
+
logger.info('Current rule settings:')
|
79
|
+
PROTECT.rules.each { |k, v| logger.info('Protect Rule mode set', rule: k, mode: v.mode) }
|
80
|
+
ASSESS.rules.each { |k, v| logger.info('Assess Rule mode set', rule: k, mode: v.enabled?) }
|
81
|
+
end
|
106
82
|
end
|
107
83
|
end
|
108
84
|
end
|
@@ -13,11 +13,9 @@ module Contrast
|
|
13
13
|
# to SpeedRacer.
|
14
14
|
module ServiceSenderUtil
|
15
15
|
include Contrast::Components::Interface
|
16
|
-
access_component :
|
16
|
+
access_component :analysis, :app_context, :logging, :settings
|
17
17
|
|
18
18
|
class << self
|
19
|
-
attr_reader :assess_messages, :ready_messages_queue
|
20
|
-
|
21
19
|
# Push the given DTM into a queue to be sent to the Service.
|
22
20
|
#
|
23
21
|
# @param event [Contrast::Api::Dtm] One of the DTMs valid for the event field of
|
@@ -25,33 +23,49 @@ module Contrast
|
|
25
23
|
def push_to_ready_queue event
|
26
24
|
return unless event
|
27
25
|
|
28
|
-
|
29
|
-
# the queue on first message sent
|
30
|
-
@ready_messages_queue ||= Queue.new
|
26
|
+
prep_queue
|
31
27
|
ready_messages_queue.push event
|
32
|
-
logger.debug(
|
28
|
+
logger.debug('Enqueued event',
|
29
|
+
event_id: event.__id__,
|
30
|
+
event_type: event.cs__class.name,
|
31
|
+
queue: ready_messages_queue.__id__,
|
32
|
+
length: ready_messages_queue.length)
|
33
|
+
end
|
34
|
+
|
35
|
+
# Bypass the queue and send the message directly to SpeedRacer. This is the only way
|
36
|
+
# to receive the response object back from SpeedRacer. An invoking method that needs
|
37
|
+
# to process the response object with custom logic should use this method.
|
38
|
+
#
|
39
|
+
# @param event [Contrast::Api::Dtm] One of the DTMs valid for the event
|
40
|
+
# field of Contrast::Api::Dtm::Message
|
41
|
+
# @return [Array<Contrast::Api::Dtm::AttackResult>] the response from SpeedRacer
|
42
|
+
def send_event_immediately event
|
43
|
+
client.send_to_speedracer(event) if event
|
33
44
|
end
|
34
45
|
|
35
46
|
def sending_thread
|
36
|
-
|
37
|
-
@ready_messages_queue ||= Queue.new
|
38
|
-
@assess_messages ||= []
|
47
|
+
return @_sender_thread if @_sender_thread
|
39
48
|
|
49
|
+
# in case we got here before a message attempted to be sent, let's make sure these are initialized
|
40
50
|
@_sender_thread ||= Contrast::Agent::Thread.new do
|
41
51
|
loop do
|
42
|
-
check_assess_queue
|
52
|
+
check_assess_queue
|
43
53
|
# if ready messages queue is empty, calling thread is suspended until a message is pushed onto queue
|
44
54
|
event = ready_messages_queue.pop
|
45
55
|
begin
|
46
|
-
logger.debug(
|
47
|
-
|
56
|
+
logger.debug('Dequeued event',
|
57
|
+
event_id: event.__id__,
|
58
|
+
event_type: event.cs__class.name,
|
59
|
+
queue: ready_messages_queue.__id__,
|
60
|
+
length: ready_messages_queue.length)
|
61
|
+
response = client.send_to_speedracer(event)
|
48
62
|
Contrast::Utils::ServiceResponseUtil.process_response(response) if response
|
49
63
|
rescue StandardError => e
|
50
|
-
logger.error(
|
64
|
+
logger.error('Could not send message to service from service sender thread.', e)
|
51
65
|
end
|
52
66
|
end
|
53
67
|
end
|
54
|
-
logger.debug(
|
68
|
+
logger.debug('Started background sending thread.')
|
55
69
|
end
|
56
70
|
alias_method :start, :sending_thread
|
57
71
|
|
@@ -60,17 +74,64 @@ module Contrast
|
|
60
74
|
end
|
61
75
|
|
62
76
|
def add_to_assess_messages msg
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
77
|
+
assess_messages! << msg
|
78
|
+
end
|
79
|
+
|
80
|
+
# Return true if the agent has connected with the service
|
81
|
+
def connection_established?
|
82
|
+
client.connection_established?
|
68
83
|
end
|
69
84
|
|
70
85
|
private
|
71
86
|
|
87
|
+
# TODO: RUBY-920
|
88
|
+
# If we've been forked, then we need to make sure the sender is set and
|
89
|
+
# alive. This is a temporary workaround to address issues in Passenger
|
90
|
+
# around forking and will be addressed next sprint.
|
91
|
+
def prep_queue
|
92
|
+
return if @_sender_thread&.alive?
|
93
|
+
|
94
|
+
@_sender_thread = nil
|
95
|
+
start
|
96
|
+
end
|
97
|
+
|
98
|
+
def ready_messages_queue
|
99
|
+
@_ready_messages_queue ||= begin
|
100
|
+
tmp = Queue.new
|
101
|
+
logger.debug('Creating new ready_messages_queue.',
|
102
|
+
queue: tmp.__id__,
|
103
|
+
length: tmp.length)
|
104
|
+
tmp
|
105
|
+
end
|
106
|
+
end
|
107
|
+
|
108
|
+
def assess_messages!
|
109
|
+
unless @_assess_messages
|
110
|
+
logger.debug('Creating new assess messages queue by force.')
|
111
|
+
@_assess_messages = nil
|
112
|
+
end
|
113
|
+
assess_messages
|
114
|
+
end
|
115
|
+
|
116
|
+
# This list holds messages containing assess findings. We may not
|
117
|
+
# know if the agent is running in assess, so until we do then we
|
118
|
+
# must keep the messages stored here. Once we do know, we'll set this
|
119
|
+
# to `false` and rely on the standard ready_messages_queue
|
120
|
+
def assess_messages
|
121
|
+
if @_assess_messages.nil?
|
122
|
+
logger.debug('Creating new assess messages queue.')
|
123
|
+
@_assess_messages = []
|
124
|
+
end
|
125
|
+
@_assess_messages
|
126
|
+
end
|
127
|
+
|
128
|
+
def client
|
129
|
+
@_client ||= Contrast::Agent::SocketClient.new
|
130
|
+
end
|
131
|
+
|
72
132
|
def check_assess_queue
|
73
|
-
return unless
|
133
|
+
return unless assess_messages
|
134
|
+
return unless APP_CONTEXT.ready?
|
74
135
|
|
75
136
|
if ASSESS.enabled?
|
76
137
|
assess_messages.each do |msg|
|
@@ -78,7 +139,7 @@ module Contrast
|
|
78
139
|
ready_messages_queue.push msg # this message is ready to be sent to SR
|
79
140
|
end
|
80
141
|
end
|
81
|
-
@
|
142
|
+
@_assess_messages = false # clear out queue, we no longer need it
|
82
143
|
end
|
83
144
|
|
84
145
|
# When we queued up findings, we didn't have access to a configuration
|
@@ -97,7 +158,7 @@ module Contrast
|
|
97
158
|
end
|
98
159
|
|
99
160
|
msg.findings.each do |finding|
|
100
|
-
finding.session_id =
|
161
|
+
finding.session_id = SETTINGS.session_id
|
101
162
|
end
|
102
163
|
end
|
103
164
|
end
|
@@ -3,207 +3,111 @@
|
|
3
3
|
|
4
4
|
cs__scoped_require 'contrast/utils/object_share'
|
5
5
|
cs__scoped_require 'contrast/api'
|
6
|
+
cs__scoped_require 'contrast/utils/cache'
|
6
7
|
|
7
8
|
module Contrast
|
8
9
|
module Utils
|
9
10
|
# Utilities for converting ruby stack trace into DTMs
|
10
11
|
class StackTraceUtils
|
11
|
-
CONTRAST_MARKER = 'contrast/extensions/ruby_core'
|
12
|
-
MONKEYPATCH_MARKER = 'cs__'
|
13
|
-
|
14
|
-
# TODO: RUBY-532
|
15
|
-
CLASSNAME_CACHE = Contrast::Utils::Cache.new
|
16
|
-
|
17
12
|
# need lib here to separate from specs
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
13
|
+
AGENT_CLASS_MARKER = '/lib/contrast/'
|
14
|
+
|
15
|
+
class << self
|
16
|
+
# Determine if this method is being invoked by application code or not
|
17
|
+
# based on the immediate caller of the code after Contrast.
|
18
|
+
#
|
19
|
+
# @return [Boolean] true if this code is called with application
|
20
|
+
# (non-gem) code in the caller
|
21
|
+
def custom_code_context?
|
22
|
+
root_dir = Contrast::Agent.framework_manager.app_root
|
23
|
+
|
24
|
+
stack = Kernel.caller(0, 15)
|
25
|
+
i = 0
|
26
|
+
while i < stack.length
|
27
|
+
stack_element = stack[i]
|
28
|
+
i += 1
|
29
|
+
next if stack_element.include?('/contrast/')
|
30
|
+
|
31
|
+
return stack_element.start_with?(root_dir)
|
33
32
|
end
|
34
|
-
i += 1
|
35
33
|
end
|
36
|
-
end
|
37
|
-
|
38
|
-
def self.build(
|
39
|
-
skip: 0,
|
40
|
-
depth: 10,
|
41
|
-
ignore: false,
|
42
|
-
ignore_strings: AGENT_CLASS_MARKERS,
|
43
|
-
class_lookup: false,
|
44
|
-
rasp_element: true)
|
45
|
-
|
46
|
-
stack = caller(skip.to_i, depth.to_i)
|
47
|
-
return [] unless stack
|
48
|
-
|
49
|
-
stack = reject_caller_entries(stack, ignore_strings) if ignore
|
50
|
-
stack.map! do |entry|
|
51
|
-
element = rasp_or_assess(rasp_element)
|
52
|
-
element = fill_element(element, entry, class_lookup)
|
53
|
-
element
|
54
|
-
end
|
55
|
-
stack.compact!
|
56
|
-
stack
|
57
|
-
end
|
58
34
|
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
35
|
+
# Call and translate a caller_locations array to an array of
|
36
|
+
# StackTraceElement for TeamServer to display, excluding any Contrast
|
37
|
+
# code found.
|
38
|
+
#
|
39
|
+
# @return [Array<Contrast::Api::Dtm::StackTraceElement]
|
40
|
+
def build_protect_stack_array
|
41
|
+
stack = caller(2, 20)
|
42
|
+
return [] unless stack
|
43
|
+
|
44
|
+
stack = reject_caller_entries(stack)
|
45
|
+
i = 0
|
46
|
+
stack.map! do |entry|
|
47
|
+
element = Contrast::Api::Dtm::StackTraceElement.new
|
48
|
+
element = fill_protect_element(element, entry, i)
|
49
|
+
i += 1
|
50
|
+
element
|
51
|
+
end
|
52
|
+
stack.compact!
|
53
|
+
stack
|
65
54
|
end
|
66
|
-
end
|
67
55
|
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
56
|
+
# Translate a caller array to an array of TraceStacks for TeamServer to
|
57
|
+
# display, excluding any Contrast code found.
|
58
|
+
#
|
59
|
+
# @param stack [Array<String>] the output of Kernel.caller
|
60
|
+
# @return [Array<Contrast::Api::Dtm::TraceStack]
|
61
|
+
def build_assess_stack_array stack
|
62
|
+
converted = []
|
63
|
+
return converted unless stack
|
64
|
+
|
65
|
+
i = 0
|
66
|
+
while i < stack.length
|
67
|
+
caller_location = stack[i]
|
68
|
+
i += 1
|
69
|
+
next if caller_location.include?(AGENT_CLASS_MARKER)
|
70
|
+
|
71
|
+
# To play nice with the way that TeamServer is rendering these
|
72
|
+
# values, we only populate the file_name field with exactly what we
|
73
|
+
# want them to display
|
74
|
+
element = Contrast::Api::Dtm::TraceStack.new
|
75
|
+
element.file_name = caller_location
|
76
|
+
converted << element
|
77
|
+
end
|
78
|
+
converted
|
73
79
|
end
|
74
|
-
end
|
75
80
|
|
76
|
-
|
77
|
-
return [] unless stack_locations
|
81
|
+
private
|
78
82
|
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
end
|
85
|
-
stack_locations.compact!
|
86
|
-
stack_locations
|
87
|
-
end
|
88
|
-
|
89
|
-
def self.reject_locations stack_locations
|
90
|
-
stack_locations.reject do |entry|
|
91
|
-
class_path = entry.path
|
92
|
-
method = entry.label
|
93
|
-
AGENT_CLASS_MARKERS.any? { |marker| class_path.include?(marker) } ||
|
94
|
-
method.include?(MONKEYPATCH_MARKER)
|
83
|
+
def reject_caller_entries stack
|
84
|
+
stack.reject do |entry|
|
85
|
+
entry = entry.to_s
|
86
|
+
entry.include?(AGENT_CLASS_MARKER)
|
87
|
+
end
|
95
88
|
end
|
96
|
-
end
|
97
89
|
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
element
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
# NOOP
|
113
|
-
nil
|
114
|
-
end
|
115
|
-
|
116
|
-
def self.best_classname path, file
|
117
|
-
name = first_class(path)
|
118
|
-
name || look_like_classname(file)
|
119
|
-
end
|
120
|
-
|
121
|
-
# "/.rvm/rubies/ruby-1.9.3-p551/lib/ruby/1.9.1/irb/workspace.rb:80:in `eval'"
|
122
|
-
def self.fill_loc_element element, caller_location
|
123
|
-
return element unless caller_location
|
124
|
-
|
125
|
-
lineno = caller_location.lineno
|
126
|
-
element.line_number = lineno.to_i
|
127
|
-
path = caller_location.path
|
128
|
-
path = Contrast::Utils::StringUtils.force_utf8(path)
|
129
|
-
file_name = filename_from_path(path)
|
130
|
-
element.file_name = Contrast::Utils::StringUtils.force_utf8(file_name)
|
131
|
-
element.declaring_class = path
|
132
|
-
label = caller_location.label
|
133
|
-
element.method_name = Contrast::Utils::StringUtils.force_utf8(label)
|
134
|
-
element
|
135
|
-
rescue StandardError
|
136
|
-
# NOOP
|
137
|
-
nil
|
138
|
-
end
|
90
|
+
# In Contrast UI - there are many ways to render the stacktraces. For
|
91
|
+
# Protect, there are two ways we're concerned about, one for the first
|
92
|
+
# element and then all others.
|
93
|
+
# 1 for protect first frame - We need the method specifically for this rendering
|
94
|
+
# 1 for protect Nth frames
|
95
|
+
def fill_protect_element element, caller_location, index
|
96
|
+
return element unless caller_location
|
97
|
+
|
98
|
+
if index.zero?
|
99
|
+
element.method_name = caller_location.split('`')[-1].delete_suffix!('\'')
|
100
|
+
element.file_name = caller_location.split(':')[0]
|
101
|
+
else
|
102
|
+
element.file_name = caller_location
|
103
|
+
end
|
139
104
|
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
path[txt_idx, path.length - txt_idx]
|
145
|
-
else
|
146
|
-
path
|
105
|
+
element
|
106
|
+
rescue StandardError
|
107
|
+
# NOOP
|
108
|
+
nil
|
147
109
|
end
|
148
110
|
end
|
149
|
-
|
150
|
-
# Bit of a HACK: Given a path to a file, assume that the first line in the
|
151
|
-
# form `class Name` is the class that was loaded. True most of the time.
|
152
|
-
#
|
153
|
-
# Using regexp here is expensive b/c it creates a ton of new Strings. We're
|
154
|
-
# trying to avoid that, so our guess is a little more clumsy, but should
|
155
|
-
# still work.
|
156
|
-
#
|
157
|
-
# Note: Might need to tune end marker to include /n
|
158
|
-
# based on: /\s*class\s+([_[:alpha:]][_[:alnum:]]*)/m
|
159
|
-
CLASS_MARKER = ' class '
|
160
|
-
CLASS_END_MARKER = Contrast::Utils::ObjectShare::NEW_LINE
|
161
|
-
def self.first_class path
|
162
|
-
return nil if path.nil? || path.empty?
|
163
|
-
|
164
|
-
name = CLASSNAME_CACHE[path]
|
165
|
-
return name if name
|
166
|
-
|
167
|
-
text = File.read(path)
|
168
|
-
name = parse_string(text, CLASS_MARKER, CLASS_END_MARKER)
|
169
|
-
CLASSNAME_CACHE[path] = name if name
|
170
|
-
name
|
171
|
-
end
|
172
|
-
|
173
|
-
RB_MARKER = '.rb'
|
174
|
-
# Convert a file to look like a classname
|
175
|
-
# If the file ends w/ '.rb', trim that off
|
176
|
-
# If the file doesn't start with a capital letter,
|
177
|
-
# capitalize it
|
178
|
-
def self.look_like_classname file
|
179
|
-
file = file.to_s
|
180
|
-
file[0].capitalize + (file.end_with?(RB_MARKER) ? file.slice(1..-4) : file.slice(1..-1))
|
181
|
-
end
|
182
|
-
|
183
|
-
# Using regexp here is expensive b/c it creates a ton of new Strings. We're
|
184
|
-
# trying to avoid that, so our guess is a little more clumsy, but should
|
185
|
-
# still work.
|
186
|
-
#
|
187
|
-
# Note: Might need to tune end marker to include /n
|
188
|
-
# based on: /[`]([^']*)[']/
|
189
|
-
METHOD_MARKER = Contrast::Utils::ObjectShare::TICK
|
190
|
-
METHOD_END_MARKER = Contrast::Utils::ObjectShare::COMMA
|
191
|
-
def self.find_method_name method
|
192
|
-
parse_string(method, METHOD_MARKER, METHOD_END_MARKER)
|
193
|
-
end
|
194
|
-
|
195
|
-
def self.parse_string string, start_marker, end_marker
|
196
|
-
return nil unless string
|
197
|
-
|
198
|
-
start_idx = string.index(start_marker)
|
199
|
-
return nil unless start_idx
|
200
|
-
|
201
|
-
start_idx += start_marker.length # account for marker length
|
202
|
-
end_idx = string.index(end_marker, start_idx)
|
203
|
-
end_idx ||= string.length
|
204
|
-
len = end_idx - start_idx
|
205
|
-
string[start_idx, len]
|
206
|
-
end
|
207
111
|
end
|
208
112
|
end
|
209
113
|
end
|