Skip to content

Allow masking of multiple substrings #696

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 2 commits into from
Nov 7, 2021
Merged

Allow masking of multiple substrings #696

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
1e296e8
Allow masking of multiple substrings
philsttr Nov 7, 2021
e5f39cb
Update README.md with info on value masker processing
philsttr Nov 7, 2021
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: 8 additions & 4 deletions src/main/java/net/logstash/logback/mask/MaskingJsonGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,18 +525,22 @@ private Object getMaskedValueForCurrentPath() {
return null;
}
/**
* @param value the value to potentially mask
* @param originalValue the value to potentially mask
* @return the masked value for the current path and value if the value should be masked.
* otherwise returns null.
*/
private Object getMaskedValueForCurrentPathAndValue(Object value) {
private Object getMaskedValueForCurrentPathAndValue(Object originalValue) {
JsonStreamContext context = getOutputContext();
Object localValue = originalValue;
for (ValueMasker valueMasker : valueMaskers) {
Object maskedValue = valueMasker.mask(context, value);
Object maskedValue = valueMasker.mask(context, localValue);
if (maskedValue != null) {
return maskedValue;
localValue = maskedValue;
}
}
if (localValue != originalValue) {
return localValue;
}
return null;
}

Expand Down
8 changes: 8 additions & 0 deletions src/test/java/net/logstash/logback/mask/MaskingJsonGeneratorDecoratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,14 @@ public void maskedAndUnmaskedField() throws IOException {
"value.");
}

@Test
public void maskedSubstrings() throws IOException {
testMaskByValue(
"{\"fieldA\":\"tomask1\",\"fieldB\":\"tomask2\",\"fieldC\":\" tomask1-tomask2 \"}",
"{\"fieldA\":\"****\",\"fieldB\":\"****\",\"fieldC\":\" ****-**** \"}",
"tomask1", "tomask2");
}

@Test
public void onlyMaskedField() throws IOException {
testMaskByPath(
Expand Down