Skip to content

Fix AppSec/IAST context dropped when trace.propagation.behavior.extract=ignore/restart #11666

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
dougqh wants to merge 1 commit into
base: master
Choose a base branch
from
+42 −0
Draft

Fix AppSec/IAST context dropped when trace.propagation.behavior.extract=ignore/restart #11666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1790,6 +1790,18 @@ protected static final AgentSpan startSpan(

// Handle remote terminated context as span links
if (parentContext != null && parentContext.isRemote()) {
// Preserve AppSec/IAST request context before dropping the remote parent: when
// extract=IGNORE or RESTART the TagContext parent is nulled before buildSpanContext
// can copy requestContextDataAppSec/Iast into DDSpanContext, causing a WAF/RASP bypass.
if (parentContext instanceof TagContext) {
TagContext tc = (TagContext) parentContext;
if (builderRequestContextDataAppSec == null) {
builderRequestContextDataAppSec = tc.getRequestContextDataAppSec();
}
if (builderRequestContextDataIast == null) {
builderRequestContextDataIast = tc.getRequestContextDataIast();
}
}
switch (Config.get().getTracePropagationBehaviorExtract()) {
case RESTART:
links = addParentContextLink(links, parentContext);
Expand Down
30 changes: 30 additions & 0 deletions dd-trace-core/src/test/java/datadog/trace/core/CoreSpanBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,36 @@ void buildContextFromExtractedContextWithIgnoreBehavior() {
assertTrue(span.getLinks().isEmpty());
}

@Test
@WithConfig(key = "trace.propagation.behavior.extract", value = "ignore")
void appSecContextPreservedFromTagContextWithIgnoreBehavior() {
Object appSecData = new Object();
Object iastData = new Object();
TagContext tagContext =
new TagContext().withRequestContextDataAppSec(appSecData).withRequestContextDataIast(iastData);

DDSpan span = (DDSpan) tracer.buildSpan("test", "op name").asChildOf(tagContext).start();

assertEquals(appSecData, span.getRequestContext().getData(RequestContextSlot.APPSEC));
assertEquals(iastData, span.getRequestContext().getData(RequestContextSlot.IAST));
span.finish();
}

@Test
@WithConfig(key = "trace.propagation.behavior.extract", value = "restart")
void appSecContextPreservedFromTagContextWithRestartBehavior() {
Object appSecData = new Object();
Object iastData = new Object();
TagContext tagContext =
new TagContext().withRequestContextDataAppSec(appSecData).withRequestContextDataIast(iastData);

DDSpan span = (DDSpan) tracer.buildSpan("test", "op name").asChildOf(tagContext).start();

assertEquals(appSecData, span.getRequestContext().getData(RequestContextSlot.APPSEC));
assertEquals(iastData, span.getRequestContext().getData(RequestContextSlot.IAST));
span.finish();
}

@TableTest({
"scenario | origin | tagMap ",
"empty tag map | | [:] ",
Expand Down