Skip to content
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

Fix NPE in IAST evidence redaction #6099

Merged
merged 2 commits into from
Oct 25, 2023
Merged

Fix NPE in IAST evidence redaction #6099

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9b32a0
Fix NPE in IAST evidence redaction
smola Oct 25, 2023
34b7d73
Fix for SQL Injection case
smola Oct 25, 2023
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
3 changes: 2 additions & 1 deletion dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/EvidenceAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,8 @@ private void addValuePart(
valueParts.add(new TaintedValuePart(adapter, source, chunk, false));
} else {
final int length = chunk.length();
final int matching = source.getValue().indexOf(chunk);
final String sourceValue = source.getValue();
final int matching = (sourceValue == null) ? 0 : sourceValue.indexOf(chunk);
final String pattern;
if (matching >= 0) {
// if matches append the matching part from the redacted value
Expand Down
34 changes: 34 additions & 0 deletions dd-java-agent/agent-iast/src/test/resources/redaction/evidence-redaction-suite.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1753,6 +1753,40 @@ suite:
]
}


- type: 'VULNERABILITIES'
description: 'Tainted range based redaction - with null source '
input: >
[
{
"type": "XSS",
"evidence": {
"value": "this could be a super long text, so we need to reduce it before send it to the backend. This redaction strategy applies to XSS vulnerability but can be extended to future ones",
"ranges": [
{ "start" : 123, "length" : 3, "source": { "origin": "http.request.body" } }
]
}
}
]
expected: >
{
"sources": [
{ "origin": "http.request.body" }
],
"vulnerabilities": [
{
"type": "XSS",
"evidence": {
"valueParts": [
{ "redacted": true },
{ "source": 0, "value": "XSS" },
{ "redacted": true }
]
}
}
]
}

- type: 'VULNERABILITIES'
description: 'Tainted range based redaction - multiple ranges'
input: >
Expand Down
Loading