Extend log scrubber for dbus serviceIds

[signal-cli] / src / main / java / org / asamk / signal / logging / Scrubber.java

diff --git a/src/main/java/org/asamk/signal/logging/Scrubber.java b/src/main/java/org/asamk/signal/logging/Scrubber.java
index efa196cede1c2062fe0a53ab2ee737311f210ce1..c1d66893956417ee5fd4466c0e0f0c83ef9a4f96 100644 (file)
--- a/src/main/java/org/asamk/signal/logging/Scrubber.java
+++ b/src/main/java/org/asamk/signal/logging/Scrubber.java
@@ -37,7 +37,7 @@ public final class Scrubber {
      * Supposedly, the shortest international phone numbers in use contain seven digits.
      * Handles URL encoded +, %2B
      */
-    private static final Pattern E164_PATTERN = Pattern.compile("(\\+|%2B)(\\d{5,13})(\\d{2})");
+    private static final Pattern E164_PATTERN = Pattern.compile("(\\+|%2B|/org/asamk/Signal/_)(\\d{5,13})(\\d{2})");
     private static final String E164_CENSOR = "*************";
 
     /**
@@ -50,7 +50,7 @@ public final class Scrubber {
      * The middle group will be censored.
      */
     private static final Pattern UUID_PATTERN = Pattern.compile(
-            "(JOB::)?([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{10})([0-9a-f]{2})",
+            "(JOB::)?([0-9a-f]{8}[-_][0-9a-f]{4}[-_][0-9a-f]{4}[-_][0-9a-f]{4}[-_][0-9a-f]{10})([0-9a-f]{2})",
             Pattern.CASE_INSENSITIVE);
     private static final String UUID_CENSOR = "********-****-****-****-**********";