2 files changed, 73 insertions, 0 deletions
diff --git a/common/src/main/java/org/onap/so/beans/nsmf/AllocateTnNssi.java b/common/src/main/java/org/onap/so/beans/nsmf/AllocateTnNssi.java
index 1b0986ca0d..3d25ef1d45 100644
--- a/common/src/main/java/org/onap/so/beans/nsmf/AllocateTnNssi.java
+++ b/common/src/main/java/org/onap/so/beans/nsmf/AllocateTnNssi.java
@@ -39,4 +39,6 @@ public class AllocateTnNssi implements Serializable {
     private NsiInfo nsiInfo;
 
     private String scriptName;
+
+    private String nssiId;
 }
diff --git a/common/src/main/java/org/onap/so/logger/MaskLogStatements.java b/common/src/main/java/org/onap/so/logger/MaskLogStatements.java
new file mode 100644
index 0000000000..cadadcf9f3
--- /dev/null
+++ b/common/src/main/java/org/onap/so/logger/MaskLogStatements.java
@@ -0,0 +1,71 @@
+package org.onap.so.logger;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import ch.qos.logback.classic.PatternLayout;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+
+public class MaskLogStatements extends PatternLayout {
+
+    private String patternsProperty;
+    private String maskChar = "*";
+    private Optional<Pattern> pattern = Optional.empty();
+    private static final Pattern authPattern =
+            Pattern.compile("Authorization(?:\\:|=)\\s?(?:\"|\\[)(?:Basic|Bearer) (.*?)(?:\"|\\])");
+    private static final Pattern openstackPattern = Pattern.compile("\"password\"\\s?:\\s?\"(.*?)\"");
+
+    public String getPatternsProperty() {
+        return patternsProperty;
+    }
+
+    public void setPatternsProperty(String patternsProperty) {
+        this.patternsProperty = patternsProperty;
+        if (this.patternsProperty != null) {
+            this.pattern = Optional.of(Pattern.compile(patternsProperty, Pattern.MULTILINE));
+        }
+    }
+
+    public String getMaskChar() {
+        return maskChar;
+    }
+
+    public void setMaskChar(String maskChar) {
+        this.maskChar = maskChar;
+    }
+
+
+    protected Collection<Pattern> getPatterns() {
+        return Arrays.asList(authPattern, openstackPattern);
+    }
+
+    @Override
+    public String doLayout(ILoggingEvent event) {
+
+        final StringBuilder message = new StringBuilder(super.doLayout(event));
+        List<Pattern> patterns = new ArrayList<>(getPatterns());
+        if (pattern.isPresent()) {
+            patterns.add(pattern.get());
+        }
+        patterns.forEach(p -> {
+            Matcher matcher = p.matcher(message);
+            while (matcher.find()) {
+                int group = 1;
+                while (group <= matcher.groupCount()) {
+                    if (matcher.group(group) != null) {
+                        for (int i = matcher.start(group); i < matcher.end(group); i++) {
+                            message.setCharAt(i, maskChar.charAt(0));
+                        }
+                    }
+                    group++;
+                }
+            }
+        });
+        return message.toString();
+    }
+
+}