contrast-agent 3.9.0 → 3.11.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.simplecov +5 -2
- data/ext/build_funchook.rb +14 -9
- data/ext/cs__assess_active_record_named/cs__active_record_named.c +5 -12
- data/ext/cs__assess_active_record_named/extconf.rb +3 -0
- data/ext/cs__assess_array/cs__assess_array.c +3 -5
- data/ext/cs__assess_array/extconf.rb +3 -0
- data/ext/cs__assess_basic_object/cs__assess_basic_object.c +10 -4
- 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 +10 -8
- 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 +13 -9
- 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 +79 -0
- 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 +20 -11
- data/ext/cs__protect_kernel/extconf.rb +3 -0
- data/ext/extconf_common.rb +10 -8
- data/funchook/autom4te.cache/output.0 +1 -13
- data/funchook/autom4te.cache/requests +44 -45
- data/funchook/autom4te.cache/traces.0 +0 -3
- data/funchook/config.log +378 -217
- data/funchook/config.status +23 -24
- data/funchook/configure +1 -13
- data/funchook/src/Makefile +7 -7
- data/funchook/src/config.h +2 -2
- data/funchook/src/decoder.o +0 -0
- data/funchook/src/distorm.o +0 -0
- data/funchook/src/funchook.o +0 -0
- data/funchook/src/funchook_io.o +0 -0
- data/funchook/src/funchook_syscall.o +0 -0
- data/funchook/src/funchook_unix.o +0 -0
- data/funchook/src/funchook_x86.o +0 -0
- data/funchook/src/instructions.o +0 -0
- data/funchook/src/insts.o +0 -0
- data/funchook/src/libfunchook.dylib +0 -0
- data/funchook/src/mnemonics.o +0 -0
- data/funchook/src/operands.o +0 -0
- data/funchook/src/os_func.o +0 -0
- data/funchook/src/os_func_unix.o +0 -0
- data/funchook/src/prefix.o +0 -0
- data/funchook/src/printf_base.o +0 -0
- data/funchook/src/textdefs.o +0 -0
- data/funchook/src/wstring.o +0 -0
- data/funchook/test/Makefile +2 -2
- data/funchook/test/funchook_test +0 -0
- data/funchook/test/libfunchook_test.so +0 -0
- data/funchook/test/libfunchook_test.so.dSYM/Contents/Info.plist +20 -0
- data/funchook/test/libfunchook_test.so.dSYM/Contents/Resources/DWARF/libfunchook_test.so +0 -0
- data/funchook/test/test_main.o +0 -0
- data/funchook/test/x86_64_test.o +0 -0
- data/lib/contrast.rb +1 -0
- data/lib/contrast/agent.rb +21 -15
- data/lib/contrast/agent/assess.rb +1 -2
- data/lib/contrast/agent/assess/adjusted_span.rb +3 -1
- data/lib/contrast/agent/assess/contrast_event.rb +20 -68
- 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 +5 -2
- data/lib/contrast/agent/assess/policy/policy_node.rb +0 -7
- data/lib/contrast/agent/assess/policy/policy_scanner.rb +1 -1
- data/lib/contrast/agent/assess/policy/preshift.rb +1 -1
- data/lib/contrast/agent/assess/policy/propagation_method.rb +65 -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/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 +40 -27
- 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_method.rb +29 -40
- data/lib/contrast/agent/assess/policy/trigger_node.rb +3 -6
- 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 -5
- data/lib/contrast/agent/assess/rule/csrf/csrf_applicator.rb +2 -22
- data/lib/contrast/agent/assess/rule/csrf/csrf_watcher.rb +5 -1
- data/lib/contrast/agent/assess/rule/provider/hardcoded_value_rule.rb +2 -2
- data/lib/contrast/agent/assess/rule/redos.rb +4 -4
- 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 +15 -6
- 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 +8 -48
- data/lib/contrast/agent/feature_state.rb +45 -78
- data/lib/contrast/agent/logger.rb +173 -0
- data/lib/contrast/agent/middleware.rb +87 -250
- data/lib/contrast/agent/module_data.rb +2 -1
- data/lib/contrast/agent/patching/policy/after_load_patch.rb +2 -1
- data/lib/contrast/agent/patching/policy/after_load_patcher.rb +21 -4
- 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 +96 -23
- data/lib/contrast/agent/patching/policy/patcher.rb +19 -19
- data/lib/contrast/agent/patching/policy/policy.rb +7 -7
- data/lib/contrast/agent/patching/policy/policy_node.rb +2 -10
- data/lib/contrast/agent/patching/policy/trigger_node.rb +1 -4
- data/lib/contrast/agent/protect/rule/base.rb +14 -33
- data/lib/contrast/agent/protect/rule/base_service.rb +3 -1
- data/lib/contrast/agent/protect/rule/cmd_injection.rb +10 -13
- data/lib/contrast/agent/protect/rule/csrf.rb +2 -1
- data/lib/contrast/agent/protect/rule/csrf/csrf_evaluator.rb +11 -14
- 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 +5 -4
- data/lib/contrast/agent/protect/rule/sqli.rb +1 -0
- 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 +2 -8
- data/lib/contrast/agent/reaction_processor.rb +5 -5
- data/lib/contrast/agent/request.rb +9 -12
- data/lib/contrast/agent/request_context.rb +12 -14
- data/lib/contrast/agent/request_handler.rb +35 -0
- data/lib/contrast/agent/response.rb +52 -30
- data/lib/contrast/agent/rewriter.rb +25 -11
- data/lib/contrast/agent/rule_set.rb +49 -0
- data/lib/contrast/agent/scope.rb +4 -12
- data/lib/contrast/agent/service_heartbeat.rb +1 -2
- data/lib/contrast/agent/settings_state.rb +10 -74
- data/lib/contrast/agent/socket_client.rb +17 -11
- data/lib/contrast/agent/static_analysis.rb +42 -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/exclusion.rb +20 -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 +31 -29
- data/lib/contrast/api/tcp_socket.rb +0 -2
- data/lib/contrast/components/agent.rb +27 -22
- data/lib/contrast/components/app_context.rb +18 -43
- data/lib/contrast/components/config.rb +7 -5
- data/lib/contrast/components/contrast_service.rb +0 -4
- data/lib/contrast/components/heap_dump.rb +12 -8
- data/lib/contrast/components/interface.rb +11 -10
- data/lib/contrast/components/logger.rb +3 -68
- data/lib/contrast/components/sampling.rb +22 -11
- data/lib/contrast/components/settings.rb +18 -5
- 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/configuration.rb +3 -5
- data/lib/contrast/extensions/framework/rails/action_controller_inheritance.rb +39 -0
- data/lib/contrast/extensions/framework/rails/active_record_named.rb +13 -8
- data/lib/contrast/extensions/ruby_core/assess.rb +1 -2
- data/lib/contrast/extensions/ruby_core/assess/assess_extension.rb +27 -22
- data/lib/contrast/extensions/ruby_core/assess/erb.rb +0 -8
- data/lib/contrast/extensions/ruby_core/assess/exec_trigger.rb +6 -8
- data/lib/contrast/extensions/ruby_core/assess/fiber.rb +88 -100
- data/lib/contrast/extensions/ruby_core/assess/hash.rb +32 -15
- data/lib/contrast/extensions/ruby_core/assess/kernel.rb +28 -27
- data/lib/contrast/extensions/ruby_core/assess/regexp.rb +74 -196
- data/lib/contrast/extensions/ruby_core/assess/string.rb +15 -7
- data/lib/contrast/extensions/ruby_core/assess/tilt_template_trigger.rb +29 -24
- data/lib/contrast/extensions/ruby_core/assess/xpath_library_trigger.rb +2 -2
- data/lib/contrast/extensions/ruby_core/eval_trigger.rb +0 -1
- data/lib/contrast/extensions/ruby_core/inventory/datastores.rb +2 -2
- data/lib/contrast/extensions/ruby_core/protect/applies_command_injection_rule.rb +9 -20
- data/lib/contrast/extensions/ruby_core/protect/applies_deserialization_rule.rb +9 -19
- data/lib/contrast/extensions/ruby_core/protect/applies_no_sqli_rule.rb +10 -27
- data/lib/contrast/extensions/ruby_core/protect/applies_path_traversal_rule.rb +13 -21
- data/lib/contrast/extensions/ruby_core/protect/applies_sqli_rule.rb +11 -23
- data/lib/contrast/extensions/ruby_core/protect/applies_xxe_rule.rb +62 -78
- data/lib/contrast/extensions/ruby_core/protect/rule_applicator.rb +50 -0
- data/lib/contrast/framework/base_support.rb +10 -0
- data/lib/contrast/framework/manager.rb +28 -2
- data/lib/contrast/framework/platform_version.rb +1 -0
- data/lib/contrast/framework/rails_support.rb +16 -0
- data/lib/contrast/framework/sinatra_support.rb +12 -2
- data/lib/contrast/framework/view_technologies_descriptor.rb +1 -0
- data/lib/contrast/tasks/service.rb +2 -8
- 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 -5
- data/lib/contrast/utils/cache.rb +0 -11
- data/lib/contrast/utils/class_util.rb +20 -1
- data/lib/contrast/utils/gemfile_reader.rb +5 -3
- data/lib/contrast/utils/hash_digest.rb +0 -4
- data/lib/contrast/utils/heap_dump_util.rb +12 -11
- data/lib/contrast/utils/invalid_configuration_util.rb +1 -1
- 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 +2 -2
- data/lib/contrast/utils/object_share.rb +1 -37
- data/lib/contrast/utils/os.rb +1 -25
- data/lib/contrast/utils/rack_assess_session_cookie.rb +3 -3
- data/lib/contrast/utils/rails_assess_configuration.rb +3 -3
- data/lib/contrast/utils/ruby_ast_rewriter.rb +5 -1
- data/lib/contrast/utils/service_response_util.rb +27 -53
- data/lib/contrast/utils/service_sender_util.rb +9 -5
- 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 +33 -21
- data/resources/protect/policy.json +9 -9
- data/ruby-agent.gemspec +7 -4
- data/service_executables/VERSION +1 -1
- data/service_executables/linux/contrast-service +0 -0
- data/service_executables/mac/contrast-service +0 -0
- metadata +79 -54
- data/ext/cs__assess_regexp_track/cs__assess_regexp_track.c +0 -63
- data/ext/cs__assess_regexp_track/cs__assess_regexp_track.h +0 -29
- data/ext/cs__assess_regexp_track/extconf.rb +0 -2
- data/funchook/src/libfunchook.so +0 -0
- data/lib/contrast/agent/assess/frozen_properties.rb +0 -41
- data/lib/contrast/agent/logger_manager.rb +0 -116
- data/lib/contrast/delegators.rb +0 -9
- data/lib/contrast/delegators/application_update.rb +0 -32
- data/lib/contrast/utils/comment_range.rb +0 -19
- data/lib/contrast/utils/environment_util.rb +0 -82
- data/lib/contrast/utils/performs_logging.rb +0 -152
- 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
@@ -1,29 +0,0 @@
|
|
1
|
-
#include <funchook.h>
|
2
|
-
#include <ruby.h>
|
3
|
-
|
4
|
-
static VALUE regexp_class;
|
5
|
-
static VALUE track_rb_n_match;
|
6
|
-
static VALUE track_rb_pre_match;
|
7
|
-
static VALUE track_rb_post_match;
|
8
|
-
static VALUE track_rb_reg_match_last;
|
9
|
-
|
10
|
-
VALUE rb_reg_match_pre(VALUE match);
|
11
|
-
static VALUE *(*rb_reg_match_pre_original)(VALUE match);
|
12
|
-
|
13
|
-
VALUE rb_reg_match_post(VALUE match);
|
14
|
-
static VALUE *(*rb_reg_match_post_original)(VALUE match);
|
15
|
-
|
16
|
-
VALUE rb_reg_match_last(VALUE match);
|
17
|
-
static VALUE *(*rb_reg_match_last_original)(VALUE match);
|
18
|
-
|
19
|
-
VALUE rb_reg_nth_match(int nth, VALUE match);
|
20
|
-
static VALUE *(*rb_reg_nth_match_original)(int nth, VALUE match);
|
21
|
-
|
22
|
-
static VALUE rb_reg_match_pre_hook(VALUE match);
|
23
|
-
static VALUE rb_reg_match_post_hook(VALUE match);
|
24
|
-
static VALUE rb_reg_match_last_hook(VALUE match);
|
25
|
-
static VALUE rb_reg_nth_match_hook(int nth, VALUE match);
|
26
|
-
|
27
|
-
static int install_regexp_hooks();
|
28
|
-
|
29
|
-
void Init_cs__assess_regexp_track(void);
|
data/funchook/src/libfunchook.so
DELETED
Binary file
|
@@ -1,41 +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 'set'
|
5
|
-
cs__scoped_require 'base64'
|
6
|
-
cs__scoped_require 'contrast/utils/tag_util'
|
7
|
-
cs__scoped_require 'contrast/utils/prevent_serialization'
|
8
|
-
|
9
|
-
module Contrast
|
10
|
-
module Agent
|
11
|
-
module Assess
|
12
|
-
# This class is used as an NoOP version of Properties. We'll pass this to
|
13
|
-
# any attempt to access Properties on a frozen object including
|
14
|
-
# AssessExtension iff that object did not have Properties before it was
|
15
|
-
# placed in a frozen state.
|
16
|
-
class FrozenProperties
|
17
|
-
include Contrast::Utils::PreventSerialization
|
18
|
-
|
19
|
-
def events
|
20
|
-
Contrast::Utils::ObjectShare::EMPTY_ARRAY
|
21
|
-
end
|
22
|
-
|
23
|
-
def properties
|
24
|
-
Contrast::Utils::ObjectShare::EMPTY_HASH
|
25
|
-
end
|
26
|
-
|
27
|
-
def tracked?
|
28
|
-
false
|
29
|
-
end
|
30
|
-
|
31
|
-
def tagged? _label
|
32
|
-
false
|
33
|
-
end
|
34
|
-
|
35
|
-
def any_tags_between? _start, _finish
|
36
|
-
false
|
37
|
-
end
|
38
|
-
end
|
39
|
-
end
|
40
|
-
end
|
41
|
-
end
|
@@ -1,116 +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 'logger'
|
5
|
-
|
6
|
-
cs__scoped_require 'contrast/extensions/ruby_core/module'
|
7
|
-
cs__scoped_require 'contrast/components/interface'
|
8
|
-
|
9
|
-
module Contrast
|
10
|
-
module Agent
|
11
|
-
# This class functions to serve as a wrapper around our logging, as we need
|
12
|
-
# to be able to dynamically update level based on updates to TeamServer.
|
13
|
-
class LoggerManager
|
14
|
-
include Contrast::Components::Interface
|
15
|
-
access_component :app_context, :logging, :config
|
16
|
-
|
17
|
-
DEFAULT_NAME = 'contrast.log'
|
18
|
-
DEFAULT_LEVEL = ::Logger::INFO
|
19
|
-
VALID_LEVELS = %w[INFO WARN DEBUG FATAL UNKNOWN ERROR].cs__freeze
|
20
|
-
STDOUT_STR = 'STDOUT'
|
21
|
-
STDERR_STR = 'STDERR'
|
22
|
-
|
23
|
-
attr_reader :current,
|
24
|
-
:previous_path,
|
25
|
-
:previous_level
|
26
|
-
|
27
|
-
def initialize
|
28
|
-
update
|
29
|
-
rescue StandardError => e
|
30
|
-
Contrast::Agent::FeatureState::Logging::FALLBACK.puts 'Unable to initialize regular logger in LoggerManager.'
|
31
|
-
Contrast::Agent::FeatureState::Logging::FALLBACK.puts e.backtrace.join(Contrast::Utils::ObjectShare::NEW_LINE)
|
32
|
-
end
|
33
|
-
|
34
|
-
def update log_file = nil, log_level = nil
|
35
|
-
config = CONFIG.root.agent.logger
|
36
|
-
|
37
|
-
config_path = config.path&.length.to_i.positive? ? config.path : nil
|
38
|
-
config_level = config.level&.length&.positive? ? config.level : nil
|
39
|
-
|
40
|
-
# config > settings > default
|
41
|
-
path = valid_path(config_path || log_file)
|
42
|
-
level_const = valid_level(config_level || log_level)
|
43
|
-
|
44
|
-
# don't needlessly recreate logger
|
45
|
-
return if @current && (path == previous_path) && (level_const == previous_level)
|
46
|
-
|
47
|
-
@previous_path = path
|
48
|
-
@previous_level = level_const
|
49
|
-
|
50
|
-
@current = build(path: path, level_const: level_const)
|
51
|
-
|
52
|
-
@current.debug { 'Initialized new contrast agent logger' }
|
53
|
-
|
54
|
-
self
|
55
|
-
rescue StandardError => e
|
56
|
-
Contrast::Agent::FeatureState::Logging::FALLBACK.puts 'Unable to process update to LoggerManager.'
|
57
|
-
Contrast::Agent::FeatureState::Logging::FALLBACK.puts e.backtrace.join(Contrast::Utils::ObjectShare::NEW_LINE)
|
58
|
-
end
|
59
|
-
|
60
|
-
private
|
61
|
-
|
62
|
-
def default_progname
|
63
|
-
'Contrast Agent'
|
64
|
-
end
|
65
|
-
|
66
|
-
def build path: STDOUT_STR, progname: default_progname, level_const: DEFAULT_LEVEL
|
67
|
-
current = case path
|
68
|
-
when STDOUT_STR, STDERR_STR
|
69
|
-
::Logger.new(Object.cs__const_get(path))
|
70
|
-
else
|
71
|
-
::Logger.new(path)
|
72
|
-
end
|
73
|
-
|
74
|
-
current.progname = progname
|
75
|
-
current.level = level_const
|
76
|
-
|
77
|
-
current.formatter = proc do |severity_f, datetime_f, progname_f, msg_f|
|
78
|
-
"#{ datetime_f.strftime('%Y-%m-%d %H:%M:%S,%L') } [#{ progname_f }] #{ severity_f } - #{ msg_f }\n"
|
79
|
-
end
|
80
|
-
|
81
|
-
current
|
82
|
-
end
|
83
|
-
|
84
|
-
def valid_path path
|
85
|
-
path = path.nil? ? Contrast::Utils::ObjectShare::EMPTY_STRING : path
|
86
|
-
return path if path == STDOUT_STR
|
87
|
-
return path if path == STDERR_STR
|
88
|
-
|
89
|
-
path = DEFAULT_NAME if path.empty?
|
90
|
-
if Contrast::Utils::IOUtil.write_permission?(path)
|
91
|
-
path
|
92
|
-
else
|
93
|
-
if File.directory?(path)
|
94
|
-
Contrast::Agent::FeatureState::Logging::FALLBACK.puts "Unable to create log in directory: #{ path }. \n Writing to standard out instead"
|
95
|
-
else
|
96
|
-
Contrast::Agent::FeatureState::Logging::FALLBACK.puts "Unable to write to log file: #{ path } \n Writing to standard out instead"
|
97
|
-
end
|
98
|
-
|
99
|
-
STDOUT_STR
|
100
|
-
end
|
101
|
-
end
|
102
|
-
|
103
|
-
def valid_level level
|
104
|
-
level = level.nil? ? DEFAULT_LEVEL : level
|
105
|
-
level = 'DEBUG' if level == 'TRACE'
|
106
|
-
if VALID_LEVELS.include?(level)
|
107
|
-
Object.cs__const_get("::Logger::#{ level }")
|
108
|
-
else
|
109
|
-
DEFAULT_LEVEL
|
110
|
-
end
|
111
|
-
rescue StandardError
|
112
|
-
DEFAULT_LEVEL
|
113
|
-
end
|
114
|
-
end
|
115
|
-
end
|
116
|
-
end
|
data/lib/contrast/delegators.rb
DELETED
@@ -1,9 +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 define decorators for objects to add behavior without polluting the namespace
|
6
|
-
module Delegators
|
7
|
-
end
|
8
|
-
end
|
9
|
-
cs__scoped_require 'contrast/delegators/application_update'
|
@@ -1,32 +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 Delegators
|
6
|
-
# Used to decorate the ApplicationUpdate protobuf model so it can own some of the data massaging required for
|
7
|
-
# AppUpdate dtm
|
8
|
-
class ApplicationUpdate < SimpleDelegator
|
9
|
-
def append_view_technology_descriptor_data view_technology_descriptors
|
10
|
-
view_technology_descriptors.each do |vtd|
|
11
|
-
vtd.technology_names.each do |tech_name|
|
12
|
-
@delegate_sd_obj.technologies[tech_name] = true
|
13
|
-
end
|
14
|
-
end
|
15
|
-
end
|
16
|
-
|
17
|
-
# TS only allows you to report 500 routes per application
|
18
|
-
def append_route_coverage_data route_coverage_dtms
|
19
|
-
route_coverage_dtms.take(500).each do |route_coverage_dtm|
|
20
|
-
@delegate_sd_obj.routes << route_coverage_dtm
|
21
|
-
end
|
22
|
-
end
|
23
|
-
|
24
|
-
def append_platform_version platform_version
|
25
|
-
@delegate_sd_obj.platform = Contrast::Api::Dtm::Platform.new if @delegate_sd_obj.platform.nil?
|
26
|
-
@delegate_sd_obj.platform.major = platform_version.major
|
27
|
-
@delegate_sd_obj.platform.minor = platform_version.minor
|
28
|
-
@delegate_sd_obj.platform.build = platform_version.patch
|
29
|
-
end
|
30
|
-
end
|
31
|
-
end
|
32
|
-
end
|
@@ -1,19 +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
|
-
# Stores the range of a comment
|
7
|
-
class CommentRange
|
8
|
-
COMMENT_START = /<!--/.cs__freeze
|
9
|
-
COMMENT_END = '-->'
|
10
|
-
|
11
|
-
attr_reader :open, :close
|
12
|
-
|
13
|
-
def initialize open_idx, close_idx
|
14
|
-
@open = open_idx
|
15
|
-
@close = close_idx
|
16
|
-
end
|
17
|
-
end
|
18
|
-
end
|
19
|
-
end
|
@@ -1,82 +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 'socket'
|
5
|
-
|
6
|
-
cs__scoped_require 'contrast/extensions/ruby_core/module'
|
7
|
-
cs__scoped_require 'contrast/components/interface'
|
8
|
-
cs__scoped_require 'contrast/utils/object_share'
|
9
|
-
cs__scoped_require 'contrast/utils/string_utils'
|
10
|
-
|
11
|
-
module Contrast
|
12
|
-
module Utils
|
13
|
-
# Gather information about the application and server environment
|
14
|
-
# that the agent is running in.
|
15
|
-
class EnvironmentUtil
|
16
|
-
CS_VERSION = 'VERSION'
|
17
|
-
|
18
|
-
# Possible names of constants that would hold version info
|
19
|
-
# TODO - RUBY-770
|
20
|
-
VERSION_CONSTANT_CANDIDATES = %w[
|
21
|
-
VERSION
|
22
|
-
::VERSION
|
23
|
-
Version::VERSION
|
24
|
-
::Version::VERSION
|
25
|
-
::Application::VERSION
|
26
|
-
].cs__freeze
|
27
|
-
|
28
|
-
class << self
|
29
|
-
######### These are helpers ####################
|
30
|
-
|
31
|
-
def present? str
|
32
|
-
!str.nil? && !str.to_s.empty?
|
33
|
-
end
|
34
|
-
|
35
|
-
######### Actually env/framework dependent ####################
|
36
|
-
|
37
|
-
# See CONTRAST-16380 for more details
|
38
|
-
# TODO RUBY-770
|
39
|
-
def determine_application_version
|
40
|
-
@_determine_application_version ||= begin
|
41
|
-
candidates = VERSION_CONSTANT_CANDIDATES.map do |name|
|
42
|
-
# If there's a constant named 'name' (VERSION, etc.), get its value.
|
43
|
-
begin
|
44
|
-
name.split('::').inject(Object) do |mod, class_name|
|
45
|
-
mod.cs__const_get(class_name)
|
46
|
-
end
|
47
|
-
rescue LoadError, StandardError
|
48
|
-
nil
|
49
|
-
end
|
50
|
-
end
|
51
|
-
candidates.compact!
|
52
|
-
candidate = candidates.first || ENV[CS_VERSION]
|
53
|
-
|
54
|
-
case candidate
|
55
|
-
when Hash
|
56
|
-
candidate.values.join(Contrast::Utils::ObjectShare::PERIOD)
|
57
|
-
when Array
|
58
|
-
candidate.join(Contrast::Utils::ObjectShare::PERIOD)
|
59
|
-
when String
|
60
|
-
candidate
|
61
|
-
when NilClass
|
62
|
-
return nil
|
63
|
-
else
|
64
|
-
candidate.inspect
|
65
|
-
end
|
66
|
-
end
|
67
|
-
end
|
68
|
-
|
69
|
-
# Read libraries from the gemfile and append to the given ApplicationUpdate message
|
70
|
-
# or other class that has a libraries map association
|
71
|
-
# TODO - RUBY-770
|
72
|
-
def add_library_to_app_update app_update_pb, library_tags = ''
|
73
|
-
libraries = Contrast::Utils::GemfileReader.instance.library_pb_list
|
74
|
-
libraries.each do |n|
|
75
|
-
n.tags = library_tags
|
76
|
-
app_update_pb.libraries[n.hash_code] = n
|
77
|
-
end
|
78
|
-
end
|
79
|
-
end
|
80
|
-
end
|
81
|
-
end
|
82
|
-
end
|
@@ -1,152 +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/utils/object_share'
|
5
|
-
cs__scoped_require 'contrast/components/interface'
|
6
|
-
|
7
|
-
module Contrast
|
8
|
-
module Utils
|
9
|
-
# This utility allows us wrap our calls to logging, allowing runtime
|
10
|
-
# determination as to whether or not an event should be logged, based upon
|
11
|
-
# the Logging Configuration as specified in Common Configuration.
|
12
|
-
module PerformsLogging
|
13
|
-
include Contrast::Components::Interface
|
14
|
-
|
15
|
-
COULDNT_INIT_CONFIG = '!!! Contrast could not initialize agent from config, flushing loq queue to TARGET !!!'
|
16
|
-
FLUSHING_LOG_QUEUE = '!!! Contrast exited before logger could initialize, flushing log queue to TARGET !!!'
|
17
|
-
|
18
|
-
TARGET = STDOUT
|
19
|
-
|
20
|
-
# idiom for propagating class methods
|
21
|
-
def self.included base
|
22
|
-
base.send :include, InstanceMethods
|
23
|
-
base.extend ClassMethods
|
24
|
-
end
|
25
|
-
|
26
|
-
# Grouping to allow for these methods to be included into another Module
|
27
|
-
# on include of the PerformsLogging Module. They'll function as instance
|
28
|
-
# methods in that Module.
|
29
|
-
module InstanceMethods #:nodoc:
|
30
|
-
@_log_mutex = Mutex.new
|
31
|
-
@_log_queue = []
|
32
|
-
|
33
|
-
protected
|
34
|
-
|
35
|
-
def init_log_queueing
|
36
|
-
# Queue log messages & defer logging until logger gets initialized.
|
37
|
-
# (Logger depends on config, so logging config errors implies
|
38
|
-
# circular dependencies.)
|
39
|
-
at_exit do
|
40
|
-
# Ideally we flush the queue when we detect agent init is impossible,
|
41
|
-
# if worse comes to worse we do it here.
|
42
|
-
if @_log_queue
|
43
|
-
lq = @_log_queue
|
44
|
-
if lq&.any?
|
45
|
-
TARGET.puts '!!! Contrast exited before logger could initialize, flushing log queue to TARGET !!!'
|
46
|
-
while (message = lq.pop)
|
47
|
-
TARGET.puts "[#{ message[2].upcase }]\t#{ message[1] }"
|
48
|
-
end
|
49
|
-
end
|
50
|
-
end
|
51
|
-
end
|
52
|
-
end
|
53
|
-
|
54
|
-
def abort_log_queues
|
55
|
-
TARGET.puts COULDNT_INIT_CONFIG
|
56
|
-
if @_log_queue
|
57
|
-
TARGET.puts FLUSHING_LOG_QUEUE
|
58
|
-
while (message = @_log_queue.pop)
|
59
|
-
TARGET.puts "[#{ message[2].upcase }]\t#{ message[1] }"
|
60
|
-
end
|
61
|
-
end
|
62
|
-
@_log_queue = nil
|
63
|
-
@_log_mutex = nil
|
64
|
-
end
|
65
|
-
|
66
|
-
def flush_log_queues
|
67
|
-
return unless @_log_queue
|
68
|
-
|
69
|
-
# Monkeypatch this class so that the next call to #instance flushes the log queue.
|
70
|
-
# (Flushing the log queue within #initialize
|
71
|
-
# causes a deadlock, as singleton classes' #initialize
|
72
|
-
# gets wrapped within a mutex, and our logger will
|
73
|
-
# try to reference the singleton instance.)
|
74
|
-
self.class.class_eval do
|
75
|
-
class << self
|
76
|
-
alias_method :__instance_original, :instance
|
77
|
-
def instance
|
78
|
-
@_log_mutex.synchronize do
|
79
|
-
# Restore old #instance method.
|
80
|
-
class_eval do
|
81
|
-
class << self
|
82
|
-
def instance
|
83
|
-
__instance_original
|
84
|
-
end
|
85
|
-
end
|
86
|
-
end
|
87
|
-
# Flush log queue.
|
88
|
-
if @_log_queue
|
89
|
-
while (message = @_log_queue.pop)
|
90
|
-
log_with_level(*message, skip_queue: true)
|
91
|
-
end
|
92
|
-
end
|
93
|
-
@_log_queue = nil
|
94
|
-
end
|
95
|
-
@_log_mutex = nil
|
96
|
-
__instance_original
|
97
|
-
end
|
98
|
-
end
|
99
|
-
end
|
100
|
-
end
|
101
|
-
end
|
102
|
-
|
103
|
-
module ClassMethods #:nodoc:
|
104
|
-
def log_error msg, exception = nil
|
105
|
-
log_with_level exception, msg, :error
|
106
|
-
end
|
107
|
-
|
108
|
-
def log_warn msg, exception = nil
|
109
|
-
log_with_level exception, msg, :warn
|
110
|
-
end
|
111
|
-
|
112
|
-
def log_info msg, exception = nil
|
113
|
-
log_with_level exception, msg, :info
|
114
|
-
end
|
115
|
-
|
116
|
-
def log_debug msg, exception = nil
|
117
|
-
log_with_level exception, msg, :debug
|
118
|
-
end
|
119
|
-
|
120
|
-
def debug_with_time msg
|
121
|
-
a = Contrast::Utils::Timer.now_ms
|
122
|
-
ret = yield if block_given?
|
123
|
-
z = Contrast::Utils::Timer.now_ms
|
124
|
-
log_with_level(nil, "#{ msg }: pid=#{ Process.pid }, elapsed=#{ z - a }ms", :debug)
|
125
|
-
ret
|
126
|
-
end
|
127
|
-
|
128
|
-
def log_with_level exception, msg, level, skip_queue: false
|
129
|
-
# Log messages are queued until the logger is initialized.
|
130
|
-
# If agent init fails, flush the log to TARGET.
|
131
|
-
if (lq = @_log_queue) && !skip_queue
|
132
|
-
lq.push [exception, msg, level]
|
133
|
-
return nil
|
134
|
-
end
|
135
|
-
|
136
|
-
if exception&.respond_to?(:message)
|
137
|
-
tmp = msg.nil? ? exception.message.to_s : "#{ exception.class.name }: #{ msg }: #{ exception.message }"
|
138
|
-
logger.send(level, tmp)
|
139
|
-
|
140
|
-
exception.backtrace.first(10).each { |line| logger.debug(line) } if logger.debug? && exception.cs__respond_to?(:backtrace) && exception.backtrace
|
141
|
-
elsif msg.to_s != Contrast::Utils::ObjectShare::EMPTY_STRING
|
142
|
-
logger.send(level, msg.to_s)
|
143
|
-
end
|
144
|
-
|
145
|
-
nil # ensure no return value
|
146
|
-
rescue StandardError
|
147
|
-
nil # NOOP
|
148
|
-
end
|
149
|
-
end
|
150
|
-
end
|
151
|
-
end
|
152
|
-
end
|