From 929c372b4096e379c69cff8d4cf04730f3f2118e Mon Sep 17 00:00:00 2001 From: "alejandro.gonzalez" Date: Fri, 17 Jan 2025 14:53:33 +0100 Subject: [PATCH 1/2] Apply the standard nomenclature to the stacktrace configs --- .../trace/api/config/AppSecConfig.java | 12 +++++++++--- .../datadog/trace/api/config/IastConfig.java | 8 ++++++-- .../main/java/datadog/trace/api/Config.java | 19 ++++++++++++++----- 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/AppSecConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/AppSecConfig.java index ca56889fda7..ed26bdffe95 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/config/AppSecConfig.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/config/AppSecConfig.java @@ -30,9 +30,15 @@ public final class AppSecConfig { public static final String APPSEC_SCA_ENABLED = "appsec.sca.enabled"; public static final String APPSEC_RASP_ENABLED = "appsec.rasp.enabled"; - public static final String APPSEC_STACK_TRACE_ENABLED = "appsec.stacktrace.enabled"; - public static final String APPSEC_MAX_STACK_TRACES = "appsec.max.stacktraces"; - public static final String APPSEC_MAX_STACK_TRACE_DEPTH = "appsec.max.stacktrace.depth"; + public static final String APPSEC_STACK_TRACE_ENABLED = "appsec.stack-trace.enabled"; + public static final String APPSEC_STACKTRACE_ENABLED = + "appsec.stacktrace.enabled"; // old non-standard as a fallback alias + public static final String APPSEC_MAX_STACK_TRACES = "appsec.max.stack-traces"; + public static final String APPSEC_MAX_STACKTRACES = + "appsec.max.stacktraces"; // old non-standard as a fallback alias + public static final String APPSEC_MAX_STACK_TRACE_DEPTH = "appsec.max.stack-trace.depth"; + public static final String APPSEC_MAX_STACKTRACE_DEPTH = + "appsec.max.stacktrace.depth"; // old non-standard as a fallback alias public static final String APPSEC_STANDALONE_ENABLED = "experimental.appsec.standalone.enabled"; diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/IastConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/IastConfig.java index 3207b1ccdf4..578780dec51 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/config/IastConfig.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/config/IastConfig.java @@ -16,7 +16,9 @@ public final class IastConfig { public static final String IAST_REDACTION_ENABLED = "iast.redaction.enabled"; public static final String IAST_REDACTION_NAME_PATTERN = "iast.redaction.name.pattern"; public static final String IAST_REDACTION_VALUE_PATTERN = "iast.redaction.value.pattern"; - public static final String IAST_STACKTRACE_LEAK_SUPPRESS = "iast.stacktrace-leak.suppress"; + public static final String IAST_STACK_TRACE_LEAK_SUPPRESS = "iast.stack-trace-leak.suppress"; + public static final String IAST_STACKTRACE_LEAK_SUPPRESS = + "iast.stacktrace-leak.suppress"; // old non-standard as a fallback alias public static final String IAST_HARDCODED_SECRET_ENABLED = "iast.hardcoded-secret.enabled"; public static final String IAST_MAX_RANGE_COUNT = "iast.max-range-count"; public static final String IAST_TRUNCATION_MAX_VALUE_LENGTH = "iast.truncation.max.value.length"; @@ -26,7 +28,9 @@ public final class IastConfig { public static final String IAST_SOURCE_MAPPING_MAX_SIZE = "iast.source-mapping.max-size"; public static final String IAST_EXPERIMENTAL_PROPAGATION_ENABLED = "iast.experimental.propagation.enabled"; - public static final String IAST_STACK_TRACE_ENABLED = "iast.stacktrace.enabled"; + public static final String IAST_STACK_TRACE_ENABLED = "iast.stack-trace.enabled"; + public static final String IAST_STACKTRACE_ENABLED = + "iast.stacktrace.enabled"; // old non-standard as a fallback alias public static final String IAST_SECURITY_CONTROLS_CONFIGURATION = "iast.security-controls.configuration"; public static final String IAST_DB_ROWS_TO_TAINT = "iast.db.rows-to-taint"; diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java index c69c6416b88..ecd23bb60e6 100644 --- a/internal-api/src/main/java/datadog/trace/api/Config.java +++ b/internal-api/src/main/java/datadog/trace/api/Config.java @@ -1284,12 +1284,18 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment()) appSecStandaloneEnabled = configProvider.getBoolean(APPSEC_STANDALONE_ENABLED, false); appSecRaspEnabled = configProvider.getBoolean(APPSEC_RASP_ENABLED, DEFAULT_APPSEC_RASP_ENABLED); appSecStackTraceEnabled = - configProvider.getBoolean(APPSEC_STACK_TRACE_ENABLED, DEFAULT_APPSEC_STACK_TRACE_ENABLED); + configProvider.getBoolean( + APPSEC_STACK_TRACE_ENABLED, + DEFAULT_APPSEC_STACK_TRACE_ENABLED, + APPSEC_STACKTRACE_ENABLED); appSecMaxStackTraces = - configProvider.getInteger(APPSEC_MAX_STACK_TRACES, DEFAULT_APPSEC_MAX_STACK_TRACES); + configProvider.getInteger( + APPSEC_MAX_STACK_TRACES, DEFAULT_APPSEC_MAX_STACK_TRACES, APPSEC_MAX_STACKTRACES); appSecMaxStackTraceDepth = configProvider.getInteger( - APPSEC_MAX_STACK_TRACE_DEPTH, DEFAULT_APPSEC_MAX_STACK_TRACE_DEPTH); + APPSEC_MAX_STACK_TRACE_DEPTH, + DEFAULT_APPSEC_MAX_STACK_TRACE_DEPTH, + APPSEC_MAX_STACKTRACE_DEPTH); apiSecurityEnabled = configProvider.getBoolean( API_SECURITY_ENABLED, DEFAULT_API_SECURITY_ENABLED, API_SECURITY_ENABLED_EXPERIMENTAL); @@ -1330,7 +1336,9 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment()) iastMaxRangeCount = iastDetectionMode.getIastMaxRangeCount(configProvider); iastStacktraceLeakSuppress = configProvider.getBoolean( - IAST_STACKTRACE_LEAK_SUPPRESS, DEFAULT_IAST_STACKTRACE_LEAK_SUPPRESS); + IAST_STACK_TRACE_LEAK_SUPPRESS, + DEFAULT_IAST_STACKTRACE_LEAK_SUPPRESS, + IAST_STACKTRACE_LEAK_SUPPRESS); iastHardcodedSecretEnabled = configProvider.getBoolean( IAST_HARDCODED_SECRET_ENABLED, DEFAULT_IAST_HARDCODED_SECRET_ENABLED); @@ -1340,7 +1348,8 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment()) iastSourceMappingEnabled = configProvider.getBoolean(IAST_SOURCE_MAPPING_ENABLED, false); iastSourceMappingMaxSize = configProvider.getInteger(IAST_SOURCE_MAPPING_MAX_SIZE, 1000); iastStackTraceEnabled = - configProvider.getBoolean(IAST_STACK_TRACE_ENABLED, DEFAULT_IAST_STACK_TRACE_ENABLED); + configProvider.getBoolean( + IAST_STACK_TRACE_ENABLED, DEFAULT_IAST_STACK_TRACE_ENABLED, IAST_STACKTRACE_ENABLED); iastExperimentalPropagationEnabled = configProvider.getBoolean(IAST_EXPERIMENTAL_PROPAGATION_ENABLED, false); iastSecurityControlsConfiguration = From 1506fd510d696dbbf5a82376a89784a258b525e8 Mon Sep 17 00:00:00 2001 From: "alejandro.gonzalez" Date: Fri, 17 Jan 2025 15:55:30 +0100 Subject: [PATCH 2/2] rename to add the DEPRECATED subfix --- .../datadog/trace/api/config/AppSecConfig.java | 6 +++--- .../java/datadog/trace/api/config/IastConfig.java | 4 ++-- .../src/main/java/datadog/trace/api/Config.java | 14 +++++++++----- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/AppSecConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/AppSecConfig.java index ed26bdffe95..1551a419cce 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/config/AppSecConfig.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/config/AppSecConfig.java @@ -31,13 +31,13 @@ public final class AppSecConfig { public static final String APPSEC_SCA_ENABLED = "appsec.sca.enabled"; public static final String APPSEC_RASP_ENABLED = "appsec.rasp.enabled"; public static final String APPSEC_STACK_TRACE_ENABLED = "appsec.stack-trace.enabled"; - public static final String APPSEC_STACKTRACE_ENABLED = + public static final String APPSEC_STACKTRACE_ENABLED_DEPRECATED = "appsec.stacktrace.enabled"; // old non-standard as a fallback alias public static final String APPSEC_MAX_STACK_TRACES = "appsec.max.stack-traces"; - public static final String APPSEC_MAX_STACKTRACES = + public static final String APPSEC_MAX_STACKTRACES_DEPRECATED = "appsec.max.stacktraces"; // old non-standard as a fallback alias public static final String APPSEC_MAX_STACK_TRACE_DEPTH = "appsec.max.stack-trace.depth"; - public static final String APPSEC_MAX_STACKTRACE_DEPTH = + public static final String APPSEC_MAX_STACKTRACE_DEPTH_DEPRECATED = "appsec.max.stacktrace.depth"; // old non-standard as a fallback alias public static final String APPSEC_STANDALONE_ENABLED = "experimental.appsec.standalone.enabled"; diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/IastConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/IastConfig.java index 578780dec51..fe75256c425 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/config/IastConfig.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/config/IastConfig.java @@ -17,7 +17,7 @@ public final class IastConfig { public static final String IAST_REDACTION_NAME_PATTERN = "iast.redaction.name.pattern"; public static final String IAST_REDACTION_VALUE_PATTERN = "iast.redaction.value.pattern"; public static final String IAST_STACK_TRACE_LEAK_SUPPRESS = "iast.stack-trace-leak.suppress"; - public static final String IAST_STACKTRACE_LEAK_SUPPRESS = + public static final String IAST_STACKTRACE_LEAK_SUPPRESS_DEPRECATED = "iast.stacktrace-leak.suppress"; // old non-standard as a fallback alias public static final String IAST_HARDCODED_SECRET_ENABLED = "iast.hardcoded-secret.enabled"; public static final String IAST_MAX_RANGE_COUNT = "iast.max-range-count"; @@ -29,7 +29,7 @@ public final class IastConfig { public static final String IAST_EXPERIMENTAL_PROPAGATION_ENABLED = "iast.experimental.propagation.enabled"; public static final String IAST_STACK_TRACE_ENABLED = "iast.stack-trace.enabled"; - public static final String IAST_STACKTRACE_ENABLED = + public static final String IAST_STACKTRACE_ENABLED_DEPRECATED = "iast.stacktrace.enabled"; // old non-standard as a fallback alias public static final String IAST_SECURITY_CONTROLS_CONFIGURATION = "iast.security-controls.configuration"; diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java index ecd23bb60e6..83813153077 100644 --- a/internal-api/src/main/java/datadog/trace/api/Config.java +++ b/internal-api/src/main/java/datadog/trace/api/Config.java @@ -1287,15 +1287,17 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment()) configProvider.getBoolean( APPSEC_STACK_TRACE_ENABLED, DEFAULT_APPSEC_STACK_TRACE_ENABLED, - APPSEC_STACKTRACE_ENABLED); + APPSEC_STACKTRACE_ENABLED_DEPRECATED); appSecMaxStackTraces = configProvider.getInteger( - APPSEC_MAX_STACK_TRACES, DEFAULT_APPSEC_MAX_STACK_TRACES, APPSEC_MAX_STACKTRACES); + APPSEC_MAX_STACK_TRACES, + DEFAULT_APPSEC_MAX_STACK_TRACES, + APPSEC_MAX_STACKTRACES_DEPRECATED); appSecMaxStackTraceDepth = configProvider.getInteger( APPSEC_MAX_STACK_TRACE_DEPTH, DEFAULT_APPSEC_MAX_STACK_TRACE_DEPTH, - APPSEC_MAX_STACKTRACE_DEPTH); + APPSEC_MAX_STACKTRACE_DEPTH_DEPRECATED); apiSecurityEnabled = configProvider.getBoolean( API_SECURITY_ENABLED, DEFAULT_API_SECURITY_ENABLED, API_SECURITY_ENABLED_EXPERIMENTAL); @@ -1338,7 +1340,7 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment()) configProvider.getBoolean( IAST_STACK_TRACE_LEAK_SUPPRESS, DEFAULT_IAST_STACKTRACE_LEAK_SUPPRESS, - IAST_STACKTRACE_LEAK_SUPPRESS); + IAST_STACKTRACE_LEAK_SUPPRESS_DEPRECATED); iastHardcodedSecretEnabled = configProvider.getBoolean( IAST_HARDCODED_SECRET_ENABLED, DEFAULT_IAST_HARDCODED_SECRET_ENABLED); @@ -1349,7 +1351,9 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment()) iastSourceMappingMaxSize = configProvider.getInteger(IAST_SOURCE_MAPPING_MAX_SIZE, 1000); iastStackTraceEnabled = configProvider.getBoolean( - IAST_STACK_TRACE_ENABLED, DEFAULT_IAST_STACK_TRACE_ENABLED, IAST_STACKTRACE_ENABLED); + IAST_STACK_TRACE_ENABLED, + DEFAULT_IAST_STACK_TRACE_ENABLED, + IAST_STACKTRACE_ENABLED_DEPRECATED); iastExperimentalPropagationEnabled = configProvider.getBoolean(IAST_EXPERIMENTAL_PROPAGATION_ENABLED, false); iastSecurityControlsConfiguration =