contrast-agent 3.10.0 → 3.12.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.flayignore +1 -0
- data/.simplecov +5 -2
- data/ext/build_funchook.rb +12 -7
- data/ext/cs__assess_active_record_named/cs__active_record_named.c +12 -14
- data/ext/cs__assess_active_record_named/cs__active_record_named.h +1 -0
- data/ext/cs__assess_active_record_named/extconf.rb +3 -0
- data/ext/cs__assess_array/cs__assess_array.c +5 -6
- data/ext/cs__assess_array/cs__assess_array.h +1 -0
- data/ext/cs__assess_array/extconf.rb +3 -0
- data/ext/cs__assess_basic_object/cs__assess_basic_object.c +13 -11
- data/ext/cs__assess_basic_object/cs__assess_basic_object.h +2 -1
- data/ext/cs__assess_basic_object/extconf.rb +3 -0
- data/ext/cs__assess_fiber_track/cs__assess_fiber_track.c +4 -3
- data/ext/cs__assess_fiber_track/cs__assess_fiber_track.h +3 -3
- data/ext/cs__assess_fiber_track/extconf.rb +3 -0
- data/ext/cs__assess_hash/cs__assess_hash.c +40 -17
- data/ext/cs__assess_hash/cs__assess_hash.h +4 -6
- data/ext/cs__assess_hash/extconf.rb +3 -0
- data/ext/cs__assess_kernel/cs__assess_kernel.c +11 -9
- data/ext/cs__assess_kernel/cs__assess_kernel.h +1 -0
- data/ext/cs__assess_kernel/extconf.rb +3 -0
- data/ext/cs__assess_marshal_module/cs__assess_marshal_module.c +3 -6
- data/ext/cs__assess_marshal_module/extconf.rb +3 -0
- data/ext/cs__assess_module/cs__assess_module.c +16 -14
- data/ext/cs__assess_module/cs__assess_module.h +3 -0
- data/ext/cs__assess_module/extconf.rb +3 -0
- data/ext/cs__assess_regexp/cs__assess_regexp.c +13 -9
- data/ext/cs__assess_regexp/cs__assess_regexp.h +1 -0
- data/ext/cs__assess_regexp/extconf.rb +3 -0
- data/ext/cs__assess_string/cs__assess_string.c +5 -8
- data/ext/cs__assess_string/cs__assess_string.h +2 -1
- data/ext/cs__assess_string/extconf.rb +3 -0
- data/ext/cs__assess_string_interpolation26/cs__assess_string_interpolation26.c +2 -2
- data/ext/cs__assess_string_interpolation26/cs__assess_string_interpolation26.h +3 -3
- data/ext/cs__assess_string_interpolation26/extconf.rb +3 -0
- data/ext/cs__assess_yield_track/cs__assess_yield_track.h +1 -1
- data/ext/cs__assess_yield_track/extconf.rb +3 -0
- data/ext/cs__common/cs__common.c +80 -1
- data/ext/cs__common/cs__common.h +34 -0
- data/ext/cs__common/extconf.rb +9 -8
- data/ext/cs__contrast_patch/cs__contrast_patch.h +1 -6
- data/ext/cs__contrast_patch/extconf.rb +3 -0
- data/ext/cs__protect_kernel/cs__protect_kernel.c +23 -12
- data/ext/cs__protect_kernel/cs__protect_kernel.h +1 -0
- data/ext/cs__protect_kernel/extconf.rb +3 -0
- data/ext/extconf_common.rb +10 -8
- data/funchook/autom4te.cache/requests +45 -45
- data/funchook/config.log +4 -4
- data/lib/contrast.rb +1 -1
- data/lib/contrast/agent.rb +32 -29
- data/lib/contrast/agent/assess.rb +1 -11
- data/lib/contrast/agent/assess/adjusted_span.rb +3 -1
- data/lib/contrast/agent/assess/contrast_event.rb +16 -62
- data/lib/contrast/agent/assess/events/event_factory.rb +25 -0
- data/lib/contrast/agent/assess/events/source_event.rb +83 -0
- data/lib/contrast/agent/assess/insulator.rb +0 -4
- data/lib/contrast/agent/assess/policy/patcher.rb +6 -2
- data/lib/contrast/agent/assess/policy/policy_node.rb +1 -8
- data/lib/contrast/agent/assess/policy/policy_scanner.rb +2 -2
- data/lib/contrast/agent/assess/policy/preshift.rb +1 -1
- data/lib/contrast/agent/assess/policy/propagation_method.rb +68 -33
- data/lib/contrast/agent/assess/policy/propagation_node.rb +2 -1
- data/lib/contrast/agent/assess/policy/propagator.rb +1 -0
- data/lib/contrast/agent/assess/policy/propagator/custom.rb +1 -1
- data/lib/contrast/agent/assess/policy/propagator/database_write.rb +1 -3
- data/lib/contrast/agent/assess/policy/propagator/match_data.rb +80 -0
- data/lib/contrast/agent/assess/policy/propagator/select.rb +35 -22
- data/lib/contrast/agent/assess/policy/propagator/split.rb +26 -6
- data/lib/contrast/agent/assess/policy/propagator/substitution.rb +2 -0
- data/lib/contrast/agent/assess/policy/rewriter_patch.rb +37 -26
- data/lib/contrast/agent/assess/policy/source_method.rb +20 -20
- data/lib/contrast/agent/assess/policy/source_node.rb +0 -15
- data/lib/contrast/agent/assess/policy/trigger/reflected_xss.rb +90 -0
- data/lib/contrast/agent/assess/policy/trigger/xpath.rb +57 -0
- data/lib/contrast/agent/assess/policy/trigger_method.rb +30 -45
- data/lib/contrast/agent/assess/policy/trigger_node.rb +7 -7
- data/lib/contrast/agent/assess/policy/trigger_validation/ssrf_validator.rb +2 -31
- data/lib/contrast/agent/assess/properties.rb +5 -3
- data/lib/contrast/agent/assess/rule/base.rb +1 -20
- data/lib/contrast/agent/assess/rule/provider/hardcoded_value_rule.rb +23 -6
- data/lib/contrast/agent/assess/rule/redos.rb +4 -5
- data/lib/contrast/agent/assess/tag.rb +24 -14
- data/lib/contrast/agent/at_exit_hook.rb +16 -13
- data/lib/contrast/agent/class_reopener.rb +23 -8
- data/lib/contrast/agent/deadzone/policy/policy.rb +2 -2
- data/lib/contrast/agent/disable_reaction.rb +3 -4
- data/lib/contrast/agent/exclusion_matcher.rb +7 -48
- data/lib/contrast/agent/inventory/policy/datastores.rb +54 -0
- data/lib/contrast/agent/inventory/policy/policy.rb +1 -1
- data/lib/contrast/agent/middleware.rb +101 -260
- data/lib/contrast/agent/module_data.rb +2 -1
- data/lib/contrast/agent/patching/policy/after_load_patch.rb +13 -3
- data/lib/contrast/agent/patching/policy/after_load_patcher.rb +59 -47
- data/lib/contrast/agent/patching/policy/method_policy.rb +3 -3
- data/lib/contrast/agent/patching/policy/module_policy.rb +0 -25
- data/lib/contrast/agent/patching/policy/patch.rb +97 -23
- data/lib/contrast/agent/patching/policy/patcher.rb +28 -30
- data/lib/contrast/agent/patching/policy/policy.rb +7 -7
- data/lib/contrast/agent/patching/policy/policy_node.rb +3 -11
- data/lib/contrast/agent/patching/policy/trigger_node.rb +2 -5
- data/lib/contrast/agent/protect/policy/applies_command_injection_rule.rb +63 -0
- data/lib/contrast/agent/protect/policy/applies_deserialization_rule.rb +52 -0
- data/lib/contrast/agent/protect/policy/applies_no_sqli_rule.rb +68 -0
- data/lib/contrast/agent/protect/policy/applies_path_traversal_rule.rb +117 -0
- data/lib/contrast/agent/protect/policy/applies_sqli_rule.rb +54 -0
- data/lib/contrast/agent/protect/policy/applies_xxe_rule.rb +129 -0
- data/lib/contrast/agent/protect/policy/policy.rb +6 -6
- data/lib/contrast/agent/protect/policy/rule_applicator.rb +51 -0
- data/lib/contrast/agent/protect/rule.rb +0 -5
- data/lib/contrast/agent/protect/rule/base.rb +19 -37
- data/lib/contrast/agent/protect/rule/base_service.rb +3 -1
- data/lib/contrast/agent/protect/rule/cmd_injection.rb +12 -15
- data/lib/contrast/agent/protect/rule/default_scanner.rb +0 -13
- data/lib/contrast/agent/protect/rule/deserialization.rb +2 -0
- data/lib/contrast/agent/protect/rule/http_method_tampering.rb +2 -2
- data/lib/contrast/agent/protect/rule/no_sqli.rb +4 -4
- data/lib/contrast/agent/protect/rule/path_traversal.rb +6 -10
- data/lib/contrast/agent/protect/rule/sqli.rb +5 -4
- data/lib/contrast/agent/protect/rule/unsafe_file_upload.rb +2 -0
- data/lib/contrast/agent/protect/rule/xss.rb +2 -0
- data/lib/contrast/agent/protect/rule/xxe.rb +10 -4
- data/lib/contrast/agent/railtie.rb +3 -8
- data/lib/contrast/agent/reaction_processor.rb +5 -5
- data/lib/contrast/agent/request.rb +11 -18
- data/lib/contrast/agent/request_context.rb +16 -19
- data/lib/contrast/agent/request_handler.rb +35 -0
- data/lib/contrast/agent/response.rb +39 -86
- data/lib/contrast/agent/rewriter.rb +22 -10
- data/lib/contrast/agent/rule_set.rb +49 -0
- data/lib/contrast/agent/scope.rb +0 -6
- data/lib/contrast/agent/service_heartbeat.rb +3 -4
- data/lib/contrast/agent/socket_client.rb +25 -19
- data/lib/contrast/agent/static_analysis.rb +41 -0
- data/lib/contrast/agent/thread.rb +1 -1
- data/lib/contrast/agent/tracepoint_hook.rb +1 -5
- data/lib/contrast/agent/version.rb +1 -1
- data/lib/contrast/api.rb +1 -1
- data/lib/contrast/api/decorators.rb +14 -0
- data/lib/contrast/api/decorators/application_settings.rb +37 -0
- data/lib/contrast/api/decorators/application_update.rb +66 -0
- data/lib/contrast/api/decorators/input_analysis.rb +17 -0
- data/lib/contrast/api/decorators/server_features.rb +24 -0
- data/lib/contrast/api/speedracer.rb +28 -24
- data/lib/contrast/api/tcp_socket.rb +0 -2
- data/lib/contrast/components/agent.rb +34 -24
- data/lib/contrast/components/app_context.rb +45 -38
- data/lib/contrast/components/assess.rb +25 -15
- data/lib/contrast/components/config.rb +7 -5
- data/lib/contrast/components/contrast_service.rb +23 -71
- data/lib/contrast/components/heap_dump.rb +12 -8
- data/lib/contrast/components/interface.rb +15 -22
- data/lib/contrast/components/inventory.rb +5 -1
- data/lib/contrast/components/logger.rb +3 -68
- data/lib/contrast/components/protect.rb +40 -4
- data/lib/contrast/components/sampling.rb +22 -11
- data/lib/contrast/components/scope.rb +2 -52
- data/lib/contrast/components/settings.rb +42 -23
- data/lib/contrast/config/base_configuration.rb +1 -0
- data/lib/contrast/config/default_value.rb +1 -0
- data/lib/contrast/config/protect_rule_configuration.rb +0 -14
- data/lib/contrast/config/protect_rules_configuration.rb +0 -1
- data/lib/contrast/configuration.rb +2 -2
- data/lib/contrast/{extensions/ruby_core → extension}/assess.rb +12 -15
- data/lib/contrast/extension/assess/array.rb +77 -0
- data/lib/contrast/{extensions/ruby_core → extension}/assess/assess_extension.rb +29 -24
- data/lib/contrast/{extensions/ruby_core → extension}/assess/erb.rb +0 -8
- data/lib/contrast/extension/assess/eval_trigger.rb +78 -0
- data/lib/contrast/{extensions/ruby_core → extension}/assess/exec_trigger.rb +7 -9
- data/lib/contrast/extension/assess/fiber.rb +113 -0
- data/lib/contrast/extension/assess/hash.rb +39 -0
- data/lib/contrast/extension/assess/kernel.rb +110 -0
- data/lib/contrast/extension/assess/regexp.rb +84 -0
- data/lib/contrast/{extensions/ruby_core → extension}/assess/string.rb +18 -10
- data/lib/contrast/{extensions/ruby_core → extension}/delegator.rb +0 -0
- data/lib/contrast/{extensions/ruby_core → extension}/inventory.rb +2 -2
- data/lib/contrast/extension/kernel.rb +54 -0
- data/lib/contrast/{extensions/ruby_core → extension}/module.rb +0 -0
- data/lib/contrast/{extensions/ruby_core → extension}/protect.rb +2 -2
- data/lib/contrast/extension/protect/kernel.rb +44 -0
- data/lib/contrast/{extensions/ruby_core → extension}/protect/psych.rb +1 -1
- data/lib/contrast/{extensions/ruby_core → extension}/thread.rb +0 -0
- data/lib/contrast/framework/base_support.rb +32 -0
- data/lib/contrast/framework/manager.rb +59 -8
- data/lib/contrast/framework/platform_version.rb +1 -0
- data/lib/contrast/framework/rack/patch/session_cookie.rb +126 -0
- data/lib/contrast/framework/rack/patch/support.rb +24 -0
- data/lib/contrast/framework/rack/support.rb +22 -0
- data/lib/contrast/framework/rails/patch/action_controller_live_buffer.rb +43 -0
- data/lib/contrast/framework/rails/patch/assess_configuration.rb +103 -0
- data/lib/contrast/framework/rails/patch/rails_application_configuration.rb +31 -0
- data/lib/contrast/framework/rails/patch/support.rb +67 -0
- data/lib/contrast/framework/rails/rewrite/action_controller_railties_helper_inherited.rb +34 -0
- data/lib/contrast/framework/rails/rewrite/active_record_attribute_methods_read.rb +39 -0
- data/lib/contrast/framework/rails/rewrite/active_record_named.rb +73 -0
- data/lib/contrast/framework/rails/rewrite/active_record_time_zone_inherited.rb +33 -0
- data/lib/contrast/framework/rails/support.rb +115 -0
- data/lib/contrast/framework/sinatra/application_helper.rb +51 -0
- data/lib/contrast/framework/sinatra/patch/base.rb +83 -0
- data/lib/contrast/framework/sinatra/patch/support.rb +27 -0
- data/lib/contrast/framework/sinatra/support.rb +109 -0
- data/lib/contrast/framework/view_technologies_descriptor.rb +1 -0
- data/lib/contrast/logger/application.rb +80 -0
- data/lib/contrast/logger/log.rb +143 -0
- data/lib/contrast/logger/time.rb +50 -0
- data/lib/contrast/tasks/config.rb +54 -0
- data/lib/contrast/tasks/service.rb +3 -13
- data/lib/contrast/utils/assess/sampling_util.rb +4 -9
- data/lib/contrast/utils/assess/tracking_util.rb +7 -1
- data/lib/contrast/utils/boolean_util.rb +2 -2
- data/lib/contrast/utils/cache.rb +0 -11
- data/lib/contrast/utils/class_util.rb +21 -2
- data/lib/contrast/utils/gemfile_reader.rb +7 -5
- data/lib/contrast/utils/hash_digest.rb +2 -11
- data/lib/contrast/utils/heap_dump_util.rb +12 -11
- data/lib/contrast/utils/invalid_configuration_util.rb +4 -4
- data/lib/contrast/utils/inventory_util.rb +2 -2
- data/lib/contrast/utils/io_util.rb +1 -11
- data/lib/contrast/utils/job_servers_running.rb +6 -4
- data/lib/contrast/utils/object_share.rb +1 -28
- data/lib/contrast/utils/os.rb +1 -25
- data/lib/contrast/utils/service_response_util.rb +36 -60
- data/lib/contrast/utils/service_sender_util.rb +84 -23
- data/lib/contrast/utils/sinatra_helper.rb +0 -6
- data/lib/contrast/utils/stack_trace_utils.rb +86 -182
- data/lib/contrast/utils/string_utils.rb +18 -2
- data/lib/contrast/utils/tag_util.rb +11 -1
- data/lib/contrast/utils/thread_tracker.rb +2 -2
- data/lib/contrast/utils/timer.rb +0 -40
- data/resources/assess/policy.json +42 -71
- data/resources/inventory/policy.json +2 -2
- data/resources/protect/policy.json +15 -15
- data/ruby-agent.gemspec +11 -4
- data/service_executables/VERSION +1 -1
- data/service_executables/linux/contrast-service +0 -0
- data/service_executables/mac/contrast-service +0 -0
- metadata +122 -111
- data/ext/cs__assess_regexp_track/cs__assess_regexp_track.c +0 -63
- data/ext/cs__assess_regexp_track/cs__assess_regexp_track.h +0 -29
- data/ext/cs__assess_regexp_track/extconf.rb +0 -2
- data/lib/contrast/agent/assess/frozen_properties.rb +0 -41
- data/lib/contrast/agent/assess/rule/csrf.rb +0 -66
- data/lib/contrast/agent/assess/rule/csrf/csrf_action.rb +0 -28
- data/lib/contrast/agent/assess/rule/csrf/csrf_applicator.rb +0 -73
- data/lib/contrast/agent/assess/rule/csrf/csrf_watcher.rb +0 -132
- data/lib/contrast/agent/assess/rule/response_scanning_rule.rb +0 -47
- data/lib/contrast/agent/assess/rule/response_watcher.rb +0 -36
- data/lib/contrast/agent/assess/rule/watcher.rb +0 -36
- data/lib/contrast/agent/feature_state.rb +0 -376
- data/lib/contrast/agent/logger_manager.rb +0 -116
- data/lib/contrast/agent/protect/rule/csrf.rb +0 -118
- data/lib/contrast/agent/protect/rule/csrf/csrf_evaluator.rb +0 -103
- data/lib/contrast/agent/protect/rule/csrf/csrf_token_injector.rb +0 -85
- data/lib/contrast/agent/settings_state.rb +0 -152
- data/lib/contrast/delegators.rb +0 -9
- data/lib/contrast/delegators/application_update.rb +0 -32
- data/lib/contrast/extensions/framework/rack/cookie.rb +0 -24
- data/lib/contrast/extensions/framework/rack/request.rb +0 -24
- data/lib/contrast/extensions/framework/rack/response.rb +0 -23
- data/lib/contrast/extensions/framework/rails/action_controller_railties_helper_inherited.rb +0 -20
- data/lib/contrast/extensions/framework/rails/active_record.rb +0 -26
- data/lib/contrast/extensions/framework/rails/active_record_named.rb +0 -53
- data/lib/contrast/extensions/framework/rails/active_record_time_zone_inherited.rb +0 -21
- data/lib/contrast/extensions/framework/rails/buffer.rb +0 -28
- data/lib/contrast/extensions/framework/rails/configuration.rb +0 -27
- data/lib/contrast/extensions/framework/sinatra/base.rb +0 -59
- data/lib/contrast/extensions/ruby_core/assess/array.rb +0 -59
- data/lib/contrast/extensions/ruby_core/assess/basic_object.rb +0 -15
- data/lib/contrast/extensions/ruby_core/assess/fiber.rb +0 -124
- data/lib/contrast/extensions/ruby_core/assess/hash.rb +0 -22
- data/lib/contrast/extensions/ruby_core/assess/kernel.rb +0 -95
- data/lib/contrast/extensions/ruby_core/assess/module.rb +0 -14
- data/lib/contrast/extensions/ruby_core/assess/regexp.rb +0 -206
- data/lib/contrast/extensions/ruby_core/assess/tilt_template_trigger.rb +0 -73
- data/lib/contrast/extensions/ruby_core/assess/xpath_library_trigger.rb +0 -40
- data/lib/contrast/extensions/ruby_core/eval_trigger.rb +0 -52
- data/lib/contrast/extensions/ruby_core/inventory/datastores.rb +0 -37
- data/lib/contrast/extensions/ruby_core/protect/applies_command_injection_rule.rb +0 -72
- data/lib/contrast/extensions/ruby_core/protect/applies_deserialization_rule.rb +0 -60
- data/lib/contrast/extensions/ruby_core/protect/applies_no_sqli_rule.rb +0 -83
- data/lib/contrast/extensions/ruby_core/protect/applies_path_traversal_rule.rb +0 -123
- data/lib/contrast/extensions/ruby_core/protect/applies_sqli_rule.rb +0 -65
- data/lib/contrast/extensions/ruby_core/protect/applies_xxe_rule.rb +0 -143
- data/lib/contrast/extensions/ruby_core/protect/kernel.rb +0 -30
- data/lib/contrast/framework/rails_support.rb +0 -88
- data/lib/contrast/framework/sinatra_application_helper.rb +0 -49
- data/lib/contrast/framework/sinatra_support.rb +0 -94
- data/lib/contrast/utils/comment_range.rb +0 -19
- data/lib/contrast/utils/data_store_util.rb +0 -23
- data/lib/contrast/utils/environment_util.rb +0 -81
- data/lib/contrast/utils/performs_logging.rb +0 -152
- data/lib/contrast/utils/rack_assess_session_cookie.rb +0 -104
- data/lib/contrast/utils/rails_assess_configuration.rb +0 -95
- data/lib/contrast/utils/random_util.rb +0 -22
- data/resources/csrf/inject.js +0 -44
- data/resources/factory-bot-spec/spec_helper.rb +0 -30
- data/resources/rubocops/kernel/catch_cop.rb +0 -37
- data/resources/rubocops/kernel/require_cop.rb +0 -37
- data/resources/rubocops/kernel/require_relative_cop.rb +0 -33
- data/resources/rubocops/module/autoload_cop.rb +0 -37
- data/resources/rubocops/module/const_defined_cop.rb +0 -37
- data/resources/rubocops/module/const_get_cop.rb +0 -37
- data/resources/rubocops/module/const_set_cop.rb +0 -37
- data/resources/rubocops/module/constants_cop.rb +0 -37
- data/resources/rubocops/module/name_cop.rb +0 -37
- data/resources/rubocops/object/class_cop.rb +0 -37
- data/resources/rubocops/object/freeze_cop.rb +0 -37
- data/resources/rubocops/object/frozen_cop.rb +0 -37
- data/resources/rubocops/object/is_a_cop.rb +0 -37
- data/resources/rubocops/object/method_cop.rb +0 -37
- data/resources/rubocops/object/respond_to_cop.rb +0 -37
- data/resources/rubocops/object/singleton_class_cop.rb +0 -37
- data/resources/rubocops/regexp/spelling_cop.rb +0 -44
- data/resources/rubocops/thread/new_cop.rb +0 -39
- data/resources/ruby-spec/ancestors_spec.rb +0 -70
- data/resources/ruby-spec/modulo_spec.rb +0 -831
- data/resources/ruby-spec/parameters_spec.rb +0 -261
- data/resources/ruby-spec/ruby_spec_spec_helper.rb +0 -35
@@ -0,0 +1,27 @@
|
|
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/agent/patching/policy/after_load_patch'
|
5
|
+
|
6
|
+
module Contrast
|
7
|
+
module Framework
|
8
|
+
module Sinatra
|
9
|
+
module Patch
|
10
|
+
# Extension point allowing for the registration of Patches required to
|
11
|
+
# support the Sinatra framework.
|
12
|
+
module Support
|
13
|
+
# (See BaseSupport#after_load_patches)
|
14
|
+
def after_load_patches
|
15
|
+
Set.new([
|
16
|
+
Contrast::Agent::Patching::Policy::AfterLoadPatch.new(
|
17
|
+
'Sinatra::Base',
|
18
|
+
'contrast/framework/sinatra/patch/base',
|
19
|
+
method_to_instrument: nil,
|
20
|
+
instrumenting_module: 'Contrast::Framework::Sinatra::Patch::Base')
|
21
|
+
])
|
22
|
+
end
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|
26
|
+
end
|
27
|
+
end
|
@@ -0,0 +1,109 @@
|
|
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/framework/base_support'
|
5
|
+
cs__scoped_require 'contrast/framework/sinatra/application_helper'
|
6
|
+
cs__scoped_require 'contrast/framework/sinatra/patch/support'
|
7
|
+
|
8
|
+
module Contrast
|
9
|
+
module Framework
|
10
|
+
module Sinatra
|
11
|
+
# Used when Sinatra is present to define framework specific behavior
|
12
|
+
class Support < BaseSupport
|
13
|
+
extend Contrast::Framework::Sinatra::ApplicationHelper
|
14
|
+
extend Contrast::Framework::Sinatra::Patch::Support
|
15
|
+
class << self
|
16
|
+
def detection_class
|
17
|
+
'Sinatra'
|
18
|
+
end
|
19
|
+
|
20
|
+
def version
|
21
|
+
::Sinatra::VERSION
|
22
|
+
end
|
23
|
+
|
24
|
+
def application_name
|
25
|
+
return unless app_class
|
26
|
+
|
27
|
+
app_class.cs__class.cs__name
|
28
|
+
end
|
29
|
+
|
30
|
+
def application_root
|
31
|
+
return unless app_class
|
32
|
+
|
33
|
+
app_class.root
|
34
|
+
end
|
35
|
+
|
36
|
+
def server_type
|
37
|
+
'sinatra'
|
38
|
+
end
|
39
|
+
|
40
|
+
def scan_views
|
41
|
+
return unless app_class
|
42
|
+
|
43
|
+
scan_view_directories(scannable_view_dirs)
|
44
|
+
end
|
45
|
+
|
46
|
+
# Iterate over every class that extends Sinatra::Base, pull out its routes
|
47
|
+
# (array of arrays with Mustermann::Sinatra as [][0]) and convert them into
|
48
|
+
# Contrast::Api::Dtm::RouteCoverage
|
49
|
+
def collect_routes
|
50
|
+
routes = []
|
51
|
+
controllers = sinatra_controllers
|
52
|
+
controllers.each do |clazz|
|
53
|
+
class_routes = sinatra_class_routes(clazz)
|
54
|
+
next unless class_routes
|
55
|
+
|
56
|
+
class_routes.each_pair do |method, list|
|
57
|
+
# item: [ Mustermann::Sinatra, [], Proc]
|
58
|
+
list.each do |item|
|
59
|
+
routes << route_to_coverage(clazz, method, item[0])
|
60
|
+
end
|
61
|
+
end
|
62
|
+
end
|
63
|
+
routes
|
64
|
+
end
|
65
|
+
|
66
|
+
# TODO: RUBY-763
|
67
|
+
def current_route _request
|
68
|
+
nil
|
69
|
+
end
|
70
|
+
|
71
|
+
def retrieve_request env
|
72
|
+
::Sinatra::Request.new(env)
|
73
|
+
end
|
74
|
+
|
75
|
+
private
|
76
|
+
|
77
|
+
# Iterate over every class that extends Sinatra::Base, pull out its routes
|
78
|
+
# (array of arrays with Mustermann::Sinatra as [][0]) and convert them into
|
79
|
+
# Contrast::Api::Dtm::RouteCoverage
|
80
|
+
def sinatra_controllers
|
81
|
+
return [] unless defined?(::Sinatra) && defined?(::Sinatra::Base)
|
82
|
+
|
83
|
+
Contrast::Utils::ClassUtil.descendants(::Sinatra::Base)
|
84
|
+
end
|
85
|
+
|
86
|
+
def sinatra_class_routes controller
|
87
|
+
controller.instance_variable_get(:@routes) if controller.instance_variable_defined?(:@routes)
|
88
|
+
rescue StandardError
|
89
|
+
logger.trace('Sinatra controller found with no route instances', module: controller)
|
90
|
+
nil
|
91
|
+
end
|
92
|
+
|
93
|
+
# TODO: RUBY-763
|
94
|
+
# given clazz, method, and Mustermann::Sinatra, build a
|
95
|
+
# Contrast::Api::Dtm::RouteCoverage
|
96
|
+
def route_to_coverage clazz, method, pattern
|
97
|
+
safe_pattern = source_or_string(pattern)
|
98
|
+
|
99
|
+
route_coverage = Contrast::Api::Dtm::RouteCoverage.new
|
100
|
+
route_coverage.route = "#{ clazz }##{ method } #{ safe_pattern }"
|
101
|
+
route_coverage.verb = Contrast::Utils::StringUtils.force_utf8(method)
|
102
|
+
route_coverage.url = Contrast::Utils::StringUtils.force_utf8(safe_pattern)
|
103
|
+
route_coverage
|
104
|
+
end
|
105
|
+
end
|
106
|
+
end
|
107
|
+
end
|
108
|
+
end
|
109
|
+
end
|
@@ -6,6 +6,7 @@ module Contrast
|
|
6
6
|
# Used to define common locations and extensions for specific technologies
|
7
7
|
class ViewTechnologiesDescriptor
|
8
8
|
attr_reader :path, :extension, :technology_names
|
9
|
+
|
9
10
|
def initialize path, extension, technology_names
|
10
11
|
@path = path
|
11
12
|
@extension = extension
|
@@ -0,0 +1,80 @@
|
|
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 Logger
|
8
|
+
# # Our decorator for the Ougai logger allowing for the logging of the
|
9
|
+
# application environment, used to provide context during troubleshooting.
|
10
|
+
module Application
|
11
|
+
include Contrast::Components::Interface
|
12
|
+
access_component :config
|
13
|
+
|
14
|
+
ENV_KEYS = %w[HOME PWD RACK_ENV RAILS_ENV RUBY_VERSION GEM_HOME GEM_PATH].cs__freeze
|
15
|
+
# Utility method to log some current ruby and rails information from environment
|
16
|
+
def application_environment
|
17
|
+
return unless info?
|
18
|
+
|
19
|
+
info('Process environment information',
|
20
|
+
p_id: Process.pid,
|
21
|
+
pp_id: Process.ppid,
|
22
|
+
agent_version: Contrast::Agent::VERSION)
|
23
|
+
ENV.each do |env_key, env_value|
|
24
|
+
env_key = env_key.to_s
|
25
|
+
next unless ENV_KEYS.include?(env_key) ||
|
26
|
+
(env_key.start_with?(Contrast::Components::Config::CONTRAST_ENV_MARKER) &&
|
27
|
+
!env_key.start_with?(Contrast::Components::Config::CONTRAST_ENV_MARKER + 'API'))
|
28
|
+
|
29
|
+
info('Environment settings', key: env_key, value: env_value)
|
30
|
+
end
|
31
|
+
end
|
32
|
+
|
33
|
+
def application_configuration
|
34
|
+
return unless info?
|
35
|
+
|
36
|
+
loggable = CONFIG.raw.send(:load_config)
|
37
|
+
loggable.delete('api')
|
38
|
+
info('Current configuration', configruation: JSON.pretty_generate(loggable))
|
39
|
+
end
|
40
|
+
|
41
|
+
def application_libraries
|
42
|
+
if debug?
|
43
|
+
log_all_libraries
|
44
|
+
elsif info?
|
45
|
+
log_specific_libraries
|
46
|
+
end
|
47
|
+
end
|
48
|
+
|
49
|
+
FRAMEWORKS = %w[rails sinatra grape].cs__freeze
|
50
|
+
WEB_SERVERS = %w[agoo falcon hoof iodine mongrel mongrel2 passenger puma rack skinny thin trinidad unicorn webrick yarn].cs__freeze
|
51
|
+
LIBRARIES = %w[excon json mongo moped mysql nokogiri oga ox pg psych sqlite3 typhoeus yaml].cs__freeze
|
52
|
+
def log_specific_libraries
|
53
|
+
FRAMEWORKS.each(&cs__method(:log_gem_data))
|
54
|
+
WEB_SERVERS.each(&cs__method(:log_gem_data))
|
55
|
+
LIBRARIES.each(&cs__method(:log_gem_data))
|
56
|
+
end
|
57
|
+
|
58
|
+
private
|
59
|
+
|
60
|
+
def log_all_libraries
|
61
|
+
return unless debug?
|
62
|
+
|
63
|
+
Gem.loaded_specs.each_pair do |_name, gem_spec|
|
64
|
+
debug('Gem loaded',
|
65
|
+
gem_name: gem_spec.name,
|
66
|
+
gem_version: gem_spec.version.to_s)
|
67
|
+
end
|
68
|
+
end
|
69
|
+
|
70
|
+
def log_gem_data gem_name
|
71
|
+
gem_spec = Gem.loaded_specs[gem_name]
|
72
|
+
return unless gem_spec
|
73
|
+
|
74
|
+
info('Gem loaded',
|
75
|
+
gem_name: gem_spec.name,
|
76
|
+
gem_version: gem_spec.version.to_s)
|
77
|
+
end
|
78
|
+
end
|
79
|
+
end
|
80
|
+
end
|
@@ -0,0 +1,143 @@
|
|
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 'logger'
|
5
|
+
cs__scoped_require 'ougai'
|
6
|
+
cs__scoped_require 'singleton'
|
7
|
+
|
8
|
+
cs__scoped_require 'contrast/components/interface'
|
9
|
+
cs__scoped_require 'contrast/extension/module'
|
10
|
+
cs__scoped_require 'contrast/logger/application'
|
11
|
+
cs__scoped_require 'contrast/logger/time'
|
12
|
+
|
13
|
+
module Contrast
|
14
|
+
module Logger
|
15
|
+
# This class functions to serve as a wrapper around our logging, as we need
|
16
|
+
# to be able to dynamically update level based on updates to TeamServer.
|
17
|
+
class Log
|
18
|
+
include Singleton
|
19
|
+
include Contrast::Components::Interface
|
20
|
+
access_component :config
|
21
|
+
|
22
|
+
DEFAULT_NAME = 'contrast.log'
|
23
|
+
DEFAULT_LEVEL = ::Ougai::Logging::Severity::INFO
|
24
|
+
VALID_LEVELS = ::Ougai::Logging::Severity::SEV_LABEL
|
25
|
+
STDOUT_STR = 'STDOUT'
|
26
|
+
STDERR_STR = 'STDERR'
|
27
|
+
|
28
|
+
attr_reader :previous_path,
|
29
|
+
:previous_level
|
30
|
+
|
31
|
+
def initialize
|
32
|
+
update
|
33
|
+
end
|
34
|
+
|
35
|
+
# Given new settings from TeamServer, update our logging to use the new
|
36
|
+
# file and level, assuming they weren't set by local configuration.
|
37
|
+
#
|
38
|
+
# @param log_file [String] the file to which to log
|
39
|
+
# @param log_level [String] the level at which to log
|
40
|
+
def update log_file = nil, log_level = nil
|
41
|
+
config = CONFIG.root.agent.logger
|
42
|
+
|
43
|
+
config_path = config.path&.length.to_i.positive? ? config.path : nil
|
44
|
+
config_level = config.level&.length&.positive? ? config.level : nil
|
45
|
+
|
46
|
+
# config > settings > default
|
47
|
+
path = valid_path(config_path || log_file)
|
48
|
+
level_const = valid_level(config_level || log_level)
|
49
|
+
|
50
|
+
# don't needlessly recreate logger
|
51
|
+
return if @_logger && (path == previous_path) && (level_const == previous_level)
|
52
|
+
|
53
|
+
@previous_path = path
|
54
|
+
@previous_level = level_const
|
55
|
+
|
56
|
+
@_logger = build(path: path, level_const: level_const)
|
57
|
+
log_update
|
58
|
+
rescue StandardError => e
|
59
|
+
if logger
|
60
|
+
logger.error('Unable to process update to LoggerManager.', e)
|
61
|
+
else
|
62
|
+
puts 'Unable to process update to LoggerManager.'
|
63
|
+
puts e.backtrace.join("\n")
|
64
|
+
end
|
65
|
+
end
|
66
|
+
|
67
|
+
def logger
|
68
|
+
@_logger
|
69
|
+
end
|
70
|
+
|
71
|
+
# StringIO is a valid path because it logs directly to a string buffer
|
72
|
+
def write_permission? path
|
73
|
+
return false if path.nil?
|
74
|
+
return true if path.is_a?(StringIO)
|
75
|
+
return File.writable?(path) if File.exist?(path)
|
76
|
+
|
77
|
+
dir_name = File.dirname(File.absolute_path(path))
|
78
|
+
File.writable?(dir_name)
|
79
|
+
end
|
80
|
+
|
81
|
+
private
|
82
|
+
|
83
|
+
def build path: STDOUT_STR, level_const: DEFAULT_LEVEL
|
84
|
+
logger = case path
|
85
|
+
when STDOUT_STR, STDERR_STR
|
86
|
+
::Ougai::Logger.new(Object.cs__const_get(path))
|
87
|
+
else
|
88
|
+
::Ougai::Logger.new(path)
|
89
|
+
end
|
90
|
+
add_contrast_loggers(logger)
|
91
|
+
logger.progname = 'Contrast Agent'
|
92
|
+
logger.level = level_const
|
93
|
+
logger.formatter.datetime_format = '%Y-%m-%dT%H:%M:%S.%L%z'
|
94
|
+
logger
|
95
|
+
end
|
96
|
+
|
97
|
+
def add_contrast_loggers logger
|
98
|
+
logger.extend(Contrast::Logger::Application)
|
99
|
+
logger.extend(Contrast::Logger::Time)
|
100
|
+
end
|
101
|
+
|
102
|
+
def valid_path path
|
103
|
+
path = path.nil? ? Contrast::Utils::ObjectShare::EMPTY_STRING : path
|
104
|
+
return path if path == STDOUT_STR
|
105
|
+
return path if path == STDERR_STR
|
106
|
+
|
107
|
+
path = DEFAULT_NAME if path.empty?
|
108
|
+
if write_permission?(path)
|
109
|
+
path
|
110
|
+
elsif write_permission?(DEFAULT_NAME)
|
111
|
+
puts "[!] Unable to write to '#{ path }'. Writing to default log '#{ DEFAULT_NAME }' instead."
|
112
|
+
DEFAULT_NAME
|
113
|
+
else
|
114
|
+
puts "[!] Unable to write to '#{ path }'. Writing to standard out instead."
|
115
|
+
STDOUT_STR
|
116
|
+
end
|
117
|
+
end
|
118
|
+
|
119
|
+
def valid_level level
|
120
|
+
level ||= DEFAULT_LEVEL
|
121
|
+
level = level.upcase
|
122
|
+
if VALID_LEVELS.include?(level)
|
123
|
+
Object.cs__const_get("::Ougai::Logging::Severity::#{ level }")
|
124
|
+
else
|
125
|
+
DEFAULT_LEVEL
|
126
|
+
end
|
127
|
+
rescue StandardError
|
128
|
+
DEFAULT_LEVEL
|
129
|
+
end
|
130
|
+
|
131
|
+
# Log that the Agent log has changed and include some default information
|
132
|
+
# at the start of the log.
|
133
|
+
def log_update
|
134
|
+
logger.debug('Initialized new contrast agent logger')
|
135
|
+
logger.debug_with_time('middleware: log environment') do
|
136
|
+
logger.application_environment
|
137
|
+
logger.application_configuration
|
138
|
+
logger.application_libraries
|
139
|
+
end
|
140
|
+
end
|
141
|
+
end
|
142
|
+
end
|
143
|
+
end
|
@@ -0,0 +1,50 @@
|
|
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 Logger
|
6
|
+
# Our decorator for the Ougai logger allowing for timing and with_level
|
7
|
+
# methods.
|
8
|
+
module Time
|
9
|
+
# Log the message at the given level.
|
10
|
+
#
|
11
|
+
# @param level [String] the name of the method to use. Should be one of
|
12
|
+
# trace, debug, info, warn, error
|
13
|
+
# @param message [String] the message to log
|
14
|
+
def with_level level, message
|
15
|
+
send(level.to_sym, message)
|
16
|
+
end
|
17
|
+
|
18
|
+
# Log, at the debug level, the action with a message including the time
|
19
|
+
# it took for the wrapped function to complete.
|
20
|
+
#
|
21
|
+
# @param msgs [Array<Object>] the arguments to pass to the logger.
|
22
|
+
# msgs[0] will be modified to include the elapsed time.
|
23
|
+
# @param block [Block, Proc] the block to execute
|
24
|
+
def debug_with_time *msgs, &block
|
25
|
+
log_with_time(:debug, *msgs, &block)
|
26
|
+
end
|
27
|
+
|
28
|
+
# Log, at the trace level, the action with a message including the time
|
29
|
+
# it took for the wrapped function to complete.
|
30
|
+
#
|
31
|
+
# @param msgs [Array<Object>] the arguments to pass to the logger.
|
32
|
+
# msgs[0] will be modified to include the elapsed time.
|
33
|
+
# @param block [Block, Proc] the block to execute
|
34
|
+
def trace_with_time *msgs, &block
|
35
|
+
log_with_time(:trace, *msgs, &block)
|
36
|
+
end
|
37
|
+
|
38
|
+
private
|
39
|
+
|
40
|
+
def log_with_time level, *msgs
|
41
|
+
a = Contrast::Utils::Timer.now_ms
|
42
|
+
ret = yield if block_given?
|
43
|
+
z = Contrast::Utils::Timer.now_ms
|
44
|
+
msgs[0] = "#{ msgs[0] }: pid=#{ Process.pid }, elapsed=#{ z - a }ms"
|
45
|
+
send(level, *msgs)
|
46
|
+
ret
|
47
|
+
end
|
48
|
+
end
|
49
|
+
end
|
50
|
+
end
|
@@ -0,0 +1,54 @@
|
|
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 'yaml'
|
5
|
+
|
6
|
+
module Contrast
|
7
|
+
# A Rake task to generate a contrast_security.yaml file with some basic settings
|
8
|
+
module Config
|
9
|
+
extend Rake::DSL
|
10
|
+
include Contrast::Components::Interface
|
11
|
+
DEFAULT_CONFIG = {
|
12
|
+
'api' => {
|
13
|
+
'url' => 'Enter your Contrast URL ex: https://app.contrastsecurity.com/Contrast',
|
14
|
+
'api_key' => 'Enter your Contrast api key',
|
15
|
+
'service_key' => 'Enter your Contrast service key',
|
16
|
+
'user_name' => 'Enter your Contrast user name'
|
17
|
+
},
|
18
|
+
'agent' => {
|
19
|
+
'service' => {
|
20
|
+
'logger' => {
|
21
|
+
'path' => 'contrast_service.log',
|
22
|
+
'level' => 'ERROR' # DEBUG | INFO | WARN | ERROR
|
23
|
+
},
|
24
|
+
'socket' => '/tmp/contrast_service.sock'
|
25
|
+
},
|
26
|
+
'logger' => {
|
27
|
+
'level' => 'ERROR',
|
28
|
+
'path' => 'contrast_agent.log'
|
29
|
+
}
|
30
|
+
}
|
31
|
+
}.cs__freeze
|
32
|
+
|
33
|
+
namespace :contrast do
|
34
|
+
namespace :config do
|
35
|
+
desc 'Create a contrast_security.yaml in the applications root directory'
|
36
|
+
task :create do
|
37
|
+
execution_directory = Dir.pwd
|
38
|
+
target_path = File.join(execution_directory, 'contrast_security.yaml')
|
39
|
+
if File.exist?(target_path)
|
40
|
+
puts 'WARNING: contrast_security.yaml already exists'
|
41
|
+
else
|
42
|
+
File.open(target_path, 'w') do |f|
|
43
|
+
f.write(YAML.dump(DEFAULT_CONFIG))
|
44
|
+
end
|
45
|
+
|
46
|
+
puts "Created contrast_security.yaml at #{ target_path }"
|
47
|
+
puts 'Open the file and enter your Contrast Security api keys or set them via environment variables'
|
48
|
+
puts 'Visit our documentation site for more details: https://docs.contrastsecurity.com/installation-rubyconfig.html'
|
49
|
+
end
|
50
|
+
end
|
51
|
+
end
|
52
|
+
end
|
53
|
+
end
|
54
|
+
end
|