contrast-agent 4.13.0 → 5.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.simplecov +2 -1
- data/Gemfile +1 -1
- data/LICENSE.txt +1 -1
- data/Rakefile +1 -1
- data/exe/contrast_service +1 -1
- data/ext/build_funchook.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 +1 -1
- 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 +1 -1
- data/ext/cs__common/extconf.rb +1 -1
- data/ext/cs__contrast_patch/cs__contrast_patch.c +1 -1
- data/ext/cs__contrast_patch/extconf.rb +1 -1
- data/ext/cs__os_information/cs__os_information.c +1 -1
- data/ext/cs__os_information/extconf.rb +1 -1
- data/ext/extconf_common.rb +1 -1
- data/lib/contrast/agent/assess/contrast_event.rb +7 -11
- data/lib/contrast/agent/assess/contrast_object.rb +1 -1
- data/lib/contrast/agent/assess/events/event_data.rb +30 -0
- data/lib/contrast/agent/assess/events/event_factory.rb +14 -6
- data/lib/contrast/agent/assess/events/source_event.rb +22 -3
- data/lib/contrast/agent/assess/finalizers/freeze.rb +1 -1
- data/lib/contrast/agent/assess/finalizers/hash.rb +1 -1
- data/lib/contrast/agent/assess/policy/dynamic_source_factory.rb +7 -7
- data/lib/contrast/agent/assess/policy/patcher.rb +1 -35
- data/lib/contrast/agent/assess/policy/policy.rb +1 -1
- data/lib/contrast/agent/assess/policy/policy_node.rb +7 -7
- data/lib/contrast/agent/assess/policy/policy_scanner.rb +6 -1
- data/lib/contrast/agent/assess/policy/preshift.rb +1 -1
- data/lib/contrast/agent/assess/policy/propagation_method.rb +55 -28
- data/lib/contrast/agent/assess/policy/propagation_node.rb +1 -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 +2 -2
- data/lib/contrast/agent/assess/policy/propagator/custom.rb +1 -1
- data/lib/contrast/agent/assess/policy/propagator/database_write.rb +6 -2
- data/lib/contrast/agent/assess/policy/propagator/insert.rb +5 -2
- data/lib/contrast/agent/assess/policy/propagator/keep.rb +1 -1
- data/lib/contrast/agent/assess/policy/propagator/match_data.rb +7 -3
- 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 +1 -1
- data/lib/contrast/agent/assess/policy/propagator/remove.rb +1 -1
- 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 -2
- data/lib/contrast/agent/assess/policy/propagator/splat.rb +1 -1
- data/lib/contrast/agent/assess/policy/propagator/split.rb +27 -25
- data/lib/contrast/agent/assess/policy/propagator/substitution.rb +3 -157
- data/lib/contrast/agent/assess/policy/propagator/substitution_utils.rb +190 -0
- data/lib/contrast/agent/assess/policy/propagator/trim.rb +9 -4
- data/lib/contrast/agent/assess/policy/propagator.rb +1 -1
- data/lib/contrast/agent/assess/policy/source_method.rb +39 -26
- data/lib/contrast/agent/assess/policy/source_node.rb +1 -1
- data/lib/contrast/agent/assess/policy/source_validation/cross_site_validator.rb +1 -1
- data/lib/contrast/agent/assess/policy/source_validation/source_validation.rb +1 -1
- data/lib/contrast/agent/assess/policy/trigger/reflected_xss.rb +7 -2
- data/lib/contrast/agent/assess/policy/trigger/xpath.rb +1 -1
- data/lib/contrast/agent/assess/policy/trigger_method.rb +68 -18
- data/lib/contrast/agent/assess/policy/trigger_node.rb +15 -7
- data/lib/contrast/agent/assess/policy/trigger_validation/redos_validator.rb +1 -1
- data/lib/contrast/agent/assess/policy/trigger_validation/ssrf_validator.rb +1 -1
- 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 -2
- data/lib/contrast/agent/assess/properties.rb +1 -1
- data/lib/contrast/agent/assess/property/evented.rb +25 -12
- data/lib/contrast/agent/assess/property/tagged.rb +52 -58
- data/lib/contrast/agent/assess/property/updated.rb +1 -1
- data/lib/contrast/agent/assess/rule/provider/hardcoded_key.rb +1 -19
- data/lib/contrast/agent/assess/rule/provider/hardcoded_password.rb +1 -13
- data/lib/contrast/agent/assess/rule/provider/hardcoded_value_rule.rb +42 -60
- data/lib/contrast/agent/assess/rule/provider.rb +1 -1
- data/lib/contrast/agent/assess/rule/response/autocomplete_rule.rb +130 -0
- data/lib/contrast/agent/assess/rule/response/base_rule.rb +117 -0
- data/lib/contrast/agent/assess/tag.rb +1 -1
- data/lib/contrast/agent/assess/tracker.rb +1 -1
- data/lib/contrast/agent/assess.rb +1 -2
- data/lib/contrast/agent/at_exit_hook.rb +1 -1
- data/lib/contrast/agent/deadzone/policy/deadzone_node.rb +13 -8
- data/lib/contrast/agent/deadzone/policy/policy.rb +1 -1
- data/lib/contrast/agent/disable_reaction.rb +1 -1
- data/lib/contrast/agent/exclusion_matcher.rb +1 -1
- data/lib/contrast/agent/inventory/database_config.rb +115 -77
- data/lib/contrast/agent/inventory/dependencies.rb +1 -1
- data/lib/contrast/agent/inventory/dependency_analysis.rb +1 -1
- data/lib/contrast/agent/inventory/dependency_usage_analysis.rb +3 -3
- 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/inventory.rb +1 -1
- data/lib/contrast/agent/metric_telemetry_event.rb +3 -3
- data/lib/contrast/agent/middleware.rb +8 -77
- data/lib/contrast/agent/module_data.rb +1 -1
- data/lib/contrast/agent/patching/policy/after_load_patch.rb +1 -1
- data/lib/contrast/agent/patching/policy/after_load_patcher.rb +1 -1
- data/lib/contrast/agent/patching/policy/method_policy.rb +31 -104
- data/lib/contrast/agent/patching/policy/method_policy_extend.rb +113 -0
- data/lib/contrast/agent/patching/policy/module_policy.rb +1 -1
- data/lib/contrast/agent/patching/policy/patch.rb +1 -1
- data/lib/contrast/agent/patching/policy/patch_status.rb +2 -26
- data/lib/contrast/agent/patching/policy/patcher.rb +13 -13
- data/lib/contrast/agent/patching/policy/policy.rb +1 -1
- data/lib/contrast/agent/patching/policy/policy_node.rb +1 -1
- data/lib/contrast/agent/patching/policy/trigger_node.rb +1 -1
- data/lib/contrast/agent/protect/policy/applies_command_injection_rule.rb +1 -1
- data/lib/contrast/agent/protect/policy/applies_deserialization_rule.rb +1 -1
- data/lib/contrast/agent/protect/policy/applies_no_sqli_rule.rb +1 -1
- data/lib/contrast/agent/protect/policy/applies_path_traversal_rule.rb +1 -1
- data/lib/contrast/agent/protect/policy/applies_sqli_rule.rb +1 -1
- data/lib/contrast/agent/protect/policy/applies_xxe_rule.rb +1 -1
- data/lib/contrast/agent/protect/policy/policy.rb +1 -1
- data/lib/contrast/agent/protect/policy/rule_applicator.rb +1 -1
- data/lib/contrast/agent/protect/policy/trigger_node.rb +1 -1
- data/lib/contrast/agent/protect/rule/base.rb +1 -1
- data/lib/contrast/agent/protect/rule/base_service.rb +1 -1
- data/lib/contrast/agent/protect/rule/cmd_injection.rb +1 -1
- data/lib/contrast/agent/protect/rule/default_scanner.rb +1 -1
- data/lib/contrast/agent/protect/rule/deserialization.rb +1 -1
- data/lib/contrast/agent/protect/rule/http_method_tampering.rb +1 -1
- data/lib/contrast/agent/protect/rule/no_sqli/mongo_no_sql_scanner.rb +1 -1
- data/lib/contrast/agent/protect/rule/no_sqli.rb +1 -1
- data/lib/contrast/agent/protect/rule/path_traversal.rb +1 -1
- data/lib/contrast/agent/protect/rule/sql_sample_builder.rb +1 -1
- 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/sqli.rb +1 -1
- data/lib/contrast/agent/protect/rule/unsafe_file_upload.rb +1 -1
- data/lib/contrast/agent/protect/rule/xss.rb +1 -1
- data/lib/contrast/agent/protect/rule/xxe/entity_wrapper.rb +1 -1
- data/lib/contrast/agent/protect/rule/xxe.rb +1 -1
- data/lib/contrast/agent/protect/rule.rb +1 -1
- data/lib/contrast/agent/reaction_processor.rb +1 -1
- data/lib/contrast/agent/reporting/report.rb +27 -0
- data/lib/contrast/agent/reporting/reporter.rb +115 -0
- data/lib/contrast/agent/reporting/reporting_events/application_inventory.rb +49 -0
- data/lib/contrast/agent/reporting/reporting_events/application_update.rb +82 -0
- data/lib/contrast/agent/reporting/reporting_events/architecture_component.rb +80 -0
- data/lib/contrast/agent/reporting/reporting_events/discovered_route.rb +59 -0
- data/lib/contrast/agent/reporting/reporting_events/finding.rb +185 -0
- data/lib/contrast/agent/reporting/reporting_events/finding_event.rb +264 -0
- data/lib/contrast/agent/reporting/reporting_events/finding_event_source.rb +57 -0
- data/lib/contrast/agent/reporting/reporting_events/finding_object.rb +90 -0
- data/lib/contrast/agent/reporting/reporting_events/finding_request.rb +121 -0
- data/lib/contrast/agent/reporting/reporting_events/finding_signature.rb +105 -0
- data/lib/contrast/agent/reporting/reporting_events/finding_stack.rb +67 -0
- data/lib/contrast/agent/reporting/reporting_events/finding_taint_range.rb +58 -0
- data/lib/contrast/agent/reporting/reporting_events/library_discovery.rb +93 -0
- data/lib/contrast/agent/reporting/reporting_events/library_usage_observation.rb +50 -0
- data/lib/contrast/agent/reporting/reporting_events/observed_library_usage.rb +54 -0
- data/lib/contrast/agent/reporting/reporting_events/observed_route.rb +66 -0
- data/lib/contrast/agent/reporting/reporting_events/preflight.rb +39 -0
- data/lib/contrast/agent/reporting/reporting_events/preflight_message.rb +75 -0
- data/lib/contrast/agent/reporting/reporting_events/reporting_event.rb +47 -0
- data/lib/contrast/agent/reporting/reporting_events/route_coverage.rb +76 -0
- data/lib/contrast/agent/reporting/reporting_events/route_discovery.rb +66 -0
- data/lib/contrast/agent/reporting/reporting_events/route_discovery_observation.rb +65 -0
- data/lib/contrast/agent/reporting/reporting_events/server_activity.rb +52 -0
- data/lib/contrast/agent/reporting/reporting_events/trace_event_source.rb +30 -0
- data/lib/contrast/agent/reporting/reporting_utilities/audit.rb +137 -0
- data/lib/contrast/agent/reporting/reporting_utilities/dtm_message.rb +67 -0
- data/lib/contrast/agent/reporting/reporting_utilities/endpoints.rb +165 -0
- data/lib/contrast/agent/reporting/reporting_utilities/headers.rb +55 -0
- data/lib/contrast/agent/reporting/reporting_utilities/reporter_client.rb +86 -0
- data/lib/contrast/agent/reporting/reporting_utilities/reporter_client_utils.rb +154 -0
- data/lib/contrast/agent/reporting/reporting_utilities/reporting_storage.rb +66 -0
- data/lib/contrast/agent/reporting/reporting_utilities/response.rb +30 -0
- data/lib/contrast/agent/reporting/reporting_utilities/response_handler.rb +57 -0
- data/lib/contrast/agent/reporting/reporting_utilities/response_handler_utils.rb +196 -0
- data/lib/contrast/agent/reporting/settings/application_settings.rb +67 -0
- data/lib/contrast/agent/reporting/settings/assess.rb +45 -0
- data/lib/contrast/agent/reporting/settings/assess_server_feature.rb +136 -0
- data/lib/contrast/agent/reporting/settings/exclusions.rb +123 -0
- data/lib/contrast/agent/reporting/settings/protect.rb +89 -0
- data/lib/contrast/agent/reporting/settings/protect_server_feature.rb +243 -0
- data/lib/contrast/agent/reporting/settings/reaction.rb +30 -0
- data/lib/contrast/agent/reporting/settings/server_features.rb +78 -0
- data/lib/contrast/agent/request.rb +46 -84
- data/lib/contrast/agent/request_context.rb +20 -131
- data/lib/contrast/agent/request_context_extend.rb +163 -0
- data/lib/contrast/agent/request_handler.rb +41 -5
- data/lib/contrast/agent/response.rb +25 -88
- data/lib/contrast/agent/rule_set.rb +1 -1
- data/lib/contrast/agent/scope.rb +1 -1
- data/lib/contrast/agent/service_heartbeat.rb +1 -1
- data/lib/contrast/agent/startup_metrics_telemetry_event.rb +73 -23
- data/lib/contrast/agent/static_analysis.rb +14 -4
- data/lib/contrast/agent/telemetry.rb +16 -8
- data/lib/contrast/agent/telemetry_event.rb +9 -10
- data/lib/contrast/agent/thread.rb +1 -1
- data/lib/contrast/agent/thread_watcher.rb +32 -6
- data/lib/contrast/agent/tracepoint_hook.rb +1 -4
- data/lib/contrast/agent/version.rb +2 -2
- data/lib/contrast/agent/worker_thread.rb +1 -1
- data/lib/contrast/agent.rb +16 -1
- data/lib/contrast/api/communication/connection_status.rb +11 -8
- data/lib/contrast/api/communication/messaging_queue.rb +38 -4
- data/lib/contrast/api/communication/response_processor.rb +22 -11
- data/lib/contrast/api/communication/service_lifecycle.rb +14 -4
- data/lib/contrast/api/communication/socket.rb +7 -9
- data/lib/contrast/api/communication/socket_client.rb +33 -13
- data/lib/contrast/api/communication/speedracer.rb +38 -2
- data/lib/contrast/api/communication/tcp_socket.rb +5 -4
- data/lib/contrast/api/communication/unix_socket.rb +2 -1
- data/lib/contrast/api/communication.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 +1 -1
- data/lib/contrast/api/decorators/application_update.rb +1 -1
- data/lib/contrast/api/decorators/architecture_component.rb +36 -0
- data/lib/contrast/api/decorators/finding.rb +29 -0
- data/lib/contrast/api/decorators/http_request.rb +3 -2
- data/lib/contrast/api/decorators/input_analysis.rb +1 -1
- data/lib/contrast/api/decorators/instrumentation_mode.rb +1 -1
- data/lib/contrast/api/decorators/library.rb +1 -1
- data/lib/contrast/api/decorators/library_usage_update.rb +1 -1
- data/lib/contrast/api/decorators/message.rb +1 -1
- 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 +1 -1
- data/lib/contrast/api/decorators/trace_event_object.rb +1 -1
- 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 +1 -1
- data/lib/contrast/api/decorators/user_input.rb +1 -1
- data/lib/contrast/api/decorators.rb +2 -1
- data/lib/contrast/api.rb +1 -1
- data/lib/contrast/components/agent.rb +5 -24
- data/lib/contrast/components/api.rb +67 -2
- data/lib/contrast/components/app_context.rb +12 -66
- data/lib/contrast/components/app_context_extend.rb +78 -0
- data/lib/contrast/components/assess.rb +12 -8
- data/lib/contrast/components/base.rb +24 -1
- data/lib/contrast/components/config.rb +38 -23
- data/lib/contrast/components/contrast_service.rb +6 -1
- data/lib/contrast/components/heap_dump.rb +1 -1
- data/lib/contrast/components/inventory.rb +5 -1
- data/lib/contrast/components/logger.rb +1 -1
- data/lib/contrast/components/protect.rb +6 -2
- data/lib/contrast/components/sampling.rb +3 -3
- data/lib/contrast/components/scope.rb +1 -1
- data/lib/contrast/components/settings.rb +25 -12
- data/lib/contrast/config/agent_configuration.rb +2 -2
- data/lib/contrast/config/api_configuration.rb +9 -4
- data/lib/contrast/config/api_proxy_configuration.rb +14 -0
- data/lib/contrast/config/application_configuration.rb +3 -4
- data/lib/contrast/config/assess_configuration.rb +4 -4
- data/lib/contrast/config/assess_rules_configuration.rb +1 -1
- data/lib/contrast/config/base_configuration.rb +18 -29
- data/lib/contrast/config/certification_configuration.rb +15 -0
- data/lib/contrast/config/env_variables.rb +3 -10
- data/lib/contrast/config/exception_configuration.rb +1 -1
- data/lib/contrast/config/heap_dump_configuration.rb +7 -7
- data/lib/contrast/config/inventory_configuration.rb +2 -6
- data/lib/contrast/config/logger_configuration.rb +1 -1
- data/lib/contrast/config/protect_configuration.rb +1 -1
- data/lib/contrast/config/protect_rule_configuration.rb +2 -2
- data/lib/contrast/config/protect_rules_configuration.rb +1 -1
- data/lib/contrast/config/request_audit_configuration.rb +18 -0
- data/lib/contrast/config/root_configuration.rb +1 -1
- data/lib/contrast/config/ruby_configuration.rb +10 -7
- 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 +2 -3
- data/lib/contrast/config.rb +1 -2
- data/lib/contrast/configuration.rb +2 -3
- data/lib/contrast/extension/assess/array.rb +9 -9
- data/lib/contrast/extension/assess/erb.rb +15 -5
- data/lib/contrast/extension/assess/eval_trigger.rb +3 -1
- data/lib/contrast/extension/assess/exec_trigger.rb +2 -1
- data/lib/contrast/extension/assess/fiber.rb +6 -3
- data/lib/contrast/extension/assess/hash.rb +1 -1
- data/lib/contrast/extension/assess/kernel.rb +8 -3
- data/lib/contrast/extension/assess/marshal.rb +6 -2
- data/lib/contrast/extension/assess/regexp.rb +8 -2
- data/lib/contrast/extension/assess/string.rb +8 -2
- data/lib/contrast/extension/assess.rb +1 -1
- data/lib/contrast/extension/delegator.rb +1 -1
- data/lib/contrast/extension/extension.rb +2 -4
- data/lib/contrast/extension/inventory.rb +1 -1
- data/lib/contrast/extension/kernel.rb +1 -1
- data/lib/contrast/extension/module.rb +1 -1
- data/lib/contrast/extension/protect/psych.rb +1 -1
- data/lib/contrast/extension/protect.rb +1 -1
- data/lib/contrast/extension/thread.rb +32 -13
- data/lib/contrast/framework/base_support.rb +5 -1
- data/lib/contrast/framework/grape/support.rb +25 -1
- data/lib/contrast/framework/manager.rb +33 -36
- data/lib/contrast/framework/manager_extend.rb +50 -0
- data/lib/contrast/framework/platform_version.rb +1 -1
- data/lib/contrast/framework/rack/patch/session_cookie.rb +1 -1
- data/lib/contrast/framework/rack/patch/support.rb +1 -1
- 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 +1 -1
- data/lib/contrast/framework/rails/patch/rails_application_configuration.rb +1 -1
- data/lib/contrast/framework/rails/patch/support.rb +1 -1
- data/lib/contrast/framework/rails/railtie.rb +2 -2
- data/lib/contrast/framework/rails/support.rb +46 -2
- data/lib/contrast/framework/sinatra/support.rb +26 -3
- data/lib/contrast/funchook/funchook.rb +21 -18
- data/lib/contrast/logger/application.rb +1 -1
- data/lib/contrast/logger/format.rb +1 -1
- data/lib/contrast/logger/log.rb +9 -104
- data/lib/contrast/logger/request.rb +1 -1
- data/lib/contrast/logger/time.rb +1 -1
- data/lib/contrast/security_exception.rb +1 -1
- data/lib/contrast/tasks/config.rb +1 -1
- data/lib/contrast/tasks/service.rb +1 -1
- data/lib/contrast/utils/assess/propagation_method_utils.rb +1 -1
- data/lib/contrast/utils/assess/property/tagged_utils.rb +24 -1
- data/lib/contrast/utils/assess/sampling_util.rb +4 -4
- data/lib/contrast/utils/assess/source_method_utils.rb +1 -1
- data/lib/contrast/utils/assess/split_utils.rb +23 -0
- data/lib/contrast/utils/assess/tracking_util.rb +21 -16
- data/lib/contrast/utils/assess/trigger_method_utils.rb +4 -3
- data/lib/contrast/utils/class_util.rb +19 -15
- data/lib/contrast/utils/duck_utils.rb +1 -1
- data/lib/contrast/utils/env_configuration_item.rb +2 -2
- data/lib/contrast/utils/exclude_key.rb +1 -1
- data/lib/contrast/utils/findings.rb +65 -0
- data/lib/contrast/utils/hash_digest.rb +46 -79
- data/lib/contrast/utils/hash_digest_extend.rb +129 -0
- data/lib/contrast/utils/head_dump_utils_extend.rb +74 -0
- data/lib/contrast/utils/heap_dump_util.rb +3 -66
- data/lib/contrast/utils/invalid_configuration_util.rb +32 -2
- data/lib/contrast/utils/io_util.rb +2 -2
- data/lib/contrast/utils/job_servers_running.rb +1 -1
- data/lib/contrast/utils/log_utils.rb +108 -0
- data/lib/contrast/utils/lru_cache.rb +1 -1
- data/lib/contrast/utils/metrics_hash.rb +2 -2
- data/lib/contrast/utils/middleware_utils.rb +87 -0
- data/lib/contrast/utils/net_http_base.rb +165 -0
- data/lib/contrast/utils/object_share.rb +2 -6
- data/lib/contrast/utils/os.rb +9 -5
- data/lib/contrast/utils/patching/policy/patch_utils.rb +63 -99
- data/lib/contrast/utils/patching/policy/patcher_utils.rb +1 -1
- data/lib/contrast/utils/preflight_util.rb +1 -1
- data/lib/contrast/utils/request_utils.rb +96 -0
- data/lib/contrast/utils/resource_loader.rb +1 -1
- data/lib/contrast/utils/response_utils.rb +97 -0
- 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 +69 -67
- data/lib/contrast/utils/tag_util.rb +11 -10
- data/lib/contrast/utils/telemetry.rb +11 -10
- data/lib/contrast/utils/telemetry_client.rb +90 -0
- data/lib/contrast/utils/telemetry_identifier.rb +18 -25
- data/lib/contrast/utils/thread_tracker.rb +1 -1
- data/lib/contrast/utils/timer.rb +1 -1
- data/lib/contrast-agent.rb +1 -1
- data/lib/contrast.rb +1 -1
- data/ruby-agent.gemspec +9 -10
- metadata +102 -49
- data/ext/cs__assess_active_record_named/cs__active_record_named.c +0 -46
- data/ext/cs__assess_active_record_named/cs__active_record_named.h +0 -11
- data/ext/cs__assess_active_record_named/extconf.rb +0 -5
- data/lib/contrast/agent/assess/policy/rewriter_patch.rb +0 -95
- data/lib/contrast/agent/class_reopener.rb +0 -258
- data/lib/contrast/agent/rewriter.rb +0 -259
- data/lib/contrast/config/default_value.rb +0 -17
- data/lib/contrast/framework/rails/rewrite/action_controller_railties_helper_inherited.rb +0 -37
- data/lib/contrast/framework/rails/rewrite/active_record_attribute_methods_read.rb +0 -41
- data/lib/contrast/framework/rails/rewrite/active_record_named.rb +0 -75
- data/lib/contrast/framework/rails/rewrite/active_record_time_zone_inherited.rb +0 -35
- data/lib/contrast/utils/requests_client.rb +0 -150
- data/lib/contrast/utils/ruby_ast_rewriter.rb +0 -82
@@ -1,4 +1,4 @@
|
|
1
|
-
# Copyright (c)
|
1
|
+
# Copyright (c) 2022 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/utils/timer'
|
@@ -7,6 +7,9 @@ require 'contrast/agent/response'
|
|
7
7
|
require 'contrast/agent/inventory/database_config'
|
8
8
|
require 'contrast/components/logger'
|
9
9
|
require 'contrast/components/scope'
|
10
|
+
require 'contrast/utils/request_utils'
|
11
|
+
require 'contrast/agent/request_context_extend'
|
12
|
+
require 'contrast/agent/reporting/reporting_events/observed_route'
|
10
13
|
|
11
14
|
module Contrast
|
12
15
|
module Agent
|
@@ -24,14 +27,18 @@ module Contrast
|
|
24
27
|
# @attr_reader server_activity [Contrast::Api::Dtm::ServerActivity] the server activity found in this request
|
25
28
|
# @attr_reader route [Contrast::Api::Dtm::RouteCoverage] the route, used for findings, of this request
|
26
29
|
# @attr_reader observed_route [Contrast::Api::Dtm::ObservedRoute] the route, used for coverage, of this request
|
30
|
+
# @attr_reader new_observed_route [Contrast::Agent::Reporting::ObservedRoute] the route, used for coverage, of this
|
31
|
+
# request
|
27
32
|
class RequestContext
|
28
33
|
include Contrast::Components::Logger::InstanceMethods
|
29
34
|
include Contrast::Components::Scope::InstanceMethods
|
35
|
+
include Contrast::Utils::RequestUtils
|
36
|
+
include Contrast::Agent::RequestContextExtend
|
30
37
|
|
31
38
|
EMPTY_INPUT_ANALYSIS_PB = Contrast::Api::Settings::InputAnalysis.new
|
32
39
|
|
33
|
-
attr_reader :activity, :logging_hash, :observed_route, :request, :response, :route,
|
34
|
-
:server_activity, :timer
|
40
|
+
attr_reader :activity, :logging_hash, :observed_route, :new_observed_route, :request, :response, :route,
|
41
|
+
:speedracer_input_analysis, :server_activity, :timer
|
35
42
|
|
36
43
|
def initialize rack_request, app_loaded = true
|
37
44
|
with_contrast_scope do
|
@@ -47,8 +54,6 @@ module Contrast
|
|
47
54
|
|
48
55
|
@server_activity = Contrast::Api::Dtm::ServerActivity.new
|
49
56
|
|
50
|
-
@observed_route = Contrast::Api::Dtm::ObservedRoute.new
|
51
|
-
|
52
57
|
# build analyzer
|
53
58
|
@do_not_track = false
|
54
59
|
@speedracer_input_analysis = EMPTY_INPUT_ANALYSIS_PB
|
@@ -64,7 +69,7 @@ module Contrast
|
|
64
69
|
@sample_req, @sample_res = Contrast::Utils::Assess::SamplingUtil.instance.sample?(@request)
|
65
70
|
end
|
66
71
|
|
67
|
-
|
72
|
+
handle_routes
|
68
73
|
end
|
69
74
|
end
|
70
75
|
|
@@ -100,98 +105,6 @@ module Contrast
|
|
100
105
|
::Contrast::ASSESS.enabled?
|
101
106
|
end
|
102
107
|
|
103
|
-
# Convert the discovered route for this request to appropriate forms and disseminate it to those locations
|
104
|
-
# where it is necessary for our route coverage and finding vulnerability discovery features to function.
|
105
|
-
#
|
106
|
-
# @param route [Contrast::Api::Dtm::RouteCoverage, nil] the route of the current request, as determined from the
|
107
|
-
# framework
|
108
|
-
def append_route_coverage route
|
109
|
-
return unless route
|
110
|
-
|
111
|
-
# For our findings
|
112
|
-
@route = route
|
113
|
-
|
114
|
-
# For SR findings
|
115
|
-
@activity.routes << route
|
116
|
-
|
117
|
-
# For TS routes
|
118
|
-
@observed_route.signature = route.route
|
119
|
-
@observed_route.verb = route.verb
|
120
|
-
@observed_route.url = route.url if route.url
|
121
|
-
@request.route = route
|
122
|
-
@request.observed_route = @observed_route
|
123
|
-
end
|
124
|
-
|
125
|
-
# Collect the results for the given rule with the given action
|
126
|
-
#
|
127
|
-
# @param rule [String] the id of the rule to which the results apply
|
128
|
-
# @param response_type [Symbol] the result of the response, matching a value of
|
129
|
-
# Contrast::Api::Dtm::AttackResult::ResponseType
|
130
|
-
# @return [Array<Contrast::Api::Dtm::AttackResult>]
|
131
|
-
def results_for rule, response_type = nil
|
132
|
-
if response_type.nil?
|
133
|
-
activity.results.select { |r| r.rule_id == rule }
|
134
|
-
else
|
135
|
-
activity.results.select { |r| r.rule_id == rule && r.response == response_type }
|
136
|
-
end
|
137
|
-
end
|
138
|
-
|
139
|
-
def service_extract_request
|
140
|
-
return false unless ::Contrast::AGENT.enabled?
|
141
|
-
return false unless ::Contrast::PROTECT.enabled?
|
142
|
-
return false if @do_not_track
|
143
|
-
|
144
|
-
service_response = Contrast::Agent.messaging_queue.send_event_immediately(@activity.http_request)
|
145
|
-
return false unless service_response
|
146
|
-
|
147
|
-
handle_protect_state(service_response)
|
148
|
-
ia = service_response.input_analysis
|
149
|
-
if ia
|
150
|
-
if logger.trace?
|
151
|
-
logger.trace('Analysis from Contrast Service', evaluations: ia.results.length)
|
152
|
-
logger.trace('Results', input_analysis: ia.inspect)
|
153
|
-
end
|
154
|
-
@speedracer_input_analysis = ia
|
155
|
-
speedracer_input_analysis.request = request
|
156
|
-
else
|
157
|
-
logger.trace('Analysis from Contrast Service was empty.')
|
158
|
-
false
|
159
|
-
end
|
160
|
-
rescue Contrast::SecurityException => e
|
161
|
-
raise e
|
162
|
-
rescue StandardError => e
|
163
|
-
logger.warn('Unable to extract Contrast Service information from request', e)
|
164
|
-
false
|
165
|
-
end
|
166
|
-
|
167
|
-
# NOTE: this method is only used as a backstop if Speedracer sends Input Evaluations when the protect state
|
168
|
-
# indicates a security exception should be thrown. This method ensures that the attack reports are generated.
|
169
|
-
# Normally these should be generated on Speedracer for any attacks detected during prefilter.
|
170
|
-
#
|
171
|
-
# @param agent_settings [Contrast::Api::Settings::AgentSettings]
|
172
|
-
def handle_protect_state agent_settings
|
173
|
-
return unless agent_settings&.protect_state
|
174
|
-
|
175
|
-
state = agent_settings.protect_state
|
176
|
-
@uuid = state.uuid
|
177
|
-
@do_not_track = true unless state.track_request
|
178
|
-
return unless state.security_exception
|
179
|
-
|
180
|
-
# If Contrast Service has NOT handled the input analysis, handle them here
|
181
|
-
build_attack_results(agent_settings)
|
182
|
-
logger.debug('Contrast Service said to block this request')
|
183
|
-
raise Contrast::SecurityException.new(nil, (state.security_message || 'Blocking suspicious behavior'))
|
184
|
-
end
|
185
|
-
|
186
|
-
# append anything we've learned to the request seen message this is the sum-total of all inventory information
|
187
|
-
# that has been accumulated since the last request
|
188
|
-
def extract_after rack_response
|
189
|
-
@response = Contrast::Agent::Response.new(rack_response)
|
190
|
-
activity.http_response = @response.dtm if @sample_res
|
191
|
-
rescue StandardError => e
|
192
|
-
logger.error('Unable to extract information after request', e)
|
193
|
-
end
|
194
|
-
|
195
108
|
def add_property key, value
|
196
109
|
@_properties[key] = value
|
197
110
|
end
|
@@ -203,43 +116,19 @@ module Contrast
|
|
203
116
|
def reset_activity
|
204
117
|
@activity = Contrast::Api::Dtm::Activity.new(http_request: request.dtm)
|
205
118
|
@server_activity = Contrast::Api::Dtm::ServerActivity.new
|
206
|
-
@observed_route = Contrast::Api::Dtm::ObservedRoute.new
|
119
|
+
@observed_route = Contrast::Api::Dtm::ObservedRoute.new # TODO: RUBY-1438 -- remove
|
120
|
+
@new_observed_route = Contrast::Agent::Reporting::ObservedRoute.new
|
207
121
|
end
|
208
122
|
|
209
123
|
private
|
210
124
|
|
211
|
-
|
212
|
-
|
213
|
-
|
214
|
-
|
215
|
-
|
216
|
-
|
217
|
-
|
218
|
-
agent_settings.input_analysis.results.each do |ia_result|
|
219
|
-
rule_id = ia_result.rule_id
|
220
|
-
rule = ::Contrast::PROTECT.rule(rule_id)
|
221
|
-
next unless rule
|
222
|
-
|
223
|
-
if logger.debug?
|
224
|
-
logger.debug('Building attack result from Contrast Service input analysis result',
|
225
|
-
result: ia_result.inspect)
|
226
|
-
end
|
227
|
-
|
228
|
-
attack_result = if rule.mode == :BLOCK
|
229
|
-
# special case for rules (like reflected xss) that used to have an infilter / block mode
|
230
|
-
# but now are just block at perimeter
|
231
|
-
rule.build_attack_with_match(self, ia_result, attack_results_by_rule[rule_id],
|
232
|
-
ia_result.value)
|
233
|
-
else
|
234
|
-
rule.build_attack_without_match(self, ia_result, attack_results_by_rule[rule_id])
|
235
|
-
end
|
236
|
-
attack_results_by_rule[rule_id] = attack_result
|
237
|
-
end
|
238
|
-
|
239
|
-
attack_results_by_rule.each_pair do |_, attack_result|
|
240
|
-
logger.info('Blocking attack result', rule: attack_result.rule_id)
|
241
|
-
activity.results << attack_result
|
242
|
-
end
|
125
|
+
def handle_routes
|
126
|
+
@observed_route = Contrast::Api::Dtm::ObservedRoute.new # TODO: RUBY-1438 -- remove
|
127
|
+
@new_observed_route = Contrast::Agent::Reporting::ObservedRoute.new
|
128
|
+
route_dtm = Contrast::Agent.framework_manager.get_route_dtm(@request)
|
129
|
+
new_route_coverage_dtm = Contrast::Agent.framework_manager.get_route_information(@request)
|
130
|
+
append_route_coverage(route_dtm)
|
131
|
+
append_to_new_observed_route(new_route_coverage_dtm)
|
243
132
|
end
|
244
133
|
end
|
245
134
|
end
|
@@ -0,0 +1,163 @@
|
|
1
|
+
# Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
|
2
|
+
# frozen_string_literal: true
|
3
|
+
|
4
|
+
require 'contrast/agent/assess/rule/response/autocomplete_rule'
|
5
|
+
|
6
|
+
module Contrast
|
7
|
+
module Agent
|
8
|
+
# This class extends RequestContexts: this class acts to encapsulate information about the currently
|
9
|
+
# executed request, making it available to the Agent for the duration of the request in a standardized
|
10
|
+
# and normalized format which the Agent understands.
|
11
|
+
module RequestContextExtend
|
12
|
+
BUILD_ATTACK_LOGGER_MESSAGE = 'Building attack result from Contrast Service input analysis result'
|
13
|
+
# Convert the discovered route for this request to appropriate forms and disseminate it to those locations
|
14
|
+
# where it is necessary for our route coverage and finding vulnerability discovery features to function.
|
15
|
+
#
|
16
|
+
# @param route [Contrast::Api::Dtm::RouteCoverage, nil] the route of the current request, as determined from the
|
17
|
+
# framework
|
18
|
+
def append_route_coverage route
|
19
|
+
return unless route
|
20
|
+
|
21
|
+
# For our findings
|
22
|
+
@route = route
|
23
|
+
|
24
|
+
# For SR findings
|
25
|
+
@activity.routes << route
|
26
|
+
|
27
|
+
# For TS routes
|
28
|
+
@observed_route.signature = route.route
|
29
|
+
@observed_route.verb = route.verb
|
30
|
+
@observed_route.url = route.url if route.url
|
31
|
+
@request.route = route
|
32
|
+
@request.observed_route = @observed_route
|
33
|
+
end
|
34
|
+
|
35
|
+
# Convert the discovered route for this request to appropriate forms and disseminate it to those locations
|
36
|
+
# where it is necessary for our route coverage and finding vulnerability discovery features to function.
|
37
|
+
#
|
38
|
+
def append_to_new_observed_route route
|
39
|
+
return unless route
|
40
|
+
|
41
|
+
@new_observed_route.signature = route.route
|
42
|
+
@new_observed_route.verb = route.verb
|
43
|
+
@new_observed_route.url = route.url if route.url
|
44
|
+
@request.new_observed_route = @new_observed_route
|
45
|
+
end
|
46
|
+
|
47
|
+
# Collect the results for the given rule with the given action
|
48
|
+
#
|
49
|
+
# @param rule [String] the id of the rule to which the results apply
|
50
|
+
# @param response_type [Symbol] the result of the response, matching a value of
|
51
|
+
# Contrast::Api::Dtm::AttackResult::ResponseType
|
52
|
+
# @return [Array<Contrast::Api::Dtm::AttackResult>]
|
53
|
+
def results_for rule, response_type = nil
|
54
|
+
if response_type.nil?
|
55
|
+
activity.results.select { |r| r.rule_id == rule }
|
56
|
+
else
|
57
|
+
activity.results.select { |r| r.rule_id == rule && r.response == response_type }
|
58
|
+
end
|
59
|
+
end
|
60
|
+
|
61
|
+
def service_extract_request
|
62
|
+
return false unless ::Contrast::AGENT.enabled?
|
63
|
+
return false unless ::Contrast::PROTECT.enabled?
|
64
|
+
return false if @do_not_track
|
65
|
+
|
66
|
+
service_response = Contrast::Agent.messaging_queue.send_event_immediately(@activity.http_request)
|
67
|
+
return false unless service_response
|
68
|
+
|
69
|
+
handle_protect_state(service_response)
|
70
|
+
ia = service_response.input_analysis
|
71
|
+
if ia
|
72
|
+
if logger.trace?
|
73
|
+
logger.trace('Analysis from Contrast Service', evaluations: ia.results.length)
|
74
|
+
logger.trace('Results', input_analysis: ia.inspect)
|
75
|
+
end
|
76
|
+
@speedracer_input_analysis = ia
|
77
|
+
speedracer_input_analysis.request = request
|
78
|
+
else
|
79
|
+
logger.trace('Analysis from Contrast Service was empty.')
|
80
|
+
false
|
81
|
+
end
|
82
|
+
rescue Contrast::SecurityException => e
|
83
|
+
raise e
|
84
|
+
rescue StandardError => e
|
85
|
+
logger.warn('Unable to extract Contrast Service information from request', e)
|
86
|
+
false
|
87
|
+
end
|
88
|
+
|
89
|
+
# NOTE: this method is only used as a backstop if Speedracer sends Input Evaluations when the protect state
|
90
|
+
# indicates a security exception should be thrown. This method ensures that the attack reports are generated.
|
91
|
+
# Normally these should be generated on Speedracer for any attacks detected during prefilter.
|
92
|
+
#
|
93
|
+
# @param agent_settings [Contrast::Api::Settings::AgentSettings]
|
94
|
+
def handle_protect_state agent_settings
|
95
|
+
return unless agent_settings&.protect_state
|
96
|
+
|
97
|
+
state = agent_settings.protect_state
|
98
|
+
@uuid = state.uuid
|
99
|
+
@do_not_track = true unless state.track_request
|
100
|
+
return unless state.security_exception
|
101
|
+
|
102
|
+
# If Contrast Service has NOT handled the input analysis, handle them here
|
103
|
+
build_attack_results(agent_settings)
|
104
|
+
logger.debug('Contrast Service said to block this request')
|
105
|
+
raise Contrast::SecurityException.new(nil, (state.security_message || 'Blocking suspicious behavior'))
|
106
|
+
end
|
107
|
+
|
108
|
+
# append anything we've learned to the request seen message this is the sum-total of all inventory information
|
109
|
+
# that has been accumulated since the last request
|
110
|
+
def extract_after rack_response
|
111
|
+
@response = Contrast::Agent::Response.new(rack_response)
|
112
|
+
activity.http_response = @response.dtm if @sample_res
|
113
|
+
return unless Contrast::Agent::Reporter.enabled?
|
114
|
+
|
115
|
+
Contrast::Agent::Assess::Rule::Response::Autocomplete.new.analyze(@response)
|
116
|
+
rescue StandardError => e
|
117
|
+
logger.error('Unable to extract information after request', e)
|
118
|
+
end
|
119
|
+
|
120
|
+
private
|
121
|
+
|
122
|
+
# Generate attack results directly from any evaluations on the agent settings object.
|
123
|
+
#
|
124
|
+
# @param agent_settings [Contrast::Api::Settings::AgentSettings]
|
125
|
+
def build_attack_results agent_settings
|
126
|
+
return unless agent_settings&.input_analysis&.results&.any?
|
127
|
+
|
128
|
+
results_by_rule = {}
|
129
|
+
agent_settings.input_analysis.results.each do |ia_result|
|
130
|
+
rule_id = ia_result.rule_id
|
131
|
+
rule = ::Contrast::PROTECT.rule(rule_id)
|
132
|
+
next unless rule
|
133
|
+
|
134
|
+
logger.debug(BUILD_ATTACK_LOGGER_MESSAGE, result: ia_result.inspect) if logger.debug?
|
135
|
+
results_by_rule[rule_id] = attack_result rule, rule_id, ia_result, results_by_rule
|
136
|
+
end
|
137
|
+
|
138
|
+
results_by_rule.each_pair do |_, attack_result|
|
139
|
+
logger.info('Blocking attack result', rule: attack_result.rule_id)
|
140
|
+
activity.results << attack_result
|
141
|
+
end
|
142
|
+
end
|
143
|
+
|
144
|
+
# Generates the attack result
|
145
|
+
#
|
146
|
+
# @param rule [Contrast::Agent::Protect::Rule, Contrast::Agent::Assess::Rule]
|
147
|
+
# @param rule_id [String] String name of the rule
|
148
|
+
# @param ia_result [Contrast::Api::Settings::InputAnalysisResult] the
|
149
|
+
# analysis of the input that was determined to be an attack
|
150
|
+
# @param results_by_rule [Hash] attack results from any evaluations on the agent settings object.
|
151
|
+
# @return [Contrast::Api::Dtm::AttackResult] the attack result from this input
|
152
|
+
def attack_result rule, rule_id, ia_result, results_by_rule
|
153
|
+
@_attack_result = if rule.mode == :BLOCK
|
154
|
+
# special case for rules (like reflected xss) that used to have an infilter / block mode
|
155
|
+
# but now are just block at perimeter
|
156
|
+
rule.build_attack_with_match(self, ia_result, results_by_rule[rule_id], ia_result.value)
|
157
|
+
else
|
158
|
+
rule.build_attack_without_match(self, ia_result, results_by_rule[rule_id])
|
159
|
+
end
|
160
|
+
end
|
161
|
+
end
|
162
|
+
end
|
163
|
+
end
|
@@ -1,8 +1,10 @@
|
|
1
|
-
# Copyright (c)
|
1
|
+
# Copyright (c) 2022 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/logger'
|
5
5
|
require 'contrast/components/scope'
|
6
|
+
require 'contrast/agent/reporting/reporter'
|
7
|
+
require 'contrast/agent/reporting/reporting_utilities/dtm_message'
|
6
8
|
|
7
9
|
module Contrast
|
8
10
|
module Agent
|
@@ -19,15 +21,49 @@ module Contrast
|
|
19
21
|
@ruleset = ::Contrast::AGENT.ruleset
|
20
22
|
end
|
21
23
|
|
22
|
-
#
|
24
|
+
# Send Activities messages to TS [Contrast::Agent::Reporting::ServerActivity,
|
25
|
+
# Contrast::Api::Dtm::ServerActivity,
|
26
|
+
# Contrast::Api::Dtm::Activity,
|
27
|
+
# Contrast::Api::Dtm::ObservedRoute]
|
28
|
+
# If bypass is enabled use the reporting service if not than the messages are
|
29
|
+
# send with speedracer
|
23
30
|
# TODO: RUBY-1355
|
24
|
-
# TODO: RUBY-1357
|
25
31
|
# TODO: RUBY-1358
|
32
|
+
# TODO: RUBY-1438 -- remove
|
26
33
|
def send_activity_messages
|
34
|
+
events = [context.activity]
|
35
|
+
unless Contrast::Agent::Reporter.enabled?
|
36
|
+
Contrast::Agent::Inventory::DependencyUsageAnalysis.instance.generate_library_usage(context.activity)
|
37
|
+
events << context.server_activity
|
38
|
+
events << context.observed_route
|
39
|
+
end
|
40
|
+
events.each do |message|
|
41
|
+
Contrast::Agent.messaging_queue&.send_event_eventually(message)
|
42
|
+
end
|
43
|
+
end
|
44
|
+
|
45
|
+
# reports events[Contrast::Agent::Reporting::ReporterEvent] to TS
|
46
|
+
# This method is used to send our JSON messages directly to TeamServer at the end of each request. As we move
|
47
|
+
# more endpoints over, this method will take the messages originally sent by #send_actiivty_messages. At the end,
|
48
|
+
# that method should be removed.
|
49
|
+
# TODO: RUBY-1358
|
50
|
+
def report_activity
|
51
|
+
return unless Contrast::Agent::Reporter.enabled?
|
52
|
+
|
53
|
+
reporter = Contrast::Agent.reporter
|
54
|
+
return unless reporter
|
55
|
+
|
27
56
|
Contrast::Agent::Inventory::DependencyUsageAnalysis.instance.generate_library_usage(context.activity)
|
28
|
-
[
|
29
|
-
|
57
|
+
[
|
58
|
+
context.new_observed_route,
|
59
|
+
Contrast::Agent::Reporting::DtmMessage.dtm_to_event(context.server_activity),
|
60
|
+
Contrast::Agent::Reporting::DtmMessage.dtm_to_event(context.activity.library_usages)
|
61
|
+
].each do |event|
|
62
|
+
reporter.send_event(event)
|
63
|
+
rescue StandardError => e
|
64
|
+
logger.warn('Unable to send Event Activity', e)
|
30
65
|
end
|
66
|
+
context.activity.library_usages.clear # TODO: RUBY-1355 remove when no longer using activity
|
31
67
|
end
|
32
68
|
|
33
69
|
# If the response is streaming, we should only perform filtering on our stream safe rules
|
@@ -1,4 +1,4 @@
|
|
1
|
-
# Copyright (c)
|
1
|
+
# Copyright (c) 2022 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 'resolv'
|
@@ -8,6 +8,7 @@ require 'contrast/utils/object_share'
|
|
8
8
|
require 'contrast/utils/string_utils'
|
9
9
|
require 'contrast/utils/hash_digest'
|
10
10
|
require 'contrast/components/logger'
|
11
|
+
require 'contrast/utils/response_utils'
|
11
12
|
|
12
13
|
module Contrast
|
13
14
|
module Agent
|
@@ -17,6 +18,7 @@ module Contrast
|
|
17
18
|
# order to avoid repeatedly creating Strings & thrashing GC.
|
18
19
|
class Response
|
19
20
|
include Contrast::Components::Logger::InstanceMethods
|
21
|
+
include Contrast::Utils::ResponseUtils
|
20
22
|
|
21
23
|
extend Forwardable
|
22
24
|
|
@@ -27,6 +29,9 @@ module Contrast
|
|
27
29
|
@is_array = !rack_response.is_a?(Rack::Response)
|
28
30
|
end
|
29
31
|
|
32
|
+
# The document type of the response, based on its Content-Type. Can be one of :JSON, :NORMAL, :XML, or nothing.
|
33
|
+
#
|
34
|
+
# @return [Symbol<:XML, :JSON, :NORMAL>, nil]
|
30
35
|
def document_type
|
31
36
|
case content_type
|
32
37
|
when /xml/i
|
@@ -38,7 +43,10 @@ module Contrast
|
|
38
43
|
end
|
39
44
|
end
|
40
45
|
|
41
|
-
#
|
46
|
+
# A form of the Rack::Response which we can report to the Service to be sent to TeamServer for processing. B/c
|
47
|
+
# the response can change, we can't memoize this :(
|
48
|
+
#
|
49
|
+
# @return [Contrast::Api::Dtm::HttpResponse]
|
42
50
|
def dtm
|
43
51
|
context_response = Contrast::Api::Dtm::HttpResponse.new
|
44
52
|
context_response.response_code = response_code.to_i
|
@@ -53,114 +61,43 @@ module Contrast
|
|
53
61
|
context_response
|
54
62
|
end
|
55
63
|
|
64
|
+
# The response code of this response
|
65
|
+
#
|
66
|
+
# @return [Integer]
|
56
67
|
def response_code
|
57
68
|
return unless rack_response
|
58
69
|
|
59
70
|
@is_array ? rack_response[0].to_i : rack_response.status
|
60
71
|
end
|
61
72
|
|
73
|
+
# The headers of this response
|
74
|
+
#
|
75
|
+
# @return [Hash, nil]
|
62
76
|
def headers
|
63
77
|
return unless rack_response
|
64
78
|
|
65
|
-
|
66
|
-
rack_response[1]
|
67
|
-
else
|
68
|
-
rack_response.headers
|
69
|
-
end
|
79
|
+
@is_array ? rack_response[1] : rack_response.headers
|
70
80
|
end
|
71
81
|
|
82
|
+
# The Content-Type of this response, as set in the headers hash under the key Rack::CONTENT_TYPE
|
83
|
+
#
|
84
|
+
# @return [String, nil]
|
72
85
|
def content_type
|
73
86
|
return unless rack_response
|
74
87
|
|
75
|
-
|
76
|
-
headers[Rack::CONTENT_TYPE]
|
77
|
-
else
|
78
|
-
rack_response.content_type
|
79
|
-
end
|
88
|
+
@is_array ? headers[Rack::CONTENT_TYPE] : rack_response.content_type
|
80
89
|
end
|
81
90
|
|
82
|
-
# The response body can change during the request lifecycle
|
83
|
-
# We should not extract it out as a variable here, or we'll miss those
|
84
|
-
#
|
91
|
+
# The response body can change during the request lifecycle, so we have to look it up every time we need it.
|
92
|
+
# We should not extract it out as a variable here, or we'll miss those changes.
|
93
|
+
#
|
94
|
+
# @return [String, nil]
|
85
95
|
def body
|
86
96
|
return unless rack_response
|
87
97
|
|
88
98
|
body_content = @is_array ? rack_response[2] : rack_response.body
|
89
99
|
extract_body(body_content)
|
90
100
|
end
|
91
|
-
|
92
|
-
private
|
93
|
-
|
94
|
-
# From the dtm for normalized_response_headers:
|
95
|
-
# Key is UPPERCASE_UNDERSCORE
|
96
|
-
#
|
97
|
-
# Example: Content-Type: text/html; charset=utf-8
|
98
|
-
# "CONTENT_TYPE" => Content-Type,["text/html; charset=utf8"]
|
99
|
-
def append_pair map, key, value
|
100
|
-
return unless key && value
|
101
|
-
return if value.is_a?(Hash)
|
102
|
-
|
103
|
-
safe_key = Contrast::Utils::StringUtils.force_utf8(key)
|
104
|
-
hash_key = Contrast::Utils::StringUtils.normalized_key(safe_key)
|
105
|
-
map[hash_key] ||= Contrast::Api::Dtm::Pair.new
|
106
|
-
map[hash_key].key = safe_key
|
107
|
-
map[hash_key].values << Contrast::Utils::StringUtils.force_utf8(value)
|
108
|
-
end
|
109
|
-
|
110
|
-
HTTP_PREFIX = /^[Hh][Tt][Tt][Pp][_-]/i.cs__freeze
|
111
|
-
|
112
|
-
# Given some holder of the content of the response's body, extract that
|
113
|
-
# content and return it as a String
|
114
|
-
#
|
115
|
-
# @param body [String, Rack::File, Rack::BodyProxy,
|
116
|
-
# ActionDispatch::Response::RackBody, Rack::Response] Something that
|
117
|
-
# holds, wraps, or is the body of the Response
|
118
|
-
# @return [nil, String] the content of the body
|
119
|
-
def extract_body body
|
120
|
-
return unless body
|
121
|
-
|
122
|
-
if defined?(Rack::File) && body.is_a?(Rack::File)
|
123
|
-
# not sure what to do in this situation, so don't do anything.
|
124
|
-
nil
|
125
|
-
elsif body.is_a?(Rack::BodyProxy)
|
126
|
-
handle_rack_body_proxy(body)
|
127
|
-
elsif (defined?(ActionDispatch::Response::RackBody) && body.is_a?(ActionDispatch::Response::RackBody)) ||
|
128
|
-
body.is_a?(Rack::Response)
|
129
|
-
|
130
|
-
extract_body(body.body)
|
131
|
-
elsif Contrast::Utils::DuckUtils.quacks_to?(body, :each)
|
132
|
-
acc = []
|
133
|
-
body.each { |tmp| acc << read_or_string(tmp) }
|
134
|
-
acc.compact.join(Contrast::Utils::ObjectShare::NEW_LINE)
|
135
|
-
elsif ActionView::OutputBuffer
|
136
|
-
# https://stackoverflow.com/questions/15654676/how-to-convert-activesupportsafebuffer-to-string
|
137
|
-
body.to_str
|
138
|
-
else
|
139
|
-
read_or_string(body)
|
140
|
-
end
|
141
|
-
end
|
142
|
-
|
143
|
-
def handle_rack_body_proxy body
|
144
|
-
next_body = body.instance_variable_get(:@body)
|
145
|
-
case next_body
|
146
|
-
when Array
|
147
|
-
extract_body(next_body[0])
|
148
|
-
else
|
149
|
-
extract_body(next_body)
|
150
|
-
end
|
151
|
-
end
|
152
|
-
|
153
|
-
def read_or_string obj
|
154
|
-
return unless obj
|
155
|
-
|
156
|
-
if Contrast::Utils::DuckUtils.quacks_to?(obj, :read)
|
157
|
-
tmp = obj.read
|
158
|
-
obj.rewind
|
159
|
-
tmp
|
160
|
-
else
|
161
|
-
obj.to_s
|
162
|
-
end
|
163
|
-
end
|
164
101
|
end
|
165
102
|
end
|
166
103
|
end
|
@@ -1,4 +1,4 @@
|
|
1
|
-
# Copyright (c)
|
1
|
+
# Copyright (c) 2022 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/logger'
|
data/lib/contrast/agent/scope.rb
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
# Copyright (c)
|
1
|
+
# Copyright (c) 2022 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) 2022 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/logger'
|