Skip to content

Fix redact processor arraycopy bug #122640

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
joegallo merged 5 commits into from
Feb 17, 2025
Merged

Fix redact processor arraycopy bug #122640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e152d9a
Add a failing unit test
joegallo Feb 14, 2025
7bd6126
Include the start and end tokens in the length
joegallo Feb 14, 2025
9bfd586
Update docs/changelog/122640.yaml
joegallo Feb 14, 2025
361fa00
Merge branch 'main' into fix-redact-arraycopy-bug
joegallo Feb 17, 2025
af1f6ac
Rename this variable
joegallo Feb 17, 2025
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
5 changes: 5 additions & 0 deletions docs/changelog/122640.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 122640
summary: Fix redact processor arraycopy bug
area: Ingest Node
type: bug
issues: []
8 changes: 6 additions & 2 deletions x-pack/plugin/redact/src/main/java/org/elasticsearch/xpack/redact/RedactProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,9 +294,13 @@ public void extract(byte[] utf8Bytes, int offset, Region region) {
*/
String redactMatches(byte[] utf8Bytes, String redactStartToken, String redactEndToken) {
var merged = mergeOverlappingReplacements(replacementPositions);
int longestPatternName = merged.stream().mapToInt(r -> r.patternName.getBytes(StandardCharsets.UTF_8).length).max().getAsInt();
int maxPatternNameLength = merged.stream()
.mapToInt(r -> r.patternName.getBytes(StandardCharsets.UTF_8).length)
.max()
.getAsInt();

int maxPossibleLength = longestPatternName * merged.size() + utf8Bytes.length;
int maxPossibleLength = (redactStartToken.length() + maxPatternNameLength + redactEndToken.length()) * merged.size()
+ utf8Bytes.length;
byte[] redact = new byte[maxPossibleLength];

int readOffset = 0;
Expand Down
12 changes: 12 additions & 0 deletions x-pack/plugin/redact/src/test/java/org/elasticsearch/xpack/redact/RedactProcessorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,18 @@ public void testMatchRedact() throws Exception {
var redacted = RedactProcessor.matchRedact(input, List.of(grok));
assertEquals("<CREDIT_CARD> <CREDIT_CARD> <CREDIT_CARD> <CREDIT_CARD>", redacted);
}
{
var config = new HashMap<String, Object>();
config.put("field", "to_redact");
config.put("patterns", List.of("%{NUMBER:NUMBER}"));
config.put("pattern_definitions", Map.of("NUMBER", "\\d{4}"));
var processor = new RedactProcessor.Factory(mockLicenseState(), MatcherWatchdog.noop()).create(null, "t", "d", config);
var grok = processor.getGroks().get(0);

String input = "1001";
var redacted = RedactProcessor.matchRedact(input, List.of(grok), "_prefix_", "_suffix_");
assertEquals("_prefix_NUMBER_suffix_", redacted);
}
}

public void testMatchRedactMultipleGroks() throws Exception {
Expand Down