datadog 2.12.1 → 2.17.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +154 -2
- data/ext/datadog_profiling_native_extension/collectors_thread_context.c +16 -14
- data/ext/datadog_profiling_native_extension/datadog_ruby_common.c +1 -4
- data/ext/datadog_profiling_native_extension/datadog_ruby_common.h +10 -0
- data/ext/datadog_profiling_native_extension/encoded_profile.c +79 -0
- data/ext/datadog_profiling_native_extension/encoded_profile.h +8 -0
- data/ext/datadog_profiling_native_extension/extconf.rb +3 -0
- data/ext/datadog_profiling_native_extension/heap_recorder.c +8 -1
- data/ext/datadog_profiling_native_extension/http_transport.c +60 -94
- data/ext/datadog_profiling_native_extension/private_vm_api_access.c +8 -0
- data/ext/datadog_profiling_native_extension/profiling.c +2 -0
- data/ext/datadog_profiling_native_extension/stack_recorder.c +23 -23
- data/ext/libdatadog_api/crashtracker.c +11 -12
- data/ext/libdatadog_api/crashtracker.h +5 -0
- data/ext/libdatadog_api/datadog_ruby_common.c +1 -4
- data/ext/libdatadog_api/datadog_ruby_common.h +10 -0
- data/ext/libdatadog_api/init.c +15 -0
- data/ext/libdatadog_api/library_config.c +122 -0
- data/ext/libdatadog_api/library_config.h +19 -0
- data/ext/libdatadog_api/macos_development.md +3 -3
- data/ext/libdatadog_api/process_discovery.c +117 -0
- data/ext/libdatadog_api/process_discovery.h +5 -0
- data/ext/libdatadog_extconf_helpers.rb +1 -1
- data/lib/datadog/appsec/actions_handler/serializable_backtrace.rb +89 -0
- data/lib/datadog/appsec/actions_handler.rb +24 -2
- data/lib/datadog/appsec/anonymizer.rb +16 -0
- data/lib/datadog/appsec/api_security/lru_cache.rb +49 -0
- data/lib/datadog/appsec/api_security.rb +9 -0
- data/lib/datadog/appsec/assets/waf_rules/README.md +50 -5
- data/lib/datadog/appsec/assets/waf_rules/processors.json +239 -10
- data/lib/datadog/appsec/assets/waf_rules/scanners.json +926 -17
- data/lib/datadog/appsec/autoload.rb +1 -1
- data/lib/datadog/appsec/component.rb +29 -20
- data/lib/datadog/appsec/compressed_json.rb +40 -0
- data/lib/datadog/appsec/configuration/settings.rb +93 -28
- data/lib/datadog/appsec/context.rb +1 -1
- data/lib/datadog/appsec/contrib/active_record/instrumentation.rb +10 -12
- data/lib/datadog/appsec/contrib/active_record/integration.rb +2 -2
- data/lib/datadog/appsec/contrib/active_record/patcher.rb +22 -22
- data/lib/datadog/appsec/contrib/auto_instrument.rb +1 -1
- data/lib/datadog/appsec/contrib/devise/configuration.rb +7 -31
- data/lib/datadog/appsec/contrib/devise/data_extractor.rb +78 -0
- data/lib/datadog/appsec/contrib/devise/ext.rb +22 -0
- data/lib/datadog/appsec/contrib/devise/integration.rb +1 -2
- data/lib/datadog/appsec/contrib/devise/patcher.rb +34 -23
- data/lib/datadog/appsec/contrib/devise/patches/signin_tracking_patch.rb +102 -0
- data/lib/datadog/appsec/contrib/devise/patches/signup_tracking_patch.rb +69 -0
- data/lib/datadog/appsec/contrib/devise/{patcher/rememberable_patch.rb → patches/skip_signin_tracking_patch.rb} +2 -2
- data/lib/datadog/appsec/contrib/devise/tracking_middleware.rb +106 -0
- data/lib/datadog/appsec/contrib/excon/integration.rb +1 -1
- data/lib/datadog/appsec/contrib/excon/ssrf_detection_middleware.rb +9 -10
- data/lib/datadog/appsec/contrib/faraday/integration.rb +1 -1
- data/lib/datadog/appsec/contrib/faraday/ssrf_detection_middleware.rb +8 -9
- data/lib/datadog/appsec/contrib/graphql/gateway/watcher.rb +8 -9
- data/lib/datadog/appsec/contrib/graphql/integration.rb +1 -1
- data/lib/datadog/appsec/contrib/rack/ext.rb +34 -0
- data/lib/datadog/appsec/contrib/rack/gateway/watcher.rb +49 -32
- data/lib/datadog/appsec/contrib/rack/integration.rb +1 -1
- data/lib/datadog/appsec/contrib/rack/request_middleware.rb +19 -18
- data/lib/datadog/appsec/contrib/rails/gateway/watcher.rb +11 -13
- data/lib/datadog/appsec/contrib/rails/integration.rb +1 -1
- data/lib/datadog/appsec/contrib/rails/patcher.rb +21 -21
- data/lib/datadog/appsec/contrib/rest_client/integration.rb +1 -1
- data/lib/datadog/appsec/contrib/rest_client/request_ssrf_detection_patch.rb +10 -11
- data/lib/datadog/appsec/contrib/sinatra/gateway/watcher.rb +17 -23
- data/lib/datadog/appsec/contrib/sinatra/integration.rb +1 -1
- data/lib/datadog/appsec/event.rb +96 -135
- data/lib/datadog/appsec/ext.rb +4 -2
- data/lib/datadog/appsec/instrumentation/gateway/argument.rb +7 -2
- data/lib/datadog/appsec/instrumentation/gateway/middleware.rb +24 -0
- data/lib/datadog/appsec/instrumentation/gateway.rb +17 -22
- data/lib/datadog/appsec/metrics/telemetry.rb +1 -1
- data/lib/datadog/appsec/monitor/gateway/watcher.rb +49 -14
- data/lib/datadog/appsec/processor/rule_loader.rb +26 -28
- data/lib/datadog/appsec/processor/rule_merger.rb +7 -6
- data/lib/datadog/appsec/processor.rb +1 -1
- data/lib/datadog/appsec/remote.rb +23 -11
- data/lib/datadog/appsec/response.rb +6 -6
- data/lib/datadog/appsec/security_engine/runner.rb +3 -3
- data/lib/datadog/appsec/security_event.rb +39 -0
- data/lib/datadog/appsec/utils.rb +0 -2
- data/lib/datadog/appsec.rb +1 -1
- data/lib/datadog/core/buffer/random.rb +18 -2
- data/lib/datadog/core/configuration/agent_settings_resolver.rb +5 -5
- data/lib/datadog/core/configuration/agentless_settings_resolver.rb +176 -0
- data/lib/datadog/core/configuration/components.rb +50 -31
- data/lib/datadog/core/configuration/components_state.rb +23 -0
- data/lib/datadog/core/configuration/ext.rb +4 -0
- data/lib/datadog/core/configuration/option.rb +79 -43
- data/lib/datadog/core/configuration/option_definition.rb +4 -4
- data/lib/datadog/core/configuration/options.rb +3 -3
- data/lib/datadog/core/configuration/settings.rb +68 -35
- data/lib/datadog/core/configuration/stable_config.rb +23 -0
- data/lib/datadog/core/configuration.rb +40 -16
- data/lib/datadog/core/crashtracking/component.rb +3 -10
- data/lib/datadog/core/diagnostics/environment_logger.rb +1 -1
- data/lib/datadog/core/encoding.rb +1 -1
- data/lib/datadog/core/environment/agent_info.rb +4 -3
- data/lib/datadog/core/environment/cgroup.rb +10 -12
- data/lib/datadog/core/environment/container.rb +38 -40
- data/lib/datadog/core/environment/ext.rb +6 -6
- data/lib/datadog/core/environment/git.rb +1 -0
- data/lib/datadog/core/environment/identity.rb +3 -3
- data/lib/datadog/core/environment/platform.rb +3 -3
- data/lib/datadog/core/environment/variable_helpers.rb +1 -1
- data/lib/datadog/core/error.rb +11 -9
- data/lib/datadog/core/logger.rb +2 -2
- data/lib/datadog/core/metrics/client.rb +20 -21
- data/lib/datadog/core/metrics/logging.rb +5 -5
- data/lib/datadog/core/process_discovery.rb +32 -0
- data/lib/datadog/core/rate_limiter.rb +4 -2
- data/lib/datadog/core/remote/client.rb +40 -32
- data/lib/datadog/core/remote/component.rb +6 -9
- data/lib/datadog/core/remote/configuration/digest.rb +7 -7
- data/lib/datadog/core/remote/configuration/path.rb +1 -1
- data/lib/datadog/core/remote/configuration/repository.rb +2 -1
- data/lib/datadog/core/remote/negotiation.rb +9 -9
- data/lib/datadog/core/remote/transport/config.rb +4 -3
- data/lib/datadog/core/remote/transport/http/client.rb +5 -4
- data/lib/datadog/core/remote/transport/http/config.rb +27 -37
- data/lib/datadog/core/remote/transport/http/negotiation.rb +7 -33
- data/lib/datadog/core/remote/transport/http.rb +22 -57
- data/lib/datadog/core/remote/transport/negotiation.rb +4 -3
- data/lib/datadog/core/runtime/metrics.rb +12 -5
- data/lib/datadog/core/telemetry/component.rb +78 -53
- data/lib/datadog/core/telemetry/emitter.rb +23 -11
- data/lib/datadog/core/telemetry/event/app_client_configuration_change.rb +65 -0
- data/lib/datadog/core/telemetry/event/app_closing.rb +18 -0
- data/lib/datadog/core/telemetry/event/app_dependencies_loaded.rb +33 -0
- data/lib/datadog/core/telemetry/event/app_heartbeat.rb +18 -0
- data/lib/datadog/core/telemetry/event/app_integrations_change.rb +58 -0
- data/lib/datadog/core/telemetry/event/app_started.rb +179 -0
- data/lib/datadog/core/telemetry/event/base.rb +40 -0
- data/lib/datadog/core/telemetry/event/distributions.rb +18 -0
- data/lib/datadog/core/telemetry/event/generate_metrics.rb +43 -0
- data/lib/datadog/core/telemetry/event/log.rb +76 -0
- data/lib/datadog/core/telemetry/event/message_batch.rb +42 -0
- data/lib/datadog/core/telemetry/event/synth_app_client_configuration_change.rb +43 -0
- data/lib/datadog/core/telemetry/event.rb +17 -472
- data/lib/datadog/core/telemetry/http/adapters/net.rb +12 -97
- data/lib/datadog/core/telemetry/logger.rb +1 -1
- data/lib/datadog/core/telemetry/metric.rb +8 -8
- data/lib/datadog/core/telemetry/request.rb +4 -4
- data/lib/datadog/core/telemetry/transport/http/api.rb +43 -0
- data/lib/datadog/core/telemetry/transport/http/client.rb +49 -0
- data/lib/datadog/core/telemetry/transport/http/telemetry.rb +92 -0
- data/lib/datadog/core/telemetry/transport/http.rb +63 -0
- data/lib/datadog/core/telemetry/transport/telemetry.rb +51 -0
- data/lib/datadog/core/telemetry/worker.rb +90 -24
- data/lib/datadog/core/transport/http/adapters/test.rb +2 -1
- data/lib/datadog/core/transport/http/api/instance.rb +17 -0
- data/lib/datadog/core/transport/http/api/spec.rb +17 -0
- data/lib/datadog/core/transport/http/builder.rb +18 -16
- data/lib/datadog/core/transport/http.rb +39 -2
- data/lib/datadog/core/utils/at_fork_monkey_patch.rb +6 -6
- data/lib/datadog/core/utils/duration.rb +32 -32
- data/lib/datadog/core/utils/forking.rb +2 -2
- data/lib/datadog/core/utils/network.rb +6 -6
- data/lib/datadog/core/utils/only_once_successful.rb +16 -5
- data/lib/datadog/core/utils/time.rb +20 -0
- data/lib/datadog/core/utils/truncation.rb +21 -0
- data/lib/datadog/core/vendor/multipart-post/multipart/post/composite_read_io.rb +1 -1
- data/lib/datadog/core/vendor/multipart-post/multipart/post/multipartable.rb +8 -8
- data/lib/datadog/core/vendor/multipart-post/multipart/post/parts.rb +7 -7
- data/lib/datadog/core/worker.rb +1 -1
- data/lib/datadog/core/workers/async.rb +29 -12
- data/lib/datadog/core/workers/interval_loop.rb +12 -1
- data/lib/datadog/core/workers/runtime_metrics.rb +2 -2
- data/lib/datadog/core.rb +8 -0
- data/lib/datadog/di/boot.rb +34 -0
- data/lib/datadog/di/component.rb +0 -2
- data/lib/datadog/di/probe_notification_builder.rb +1 -1
- data/lib/datadog/di/probe_notifier_worker.rb +16 -16
- data/lib/datadog/di/remote.rb +2 -0
- data/lib/datadog/di/transport/diagnostics.rb +4 -3
- data/lib/datadog/di/transport/http/api.rb +2 -12
- data/lib/datadog/di/transport/http/client.rb +4 -3
- data/lib/datadog/di/transport/http/diagnostics.rb +7 -34
- data/lib/datadog/di/transport/http/input.rb +7 -34
- data/lib/datadog/di/transport/http.rb +14 -62
- data/lib/datadog/di/transport/input.rb +4 -3
- data/lib/datadog/di/utils.rb +5 -0
- data/lib/datadog/di.rb +5 -32
- data/lib/datadog/error_tracking/collector.rb +87 -0
- data/lib/datadog/error_tracking/component.rb +167 -0
- data/lib/datadog/error_tracking/configuration/settings.rb +63 -0
- data/lib/datadog/error_tracking/configuration.rb +11 -0
- data/lib/datadog/error_tracking/ext.rb +18 -0
- data/lib/datadog/error_tracking/extensions.rb +16 -0
- data/lib/datadog/error_tracking/filters.rb +77 -0
- data/lib/datadog/error_tracking.rb +18 -0
- data/lib/datadog/kit/appsec/events.rb +12 -0
- data/lib/datadog/kit/identity.rb +5 -1
- data/lib/datadog/opentelemetry/api/baggage.rb +90 -0
- data/lib/datadog/opentelemetry/api/baggage.rbs +26 -0
- data/lib/datadog/opentelemetry/api/context.rb +16 -2
- data/lib/datadog/opentelemetry/sdk/trace/span.rb +1 -1
- data/lib/datadog/opentelemetry.rb +2 -1
- data/lib/datadog/profiling/collectors/code_provenance.rb +1 -1
- data/lib/datadog/profiling/collectors/info.rb +3 -0
- data/lib/datadog/profiling/collectors/thread_context.rb +1 -1
- data/lib/datadog/profiling/encoded_profile.rb +11 -0
- data/lib/datadog/profiling/exporter.rb +3 -4
- data/lib/datadog/profiling/ext.rb +0 -2
- data/lib/datadog/profiling/flush.rb +5 -8
- data/lib/datadog/profiling/http_transport.rb +5 -59
- data/lib/datadog/profiling/scheduler.rb +8 -1
- data/lib/datadog/profiling/stack_recorder.rb +4 -4
- data/lib/datadog/profiling/tag_builder.rb +1 -5
- data/lib/datadog/profiling.rb +6 -2
- data/lib/datadog/tracing/analytics.rb +1 -1
- data/lib/datadog/tracing/component.rb +15 -12
- data/lib/datadog/tracing/configuration/ext.rb +7 -1
- data/lib/datadog/tracing/configuration/settings.rb +18 -2
- data/lib/datadog/tracing/context_provider.rb +1 -1
- data/lib/datadog/tracing/contrib/active_record/integration.rb +1 -1
- data/lib/datadog/tracing/contrib/active_support/cache/events/cache.rb +4 -1
- data/lib/datadog/tracing/contrib/active_support/cache/instrumentation.rb +33 -0
- data/lib/datadog/tracing/contrib/active_support/cache/patcher.rb +4 -0
- data/lib/datadog/tracing/contrib/active_support/cache/redis.rb +2 -4
- data/lib/datadog/tracing/contrib/aws/instrumentation.rb +10 -0
- data/lib/datadog/tracing/contrib/aws/parsed_context.rb +5 -1
- data/lib/datadog/tracing/contrib/configuration/settings.rb +1 -1
- data/lib/datadog/tracing/contrib/ethon/easy_patch.rb +4 -5
- data/lib/datadog/tracing/contrib/excon/middleware.rb +5 -3
- data/lib/datadog/tracing/contrib/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/faraday/middleware.rb +5 -3
- data/lib/datadog/tracing/contrib/grpc/datadog_interceptor/client.rb +7 -1
- data/lib/datadog/tracing/contrib/grpc/distributed/propagation.rb +3 -0
- data/lib/datadog/tracing/contrib/http/circuit_breaker.rb +0 -15
- data/lib/datadog/tracing/contrib/http/distributed/propagation.rb +4 -1
- data/lib/datadog/tracing/contrib/http/instrumentation.rb +6 -10
- data/lib/datadog/tracing/contrib/httpclient/instrumentation.rb +6 -16
- data/lib/datadog/tracing/contrib/httprb/instrumentation.rb +7 -15
- data/lib/datadog/tracing/contrib/karafka/configuration/settings.rb +27 -0
- data/lib/datadog/tracing/contrib/karafka/distributed/propagation.rb +48 -0
- data/lib/datadog/tracing/contrib/karafka/ext.rb +27 -0
- data/lib/datadog/tracing/contrib/karafka/integration.rb +45 -0
- data/lib/datadog/tracing/contrib/karafka/monitor.rb +66 -0
- data/lib/datadog/tracing/contrib/karafka/patcher.rb +71 -0
- data/lib/datadog/tracing/contrib/karafka.rb +37 -0
- data/lib/datadog/tracing/contrib/mongodb/configuration/settings.rb +8 -0
- data/lib/datadog/tracing/contrib/mongodb/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/mongodb/subscribers.rb +18 -1
- data/lib/datadog/tracing/contrib/opensearch/configuration/settings.rb +17 -0
- data/lib/datadog/tracing/contrib/opensearch/ext.rb +9 -0
- data/lib/datadog/tracing/contrib/opensearch/patcher.rb +5 -1
- data/lib/datadog/tracing/contrib/patcher.rb +5 -2
- data/lib/datadog/tracing/contrib/rack/request_queue.rb +1 -1
- data/lib/datadog/tracing/contrib/rest_client/request_patch.rb +5 -3
- data/lib/datadog/tracing/contrib/sidekiq/client_tracer.rb +6 -1
- data/lib/datadog/tracing/contrib/sidekiq/distributed/propagation.rb +3 -0
- data/lib/datadog/tracing/contrib/sidekiq/server_tracer.rb +1 -1
- data/lib/datadog/tracing/contrib/support.rb +28 -0
- data/lib/datadog/tracing/contrib.rb +1 -0
- data/lib/datadog/tracing/correlation.rb +9 -2
- data/lib/datadog/tracing/distributed/b3_multi.rb +1 -1
- data/lib/datadog/tracing/distributed/b3_single.rb +1 -1
- data/lib/datadog/tracing/distributed/baggage.rb +131 -0
- data/lib/datadog/tracing/distributed/datadog.rb +4 -2
- data/lib/datadog/tracing/distributed/propagation.rb +25 -4
- data/lib/datadog/tracing/distributed/propagation_policy.rb +42 -0
- data/lib/datadog/tracing/metadata/errors.rb +4 -4
- data/lib/datadog/tracing/metadata/ext.rb +5 -0
- data/lib/datadog/tracing/metadata/metastruct.rb +36 -0
- data/lib/datadog/tracing/metadata/metastruct_tagging.rb +42 -0
- data/lib/datadog/tracing/metadata.rb +2 -0
- data/lib/datadog/tracing/sampling/rate_sampler.rb +2 -1
- data/lib/datadog/tracing/sampling/span/rule.rb +0 -1
- data/lib/datadog/tracing/span.rb +10 -1
- data/lib/datadog/tracing/span_event.rb +1 -1
- data/lib/datadog/tracing/span_operation.rb +46 -16
- data/lib/datadog/tracing/sync_writer.rb +1 -2
- data/lib/datadog/tracing/trace_digest.rb +9 -2
- data/lib/datadog/tracing/trace_operation.rb +44 -24
- data/lib/datadog/tracing/trace_segment.rb +6 -4
- data/lib/datadog/tracing/tracer.rb +45 -5
- data/lib/datadog/tracing/transport/http/api.rb +2 -10
- data/lib/datadog/tracing/transport/http/client.rb +5 -4
- data/lib/datadog/tracing/transport/http/traces.rb +13 -41
- data/lib/datadog/tracing/transport/http.rb +11 -44
- data/lib/datadog/tracing/transport/serializable_trace.rb +3 -1
- data/lib/datadog/tracing/transport/trace_formatter.rb +7 -0
- data/lib/datadog/tracing/transport/traces.rb +26 -9
- data/lib/datadog/tracing/utils.rb +1 -1
- data/lib/datadog/tracing/workers/trace_writer.rb +2 -6
- data/lib/datadog/tracing/writer.rb +2 -6
- data/lib/datadog/tracing.rb +16 -3
- data/lib/datadog/version.rb +2 -2
- data/lib/datadog.rb +2 -3
- metadata +80 -19
- data/lib/datadog/appsec/contrib/devise/event.rb +0 -54
- data/lib/datadog/appsec/contrib/devise/patcher/authenticatable_patch.rb +0 -72
- data/lib/datadog/appsec/contrib/devise/patcher/registration_controller_patch.rb +0 -47
- data/lib/datadog/appsec/contrib/devise/resource.rb +0 -35
- data/lib/datadog/appsec/contrib/devise/tracking.rb +0 -57
- data/lib/datadog/appsec/utils/trace_operation.rb +0 -15
- data/lib/datadog/core/telemetry/http/env.rb +0 -20
- data/lib/datadog/core/telemetry/http/ext.rb +0 -28
- data/lib/datadog/core/telemetry/http/response.rb +0 -70
- data/lib/datadog/core/telemetry/http/transport.rb +0 -90
@@ -1,15 +1,22 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require_relative '
|
4
|
-
|
5
|
-
require_relative '
|
3
|
+
require_relative '../../../core/utils/only_once'
|
4
|
+
|
5
|
+
require_relative 'tracking_middleware'
|
6
|
+
require_relative 'patches/signup_tracking_patch'
|
7
|
+
require_relative 'patches/signin_tracking_patch'
|
8
|
+
require_relative 'patches/skip_signin_tracking_patch'
|
6
9
|
|
7
10
|
module Datadog
|
8
11
|
module AppSec
|
9
12
|
module Contrib
|
10
13
|
module Devise
|
11
|
-
#
|
14
|
+
# Devise patcher
|
12
15
|
module Patcher
|
16
|
+
GUARD_ONCE_PER_APP = Hash.new do |hash, key|
|
17
|
+
hash[key] = Datadog::Core::Utils::OnlyOnce.new
|
18
|
+
end
|
19
|
+
|
13
20
|
module_function
|
14
21
|
|
15
22
|
def patched?
|
@@ -21,29 +28,33 @@ module Datadog
|
|
21
28
|
end
|
22
29
|
|
23
30
|
def patch
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
def patch_authenticatable_strategy
|
32
|
-
::Devise::Strategies::Authenticatable.prepend(AuthenticatablePatch)
|
33
|
-
end
|
31
|
+
::ActiveSupport.on_load(:before_initialize) do |app|
|
32
|
+
GUARD_ONCE_PER_APP[app].run do
|
33
|
+
app.middleware.insert_after(Warden::Manager, TrackingMiddleware)
|
34
|
+
rescue RuntimeError
|
35
|
+
AppSec.telemetry.error('AppSec: unable to insert Devise TrackingMiddleware')
|
36
|
+
end
|
37
|
+
end
|
34
38
|
|
35
|
-
|
36
|
-
|
39
|
+
::ActiveSupport.on_load(:after_initialize) do
|
40
|
+
if ::Devise::RegistrationsController.descendants.empty?
|
41
|
+
::Devise::RegistrationsController.prepend(Patches::SignupTrackingPatch)
|
42
|
+
else
|
43
|
+
::Devise::RegistrationsController.descendants.each do |controller|
|
44
|
+
controller.prepend(Patches::SignupTrackingPatch)
|
45
|
+
end
|
46
|
+
end
|
47
|
+
end
|
37
48
|
|
38
|
-
|
39
|
-
::Devise::Models::Rememberable # rubocop:disable Lint/Void
|
40
|
-
::Devise::Strategies::Rememberable.prepend(RememberablePatch)
|
41
|
-
end
|
49
|
+
::Devise::Strategies::Authenticatable.prepend(Patches::SigninTrackingPatch)
|
42
50
|
|
43
|
-
|
44
|
-
|
45
|
-
|
51
|
+
if ::Devise::STRATEGIES.include?(:rememberable)
|
52
|
+
# Rememberable strategy is required in autoloaded Rememberable model
|
53
|
+
require 'devise/models/rememberable'
|
54
|
+
::Devise::Strategies::Rememberable.prepend(Patches::SkipSigninTrackingPatch)
|
46
55
|
end
|
56
|
+
|
57
|
+
Patcher.instance_variable_set(:@patched, true)
|
47
58
|
end
|
48
59
|
end
|
49
60
|
end
|
@@ -0,0 +1,102 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require_relative '../ext'
|
4
|
+
require_relative '../configuration'
|
5
|
+
require_relative '../data_extractor'
|
6
|
+
|
7
|
+
module Datadog
|
8
|
+
module AppSec
|
9
|
+
module Contrib
|
10
|
+
module Devise
|
11
|
+
module Patches
|
12
|
+
# A patch for Devise::Authenticatable strategy with tracking functionality
|
13
|
+
module SigninTrackingPatch
|
14
|
+
def validate(resource, &block)
|
15
|
+
result = super
|
16
|
+
|
17
|
+
return result unless AppSec.enabled?
|
18
|
+
return result if @_datadog_appsec_skip_track_login_event
|
19
|
+
return result unless Configuration.auto_user_instrumentation_enabled?
|
20
|
+
return result unless AppSec.active_context
|
21
|
+
|
22
|
+
context = AppSec.active_context
|
23
|
+
if context.trace.nil? || context.span.nil?
|
24
|
+
Datadog.logger.debug { 'AppSec: unable to track signin events, due to missing trace or span' }
|
25
|
+
return result
|
26
|
+
end
|
27
|
+
|
28
|
+
context.trace.keep!
|
29
|
+
|
30
|
+
if result
|
31
|
+
record_successful_signin(context, resource)
|
32
|
+
Instrumentation.gateway.push('appsec.events.user_lifecycle', Ext::EVENT_LOGIN_SUCCESS)
|
33
|
+
|
34
|
+
return result
|
35
|
+
end
|
36
|
+
|
37
|
+
record_failed_signin(context, resource)
|
38
|
+
Instrumentation.gateway.push('appsec.events.user_lifecycle', Ext::EVENT_LOGIN_FAILURE)
|
39
|
+
|
40
|
+
result
|
41
|
+
end
|
42
|
+
|
43
|
+
private
|
44
|
+
|
45
|
+
def record_successful_signin(context, resource)
|
46
|
+
extractor = DataExtractor.new(mode: Configuration.auto_user_instrumentation_mode)
|
47
|
+
|
48
|
+
id = extractor.extract_id(resource)
|
49
|
+
login = extractor.extract_login(authentication_hash) || extractor.extract_login(resource)
|
50
|
+
|
51
|
+
if id
|
52
|
+
context.span[Ext::TAG_USR_ID] ||= id
|
53
|
+
context.span[Ext::TAG_DD_USR_ID] = id
|
54
|
+
end
|
55
|
+
|
56
|
+
context.span[Ext::TAG_LOGIN_SUCCESS_USR_LOGIN] ||= login
|
57
|
+
context.span[Ext::TAG_LOGIN_SUCCESS_TRACK] = 'true'
|
58
|
+
context.span[Ext::TAG_DD_USR_LOGIN] = login
|
59
|
+
context.span[Ext::TAG_DD_LOGIN_SUCCESS_MODE] = Configuration.auto_user_instrumentation_mode
|
60
|
+
|
61
|
+
# NOTE: We don't have a way to make one-shot receivers for events,
|
62
|
+
# and because of that we will trigger an additional event even
|
63
|
+
# if it was already done via the SDK
|
64
|
+
AppSec::Instrumentation.gateway.push(
|
65
|
+
'identity.set_user', AppSec::Instrumentation::Gateway::User.new(id, login)
|
66
|
+
)
|
67
|
+
end
|
68
|
+
|
69
|
+
def record_failed_signin(context, resource)
|
70
|
+
extractor = DataExtractor.new(mode: Configuration.auto_user_instrumentation_mode)
|
71
|
+
|
72
|
+
context.span[Ext::TAG_LOGIN_FAILURE_TRACK] = 'true'
|
73
|
+
context.span[Ext::TAG_DD_LOGIN_FAILURE_MODE] = Configuration.auto_user_instrumentation_mode
|
74
|
+
|
75
|
+
unless resource
|
76
|
+
login = extractor.extract_login(authentication_hash)
|
77
|
+
|
78
|
+
context.span[Ext::TAG_DD_USR_LOGIN] = login
|
79
|
+
context.span[Ext::TAG_LOGIN_FAILURE_USR_LOGIN] ||= login
|
80
|
+
context.span[Ext::TAG_LOGIN_FAILURE_USR_EXISTS] ||= 'false'
|
81
|
+
|
82
|
+
return
|
83
|
+
end
|
84
|
+
|
85
|
+
id = extractor.extract_id(resource)
|
86
|
+
login = extractor.extract_login(authentication_hash) || extractor.extract_login(resource)
|
87
|
+
|
88
|
+
if id
|
89
|
+
context.span[Ext::TAG_DD_USR_ID] = id
|
90
|
+
context.span[Ext::TAG_LOGIN_FAILURE_USR_ID] ||= id
|
91
|
+
end
|
92
|
+
|
93
|
+
context.span[Ext::TAG_DD_USR_LOGIN] = login
|
94
|
+
context.span[Ext::TAG_LOGIN_FAILURE_USR_LOGIN] ||= login
|
95
|
+
context.span[Ext::TAG_LOGIN_FAILURE_USR_EXISTS] ||= 'true'
|
96
|
+
end
|
97
|
+
end
|
98
|
+
end
|
99
|
+
end
|
100
|
+
end
|
101
|
+
end
|
102
|
+
end
|
@@ -0,0 +1,69 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require_relative '../ext'
|
4
|
+
require_relative '../configuration'
|
5
|
+
require_relative '../data_extractor'
|
6
|
+
|
7
|
+
module Datadog
|
8
|
+
module AppSec
|
9
|
+
module Contrib
|
10
|
+
module Devise
|
11
|
+
module Patches
|
12
|
+
# A patch for Devise::RegistrationsController with tracking functionality
|
13
|
+
module SignupTrackingPatch
|
14
|
+
def create
|
15
|
+
return super unless AppSec.enabled?
|
16
|
+
return super unless Configuration.auto_user_instrumentation_enabled?
|
17
|
+
return super unless AppSec.active_context
|
18
|
+
|
19
|
+
super do |resource|
|
20
|
+
context = AppSec.active_context
|
21
|
+
|
22
|
+
if context.trace.nil? || context.span.nil?
|
23
|
+
Datadog.logger.debug { 'AppSec: unable to track signup events, due to missing trace or span' }
|
24
|
+
next yield(resource) if block_given?
|
25
|
+
end
|
26
|
+
|
27
|
+
next yield(resource) if resource.new_record? && block_given?
|
28
|
+
|
29
|
+
context.trace.keep!
|
30
|
+
record_successful_signup(context, resource)
|
31
|
+
Instrumentation.gateway.push('appsec.events.user_lifecycle', Ext::EVENT_SIGNUP)
|
32
|
+
|
33
|
+
yield(resource) if block_given?
|
34
|
+
end
|
35
|
+
end
|
36
|
+
|
37
|
+
private
|
38
|
+
|
39
|
+
def record_successful_signup(context, resource)
|
40
|
+
extractor = DataExtractor.new(mode: Configuration.auto_user_instrumentation_mode)
|
41
|
+
|
42
|
+
id = extractor.extract_id(resource)
|
43
|
+
login = extractor.extract_login(resource_params) || extractor.extract_login(resource)
|
44
|
+
|
45
|
+
context.span[Ext::TAG_SIGNUP_TRACK] = 'true'
|
46
|
+
context.span[Ext::TAG_DD_USR_LOGIN] = login
|
47
|
+
context.span[Ext::TAG_SIGNUP_USR_LOGIN] ||= login
|
48
|
+
context.span[Ext::TAG_DD_SIGNUP_MODE] = Configuration.auto_user_instrumentation_mode
|
49
|
+
|
50
|
+
if id
|
51
|
+
context.span[Ext::TAG_DD_USR_ID] = id
|
52
|
+
|
53
|
+
id_tag = resource.active_for_authentication? ? Ext::TAG_USR_ID : Ext::TAG_SIGNUP_USR_ID
|
54
|
+
context.span[id_tag] ||= id
|
55
|
+
end
|
56
|
+
|
57
|
+
# NOTE: We don't have a way to make one-shot receivers for events,
|
58
|
+
# and because of that we will trigger an additional event even
|
59
|
+
# if it was already done via the SDK
|
60
|
+
AppSec::Instrumentation.gateway.push(
|
61
|
+
'identity.set_user', AppSec::Instrumentation::Gateway::User.new(id, login)
|
62
|
+
)
|
63
|
+
end
|
64
|
+
end
|
65
|
+
end
|
66
|
+
end
|
67
|
+
end
|
68
|
+
end
|
69
|
+
end
|
@@ -4,10 +4,10 @@ module Datadog
|
|
4
4
|
module AppSec
|
5
5
|
module Contrib
|
6
6
|
module Devise
|
7
|
-
module
|
7
|
+
module Patches
|
8
8
|
# To avoid tracking new sessions that are created by
|
9
9
|
# Rememberable strategy as Login Success events.
|
10
|
-
module
|
10
|
+
module SkipSigninTrackingPatch
|
11
11
|
def validate(*args)
|
12
12
|
@_datadog_appsec_skip_track_login_event = true
|
13
13
|
|
@@ -0,0 +1,106 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require_relative 'ext'
|
4
|
+
require_relative '../../anonymizer'
|
5
|
+
|
6
|
+
module Datadog
|
7
|
+
module AppSec
|
8
|
+
module Contrib
|
9
|
+
module Devise
|
10
|
+
# A Rack middleware capable of tracking currently signed user
|
11
|
+
class TrackingMiddleware
|
12
|
+
WARDEN_KEY = 'warden'
|
13
|
+
SESSION_ID_KEY = 'session_id'
|
14
|
+
|
15
|
+
def initialize(app)
|
16
|
+
@app = app
|
17
|
+
@devise_session_scope_keys = {}
|
18
|
+
end
|
19
|
+
|
20
|
+
def call(env)
|
21
|
+
return @app.call(env) unless AppSec.enabled?
|
22
|
+
return @app.call(env) unless Configuration.auto_user_instrumentation_enabled?
|
23
|
+
return @app.call(env) unless AppSec.active_context
|
24
|
+
|
25
|
+
unless env.key?(WARDEN_KEY)
|
26
|
+
Datadog.logger.debug { 'AppSec: unable to track requests, due to missing warden manager' }
|
27
|
+
return @app.call(env)
|
28
|
+
end
|
29
|
+
|
30
|
+
context = AppSec.active_context
|
31
|
+
if context.trace.nil? || context.span.nil?
|
32
|
+
Datadog.logger.debug { 'AppSec: unable to track requests, due to missing trace or span' }
|
33
|
+
return @app.call(env)
|
34
|
+
end
|
35
|
+
|
36
|
+
# NOTE: Rails session id will be set for unauthenticated users as well,
|
37
|
+
# so we need to make sure we are tracking only authenticated users.
|
38
|
+
id = transform(extract_id(env[WARDEN_KEY]))
|
39
|
+
session_id = env[WARDEN_KEY].raw_session[SESSION_ID_KEY] if id
|
40
|
+
|
41
|
+
if id
|
42
|
+
# NOTE: There is no option to set session id without setting user id via SDK.
|
43
|
+
unless context.span.has_tag?(Ext::TAG_USR_ID) && context.span.has_tag?(Ext::TAG_SESSION_ID)
|
44
|
+
user_id = context.span[Ext::TAG_USR_ID] || id
|
45
|
+
user_session_id = context.span[Ext::TAG_SESSION_ID] || session_id
|
46
|
+
|
47
|
+
# FIXME: The current implementation of event arguments is forsing us
|
48
|
+
# to bloat User class, and pass nil-value instead of skip
|
49
|
+
# passing them at first place.
|
50
|
+
# This is a temporary situation until we refactor events model.
|
51
|
+
AppSec::Instrumentation.gateway.push(
|
52
|
+
'identity.set_user', AppSec::Instrumentation::Gateway::User.new(user_id, nil, user_session_id)
|
53
|
+
)
|
54
|
+
end
|
55
|
+
|
56
|
+
context.span[Ext::TAG_USR_ID] ||= id
|
57
|
+
context.span[Ext::TAG_DD_USR_ID] = id
|
58
|
+
context.span[Ext::TAG_DD_COLLECTION_MODE] ||= Configuration.auto_user_instrumentation_mode
|
59
|
+
end
|
60
|
+
|
61
|
+
@app.call(env)
|
62
|
+
end
|
63
|
+
|
64
|
+
private
|
65
|
+
|
66
|
+
def extract_id(warden)
|
67
|
+
session_serializer = warden.session_serializer
|
68
|
+
|
69
|
+
key = session_key_for(session_serializer, ::Devise.default_scope)
|
70
|
+
id = session_serializer.session[key]&.dig(0, 0)
|
71
|
+
|
72
|
+
return id if ::Devise.mappings.size == 1
|
73
|
+
return "#{::Devise.default_scope}:#{id}" if id
|
74
|
+
|
75
|
+
::Devise.mappings.each_key do |scope|
|
76
|
+
next if scope == ::Devise.default_scope
|
77
|
+
|
78
|
+
key = session_key_for(session_serializer, scope)
|
79
|
+
id = session_serializer.session[key]&.dig(0, 0)
|
80
|
+
|
81
|
+
return "#{scope}:#{id}" if id
|
82
|
+
end
|
83
|
+
|
84
|
+
nil
|
85
|
+
end
|
86
|
+
|
87
|
+
def session_key_for(session_serializer, scope)
|
88
|
+
@devise_session_scope_keys[scope] ||= session_serializer.key_for(scope)
|
89
|
+
end
|
90
|
+
|
91
|
+
def transform(value)
|
92
|
+
return if value.nil?
|
93
|
+
return value.to_s unless anonymize?
|
94
|
+
|
95
|
+
Anonymizer.anonimyze(value.to_s)
|
96
|
+
end
|
97
|
+
|
98
|
+
def anonymize?
|
99
|
+
Configuration.auto_user_instrumentation_mode ==
|
100
|
+
AppSec::Configuration::Settings::ANONYMIZATION_AUTO_USER_INSTRUMENTATION_MODE
|
101
|
+
end
|
102
|
+
end
|
103
|
+
end
|
104
|
+
end
|
105
|
+
end
|
106
|
+
end
|
@@ -3,6 +3,9 @@
|
|
3
3
|
|
4
4
|
require 'excon'
|
5
5
|
|
6
|
+
require_relative '../../event'
|
7
|
+
require_relative '../../security_event'
|
8
|
+
|
6
9
|
module Datadog
|
7
10
|
module AppSec
|
8
11
|
module Contrib
|
@@ -15,22 +18,18 @@ module Datadog
|
|
15
18
|
context = AppSec.active_context
|
16
19
|
|
17
20
|
request_url = URI.join("#{data[:scheme]}://#{data[:host]}", data[:path]).to_s
|
18
|
-
ephemeral_data = {
|
21
|
+
ephemeral_data = {'server.io.net.url' => request_url}
|
19
22
|
|
20
23
|
result = context.run_rasp(Ext::RASP_SSRF, {}, ephemeral_data, Datadog.configuration.appsec.waf_timeout)
|
21
24
|
|
22
25
|
if result.match?
|
23
|
-
|
26
|
+
AppSec::Event.tag_and_keep!(context, result)
|
24
27
|
|
25
|
-
context.events
|
26
|
-
|
27
|
-
|
28
|
-
span: context.span,
|
29
|
-
request_url: request_url,
|
30
|
-
actions: result.actions
|
31
|
-
}
|
28
|
+
context.events.push(
|
29
|
+
AppSec::SecurityEvent.new(result, trace: context.trace, span: context.span)
|
30
|
+
)
|
32
31
|
|
33
|
-
ActionsHandler.handle(result.actions)
|
32
|
+
AppSec::ActionsHandler.handle(result.actions)
|
34
33
|
end
|
35
34
|
|
36
35
|
super
|
@@ -1,6 +1,9 @@
|
|
1
1
|
# rubocop:disable Naming/FileName
|
2
2
|
# frozen_string_literal: true
|
3
3
|
|
4
|
+
require_relative '../../event'
|
5
|
+
require_relative '../../security_event'
|
6
|
+
|
4
7
|
module Datadog
|
5
8
|
module AppSec
|
6
9
|
module Contrib
|
@@ -19,17 +22,13 @@ module Datadog
|
|
19
22
|
result = context.run_rasp(Ext::RASP_SSRF, {}, ephemeral_data, Datadog.configuration.appsec.waf_timeout)
|
20
23
|
|
21
24
|
if result.match?
|
22
|
-
|
25
|
+
AppSec::Event.tag_and_keep!(context, result)
|
23
26
|
|
24
|
-
context.events
|
25
|
-
|
26
|
-
|
27
|
-
span: context.span,
|
28
|
-
request_url: request_env.url,
|
29
|
-
actions: result.actions
|
30
|
-
}
|
27
|
+
context.events.push(
|
28
|
+
AppSec::SecurityEvent.new(result, trace: context.trace, span: context.span)
|
29
|
+
)
|
31
30
|
|
32
|
-
ActionsHandler.handle(result.actions)
|
31
|
+
AppSec::ActionsHandler.handle(result.actions)
|
33
32
|
end
|
34
33
|
|
35
34
|
@app.call(request_env)
|
@@ -1,6 +1,9 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
require 'json'
|
4
|
+
|
5
|
+
require_relative '../../../event'
|
6
|
+
require_relative '../../../security_event'
|
4
7
|
require_relative '../../../instrumentation/gateway'
|
5
8
|
|
6
9
|
module Datadog
|
@@ -29,17 +32,13 @@ module Datadog
|
|
29
32
|
result = context.run_waf(persistent_data, {}, Datadog.configuration.appsec.waf_timeout)
|
30
33
|
|
31
34
|
if result.match?
|
32
|
-
|
35
|
+
AppSec::Event.tag_and_keep!(context, result)
|
33
36
|
|
34
|
-
context.events
|
35
|
-
|
36
|
-
|
37
|
-
span: context.span,
|
38
|
-
multiplex: gateway_multiplex,
|
39
|
-
actions: result.actions
|
40
|
-
}
|
37
|
+
context.events.push(
|
38
|
+
AppSec::SecurityEvent.new(result, trace: context.trace, span: context.span)
|
39
|
+
)
|
41
40
|
|
42
|
-
|
41
|
+
AppSec::ActionsHandler.handle(result.actions)
|
43
42
|
end
|
44
43
|
end
|
45
44
|
|
@@ -6,6 +6,40 @@ module Datadog
|
|
6
6
|
module Rack
|
7
7
|
# Rack integration constants
|
8
8
|
module Ext
|
9
|
+
COLLECTABLE_REQUEST_HEADERS = [
|
10
|
+
'accept',
|
11
|
+
'akamai-user-risk',
|
12
|
+
'cf-ray',
|
13
|
+
'cloudfront-viewer-ja3-fingerprint',
|
14
|
+
'content-type',
|
15
|
+
'user-agent',
|
16
|
+
'x-amzn-trace-Id',
|
17
|
+
'x-appgw-trace-id',
|
18
|
+
'x-cloud-trace-context',
|
19
|
+
'x-sigsci-requestid',
|
20
|
+
'x-sigsci-tags'
|
21
|
+
].freeze
|
22
|
+
|
23
|
+
IDENTITY_COLLECTABLE_REQUEST_HEADERS = [
|
24
|
+
'accept-encoding',
|
25
|
+
'accept-language',
|
26
|
+
'cf-connecting-ip',
|
27
|
+
'cf-connecting-ipv6',
|
28
|
+
'content-encoding',
|
29
|
+
'content-language',
|
30
|
+
'content-length',
|
31
|
+
'fastly-client-ip',
|
32
|
+
'forwarded',
|
33
|
+
'forwarded-for',
|
34
|
+
'host',
|
35
|
+
'true-client-ip',
|
36
|
+
'via',
|
37
|
+
'x-client-ip',
|
38
|
+
'x-cluster-client-ip',
|
39
|
+
'x-forwarded',
|
40
|
+
'x-forwarded-for',
|
41
|
+
'x-real-ip'
|
42
|
+
].freeze
|
9
43
|
end
|
10
44
|
end
|
11
45
|
end
|