Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>com.uid2</groupId>
<artifactId>uid2-shared</artifactId>
<version>11.3.3</version>
<version>11.3.4-alpha-333-SNAPSHOT</version>
<name>${project.groupId}:${project.artifactId}</name>
<description>Library for all the shared uid2 operations</description>
<url>https://github.com/IABTechLab/uid2docs</url>
Expand Down
15 changes: 7 additions & 8 deletions src/main/java/com/uid2/shared/logback/MaskingPatternLayout.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@
import ch.qos.logback.classic.PatternLayout;
import ch.qos.logback.classic.spi.ILoggingEvent;

import java.util.Map;
import java.util.regex.Pattern;

public class MaskingPatternLayout extends PatternLayout {
private static final Map<Pattern, String> MASKING_PATTERNS = Map.of(
Pattern.compile("\\S+s3\\.amazonaws\\.com/\\S*X-Amz-Security-Token=\\S+"), "REDACTED - S3"
);
private static final Pattern AWS_PRESIGNED_URL_REGEX_PATTERN = Pattern.compile("\\S+s3\\.amazonaws\\.com/\\S*X-Amz-Security-Token=\\S+");
private static final String AWS_SECURITY_TOKEN_HEADER = "X-Amz-Security-Token=";
private static final String AWS_PRESIGNED_URL_REDACTION_MASK = "REDACTED - S3";

@Override
public String doLayout(ILoggingEvent event) {
Expand All @@ -22,11 +21,11 @@ private String mask(String message) {
}

String maskedMessage = message;
for (Map.Entry<Pattern, String> entry : MASKING_PATTERNS.entrySet()) {
Pattern pattern = entry.getKey();
String mask = entry.getValue();
maskedMessage = pattern.matcher(maskedMessage).replaceAll(mask);
// Perform a broad check to potentially skip regex
if (maskedMessage.contains(AWS_SECURITY_TOKEN_HEADER)) {
maskedMessage = AWS_PRESIGNED_URL_REGEX_PATTERN.matcher(maskedMessage).replaceAll(AWS_PRESIGNED_URL_REDACTION_MASK);
}

return maskedMessage;
}
}
Loading