Update user agent

[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..9219a1d6e7a04c08b781c8faaa38d57b4804dfb8 100644 (file)
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -24,9 +24,11 @@ import net.sourceforge.argparse4j.inf.Namespace;
 
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.RateLimitErrorException;
 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;
@@ -43,29 +45,26 @@ public class Main {
         installSecurityProviderWorkaround();
 
         // Configuring the logger needs to happen before any logger is initialized
+        final var loggingConfig = parseLoggingConfig(args);
+        configureLogging(loggingConfig);
 
-        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);
-
-        var parser = App.buildArgumentParser();
-
-        var ns = parser.parseArgsOrFail(args);
+        final var parser = App.buildArgumentParser();
+        final var ns = parser.parseArgsOrFail(args);
 
         int status = 0;
         try {
             new App(ns).init();
         } catch (CommandException e) {
             System.err.println(e.getMessage());
-            if (verboseLevel > 0 && e.getCause() != null) {
-                e.getCause().printStackTrace();
+            if (loggingConfig.verboseLevel > 0 && e.getCause() != null) {
+                e.getCause().printStackTrace(System.err);
             }
             status = getStatusForError(e);
         } catch (Throwable e) {
-            e.printStackTrace();
+            e.printStackTrace(System.err);
             status = 2;
         }
+        Shutdown.shutdownComplete();
         System.exit(status);
     }
 
@@ -75,13 +74,29 @@ public class Main {
         Security.addProvider(new BouncyCastleProvider());
     }
 
+    private static LoggingConfig parseLoggingConfig(final String[] args) {
+        final var nsLog = parseArgs(args);
+        if (nsLog == null) {
+            return new LoggingConfig(0, null, false);
+        }
+
+        final var verboseLevel = nsLog.getInt("verbose");
+        final var logFile = nsLog.<File>get("log-file");
+        final var scrubLog = nsLog.getBoolean("scrub-log");
+        return new LoggingConfig(verboseLevel, logFile, scrubLog);
+    }
+
+    /**
+     * This method only parses commandline args relevant for logging configuration.
+     */
     private static Namespace parseArgs(String[] args) {
         var parser = ArgumentParsers.newFor("signal-cli", DefaultSettings.VERSION_0_9_0_DEFAULT_SETTINGS)
                 .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("--scrub-log").action(Arguments.storeTrue());
 
         try {
             return parser.parseKnownArgs(args, null);
@@ -90,13 +105,16 @@ public class Main {
         }
     }
 
-    private static void configureLogging(final int verboseLevel, final File logFile) {
-        LogConfigurator.setVerboseLevel(verboseLevel);
-        LogConfigurator.setLogFile(logFile);
+    private static void configureLogging(final LoggingConfig loggingConfig) {
+        LogConfigurator.setVerboseLevel(loggingConfig.verboseLevel);
+        LogConfigurator.setLogFile(loggingConfig.logFile);
+        LogConfigurator.setScrubSensitiveInformation(loggingConfig.scrubLog);
 
-        if (verboseLevel > 0) {
+        if (loggingConfig.verboseLevel > 0) {
             java.util.logging.Logger.getLogger("")
-                    .setLevel(verboseLevel > 2 ? java.util.logging.Level.FINEST : java.util.logging.Level.INFO);
+                    .setLevel(loggingConfig.verboseLevel > 2
+                            ? java.util.logging.Level.FINEST
+                            : java.util.logging.Level.INFO);
             ManagerLogger.initLogger();
         }
         SLF4JBridgeHandler.removeHandlersForRootLogger();
@@ -104,16 +122,15 @@ public class Main {
     }
 
     private static int getStatusForError(final CommandException e) {
-        if (e instanceof UserErrorException) {
-            return 1;
-        } else if (e instanceof UnexpectedErrorException) {
-            return 2;
-        } else if (e instanceof IOErrorException) {
-            return 3;
-        } else if (e instanceof UntrustedKeyErrorException) {
-            return 4;
-        } else {
-            return 2;
-        }
+        return switch (e) {
+            case UserErrorException userErrorException -> 1;
+            case UnexpectedErrorException unexpectedErrorException -> 2;
+            case IOErrorException ioErrorException -> 3;
+            case UntrustedKeyErrorException untrustedKeyErrorException -> 4;
+            case RateLimitErrorException rateLimitErrorException -> 5;
+            case null -> 2;
+        };
     }
+
+    private record LoggingConfig(int verboseLevel, File logFile, boolean scrubLog) {}
 }