contrast-agent 3.11.0 → 3.13.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.dockerignore +0 -1
- data/.flayignore +1 -0
- data/.gitignore +1 -1
- data/.simplecov +1 -1
- data/Rakefile +31 -0
- data/ext/build_funchook.rb +0 -2
- data/ext/cs__assess_active_record_named/cs__active_record_named.c +7 -2
- data/ext/cs__assess_active_record_named/cs__active_record_named.h +1 -0
- data/ext/cs__assess_array/cs__assess_array.c +2 -1
- data/ext/cs__assess_array/cs__assess_array.h +1 -0
- data/ext/cs__assess_basic_object/cs__assess_basic_object.c +3 -7
- data/ext/cs__assess_basic_object/cs__assess_basic_object.h +2 -1
- data/ext/cs__assess_fiber_track/cs__assess_fiber_track.c +2 -8
- data/ext/cs__assess_fiber_track/cs__assess_fiber_track.h +0 -1
- data/ext/cs__assess_kernel/cs__assess_kernel.c +1 -1
- data/ext/cs__assess_module/cs__assess_module.c +5 -7
- data/ext/cs__assess_module/cs__assess_module.h +3 -0
- data/ext/cs__assess_string_interpolation26/cs__assess_string_interpolation26.c +1 -6
- data/ext/cs__assess_yield_track/cs__assess_yield_track.c +1 -5
- data/ext/cs__assess_yield_track/cs__assess_yield_track.h +0 -1
- data/ext/cs__common/cs__common.c +25 -1
- data/ext/cs__common/cs__common.h +3 -0
- data/ext/cs__common/extconf.rb +0 -14
- data/ext/cs__protect_kernel/cs__protect_kernel.c +4 -2
- data/ext/cs__protect_kernel/cs__protect_kernel.h +1 -0
- data/ext/extconf_common.rb +0 -28
- data/lib/contrast.rb +3 -2
- data/lib/contrast/agent.rb +33 -24
- data/lib/contrast/agent/assess.rb +0 -9
- data/lib/contrast/agent/assess/contrast_event.rb +28 -167
- data/lib/contrast/agent/assess/events/source_event.rb +3 -7
- data/lib/contrast/agent/assess/policy/dynamic_source_factory.rb +1 -1
- data/lib/contrast/agent/assess/policy/patcher.rb +1 -0
- data/lib/contrast/agent/assess/policy/policy_node.rb +5 -99
- data/lib/contrast/agent/assess/policy/policy_scanner.rb +1 -1
- data/lib/contrast/agent/assess/policy/propagation_method.rb +4 -2
- data/lib/contrast/agent/assess/policy/propagation_node.rb +5 -1
- data/lib/contrast/agent/assess/policy/propagator/base.rb +1 -1
- 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/insert.rb +1 -4
- data/lib/contrast/agent/assess/policy/propagator/match_data.rb +9 -1
- data/lib/contrast/agent/assess/policy/propagator/remove.rb +6 -11
- data/lib/contrast/agent/assess/policy/propagator/select.rb +4 -4
- data/lib/contrast/agent/assess/policy/propagator/split.rb +2 -2
- data/lib/contrast/agent/assess/policy/propagator/substitution.rb +4 -4
- data/lib/contrast/agent/assess/policy/propagator/trim.rb +6 -10
- data/lib/contrast/agent/assess/policy/source_method.rb +1 -2
- 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 +2 -14
- data/lib/contrast/agent/assess/policy/trigger_node.rb +20 -5
- data/lib/contrast/agent/assess/properties.rb +4 -382
- data/lib/contrast/agent/assess/property/evented.rb +78 -0
- data/lib/contrast/agent/assess/property/tagged.rb +339 -0
- data/lib/contrast/agent/assess/rule/base.rb +0 -15
- data/lib/contrast/agent/assess/rule/provider/hardcoded_value_rule.rb +5 -6
- data/lib/contrast/agent/assess/rule/redos.rb +0 -1
- data/lib/contrast/agent/assess/tag.rb +27 -12
- data/lib/contrast/agent/at_exit_hook.rb +4 -2
- data/lib/contrast/agent/class_reopener.rb +9 -4
- data/lib/contrast/agent/exclusion_matcher.rb +2 -3
- data/lib/contrast/agent/inventory/policy/datastores.rb +53 -0
- data/lib/contrast/agent/inventory/policy/policy.rb +1 -1
- data/lib/contrast/agent/middleware.rb +36 -44
- data/lib/contrast/agent/patching/policy/after_load_patch.rb +11 -2
- data/lib/contrast/agent/patching/policy/after_load_patcher.rb +51 -56
- data/lib/contrast/agent/patching/policy/patch.rb +3 -2
- data/lib/contrast/agent/patching/policy/patcher.rb +10 -12
- data/lib/contrast/agent/patching/policy/policy.rb +3 -3
- data/lib/contrast/agent/patching/policy/policy_node.rb +3 -3
- data/lib/contrast/agent/patching/policy/trigger_node.rb +1 -1
- 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 +25 -36
- data/lib/contrast/agent/protect/rule/base_service.rb +1 -1
- data/lib/contrast/agent/protect/rule/cmd_injection.rb +3 -3
- data/lib/contrast/agent/protect/rule/http_method_tampering.rb +2 -7
- data/lib/contrast/agent/protect/rule/path_traversal.rb +2 -7
- data/lib/contrast/agent/protect/rule/sqli.rb +4 -4
- data/lib/contrast/agent/protect/rule/xxe.rb +1 -0
- data/lib/contrast/agent/railtie.rb +1 -0
- data/lib/contrast/agent/reaction_processor.rb +3 -3
- data/lib/contrast/agent/request.rb +91 -334
- data/lib/contrast/agent/request_context.rb +17 -18
- data/lib/contrast/agent/request_handler.rb +2 -2
- data/lib/contrast/agent/response.rb +2 -83
- data/lib/contrast/agent/scope.rb +1 -1
- data/lib/contrast/agent/service_heartbeat.rb +8 -10
- data/lib/contrast/agent/static_analysis.rb +2 -3
- data/lib/contrast/agent/thread_watcher.rb +49 -0
- data/lib/contrast/agent/version.rb +1 -1
- data/lib/contrast/agent/worker_thread.rb +24 -0
- data/lib/contrast/api.rb +3 -5
- data/lib/contrast/api/communication.rb +20 -0
- data/lib/contrast/api/communication/connection_status.rb +41 -0
- data/lib/contrast/api/communication/messaging_queue.rb +79 -0
- data/lib/contrast/{utils/service_response_util.rb → api/communication/response_processor.rb} +15 -22
- data/lib/contrast/api/communication/service_lifecycle.rb +61 -0
- data/lib/contrast/api/communication/socket.rb +45 -0
- data/lib/contrast/api/communication/socket_client.rb +76 -0
- data/lib/contrast/api/communication/speedracer.rb +111 -0
- data/lib/contrast/api/communication/tcp_socket.rb +31 -0
- data/lib/contrast/api/communication/unix_socket.rb +27 -0
- data/lib/contrast/api/decorators.rb +10 -0
- data/lib/contrast/api/decorators/address.rb +60 -0
- data/lib/contrast/api/decorators/application_settings.rb +7 -3
- data/lib/contrast/api/decorators/application_update.rb +0 -9
- data/lib/contrast/api/decorators/http_request.rb +139 -0
- data/lib/contrast/api/decorators/message.rb +75 -0
- data/lib/contrast/api/decorators/rasp_rule_sample.rb +28 -0
- data/lib/contrast/api/decorators/route_coverage.rb +57 -0
- data/lib/contrast/api/decorators/trace_event.rb +99 -0
- data/lib/contrast/api/decorators/trace_event_object.rb +57 -0
- data/lib/contrast/api/decorators/trace_event_signature.rb +46 -0
- data/lib/contrast/api/decorators/trace_taint_range.rb +51 -0
- data/lib/contrast/api/decorators/trace_taint_range_tags.rb +109 -0
- data/lib/contrast/api/decorators/user_input.rb +40 -0
- data/lib/contrast/components/agent.rb +17 -12
- data/lib/contrast/components/app_context.rb +27 -2
- data/lib/contrast/components/assess.rb +25 -15
- data/lib/contrast/components/config.rb +4 -9
- data/lib/contrast/components/contrast_service.rb +23 -67
- data/lib/contrast/components/interface.rb +5 -13
- data/lib/contrast/components/inventory.rb +5 -1
- data/lib/contrast/components/logger.rb +2 -2
- data/lib/contrast/components/protect.rb +40 -4
- data/lib/contrast/components/scope.rb +2 -52
- data/lib/contrast/components/settings.rb +18 -18
- 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 +3 -4
- data/lib/contrast/{extensions/ruby_core → extension}/assess/erb.rb +0 -0
- data/lib/contrast/extension/assess/eval_trigger.rb +78 -0
- data/lib/contrast/{extensions/ruby_core → extension}/assess/exec_trigger.rb +1 -1
- data/lib/contrast/{extensions/ruby_core → extension}/assess/fiber.rb +7 -6
- data/lib/contrast/{extensions/ruby_core → extension}/assess/hash.rb +2 -2
- data/lib/contrast/extension/assess/kernel.rb +110 -0
- data/lib/contrast/{extensions/ruby_core → extension}/assess/regexp.rb +4 -4
- data/lib/contrast/{extensions/ruby_core → extension}/assess/string.rb +6 -6
- data/lib/contrast/{extensions/ruby_core → extension}/delegator.rb +0 -0
- data/lib/contrast/{extensions/ruby_core → extension}/inventory.rb +2 -3
- 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 +22 -23
- data/lib/contrast/framework/manager.rb +31 -15
- 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 +41 -0
- data/lib/contrast/framework/rails/patch/assess_configuration.rb +102 -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 +86 -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 +98 -0
- data/lib/contrast/funchook/funchook.rb +45 -0
- data/lib/contrast/logger/application.rb +80 -0
- data/lib/contrast/logger/format.rb +51 -0
- data/lib/contrast/{agent/logger.rb → logger/log.rb} +39 -63
- data/lib/contrast/logger/time.rb +50 -0
- data/lib/contrast/tasks/config.rb +54 -0
- data/lib/contrast/tasks/service.rb +1 -5
- data/lib/contrast/utils/assess/tracking_util.rb +45 -20
- data/lib/contrast/utils/class_util.rb +4 -2
- data/lib/contrast/utils/gemfile_reader.rb +2 -2
- data/lib/contrast/utils/hash_digest.rb +13 -9
- data/lib/contrast/utils/invalid_configuration_util.rb +2 -18
- data/lib/contrast/utils/inventory_util.rb +2 -7
- data/lib/contrast/utils/job_servers_running.rb +4 -2
- data/lib/contrast/utils/object_share.rb +0 -2
- data/lib/contrast/utils/os.rb +16 -4
- data/lib/contrast/utils/stack_trace_utils.rb +0 -1
- data/lib/contrast/utils/tag_util.rb +1 -1
- data/lib/contrast/utils/thread_tracker.rb +1 -14
- data/lib/contrast/utils/timer.rb +1 -17
- data/resources/assess/policy.json +9 -50
- data/resources/inventory/policy.json +2 -2
- data/resources/protect/policy.json +6 -6
- data/ruby-agent.gemspec +9 -5
- data/service_executables/VERSION +1 -1
- data/service_executables/linux/contrast-service +0 -0
- data/service_executables/mac/contrast-service +0 -0
- metadata +103 -139
- data/funchook/Makefile +0 -29
- data/funchook/autom4te.cache/output.0 +0 -4964
- data/funchook/autom4te.cache/requests +0 -77
- data/funchook/autom4te.cache/traces.0 +0 -361
- data/funchook/config.log +0 -651
- data/funchook/config.status +0 -1015
- data/funchook/configure +0 -4964
- data/funchook/src/Makefile +0 -70
- data/funchook/src/config.h +0 -101
- data/funchook/src/config.h.in +0 -100
- 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 +0 -43
- 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 +0 -20
- 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/agent/assess/adjusted_span.rb +0 -27
- 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 -53
- data/lib/contrast/agent/assess/rule/csrf/csrf_watcher.rb +0 -136
- 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 -346
- data/lib/contrast/agent/protect/rule/csrf.rb +0 -119
- data/lib/contrast/agent/protect/rule/csrf/csrf_evaluator.rb +0 -100
- data/lib/contrast/agent/protect/rule/csrf/csrf_token_injector.rb +0 -85
- data/lib/contrast/agent/settings_state.rb +0 -88
- data/lib/contrast/agent/socket_client.rb +0 -134
- data/lib/contrast/api/connection_status.rb +0 -49
- data/lib/contrast/api/decorators/exclusion.rb +0 -20
- data/lib/contrast/api/socket.rb +0 -43
- data/lib/contrast/api/speedracer.rb +0 -188
- data/lib/contrast/api/tcp_socket.rb +0 -29
- data/lib/contrast/api/unix_socket.rb +0 -25
- 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_inheritance.rb +0 -39
- 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 -58
- 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/kernel.rb +0 -96
- data/lib/contrast/extensions/ruby_core/assess/module.rb +0 -14
- data/lib/contrast/extensions/ruby_core/assess/tilt_template_trigger.rb +0 -78
- data/lib/contrast/extensions/ruby_core/assess/xpath_library_trigger.rb +0 -40
- data/lib/contrast/extensions/ruby_core/eval_trigger.rb +0 -51
- data/lib/contrast/extensions/ruby_core/inventory/datastores.rb +0 -37
- data/lib/contrast/extensions/ruby_core/protect/applies_command_injection_rule.rb +0 -61
- data/lib/contrast/extensions/ruby_core/protect/applies_deserialization_rule.rb +0 -50
- data/lib/contrast/extensions/ruby_core/protect/applies_no_sqli_rule.rb +0 -66
- data/lib/contrast/extensions/ruby_core/protect/applies_path_traversal_rule.rb +0 -115
- data/lib/contrast/extensions/ruby_core/protect/applies_sqli_rule.rb +0 -53
- data/lib/contrast/extensions/ruby_core/protect/applies_xxe_rule.rb +0 -127
- data/lib/contrast/extensions/ruby_core/protect/kernel.rb +0 -30
- data/lib/contrast/extensions/ruby_core/protect/rule_applicator.rb +0 -50
- data/lib/contrast/framework/rails_support.rb +0 -104
- data/lib/contrast/framework/sinatra_application_helper.rb +0 -49
- data/lib/contrast/framework/sinatra_support.rb +0 -104
- data/lib/contrast/framework/view_technologies_descriptor.rb +0 -21
- data/lib/contrast/internal_exception.rb +0 -8
- data/lib/contrast/utils/cache.rb +0 -58
- data/lib/contrast/utils/data_store_util.rb +0 -23
- 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/lib/contrast/utils/service_sender_util.rb +0 -110
- data/lib/contrast/utils/sinatra_helper.rb +0 -49
- data/resources/csrf/inject.js +0 -44
@@ -0,0 +1,79 @@
|
|
1
|
+
# Copyright (c) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
|
2
|
+
# frozen_string_literal: true
|
3
|
+
|
4
|
+
cs__scoped_require 'contrast/components/interface'
|
5
|
+
cs__scoped_require 'contrast/agent/worker_thread'
|
6
|
+
|
7
|
+
module Contrast
|
8
|
+
module Api
|
9
|
+
module Communication
|
10
|
+
# Top level gateway to messaging with speedracer
|
11
|
+
class MessagingQueue < Contrast::Agent::WorkerThread
|
12
|
+
include Contrast::Components::Interface
|
13
|
+
access_component :analysis, :logging, :settings
|
14
|
+
|
15
|
+
attr_reader :queue, :speedracer
|
16
|
+
|
17
|
+
def initialize
|
18
|
+
@queue = Queue.new
|
19
|
+
@speedracer = Contrast::Api::Communication::Speedracer.new
|
20
|
+
super
|
21
|
+
end
|
22
|
+
|
23
|
+
# Use this to bypass the messaging queue and leave response processing to the caller
|
24
|
+
def send_event_immediately event
|
25
|
+
send_event(event, true)
|
26
|
+
end
|
27
|
+
|
28
|
+
# Use this to add a message to the queue and process the response internally
|
29
|
+
def send_event_eventually event
|
30
|
+
logger.debug('Enqueued event for sending', event_type: event.cs__class)
|
31
|
+
queue << event if event
|
32
|
+
end
|
33
|
+
|
34
|
+
def start_thread!
|
35
|
+
speedracer.ensure_startup!
|
36
|
+
return if running?
|
37
|
+
|
38
|
+
@_thread = Contrast::Agent::Thread.new do
|
39
|
+
loop do
|
40
|
+
event = queue.pop
|
41
|
+
|
42
|
+
begin
|
43
|
+
logger.debug('Dequeued event for sending', event_type: event.cs__class)
|
44
|
+
send_event(event)
|
45
|
+
rescue StandardError => e
|
46
|
+
logger.error('Could not send message to service from messaging queue thread.', e)
|
47
|
+
end
|
48
|
+
end
|
49
|
+
end
|
50
|
+
logger.debug('Started background sending thread.')
|
51
|
+
end
|
52
|
+
|
53
|
+
private
|
54
|
+
|
55
|
+
# return_response is used to determine if we want to return the response to the caller or process it internally
|
56
|
+
def send_event event, return_response = false
|
57
|
+
preprocess_event(event)
|
58
|
+
if return_response
|
59
|
+
speedracer.return_response(event)
|
60
|
+
else
|
61
|
+
speedracer.process_internally(event)
|
62
|
+
end
|
63
|
+
end
|
64
|
+
|
65
|
+
# For now this only handles appending assess tags
|
66
|
+
# eventually we could break out preprocessors for every event type
|
67
|
+
def preprocess_event event
|
68
|
+
return unless event.is_a?(Contrast::Api::Dtm::Activity)
|
69
|
+
|
70
|
+
# So set their tags
|
71
|
+
event.finding_tags = Contrast::Utils::StringUtils.force_utf8(ASSESS.tags)
|
72
|
+
|
73
|
+
# and see if they're even enabled
|
74
|
+
event.findings.delete_if { |finding| ASSESS.rule_disabled?(finding.rule_id) }
|
75
|
+
end
|
76
|
+
end
|
77
|
+
end
|
78
|
+
end
|
79
|
+
end
|
data/lib/contrast/{utils/service_response_util.rb → api/communication/response_processor.rb}
RENAMED
@@ -1,23 +1,18 @@
|
|
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/agent/
|
5
|
-
cs__scoped_require 'contrast/components/interface'
|
6
|
-
cs__scoped_require 'contrast/utils/assess/sampling_util'
|
4
|
+
cs__scoped_require 'contrast/agent/reaction_processor'
|
7
5
|
|
8
6
|
module Contrast
|
9
|
-
module
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
def process_response response
|
19
|
-
fs = Contrast::Agent::FeatureState.instance
|
20
|
-
fs.last_update = response&.sent_ms
|
7
|
+
module Api
|
8
|
+
module Communication
|
9
|
+
# Handles processing deferred messages
|
10
|
+
class ResponseProcessor
|
11
|
+
include Contrast::Components::Interface
|
12
|
+
access_component :agent, :analysis, :logging, :settings
|
13
|
+
|
14
|
+
def process response
|
15
|
+
logger.debug('Received a response', sent_ms: response&.sent_ms)
|
21
16
|
|
22
17
|
server_features = process_server_response(response)
|
23
18
|
app_settings = process_application_response(response)
|
@@ -25,17 +20,13 @@ module Contrast
|
|
25
20
|
# ReactionProcessor is a design pattern from TeamServer.
|
26
21
|
# Right now, there's one potential reaction, which is disabling the agent
|
27
22
|
Contrast::Agent::ReactionProcessor.process(response&.application_settings)
|
28
|
-
# Determine new accumulator state
|
29
|
-
if (new_accum = response&.accumulator_settings)
|
30
|
-
SETTINGS.accumulator_settings.replace(new_accum)
|
31
|
-
end
|
32
23
|
|
33
|
-
Contrast::
|
24
|
+
Contrast::Logger::Log.instance.update(server_features&.log_file, server_features&.log_level)
|
34
25
|
update_features(server_features, app_settings)
|
35
26
|
logger.trace(
|
36
27
|
'Agent settings updated in response to Service',
|
37
|
-
protect_on:
|
38
|
-
assess_on:
|
28
|
+
protect_on: PROTECT.enabled?,
|
29
|
+
assess_on: ASSESS.enabled?)
|
39
30
|
end
|
40
31
|
|
41
32
|
private
|
@@ -68,10 +59,12 @@ module Contrast
|
|
68
59
|
# I don't think it should go into contrast_service because that only handles connection specific data
|
69
60
|
def update_features server_features, app_settings
|
70
61
|
return unless !!(server_features || app_settings)
|
62
|
+
return unless AGENT.enabled?
|
71
63
|
|
72
64
|
logger.trace_with_time('Rebuilding rule modes') do
|
73
65
|
SETTINGS.build_protect_rules if PROTECT.enabled?
|
74
66
|
SETTINGS.build_assess_rules if ASSESS.enabled?
|
67
|
+
AGENT.reset_ruleset
|
75
68
|
|
76
69
|
logger.info('Current rule settings:')
|
77
70
|
PROTECT.rules.each { |k, v| logger.info('Protect Rule mode set', rule: k, mode: v.mode) }
|
@@ -0,0 +1,61 @@
|
|
1
|
+
# Copyright (c) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
|
2
|
+
# frozen_string_literal: true
|
3
|
+
|
4
|
+
module Contrast
|
5
|
+
module Api
|
6
|
+
module Communication
|
7
|
+
# Handles local service startup
|
8
|
+
module ServiceLifecycle
|
9
|
+
include Contrast::Components::Interface
|
10
|
+
access_component :logging, :contrast_service
|
11
|
+
|
12
|
+
def attempt_local_service_startup
|
13
|
+
zombie_check
|
14
|
+
service_starter_thread.join(5)
|
15
|
+
is_service_started = Contrast::Utils::OS.running?
|
16
|
+
if is_service_started
|
17
|
+
logger.info('The bundled service was successfully started.')
|
18
|
+
else
|
19
|
+
logger.error('The bundled service could not be started. The agent will not function properly.')
|
20
|
+
end
|
21
|
+
is_service_started
|
22
|
+
end
|
23
|
+
|
24
|
+
# check if there's a zombie service that exists, and wait on it if so.
|
25
|
+
# currently, this only happens when trying to initialize speedracer
|
26
|
+
def zombie_check
|
27
|
+
zombie_pid_list = Contrast::Utils::OS.zombie_pids
|
28
|
+
zombie_pid_list.each do |pid|
|
29
|
+
Process.wait(pid.to_i)
|
30
|
+
end
|
31
|
+
end
|
32
|
+
|
33
|
+
def determine_startup_options
|
34
|
+
return { out: :out, err: :out } if CONTRAST_SERVICE.logger_path == 'STDOUT'
|
35
|
+
return { out: :err, err: :err } if CONTRAST_SERVICE.logger_path == 'STDERR'
|
36
|
+
|
37
|
+
{ out: File::NULL, err: File::NULL }
|
38
|
+
end
|
39
|
+
|
40
|
+
# This is a separate method so we can overwrite it globally in specs
|
41
|
+
def spawn_service
|
42
|
+
options = determine_startup_options
|
43
|
+
logger.debug('Spawning service')
|
44
|
+
spawn 'contrast_service', options
|
45
|
+
end
|
46
|
+
|
47
|
+
def service_starter_thread
|
48
|
+
Contrast::Agent::Thread.new do
|
49
|
+
# Always check to see if it already started
|
50
|
+
unless Contrast::Utils::OS.running?
|
51
|
+
# Spawn the service process
|
52
|
+
spawn_service
|
53
|
+
# Block until service is running
|
54
|
+
sleep(0.1) until Contrast::Utils::OS.running?
|
55
|
+
end
|
56
|
+
end
|
57
|
+
end
|
58
|
+
end
|
59
|
+
end
|
60
|
+
end
|
61
|
+
end
|
@@ -0,0 +1,45 @@
|
|
1
|
+
# Copyright (c) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
|
2
|
+
# frozen_string_literal: true
|
3
|
+
|
4
|
+
module Contrast
|
5
|
+
module Api
|
6
|
+
module Communication
|
7
|
+
# Behavior common to all sockets used
|
8
|
+
# to communicate with the Contrast Service.
|
9
|
+
module Socket
|
10
|
+
SOCKET_MONITOR = Monitor.new
|
11
|
+
|
12
|
+
# Send a message across the socket and read back the response.
|
13
|
+
# @param marshaled [String] some marshaled form of data to be sent across
|
14
|
+
# the socket. Typically an encoded form of Contrast::Api::Dtm::Message.
|
15
|
+
# @return [String] some marshalled form of data returned by the socket.
|
16
|
+
# Typically an encoded form of Contrast::Api::Settings::AgentSettings.
|
17
|
+
def send_marshaled marshaled
|
18
|
+
SOCKET_MONITOR.synchronize do
|
19
|
+
socket = new_socket
|
20
|
+
|
21
|
+
# write message length
|
22
|
+
len = marshaled.length
|
23
|
+
socket.write([len].pack(Contrast::Api::ENCODING_STRING))
|
24
|
+
|
25
|
+
# write the entire message
|
26
|
+
socket.write(marshaled)
|
27
|
+
socket.close_write
|
28
|
+
|
29
|
+
# read the response length
|
30
|
+
len = socket.read(4).unpack1(Contrast::Api::ENCODING_STRING)
|
31
|
+
|
32
|
+
# read expected response to end
|
33
|
+
socket.read(len)
|
34
|
+
end
|
35
|
+
end
|
36
|
+
|
37
|
+
# Override this method to return a socket.
|
38
|
+
# Should be interface compatible with TCPSocket, UNIXSocket, etc.
|
39
|
+
def new_socket
|
40
|
+
raise NoMethodError, 'This is abstract, override it.'
|
41
|
+
end
|
42
|
+
end
|
43
|
+
end
|
44
|
+
end
|
45
|
+
end
|
@@ -0,0 +1,76 @@
|
|
1
|
+
# Copyright (c) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
|
2
|
+
# frozen_string_literal: true
|
3
|
+
|
4
|
+
cs__scoped_require 'socket'
|
5
|
+
cs__scoped_require 'uri'
|
6
|
+
|
7
|
+
cs__scoped_require 'contrast/api/communication/tcp_socket'
|
8
|
+
cs__scoped_require 'contrast/api/communication/unix_socket'
|
9
|
+
cs__scoped_require 'contrast/components/interface'
|
10
|
+
|
11
|
+
module Contrast
|
12
|
+
module Api
|
13
|
+
module Communication
|
14
|
+
# SocketClient acts as a interface between the agent and the service. It instantiates a
|
15
|
+
# service proxy and tracks the state of that proxy.
|
16
|
+
class SocketClient
|
17
|
+
include Contrast::Components::Interface
|
18
|
+
access_component :contrast_service, :logging
|
19
|
+
|
20
|
+
def initialize
|
21
|
+
@socket = init_connection
|
22
|
+
end
|
23
|
+
|
24
|
+
# Wrap the given DTM in a Contrast::Api::Dtm::Message and send it to the
|
25
|
+
# Service for processing
|
26
|
+
#
|
27
|
+
# @param event [Contrast::Api::Dtm] One of the DTMs valid for the event field of
|
28
|
+
# Contrast::Api::Dtm::Message
|
29
|
+
def send_one event
|
30
|
+
msg = Contrast::Api::Dtm::Message.build(event)
|
31
|
+
send_message(msg)
|
32
|
+
end
|
33
|
+
|
34
|
+
private
|
35
|
+
|
36
|
+
def init_connection
|
37
|
+
if CONTRAST_SERVICE.use_tcp?
|
38
|
+
Contrast::Api::Communication::TcpSocket.new(CONTRAST_SERVICE.host, CONTRAST_SERVICE.port)
|
39
|
+
else
|
40
|
+
Contrast::Api::Communication::UnixSocket.new(CONTRAST_SERVICE.socket_path)
|
41
|
+
end
|
42
|
+
end
|
43
|
+
|
44
|
+
def send_message msg
|
45
|
+
return unless msg
|
46
|
+
|
47
|
+
logger.debug('Sending message.',
|
48
|
+
msg_id: msg.__id__,
|
49
|
+
p_id: msg.pid,
|
50
|
+
msg_count: msg.message_count)
|
51
|
+
to_service = Contrast::Api::Dtm::Message.encode(msg)
|
52
|
+
from_service = send_marshaled(to_service)
|
53
|
+
response = Contrast::Api::Settings::AgentSettings.decode(from_service)
|
54
|
+
logger.debug('Received response.',
|
55
|
+
msg_id: msg.__id__,
|
56
|
+
p_id: msg.pid,
|
57
|
+
msg_count: msg.message_count,
|
58
|
+
response_id: response&.__id__)
|
59
|
+
response
|
60
|
+
rescue StandardError => e
|
61
|
+
logger.error('Sending failed for message.',
|
62
|
+
e,
|
63
|
+
msg_id: msg.__id__,
|
64
|
+
p_id: msg.pid,
|
65
|
+
msg_count: msg.message_count,
|
66
|
+
response_id: response&.__id__)
|
67
|
+
raise e # reraise to let Speedracer manage the connection
|
68
|
+
end
|
69
|
+
|
70
|
+
def send_marshaled marshaled
|
71
|
+
@socket.send_marshaled(marshaled)
|
72
|
+
end
|
73
|
+
end
|
74
|
+
end
|
75
|
+
end
|
76
|
+
end
|
@@ -0,0 +1,111 @@
|
|
1
|
+
# Copyright (c) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
|
2
|
+
# frozen_string_literal: true
|
3
|
+
|
4
|
+
cs__scoped_require 'contrast/components/interface'
|
5
|
+
|
6
|
+
module Contrast
|
7
|
+
module Api
|
8
|
+
module Communication
|
9
|
+
# Wraps all connection data to speedracer
|
10
|
+
class Speedracer
|
11
|
+
include Contrast::Api::Communication::ServiceLifecycle
|
12
|
+
include Contrast::Components::Interface
|
13
|
+
access_component :contrast_service, :logging, :app_context
|
14
|
+
|
15
|
+
attr_reader :status, :response_processor, :socket_client, :ensure_running
|
16
|
+
|
17
|
+
def initialize
|
18
|
+
@status = Contrast::Api::Communication::ConnectionStatus.new
|
19
|
+
@socket_client = Contrast::Api::Communication::SocketClient.new
|
20
|
+
@response_processor = Contrast::Api::Communication::ResponseProcessor.new
|
21
|
+
@ensure_running = Mutex.new
|
22
|
+
end
|
23
|
+
|
24
|
+
def ensure_startup!
|
25
|
+
return if status.connected?
|
26
|
+
|
27
|
+
ensure_running.synchronize do
|
28
|
+
if CONTRAST_SERVICE.use_bundled_service?
|
29
|
+
logger.info('Attempting to start local service')
|
30
|
+
unless attempt_local_service_startup
|
31
|
+
logger.error('Failed to start local service')
|
32
|
+
return
|
33
|
+
end
|
34
|
+
end
|
35
|
+
unless status.startup_messages_sent?
|
36
|
+
startup_responses = send_initialization_messages
|
37
|
+
return false unless startup_responses
|
38
|
+
|
39
|
+
startup_responses.each { |response| response_processor.process(response) }
|
40
|
+
end
|
41
|
+
end
|
42
|
+
end
|
43
|
+
|
44
|
+
def return_response event
|
45
|
+
send_to_speedracer(event) do |response|
|
46
|
+
return response
|
47
|
+
end
|
48
|
+
end
|
49
|
+
|
50
|
+
def process_internally event
|
51
|
+
send_to_speedracer(event) do |response|
|
52
|
+
response_processor.process(response)
|
53
|
+
end
|
54
|
+
end
|
55
|
+
|
56
|
+
private
|
57
|
+
|
58
|
+
def send_to_speedracer event
|
59
|
+
ensure_startup!
|
60
|
+
|
61
|
+
logger.debug_with_time(event.cs__class.name) do
|
62
|
+
response = socket_client.send_one event
|
63
|
+
status.success!
|
64
|
+
yield response
|
65
|
+
end
|
66
|
+
rescue StandardError => e
|
67
|
+
status.failure!
|
68
|
+
logger.error('Unable to send message.', e,
|
69
|
+
event_id: event.__id__,
|
70
|
+
event_type: event.cs__class.name)
|
71
|
+
nil
|
72
|
+
end
|
73
|
+
|
74
|
+
def send_initialization_messages
|
75
|
+
agent_startup_msg = APP_CONTEXT.build_agent_startup_message
|
76
|
+
app_startup_msg = APP_CONTEXT.build_app_startup_message
|
77
|
+
|
78
|
+
logger.debug('Preparing to send startup messages')
|
79
|
+
# 1 initial attempt, + 3 potential retries.
|
80
|
+
# The agent-service-api REQUIREMENTS.md spec mandates this #.
|
81
|
+
4.times do
|
82
|
+
log_send_event(agent_startup_msg)
|
83
|
+
next unless (agent_response = socket_client.send_one(agent_startup_msg))
|
84
|
+
|
85
|
+
# Connection was successful
|
86
|
+
log_send_event(app_startup_msg)
|
87
|
+
app_response = socket_client.send_one(app_startup_msg)
|
88
|
+
|
89
|
+
status.success!
|
90
|
+
logger.debug('Successfully sent startup messages to service.')
|
91
|
+
return [agent_response, app_response]
|
92
|
+
end
|
93
|
+
|
94
|
+
status.failure!
|
95
|
+
logger.error('Could not send agent startup message context')
|
96
|
+
nil
|
97
|
+
rescue StandardError => e
|
98
|
+
logger.error('Could not build service context', e)
|
99
|
+
status.failure!
|
100
|
+
nil
|
101
|
+
end
|
102
|
+
|
103
|
+
def log_send_event event
|
104
|
+
logger.debug('Immediately sending event.',
|
105
|
+
event_id: event.__id__,
|
106
|
+
event_type: event.cs__class.name)
|
107
|
+
end
|
108
|
+
end
|
109
|
+
end
|
110
|
+
end
|
111
|
+
end
|
@@ -0,0 +1,31 @@
|
|
1
|
+
# Copyright (c) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
|
2
|
+
# frozen_string_literal: true
|
3
|
+
|
4
|
+
cs__scoped_require 'contrast/api/communication/socket'
|
5
|
+
|
6
|
+
module Contrast
|
7
|
+
module Api
|
8
|
+
module Communication
|
9
|
+
# This class allows us to create a TCP Socket to communicate to the Service
|
10
|
+
# (Speed Racer). Either it or the Unix Socket will be used, as determined
|
11
|
+
# by the configuration options set for Service communication.
|
12
|
+
class TcpSocket
|
13
|
+
include Contrast::Api::Communication::Socket
|
14
|
+
|
15
|
+
attr_reader :host, :port
|
16
|
+
|
17
|
+
# Create the socket
|
18
|
+
# @param host [String] socket target hostname or IP address
|
19
|
+
# @param port [String,Integer] socket target port
|
20
|
+
def initialize host, port
|
21
|
+
@host = host.to_s
|
22
|
+
@port = port.to_i
|
23
|
+
end
|
24
|
+
|
25
|
+
def new_socket
|
26
|
+
::TCPSocket.new(host, port)
|
27
|
+
end
|
28
|
+
end
|
29
|
+
end
|
30
|
+
end
|
31
|
+
end
|