Skip to content

Fix IAST Vulnerabilities stack trace generation when multiple vulnerabilities share location #8412

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

Merged
merged 1 commit into from
Feb 18, 2025
+77 −1
Merged

Fix IAST Vulnerabilities stack trace generation when multiple vulnerabilities share location #8412

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
4 changes: 3 additions & 1 deletion dd-java-agent/agent-iast/src/main/java/com/datadog/iast/Reporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,9 @@ private void reportVulnerability(
final VulnerabilityBatch batch = getOrCreateVulnerabilityBatch(span);
if (batch != null) {
batch.add(vulnerability);
if (Config.get().isIastStackTraceEnabled() && batch.getVulnerabilities() != null) {
if (Config.get().isIastStackTraceEnabled()
&& batch.getVulnerabilities() != null
&& vulnerability.getLocation().getStackId() == null) {
String stackId =
addVulnerabilityStackTrace(span, String.valueOf(batch.getVulnerabilities().size()));
if (stackId != null) {
Expand Down
74 changes: 74 additions & 0 deletions dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/ReporterTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,6 +533,80 @@ class ReporterTest extends DDSpecification {
batch.vulnerabilities.size() == 2
}

void 'two cookie vulnerabilities that share location share stackId and only generate one stack'() {
given:
final Reporter reporter = new Reporter()
final traceSegment = Mock(TraceSegment)
final ctx = new IastRequestContext(noOpTaintedObjects())
final reqCtx = Mock(RequestContext)
final spanId = 123456
VulnerabilityBatch batch = null
Map stackTraceBatch = new ConcurrentHashMap()

final span = Stub(AgentSpan)
span.getRequestContext() >> reqCtx
span.getSpanId() >> spanId

final location = Location.forSpanAndStack(span, new StackTraceElement("foo", "foo", "foo", 1))

final v1 = new Vulnerability(
VulnerabilityType.INSECURE_COOKIE,
location,
new Evidence("JSESSIONID")
)
final v2 = new Vulnerability(
VulnerabilityType.NO_SAMESITE_COOKIE,
location,
new Evidence("JSESSIONID")
)

when:
reporter.report(span, v1)
reporter.report(span, v2)

then:
1 * reqCtx.getData(RequestContextSlot.IAST) >> ctx
2 * reqCtx.getTraceSegment() >> traceSegment
// first vulnerability
1 * traceSegment.getDataTop('iast') >> null
1 * traceSegment.setDataTop('iast', _) >> { batch = it[1] as VulnerabilityBatch }
1 * reqCtx.getOrCreateMetaStructTop('_dd.stack', _) >> { stackTraceBatch }
// second vulnerability
1 * traceSegment.getDataTop('iast') >> { return batch } // second vulnerability
JSONAssert.assertEquals('''{
"vulnerabilities": [
{
"evidence": { "value":"JSESSIONID" },
"hash":1156210466,
"location": {
"spanId":123456,
"line":1,
"path":"foo",
"method": "foo",
"stackId":"1"
},
"type":"INSECURE_COOKIE"
},
{
"evidence": {"value":"JSESSIONID"},
"hash":1090504969,
"location": {
"spanId":123456,
"line":1,
"path":"foo",
"method": "foo",
"stackId":"1"
},
"type":"NO_SAMESITE_COOKIE"
}
]
}''', batch.toString(), true)
1 * traceSegment.setTagTop('asm.keep', true)
1 * traceSegment.setTagTop('_dd.p.ts', ProductTraceSource.ASM)
assert stackTraceBatch.get("vulnerability").size() == 1
0 * _
}

private AgentSpan spanWithBatch(final VulnerabilityBatch batch) {
final traceSegment = Mock(TraceSegment) {
getDataTop('iast') >> batch
Expand Down
Loading