Add helper method to create valid dbus object path

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

diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index 14bdc4c92ded097bb296eeaf4e1b493fd0971f49..429cdc939199ae59403e12bd1da65fb9b2ef44bb 100644 (file)
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -27,6 +27,7 @@ import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UntrustedKeyErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UntrustedKeyErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;

+import org.asamk.signal.logging.LogConfigurator;

 import org.asamk.signal.manager.ManagerLogger;
 import org.asamk.signal.util.SecurityProvider;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.asamk.signal.manager.ManagerLogger;
 import org.asamk.signal.util.SecurityProvider;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;


@@ -47,7 +48,8 @@ public class Main {
         final var nsLog = parseArgs(args);
         final var verboseLevel = nsLog == null ? 0 : nsLog.getInt("verbose");
         final var logFile = nsLog == null ? null : nsLog.<File>get("log-file");
         final var nsLog = parseArgs(args);
         final var verboseLevel = nsLog == null ? 0 : nsLog.getInt("verbose");
         final var logFile = nsLog == null ? null : nsLog.<File>get("log-file");

-        configureLogging(verboseLevel, logFile);
+        final var scrubLog = nsLog != null && nsLog.getBoolean("scrub-log");
+        configureLogging(verboseLevel, logFile, scrubLog);

 
         var parser = App.buildArgumentParser();
 
 
         var parser = App.buildArgumentParser();
 


@@ -80,8 +82,9 @@ public class Main {
                 .includeArgumentNamesAsKeysInResult(true)
                 .build()
                 .defaultHelp(false);
                 .includeArgumentNamesAsKeysInResult(true)
                 .build()
                 .defaultHelp(false);

-        parser.addArgument("--verbose").action(Arguments.count());
+        parser.addArgument("-v", "--verbose").action(Arguments.count());

         parser.addArgument("--log-file").type(File.class);
         parser.addArgument("--log-file").type(File.class);

+        parser.addArgument("--scrub-log").action(Arguments.storeTrue());

 
         try {
             return parser.parseKnownArgs(args, null);
 
         try {
             return parser.parseKnownArgs(args, null);


@@ -90,9 +93,10 @@ public class Main {
         }
     }
 
         }
     }
 

-    private static void configureLogging(final int verboseLevel, final File logFile) {
+    private static void configureLogging(final int verboseLevel, final File logFile, final boolean scrubLog) {

         LogConfigurator.setVerboseLevel(verboseLevel);
         LogConfigurator.setLogFile(logFile);
         LogConfigurator.setVerboseLevel(verboseLevel);
         LogConfigurator.setLogFile(logFile);

+        LogConfigurator.setScrubSensitiveInformation(scrubLog);

 
         if (verboseLevel > 0) {
             java.util.logging.Logger.getLogger("")
 
         if (verboseLevel > 0) {
             java.util.logging.Logger.getLogger("")