Log signal-cli version on startup

[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 88ae06caaa621d4dfdbc940984c128d1c86770ae..429cdc939199ae59403e12bd1da65fb9b2ef44bb 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,30 +17,58 @@
 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 net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.ArgumentParserException;
 import net.sourceforge.argparse4j.inf.Namespace;
 

-import org.asamk.signal.manager.LibSignalLogger;
+import org.asamk.signal.commands.exceptions.CommandException;
+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.logging.LogConfigurator;
+import org.asamk.signal.manager.ManagerLogger;

 import org.asamk.signal.util.SecurityProvider;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 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 {
 
     public static void main(String[] args) {
 import java.security.Security;
 
 public class Main {
 
     public static void main(String[] args) {

+        // enable unlimited strength crypto via Policy, supported on relevant JREs
+        Security.setProperty("crypto.policy", "unlimited");

         installSecurityProviderWorkaround();
 
         // Configuring the logger needs to happen before any logger is initialized
         installSecurityProviderWorkaround();
 
         // Configuring the logger needs to happen before any logger is initialized

-        configureLogging(isVerbose(args));
+
+        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 scrubLog = nsLog != null && nsLog.getBoolean("scrub-log");
+        configureLogging(verboseLevel, logFile, scrubLog);

 
         var parser = App.buildArgumentParser();
 
         var ns = parser.parseArgsOrFail(args);
 
 
         var parser = App.buildArgumentParser();
 
         var ns = parser.parseArgsOrFail(args);
 

-        var res = new App(ns).init();
-        System.exit(res);
+        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();
+            }
+            status = getStatusForError(e);
+        } catch (Throwable e) {
+            e.printStackTrace();
+            status = 2;
+        }
+        System.exit(status);

     }
 
     private static void installSecurityProviderWorkaround() {
     }
 
     private static void installSecurityProviderWorkaround() {


@@ -49,33 +77,47 @@ public class Main {
         Security.addProvider(new BouncyCastleProvider());
     }
 
         Security.addProvider(new BouncyCastleProvider());
     }
 

-    private static boolean isVerbose(String[] args) {
-        var parser = ArgumentParsers.newFor("signal-cli").build().defaultHelp(false);
-        parser.addArgument("--verbose").action(Arguments.storeTrue());
+    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 false;
+            return null;

         }
         }

+    }
+
+    private static void configureLogging(final int verboseLevel, final File logFile, final boolean scrubLog) {
+        LogConfigurator.setVerboseLevel(verboseLevel);
+        LogConfigurator.setLogFile(logFile);
+        LogConfigurator.setScrubSensitiveInformation(scrubLog);

 
 

-        return ns.getBoolean("verbose");
+        if (verboseLevel > 0) {
+            java.util.logging.Logger.getLogger("")
+                    .setLevel(verboseLevel > 2 ? java.util.logging.Level.FINEST : java.util.logging.Level.INFO);
+            ManagerLogger.initLogger();
+        }
+        SLF4JBridgeHandler.removeHandlersForRootLogger();
+        SLF4JBridgeHandler.install();

     }
 
     }
 

-    private static void configureLogging(final boolean verbose) {
-        if (verbose) {
-            System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "debug");
-            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");
-            LibSignalLogger.initLogger();
+    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 {
         } else {

-            System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "info");
-            System.setProperty("org.slf4j.simpleLogger.showThreadName", "false");
-            System.setProperty("org.slf4j.simpleLogger.showShortLogName", "true");
-            System.setProperty("org.slf4j.simpleLogger.showDateTime", "false");
+            return 2;

         }
     }
 }
         }
     }
 }