contrast-agent 3.12.1 → 3.14.0
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/.gitignore +1 -1
- data/.simplecov +1 -1
- data/Rakefile +31 -0
- data/exe/contrast_service +1 -7
- data/ext/build_funchook.rb +0 -2
- data/ext/cs__assess_active_record_named/cs__active_record_named.c +8 -7
- data/ext/cs__assess_array/cs__assess_array.c +6 -5
- data/ext/cs__assess_basic_object/cs__assess_basic_object.c +5 -5
- data/ext/cs__assess_fiber_track/cs__assess_fiber_track.c +4 -9
- data/ext/cs__assess_fiber_track/cs__assess_fiber_track.h +0 -1
- data/ext/cs__assess_hash/cs__assess_hash.c +18 -17
- data/ext/cs__assess_hash/cs__assess_hash.h +2 -1
- data/ext/cs__assess_kernel/cs__assess_kernel.c +7 -8
- data/ext/cs__assess_marshal_module/cs__assess_marshal_module.c +4 -5
- data/ext/cs__assess_module/cs__assess_module.c +6 -6
- data/ext/cs__assess_regexp/cs__assess_regexp.c +4 -4
- data/ext/cs__assess_string/cs__assess_string.c +20 -4
- data/ext/cs__assess_string/cs__assess_string.h +4 -1
- data/ext/cs__assess_string_interpolation26/cs__assess_string_interpolation26.c +4 -7
- data/ext/cs__assess_yield_track/cs__assess_yield_track.c +3 -7
- data/ext/cs__assess_yield_track/cs__assess_yield_track.h +0 -1
- data/ext/cs__common/cs__common.c +59 -28
- data/ext/cs__common/cs__common.h +18 -20
- data/ext/cs__common/extconf.rb +0 -14
- data/ext/cs__contrast_patch/cs__contrast_patch.c +27 -25
- data/ext/cs__contrast_patch/cs__contrast_patch.h +5 -7
- data/ext/cs__protect_kernel/cs__protect_kernel.c +11 -12
- data/ext/cs__protect_kernel/cs__protect_kernel.h +2 -2
- data/ext/extconf_common.rb +0 -28
- data/lib/contrast-agent.rb +1 -1
- data/lib/contrast.rb +15 -23
- data/lib/contrast/agent.rb +51 -39
- data/lib/contrast/agent/assess.rb +11 -12
- data/lib/contrast/agent/assess/contrast_event.rb +39 -176
- data/lib/contrast/agent/assess/events/event_factory.rb +2 -2
- data/lib/contrast/agent/assess/events/source_event.rb +5 -9
- data/lib/contrast/agent/assess/finalizers/finalize.rb +21 -0
- data/lib/contrast/agent/assess/finalizers/freeze.rb +13 -0
- data/lib/contrast/agent/assess/finalizers/hash.rb +53 -0
- data/lib/contrast/agent/assess/policy/dynamic_source_factory.rb +2 -2
- data/lib/contrast/agent/assess/policy/patcher.rb +5 -5
- data/lib/contrast/agent/assess/policy/policy.rb +9 -9
- data/lib/contrast/agent/assess/policy/policy_node.rb +5 -99
- data/lib/contrast/agent/assess/policy/policy_scanner.rb +3 -3
- data/lib/contrast/agent/assess/policy/preshift.rb +15 -5
- data/lib/contrast/agent/assess/policy/propagation_method.rb +26 -24
- data/lib/contrast/agent/assess/policy/propagation_node.rb +6 -2
- data/lib/contrast/agent/assess/policy/propagator.rb +18 -18
- 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 -1
- data/lib/contrast/agent/assess/policy/propagator/insert.rb +1 -4
- data/lib/contrast/agent/assess/policy/propagator/match_data.rb +12 -3
- data/lib/contrast/agent/assess/policy/propagator/prepend.rb +5 -0
- 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 +5 -5
- data/lib/contrast/agent/assess/policy/propagator/substitution.rb +8 -7
- data/lib/contrast/agent/assess/policy/propagator/trim.rb +6 -10
- data/lib/contrast/agent/assess/policy/rewriter_patch.rb +5 -5
- data/lib/contrast/agent/assess/policy/source_method.rb +6 -16
- 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/xpath.rb +1 -1
- data/lib/contrast/agent/assess/policy/trigger_method.rb +7 -15
- data/lib/contrast/agent/assess/policy/trigger_node.rb +18 -6
- data/lib/contrast/agent/assess/policy/trigger_validation/trigger_validation.rb +2 -2
- data/lib/contrast/agent/assess/properties.rb +13 -383
- 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.rb +2 -2
- data/lib/contrast/agent/assess/rule/base.rb +3 -4
- data/lib/contrast/agent/assess/rule/provider.rb +3 -3
- data/lib/contrast/agent/assess/rule/provider/hardcoded_password.rb +1 -1
- data/lib/contrast/agent/assess/rule/provider/hardcoded_value_rule.rb +4 -22
- 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 +7 -6
- data/lib/contrast/agent/deadzone/policy/deadzone_node.rb +1 -1
- data/lib/contrast/agent/deadzone/policy/policy.rb +2 -2
- data/lib/contrast/agent/disable_reaction.rb +1 -1
- data/lib/contrast/agent/exclusion_matcher.rb +3 -3
- data/lib/contrast/agent/inventory/policy/datastores.rb +2 -3
- data/lib/contrast/agent/inventory/policy/policy.rb +3 -3
- data/lib/contrast/agent/inventory/policy/trigger_node.rb +1 -1
- data/lib/contrast/agent/middleware.rb +37 -48
- data/lib/contrast/agent/patching/policy/after_load_patch.rb +4 -4
- data/lib/contrast/agent/patching/policy/after_load_patcher.rb +6 -5
- data/lib/contrast/agent/patching/policy/module_policy.rb +1 -1
- data/lib/contrast/agent/patching/policy/patch.rb +16 -16
- data/lib/contrast/agent/patching/policy/patcher.rb +30 -22
- data/lib/contrast/agent/patching/policy/policy.rb +9 -9
- data/lib/contrast/agent/patching/policy/policy_node.rb +3 -3
- data/lib/contrast/agent/patching/policy/trigger_node.rb +2 -2
- data/lib/contrast/agent/protect/policy/applies_command_injection_rule.rb +3 -3
- data/lib/contrast/agent/protect/policy/applies_deserialization_rule.rb +2 -2
- data/lib/contrast/agent/protect/policy/applies_no_sqli_rule.rb +2 -2
- data/lib/contrast/agent/protect/policy/applies_path_traversal_rule.rb +3 -3
- data/lib/contrast/agent/protect/policy/applies_sqli_rule.rb +2 -2
- data/lib/contrast/agent/protect/policy/applies_xxe_rule.rb +3 -3
- data/lib/contrast/agent/protect/policy/policy.rb +8 -8
- data/lib/contrast/agent/protect/policy/rule_applicator.rb +3 -3
- data/lib/contrast/agent/protect/policy/trigger_node.rb +1 -1
- data/lib/contrast/agent/protect/rule.rb +18 -18
- data/lib/contrast/agent/protect/rule/base.rb +21 -32
- data/lib/contrast/agent/protect/rule/base_service.rb +2 -2
- data/lib/contrast/agent/protect/rule/cmd_injection.rb +5 -5
- data/lib/contrast/agent/protect/rule/deserialization.rb +1 -1
- data/lib/contrast/agent/protect/rule/http_method_tampering.rb +3 -8
- data/lib/contrast/agent/protect/rule/no_sqli.rb +1 -1
- data/lib/contrast/agent/protect/rule/path_traversal.rb +4 -5
- data/lib/contrast/agent/protect/rule/sqli.rb +2 -2
- 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.rb +4 -5
- data/lib/contrast/agent/protect/rule/xxe/entity_wrapper.rb +2 -2
- data/lib/contrast/agent/railtie.rb +1 -1
- data/lib/contrast/agent/reaction_processor.rb +5 -5
- data/lib/contrast/agent/request.rb +103 -340
- data/lib/contrast/agent/request_context.rb +25 -21
- data/lib/contrast/agent/request_handler.rb +1 -1
- data/lib/contrast/agent/response.rb +8 -20
- data/lib/contrast/agent/rewriter.rb +5 -6
- data/lib/contrast/agent/scope.rb +1 -1
- data/lib/contrast/agent/service_heartbeat.rb +8 -10
- data/lib/contrast/agent/static_analysis.rb +4 -4
- data/lib/contrast/agent/thread.rb +1 -1
- data/lib/contrast/agent/thread_watcher.rb +49 -0
- data/lib/contrast/agent/tracepoint_hook.rb +1 -1
- data/lib/contrast/agent/version.rb +1 -1
- data/lib/contrast/agent/worker_thread.rb +24 -0
- data/lib/contrast/api.rb +4 -6
- 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} +10 -19
- 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 +14 -4
- data/lib/contrast/api/decorators/address.rb +61 -0
- data/lib/contrast/api/decorators/application_settings.rb +10 -5
- data/lib/contrast/api/decorators/application_update.rb +5 -13
- data/lib/contrast/api/decorators/http_request.rb +140 -0
- data/lib/contrast/api/decorators/input_analysis.rb +3 -2
- data/lib/contrast/api/decorators/message.rb +76 -0
- data/lib/contrast/api/decorators/rasp_rule_sample.rb +29 -0
- data/lib/contrast/api/decorators/route_coverage.rb +58 -0
- data/lib/contrast/api/decorators/server_features.rb +3 -2
- data/lib/contrast/api/decorators/trace_event.rb +100 -0
- data/lib/contrast/api/decorators/trace_event_object.rb +58 -0
- data/lib/contrast/api/decorators/trace_event_signature.rb +47 -0
- data/lib/contrast/api/decorators/trace_taint_range.rb +52 -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/common_agent_configuration.rb +2 -2
- data/lib/contrast/components/agent.rb +2 -2
- data/lib/contrast/components/app_context.rb +1 -8
- data/lib/contrast/components/config.rb +7 -12
- data/lib/contrast/components/contrast_service.rb +1 -1
- data/lib/contrast/components/interface.rb +16 -16
- data/lib/contrast/components/logger.rb +1 -1
- data/lib/contrast/components/scope.rb +3 -3
- data/lib/contrast/components/settings.rb +0 -6
- data/lib/contrast/config.rb +18 -18
- data/lib/contrast/config/base_configuration.rb +2 -2
- data/lib/contrast/config/protect_rule_configuration.rb +1 -1
- data/lib/contrast/configuration.rb +5 -5
- data/lib/contrast/extension/assess.rb +22 -22
- data/lib/contrast/extension/assess/array.rb +4 -4
- data/lib/contrast/extension/assess/assess_extension.rb +28 -31
- data/lib/contrast/extension/assess/eval_trigger.rb +3 -3
- data/lib/contrast/extension/assess/exec_trigger.rb +1 -1
- data/lib/contrast/extension/assess/fiber.rb +3 -3
- data/lib/contrast/extension/assess/hash.rb +5 -3
- data/lib/contrast/extension/assess/kernel.rb +7 -6
- data/lib/contrast/extension/assess/marshal.rb +62 -0
- data/lib/contrast/extension/assess/regexp.rb +3 -3
- data/lib/contrast/extension/assess/string.rb +6 -6
- data/lib/contrast/extension/inventory.rb +4 -5
- data/lib/contrast/extension/kernel.rb +1 -1
- data/lib/contrast/extension/module.rb +1 -1
- data/lib/contrast/extension/protect.rb +3 -3
- data/lib/contrast/extension/protect/kernel.rb +2 -2
- data/lib/contrast/extension/protect/psych.rb +2 -2
- data/lib/contrast/framework/base_support.rb +0 -23
- data/lib/contrast/framework/manager.rb +7 -17
- 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 +2 -2
- data/lib/contrast/framework/rails/patch/action_controller_live_buffer.rb +1 -3
- data/lib/contrast/framework/rails/patch/assess_configuration.rb +5 -6
- data/lib/contrast/framework/rails/patch/rails_application_configuration.rb +1 -1
- data/lib/contrast/framework/rails/patch/support.rb +3 -3
- data/lib/contrast/framework/rails/rewrite/action_controller_railties_helper_inherited.rb +2 -2
- data/lib/contrast/framework/rails/rewrite/active_record_named.rb +2 -2
- data/lib/contrast/framework/rails/rewrite/active_record_time_zone_inherited.rb +2 -2
- data/lib/contrast/framework/rails/support.rb +56 -37
- data/lib/contrast/framework/sinatra/patch/base.rb +2 -2
- data/lib/contrast/framework/sinatra/patch/support.rb +1 -1
- data/lib/contrast/framework/sinatra/support.rb +13 -24
- data/lib/contrast/funchook/funchook.rb +45 -0
- data/lib/contrast/logger/application.rb +3 -3
- data/lib/contrast/logger/format.rb +64 -0
- data/lib/contrast/logger/log.rb +17 -9
- data/lib/contrast/logger/request.rb +30 -0
- data/lib/contrast/tasks/config.rb +1 -1
- data/lib/contrast/tasks/service.rb +2 -2
- data/lib/contrast/utils/assess/sampling_util.rb +2 -2
- data/lib/contrast/utils/assess/tracking_util.rb +46 -21
- data/lib/contrast/utils/boolean_util.rb +1 -1
- data/lib/contrast/utils/class_util.rb +5 -3
- data/lib/contrast/utils/freeze_util.rb +1 -1
- data/lib/contrast/utils/gemfile_reader.rb +5 -5
- data/lib/contrast/utils/hash_digest.rb +13 -3
- data/lib/contrast/utils/heap_dump_util.rb +2 -2
- data/lib/contrast/utils/invalid_configuration_util.rb +2 -18
- data/lib/contrast/utils/inventory_util.rb +6 -11
- data/lib/contrast/utils/io_util.rb +1 -1
- data/lib/contrast/utils/object_share.rb +0 -1
- data/lib/contrast/utils/os.rb +16 -4
- data/lib/contrast/utils/ruby_ast_rewriter.rb +1 -1
- data/lib/contrast/utils/sha256_builder.rb +2 -2
- data/lib/contrast/utils/stack_trace_utils.rb +2 -3
- data/lib/contrast/utils/string_utils.rb +1 -1
- data/lib/contrast/utils/tag_util.rb +1 -1
- data/lib/contrast/utils/thread_tracker.rb +1 -14
- data/lib/contrast/utils/timer.rb +1 -17
- data/resources/deadzone/policy.json +5 -0
- data/ruby-agent.gemspec +9 -9
- data/service_executables/VERSION +1 -1
- data/service_executables/linux/contrast-service +0 -0
- data/service_executables/mac/contrast-service +0 -0
- metadata +60 -79
- data/funchook/Makefile +0 -29
- data/funchook/autom4te.cache/output.0 +0 -4976
- data/funchook/autom4te.cache/requests +0 -78
- data/funchook/autom4te.cache/traces.0 +0 -364
- data/funchook/config.log +0 -490
- data/funchook/config.status +0 -1016
- data/funchook/configure +0 -4976
- 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.so +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/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/insulator.rb +0 -49
- data/lib/contrast/agent/require_state.rb +0 -61
- data/lib/contrast/agent/socket_client.rb +0 -134
- data/lib/contrast/api/connection_status.rb +0 -49
- 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/framework/sinatra/application_helper.rb +0 -51
- 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/service_sender_util.rb +0 -167
- data/lib/contrast/utils/sinatra_helper.rb +0 -49
@@ -1,51 +0,0 @@
|
|
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 Framework
|
6
|
-
module Sinatra
|
7
|
-
# This module is to help perform sometimes necessary tasks specific to Sinatra
|
8
|
-
module ApplicationHelper
|
9
|
-
SINATRA_VIEWS = [
|
10
|
-
Contrast::Framework::ViewTechnologiesDescriptor.new('public/stylesheets', 'scss', %w[SASS]),
|
11
|
-
Contrast::Framework::ViewTechnologiesDescriptor.new('views', 'html', %w[HTML5]),
|
12
|
-
Contrast::Framework::ViewTechnologiesDescriptor.new('views', 'html.erb', %w[HTML5 ERB]),
|
13
|
-
Contrast::Framework::ViewTechnologiesDescriptor.new('views', 'html.haml', %w[HTML5 HAML]),
|
14
|
-
Contrast::Framework::ViewTechnologiesDescriptor.new('public', 'html', %w[HTML5])
|
15
|
-
].cs__freeze
|
16
|
-
|
17
|
-
def app_class
|
18
|
-
@_app_class ||= begin
|
19
|
-
return nil unless defined?(::Sinatra) && defined?(::Sinatra::Base)
|
20
|
-
|
21
|
-
sinatra_layers = ObjectSpace.each_object(::Sinatra::Base).to_a
|
22
|
-
result_layer = sinatra_layers.find { |layer| layer.app.nil? }
|
23
|
-
result_layer
|
24
|
-
end
|
25
|
-
end
|
26
|
-
|
27
|
-
def scannable_view_dirs
|
28
|
-
@_scannable_view_dirs ||= begin
|
29
|
-
views = SINATRA_VIEWS.dup
|
30
|
-
views << Contrast::Framework::ViewTechnologiesDescriptor.new(view_directory, 'erb', %w[HTML5 ERB]) if view_directory
|
31
|
-
views << Contrast::Framework::ViewTechnologiesDescriptor.new(view_directory, 'haml', %w[HTML5 HAML]) if view_directory
|
32
|
-
views << Contrast::Framework::ViewTechnologiesDescriptor.new(public_directory, 'html', %w[HTML5]) if public_directory
|
33
|
-
views
|
34
|
-
end
|
35
|
-
end
|
36
|
-
|
37
|
-
def view_directory
|
38
|
-
@_view_directory ||= begin
|
39
|
-
app_class&.settings&.views
|
40
|
-
end
|
41
|
-
end
|
42
|
-
|
43
|
-
def public_directory
|
44
|
-
@_public_directory ||= begin
|
45
|
-
app_class&.settings&.public_dir
|
46
|
-
end
|
47
|
-
end
|
48
|
-
end
|
49
|
-
end
|
50
|
-
end
|
51
|
-
end
|
@@ -1,21 +0,0 @@
|
|
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 Framework
|
6
|
-
# Used to define common locations and extensions for specific technologies
|
7
|
-
class ViewTechnologiesDescriptor
|
8
|
-
attr_reader :path, :extension, :technology_names
|
9
|
-
|
10
|
-
def initialize path, extension, technology_names
|
11
|
-
@path = path
|
12
|
-
@extension = extension
|
13
|
-
@technology_names = technology_names
|
14
|
-
end
|
15
|
-
|
16
|
-
def empty?
|
17
|
-
Dir["#{ path }/**/*#{ extension }"].empty?
|
18
|
-
end
|
19
|
-
end
|
20
|
-
end
|
21
|
-
end
|
@@ -1,8 +0,0 @@
|
|
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
|
-
# Used to type a StandardError raised by Contrast code.
|
6
|
-
class InternalException < StandardError
|
7
|
-
end
|
8
|
-
end
|
data/lib/contrast/utils/cache.rb
DELETED
@@ -1,58 +0,0 @@
|
|
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 Utils
|
6
|
-
# Implementation taken from http://stackoverflow.com/questions/1933866/efficient-ruby-lru-cache
|
7
|
-
class Cache
|
8
|
-
def initialize max_size = 1000
|
9
|
-
@max_size = max_size
|
10
|
-
@data = {}
|
11
|
-
end
|
12
|
-
|
13
|
-
def [] key
|
14
|
-
found = true
|
15
|
-
value = @data.delete(key) { found = false }
|
16
|
-
@data[key] = value if found
|
17
|
-
end
|
18
|
-
|
19
|
-
def []= key, value
|
20
|
-
@data.delete(key)
|
21
|
-
@data[key] = value
|
22
|
-
@data.delete(@data.first[0]) if @data.length > @max_size
|
23
|
-
|
24
|
-
value # rubocop:disable Lint/Void
|
25
|
-
end
|
26
|
-
|
27
|
-
def each
|
28
|
-
@data.reverse_each do |pair|
|
29
|
-
yield pair
|
30
|
-
end
|
31
|
-
end
|
32
|
-
|
33
|
-
# used further up the chain, non thread safe each
|
34
|
-
alias_method :each_unsafe, :each
|
35
|
-
|
36
|
-
def to_a
|
37
|
-
@data.to_a.reverse
|
38
|
-
end
|
39
|
-
|
40
|
-
def delete key
|
41
|
-
@data.delete(key)
|
42
|
-
end
|
43
|
-
|
44
|
-
def clear
|
45
|
-
@data.clear
|
46
|
-
end
|
47
|
-
|
48
|
-
def count
|
49
|
-
@data.count
|
50
|
-
end
|
51
|
-
|
52
|
-
# for cache validation only, ensures all is sound
|
53
|
-
def valid?
|
54
|
-
true
|
55
|
-
end
|
56
|
-
end
|
57
|
-
end
|
58
|
-
end
|
@@ -1,167 +0,0 @@
|
|
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 Utils
|
8
|
-
# This module keeps a background thread, initialized at startup, running. This thread is
|
9
|
-
# responsible for pulling a message off the queue, sending that message to SpeedRacer, and
|
10
|
-
# processing the response returned back from SpeedRacer. When we didn't know our config
|
11
|
-
# values, we may have queued assess messages to send later. This thread is also
|
12
|
-
# responsible for checking to see if we are now ready to send any of these assess messages
|
13
|
-
# to SpeedRacer.
|
14
|
-
module ServiceSenderUtil
|
15
|
-
include Contrast::Components::Interface
|
16
|
-
access_component :analysis, :app_context, :logging, :settings
|
17
|
-
|
18
|
-
class << self
|
19
|
-
# Push the given DTM into a queue to be sent to the Service.
|
20
|
-
#
|
21
|
-
# @param event [Contrast::Api::Dtm] One of the DTMs valid for the event field of
|
22
|
-
# Contrast::Api::Dtm::Message
|
23
|
-
def push_to_ready_queue event
|
24
|
-
return unless event
|
25
|
-
|
26
|
-
prep_queue
|
27
|
-
ready_messages_queue.push event
|
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
|
44
|
-
end
|
45
|
-
|
46
|
-
def sending_thread
|
47
|
-
return @_sender_thread if @_sender_thread
|
48
|
-
|
49
|
-
# in case we got here before a message attempted to be sent, let's make sure these are initialized
|
50
|
-
@_sender_thread ||= Contrast::Agent::Thread.new do
|
51
|
-
loop do
|
52
|
-
check_assess_queue
|
53
|
-
# if ready messages queue is empty, calling thread is suspended until a message is pushed onto queue
|
54
|
-
event = ready_messages_queue.pop
|
55
|
-
begin
|
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)
|
62
|
-
Contrast::Utils::ServiceResponseUtil.process_response(response) if response
|
63
|
-
rescue StandardError => e
|
64
|
-
logger.error('Could not send message to service from service sender thread.', e)
|
65
|
-
end
|
66
|
-
end
|
67
|
-
end
|
68
|
-
logger.debug('Started background sending thread.')
|
69
|
-
end
|
70
|
-
alias_method :start, :sending_thread
|
71
|
-
|
72
|
-
def stop
|
73
|
-
Thread.kill(@_sender_thread) if @_sender_thread&.alive?
|
74
|
-
end
|
75
|
-
|
76
|
-
def add_to_assess_messages msg
|
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?
|
83
|
-
end
|
84
|
-
|
85
|
-
private
|
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
|
-
|
132
|
-
def check_assess_queue
|
133
|
-
return unless assess_messages
|
134
|
-
return unless APP_CONTEXT.ready?
|
135
|
-
|
136
|
-
if ASSESS.enabled?
|
137
|
-
assess_messages.each do |msg|
|
138
|
-
update_queued_finding msg
|
139
|
-
ready_messages_queue.push msg # this message is ready to be sent to SR
|
140
|
-
end
|
141
|
-
end
|
142
|
-
@_assess_messages = false # clear out queue, we no longer need it
|
143
|
-
end
|
144
|
-
|
145
|
-
# When we queued up findings, we didn't have access to a configuration
|
146
|
-
# object. As such, we have to make decisions now for those findings.
|
147
|
-
def update_queued_finding msg
|
148
|
-
# Findings only exist in activity messages
|
149
|
-
return unless msg.is_a?(Contrast::Api::Dtm::Activity)
|
150
|
-
|
151
|
-
# So set their tags
|
152
|
-
msg.finding_tags = Contrast::Utils::StringUtils.force_utf8(ASSESS.tags)
|
153
|
-
|
154
|
-
# and see if they're even enabled
|
155
|
-
check = msg.findings.dup
|
156
|
-
check.each do |finding|
|
157
|
-
msg.findings.delete(finding) if ASSESS.rule_disabled?(finding.rule_id)
|
158
|
-
end
|
159
|
-
|
160
|
-
msg.findings.each do |finding|
|
161
|
-
finding.session_id = SETTINGS.session_id
|
162
|
-
end
|
163
|
-
end
|
164
|
-
end
|
165
|
-
end
|
166
|
-
end
|
167
|
-
end
|
@@ -1,49 +0,0 @@
|
|
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 Utils
|
6
|
-
# This module is to help perform sometimes necessary tasks specific to Sinatra
|
7
|
-
module SinatraHelper
|
8
|
-
SINATRA_VIEWS = [
|
9
|
-
['public/stylesheets', '*.scss', %w[SASS]],
|
10
|
-
['views', '*.html', %w[HTML5]],
|
11
|
-
['views', '*.html.erb', %w[HTML5 ERB]],
|
12
|
-
['views', '*.html.haml', %w[HTML5 HAML]],
|
13
|
-
['public', '*.html', %w[HTML5]]
|
14
|
-
].cs__freeze
|
15
|
-
|
16
|
-
def self.app_class
|
17
|
-
@_app_class ||= begin
|
18
|
-
return nil unless defined?(Sinatra) && defined?(Sinatra::Base)
|
19
|
-
|
20
|
-
sinatra_layers = ObjectSpace.each_object(Sinatra::Base).to_a
|
21
|
-
result_layer = sinatra_layers.find { |layer| layer.app.nil? }
|
22
|
-
result_layer
|
23
|
-
end
|
24
|
-
end
|
25
|
-
|
26
|
-
def self.scannable_view_dirs
|
27
|
-
@_scannable_view_dirs ||= begin
|
28
|
-
views = SINATRA_VIEWS.dup
|
29
|
-
views << [view_directory, '*.erb', %w[HTML5 ERB]] if view_directory
|
30
|
-
views << [view_directory, '*.haml', %w[HTML5 HAML]] if view_directory
|
31
|
-
views << [public_directory, '*.html', %w[HTML5]] if public_directory
|
32
|
-
views
|
33
|
-
end
|
34
|
-
end
|
35
|
-
|
36
|
-
def self.view_directory
|
37
|
-
@_view_directory ||= begin
|
38
|
-
app_class&.settings&.views
|
39
|
-
end
|
40
|
-
end
|
41
|
-
|
42
|
-
def self.public_directory
|
43
|
-
@_public_directory ||= begin
|
44
|
-
app_class&.settings&.public_dir
|
45
|
-
end
|
46
|
-
end
|
47
|
-
end
|
48
|
-
end
|
49
|
-
end
|