Improve addDevice error message

[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 9029f87186a2b8169e61a1d9a620ceca74ea82a3..9219a1d6e7a04c08b781c8faaa38d57b4804dfb8 100644 (file)
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -1,5 +1,5 @@
 /*
 /*

-  Copyright (C) 2015-2021 AsamK and contributors
+  Copyright (C) 2015-2022 AsamK and contributors

 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by


@@ -17,20 +17,24 @@
 package org.asamk.signal;
 
 import net.sourceforge.argparse4j.ArgumentParsers;
 package org.asamk.signal;
 
 import net.sourceforge.argparse4j.ArgumentParsers;

+import net.sourceforge.argparse4j.DefaultSettings;

 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.ArgumentParserException;
 import net.sourceforge.argparse4j.inf.Namespace;
 
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.ArgumentParserException;
 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.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UntrustedKeyErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;

-import org.asamk.signal.manager.Manager;
+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.slf4j.bridge.SLF4JBridgeHandler;
 
 import org.asamk.signal.util.SecurityProvider;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.slf4j.bridge.SLF4JBridgeHandler;
 

+import java.io.File;

 import java.security.Security;
 
 public class Main {
 import java.security.Security;
 
 public class Main {


@@ -41,26 +45,26 @@ public class Main {
         installSecurityProviderWorkaround();
 
         // Configuring the logger needs to happen before any logger is initialized
         installSecurityProviderWorkaround();
 
         // Configuring the logger needs to happen before any logger is initialized

-        final var verboseLevel = getVerboseLevel(args);
-        configureLogging(verboseLevel);
+        final var loggingConfig = parseLoggingConfig(args);
+        configureLogging(loggingConfig);

 
 

-        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());
 
         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) {
             }
             status = getStatusForError(e);
         } catch (Throwable e) {

-            e.printStackTrace();
+            e.printStackTrace(System.err);

             status = 2;
         }
             status = 2;
         }

+        Shutdown.shutdownComplete();

         System.exit(status);
     }
 
         System.exit(status);
     }
 


@@ -70,51 +74,63 @@ public class Main {
         Security.addProvider(new BouncyCastleProvider());
     }
 
         Security.addProvider(new BouncyCastleProvider());
     }
 

-    private static int getVerboseLevel(String[] args) {
-        var parser = ArgumentParsers.newFor("signal-cli").build().defaultHelp(false);
-        parser.addArgument("--verbose").action(Arguments.count());
+    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("-v", "--verbose").action(Arguments.count());
+        parser.addArgument("--log-file").type(File.class);
+        parser.addArgument("--scrub-log").action(Arguments.storeTrue());

 
 

-        Namespace ns;

         try {
         try {

-            ns = parser.parseKnownArgs(args, null);
+            return parser.parseKnownArgs(args, null);

         } catch (ArgumentParserException e) {
         } catch (ArgumentParserException e) {

-            return 0;
+            return null;

         }
         }

-
-        return ns.getInt("verbose");

     }
 
     }
 

-    private static void configureLogging(final int verboseLevel) {
-        final var defaultLogLevel = verboseLevel > 1 ? "trace" : verboseLevel > 0 ? "debug" : "info";
-        System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", defaultLogLevel);
-        if (verboseLevel > 0) {
-            System.setProperty("org.slf4j.simpleLogger.showThreadName", "true");
-            System.setProperty("org.slf4j.simpleLogger.showShortLogName", "false");
-            System.setProperty("org.slf4j.simpleLogger.showDateTime", "true");
-            System.setProperty("org.slf4j.simpleLogger.dateTimeFormat", "yyyy-MM-dd'T'HH:mm:ss.SSSXX");
+    private static void configureLogging(final LoggingConfig loggingConfig) {
+        LogConfigurator.setVerboseLevel(loggingConfig.verboseLevel);
+        LogConfigurator.setLogFile(loggingConfig.logFile);
+        LogConfigurator.setScrubSensitiveInformation(loggingConfig.scrubLog);
+
+        if (loggingConfig.verboseLevel > 0) {

             java.util.logging.Logger.getLogger("")
             java.util.logging.Logger.getLogger("")

-                    .setLevel(verboseLevel > 2 ? java.util.logging.Level.FINEST : java.util.logging.Level.INFO);
-            Manager.initLogger();
-        } else {
-            System.setProperty("org.slf4j.simpleLogger.showThreadName", "false");
-            System.setProperty("org.slf4j.simpleLogger.showShortLogName", "true");
-            System.setProperty("org.slf4j.simpleLogger.showDateTime", "false");
+                    .setLevel(loggingConfig.verboseLevel > 2
+                            ? java.util.logging.Level.FINEST
+                            : java.util.logging.Level.INFO);
+            ManagerLogger.initLogger();

         }
         SLF4JBridgeHandler.removeHandlersForRootLogger();
         SLF4JBridgeHandler.install();
     }
 
     private static int getStatusForError(final CommandException e) {
         }
         SLF4JBridgeHandler.removeHandlersForRootLogger();
         SLF4JBridgeHandler.install();
     }
 
     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) {}

 }
 }