Remove libsignal-service from manager lib API

[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 45945c0211f6e6f1252e2bf81c0d1eaca6fb0781..863f838824fe1bf4822ce85e9f69c84fdc96f4e4 100644 (file)
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -18,49 +18,49 @@ package org.asamk.signal;
 
 import net.sourceforge.argparse4j.ArgumentParsers;
 import net.sourceforge.argparse4j.impl.Arguments;
-import net.sourceforge.argparse4j.inf.ArgumentParser;
 import net.sourceforge.argparse4j.inf.ArgumentParserException;
-import net.sourceforge.argparse4j.inf.MutuallyExclusiveGroup;
 import net.sourceforge.argparse4j.inf.Namespace;
-import net.sourceforge.argparse4j.inf.Subparser;
-import net.sourceforge.argparse4j.inf.Subparsers;
 
-import org.asamk.signal.commands.Command;
-import org.asamk.signal.commands.Commands;
-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.manager.Manager;
 import org.asamk.signal.util.SecurityProvider;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 
 import java.security.Security;
-import java.util.Map;
 
 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
-        if (isVerbose(args)) {
-            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();
-        } 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");
-        }
+        final var isVerbose = isVerbose(args);
+        configureLogging(isVerbose);
 
-        Namespace ns = parseArgs(args);
-        if (ns == null) {
-            System.exit(2);
-        }
+        var parser = App.buildArgumentParser();
+
+        var ns = parser.parseArgsOrFail(args);
 
-        int res = new Cli(ns).init();
-        System.exit(res);
+        int status = 0;
+        try {
+            new App(ns).init();
+        } catch (CommandException e) {
+            System.err.println(e.getMessage());
+            if (isVerbose && e.getCause() != null) {
+                e.getCause().printStackTrace();
+            }
+            status = getStatusForError(e);
+        } catch (Throwable e) {
+            e.printStackTrace();
+            status = 2;
+        }
+        System.exit(status);
     }
 
     private static void installSecurityProviderWorkaround() {
@@ -70,7 +70,8 @@ public class Main {
     }
 
     private static boolean isVerbose(String[] args) {
-        ArgumentParser parser = buildBaseArgumentParser();
+        var parser = ArgumentParsers.newFor("signal-cli").build().defaultHelp(false);
+        parser.addArgument("--verbose").action(Arguments.storeTrue());
 
         Namespace ns;
         try {
@@ -79,66 +80,36 @@ public class Main {
             return false;
         }
 
-        return ns.getBoolean("verbose");
+        return Boolean.TRUE.equals(ns.getBoolean("verbose"));
     }
 
-    private static Namespace parseArgs(String[] args) {
-        ArgumentParser parser = buildArgumentParser();
-
-        Namespace ns;
-        try {
-            ns = parser.parseArgs(args);
-        } catch (ArgumentParserException e) {
-            parser.handleError(e);
-            return null;
+    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");
+            Manager.initLogger();
+        } 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 ns;
     }
 
-    private static ArgumentParser buildArgumentParser() {
-        ArgumentParser parser = buildBaseArgumentParser();
-
-        Subparsers subparsers = parser.addSubparsers()
-                .title("subcommands")
-                .dest("command")
-                .description("valid subcommands")
-                .help("additional help");
-
-        final Map<String, Command> commands = Commands.getCommands();
-        for (Map.Entry<String, Command> entry : commands.entrySet()) {
-            Subparser subparser = subparsers.addParser(entry.getKey());
-            entry.getValue().attachToSubparser(subparser);
+    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 parser;
-    }
-
-    private static ArgumentParser buildBaseArgumentParser() {
-        ArgumentParser parser = ArgumentParsers.newFor("signal-cli")
-                .build()
-                .defaultHelp(true)
-                .description("Commandline interface for Signal.")
-                .version(BaseConfig.PROJECT_NAME + " " + BaseConfig.PROJECT_VERSION);
-
-        parser.addArgument("-v", "--version").help("Show package version.").action(Arguments.version());
-        parser.addArgument("--verbose")
-                .help("Raise log level and include lib signal logs.")
-                .action(Arguments.storeTrue());
-        parser.addArgument("--config")
-                .help("Set the path, where to store the config (Default: $XDG_DATA_HOME/signal-cli , $HOME/.local/share/signal-cli).");
-
-        parser.addArgument("-u", "--username").help("Specify your phone number, that will be used for verification.");
-
-        MutuallyExclusiveGroup mut = parser.addMutuallyExclusiveGroup();
-        mut.addArgument("--dbus").help("Make request via user dbus.").action(Arguments.storeTrue());
-        mut.addArgument("--dbus-system").help("Make request via system dbus.").action(Arguments.storeTrue());
-
-        parser.addArgument("-o", "--output")
-                .help("Choose to output in plain text or JSON")
-                .choices("plain-text", "json")
-                .setDefault("plain-text");
-
-        return parser;
     }
 }