[cxf] branch feature/CXF-8099_mask_sensitive_logging_elements updated: CXF-8099: added precompiled patterns

[ashakirin]

This is an automated email from the ASF dual-hosted git repository.

ashakirin pushed a commit to branch 
feature/CXF-8099_mask_sensitive_logging_elements
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to 
refs/heads/feature/CXF-8099_mask_sensitive_logging_elements by this push:
     new ed504c8  CXF-8099: added precompiled patterns
ed504c8 is described below

commit ed504c80c0d40f709566b0b485e4bce7affff504
Author: ashakirin <49843238+ashakirin-tal...@users.noreply.github.com>
AuthorDate: Tue Jul 21 00:29:06 2020 +0200

    CXF-8099: added precompiled patterns
---
 .../cxf/ext/logging/MaskSensitiveHelper.java       | 44 ++++++++++++++++------
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git 
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/MaskSensitiveHelper.java
 
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/MaskSensitiveHelper.java
index 627cfcf..0db8dc0 100644
--- 
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/MaskSensitiveHelper.java
+++ 
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/MaskSensitiveHelper.java
@@ -20,6 +20,7 @@ package org.apache.cxf.ext.logging;
 
 import java.util.HashSet;
 import java.util.Set;
+import java.util.regex.Pattern;
 
 import org.apache.cxf.message.Message;
 
@@ -34,36 +35,57 @@ public class MaskSensitiveHelper {
     private static final String HTML_CONTENT = "html";
     private static final String JSON_CONTENT = "json";
 
-    private final Set<String> sensitiveElementNames = new HashSet<>();
+    private static class ReplacementPair {
+        private final Pattern matchPattern;
+        private final String replacement;
+
+        ReplacementPair(String matchPattern, String replacement) {
+            this.matchPattern = Pattern.compile(matchPattern);
+            this.replacement = replacement;
+        }
+    }
+
+    private final Set<ReplacementPair> replacementsXML = new HashSet<>();
+    private final Set<ReplacementPair> replacementsJSON = new HashSet<>();
 
     public void addSensitiveElementNames(final Set<String> 
inSensitiveElementNames) {
-        this.sensitiveElementNames.addAll(inSensitiveElementNames);
+        for (final String sensitiveName : inSensitiveElementNames) {
+            addReplacementPair(MATCH_PATTERN_XML_TEMPLATE, 
REPLACEMENT_XML_TEMPLATE, sensitiveName, replacementsXML);
+            addReplacementPair(MATCH_PATTERN_JSON_TEMPLATE, 
REPLACEMENT_JSON_TEMPLATE, sensitiveName, replacementsJSON);
+        }
+    }
+
+    private void addReplacementPair(final String matchPatternTemplate,
+                                    final String replacementTemplate,
+                                    final String sensitiveName,
+                                    final Set<ReplacementPair> replacements) {
+        final String matchPatternXML = 
matchPatternTemplate.replaceAll(ELEMENT_NAME_TEMPLATE, sensitiveName);
+        final String replacementXML = 
replacementTemplate.replaceAll(ELEMENT_NAME_TEMPLATE, sensitiveName);
+        replacements.add(new ReplacementPair(matchPatternXML, replacementXML));
     }
 
     public String maskSensitiveElements(
             final Message message,
             final String originalLogString) {
-        if (sensitiveElementNames.isEmpty()
+        if (replacementsXML.isEmpty() && replacementsJSON.isEmpty()
                 || message == null
-                || (originalLogString == null)) {
+                || originalLogString == null) {
             return originalLogString;
         }
         final String contentType = (String) message.get(Message.CONTENT_TYPE);
         if (contentType.toLowerCase().contains(XML_CONTENT)
                 || contentType.toLowerCase().contains(HTML_CONTENT)) {
-            return applyMasks(originalLogString, MATCH_PATTERN_XML_TEMPLATE, 
REPLACEMENT_XML_TEMPLATE);
+            return applyMasks(originalLogString, replacementsXML);
         } else if (contentType.toLowerCase().contains(JSON_CONTENT)) {
-            return applyMasks(originalLogString, MATCH_PATTERN_JSON_TEMPLATE, 
REPLACEMENT_JSON_TEMPLATE);
+            return applyMasks(originalLogString, replacementsJSON);
         }
         return originalLogString;
     }
 
-    private String applyMasks(String originalLogString, String 
matchElementPattern, String replacementElementTemplate) {
+    private String applyMasks(String originalLogString, Set<ReplacementPair> 
replacementPairs) {
         String resultString = originalLogString;
-        for (final String sensitiveName : sensitiveElementNames) {
-            final String matchPattern = 
matchElementPattern.replaceAll(ELEMENT_NAME_TEMPLATE, sensitiveName);
-            final String replacement = 
replacementElementTemplate.replaceAll(ELEMENT_NAME_TEMPLATE, sensitiveName);
-            resultString = resultString.replaceAll(matchPattern, replacement);
+        for (final ReplacementPair replacementPair : replacementPairs) {
+            resultString = 
replacementPair.matchPattern.matcher(resultString).replaceAll(replacementPair.replacement);
         }
         return resultString;
     }