Merge pull request #18 from ing-bank/feature/sanitize_logs2

remove TokenCode from logs
ing-bank · Jan 24, 2019 · 22b6ff6 · 22b6ff6
2 parents 8faaf28 + efec11f
commit 22b6ff6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/build.sbt b/build.sbt
@@ -4,7 +4,7 @@ import scalariform.formatter.preferences._
 
 name := "airlock-sts"
 
-version := "0.1.4"
+version := "0.1.6"
 
 scalaVersion := "2.12.8"
 

diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
@@ -25,13 +25,17 @@
           <replacement>$1"secretKey":"[...]$3</replacement>
         </replace>
         <replace>
-          <pattern>(?ism)sessionToken=Some\((([\w\d]{5})[\w\d]+)\)</pattern>
-          <replacement>sessionToken=Some([$2...])</replacement>
+          <pattern>(?ism)sessionToken(=Some\(|=)+(([\w\d]{5})[\w\d]+)[\)]?</pattern>
+          <replacement>sessionToken=[$3...]</replacement>
         </replace>
         <replace>
           <pattern>(?ism)New kids:\s\S([\w\d]{3})[\w\d]+</pattern>
           <replacement>New kids: [$1...]</replacement>
         </replace>
+        <replace>
+          <pattern>(?ism)(TokenCode=)([\w\d]{3})([^,]+\))</pattern>
+          <replacement>$1[$2...]</replacement>
+        </replace>
         <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
       </layout>
     </encoder>