Merge pull request #587 from IABTechLab/srm-UID2-6477-implement-log-masking-optimization

Added early exit without doing regex matches for masking pattern layout

Author: RSam25

pom.xml

@@ -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>

src/main/java/com/uid2/shared/logback/MaskingPatternLayout.java

@@ -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) {
@@ -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;
     }
 }