Send self messages as normal messages, new flag --note-to-self for sync 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 97e3f9b2e2760081f333f0626eb6b1695a79d532..45945c0211f6e6f1252e2bf81c0d1eaca6fb0781 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-2020 AsamK and contributors
+  Copyright (C) 2015-2021 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


@@ -25,209 +25,61 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 import net.sourceforge.argparse4j.inf.Subparsers;
 
 import net.sourceforge.argparse4j.inf.Subparser;
 import net.sourceforge.argparse4j.inf.Subparsers;
 

-import org.asamk.Signal;

 import org.asamk.signal.commands.Command;
 import org.asamk.signal.commands.Commands;
 import org.asamk.signal.commands.Command;
 import org.asamk.signal.commands.Commands;

-import org.asamk.signal.commands.DbusCommand;
-import org.asamk.signal.commands.ExtendedDbusCommand;
-import org.asamk.signal.commands.LocalCommand;
-import org.asamk.signal.commands.ProvisioningCommand;
-import org.asamk.signal.dbus.DbusSignalImpl;
-import org.asamk.signal.manager.Manager;
-import org.asamk.signal.manager.ProvisioningManager;
-import org.asamk.signal.manager.ServiceConfig;
-import org.asamk.signal.util.IOUtils;
+import org.asamk.signal.manager.LibSignalLogger;

 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.freedesktop.dbus.connections.impl.DBusConnection;
-import org.freedesktop.dbus.exceptions.DBusException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
-import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
-import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;

 
 

-import java.io.File;
-import java.io.IOException;

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

-    final static Logger logger = LoggerFactory.getLogger(Main.class);
-

     public static void main(String[] args) {
         installSecurityProviderWorkaround();
 
     public static void main(String[] args) {
         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");
+        }
+

         Namespace ns = parseArgs(args);
         if (ns == null) {
         Namespace ns = parseArgs(args);
         if (ns == null) {

-            System.exit(1);
+            System.exit(2);

         }
 
         }
 

-        int res = init(ns);
+        int res = new Cli(ns).init();

         System.exit(res);
     }
 
         System.exit(res);
     }
 

-    public static void installSecurityProviderWorkaround() {
+    private static void installSecurityProviderWorkaround() {

         // Register our own security provider
         Security.insertProviderAt(new SecurityProvider(), 1);
         Security.addProvider(new BouncyCastleProvider());
     }
 
         // Register our own security provider
         Security.insertProviderAt(new SecurityProvider(), 1);
         Security.addProvider(new BouncyCastleProvider());
     }
 

-    public static int init(Namespace ns) {
-        if (ns.getBoolean("dbus") || ns.getBoolean("dbus_system")) {
-            return initDbusClient(ns, ns.getBoolean("dbus_system"));
-        }
-
-        final String username = ns.getString("username");
-
-        final File dataPath;
-        String config = ns.getString("config");
-        if (config != null) {
-            dataPath = new File(config);
-        } else {
-            dataPath = getDefaultDataPath();
-        }
-
-        final SignalServiceConfiguration serviceConfiguration = ServiceConfig.createDefaultServiceConfiguration(
-                BaseConfig.USER_AGENT);
-
-        if (!ServiceConfig.getCapabilities().isGv2()) {
-            logger.warn("WARNING: Support for new group V2 is disabled,"
-                    + " because the required native library dependency is missing: libzkgroup");
-        }
-
-        if (username == null) {
-            ProvisioningManager pm = new ProvisioningManager(dataPath, serviceConfiguration, BaseConfig.USER_AGENT);
-            return handleCommands(ns, pm);
-        }
-
-        Manager manager;
-        try {
-            manager = Manager.init(username, dataPath, serviceConfiguration, BaseConfig.USER_AGENT);
-        } catch (Throwable e) {
-            logger.error("Error loading state file: {}", e.getMessage());
-            return 2;
-        }
+    private static boolean isVerbose(String[] args) {
+        ArgumentParser parser = buildBaseArgumentParser();

 
 

-        try (Manager m = manager) {
-            try {
-                m.checkAccountState();
-            } catch (AuthorizationFailedException e) {
-                if (!"register".equals(ns.getString("command"))) {
-                    // Register command should still be possible, if current authorization fails
-                    System.err.println("Authorization failed, was the number registered elsewhere?");
-                    return 2;
-                }
-            } catch (IOException e) {
-                logger.error("Error while checking account: {}", e.getMessage());
-                return 2;
-            }
-
-            return handleCommands(ns, m);
-        } catch (IOException e) {
-            logger.error("Cleanup failed", e);
-            return 3;
-        }
-    }
-
-    private static int initDbusClient(final Namespace ns, final boolean systemBus) {
+        Namespace ns;

         try {
         try {

-            DBusConnection.DBusBusType busType;
-            if (systemBus) {
-                busType = DBusConnection.DBusBusType.SYSTEM;
-            } else {
-                busType = DBusConnection.DBusBusType.SESSION;
-            }
-            try (DBusConnection dBusConn = DBusConnection.getConnection(busType)) {
-                Signal ts = dBusConn.getRemoteObject(DbusConfig.SIGNAL_BUSNAME,
-                        DbusConfig.SIGNAL_OBJECTPATH,
-                        Signal.class);
-
-                return handleCommands(ns, ts, dBusConn);
-            }
-        } catch (DBusException | IOException e) {
-            logger.error("Dbus client failed", e);
-            return 3;
-        }
-    }
-
-    private static int handleCommands(Namespace ns, Signal ts, DBusConnection dBusConn) {
-        String commandKey = ns.getString("command");
-        final Map<String, Command> commands = Commands.getCommands();
-        if (commands.containsKey(commandKey)) {
-            Command command = commands.get(commandKey);
-
-            if (command instanceof ExtendedDbusCommand) {
-                return ((ExtendedDbusCommand) command).handleCommand(ns, ts, dBusConn);
-            } else if (command instanceof DbusCommand) {
-                return ((DbusCommand) command).handleCommand(ns, ts);
-            } else {
-                System.err.println(commandKey + " is not yet implemented via dbus");
-                return 1;
-            }
-        }
-        return 0;
-    }
-
-    private static int handleCommands(Namespace ns, ProvisioningManager pm) {
-        String commandKey = ns.getString("command");
-        final Map<String, Command> commands = Commands.getCommands();
-        if (commands.containsKey(commandKey)) {
-            Command command = commands.get(commandKey);
-
-            if (command instanceof ProvisioningCommand) {
-                return ((ProvisioningCommand) command).handleCommand(ns, pm);
-            } else {
-                System.err.println(commandKey + " only works with a username");
-                return 1;
-            }
-        }
-        return 0;
-    }
-
-    private static int handleCommands(Namespace ns, Manager m) {
-        String commandKey = ns.getString("command");
-        final Map<String, Command> commands = Commands.getCommands();
-        if (commands.containsKey(commandKey)) {
-            Command command = commands.get(commandKey);
-
-            if (command instanceof LocalCommand) {
-                return ((LocalCommand) command).handleCommand(ns, m);
-            } else if (command instanceof DbusCommand) {
-                return ((DbusCommand) command).handleCommand(ns, new DbusSignalImpl(m));
-            } else if (command instanceof ExtendedDbusCommand) {
-                System.err.println(commandKey + " only works via dbus");
-            }
-            return 1;
-        }
-        return 0;
-    }
-
-    /**
-     * Uses $XDG_DATA_HOME/signal-cli if it exists, or if none of the legacy directories exist:
-     * - $HOME/.config/signal
-     * - $HOME/.config/textsecure
-     *
-     * @return the data directory to be used by signal-cli.
-     */
-    private static File getDefaultDataPath() {
-        File dataPath = new File(IOUtils.getDataHomeDir(), "/signal-cli");
-        if (dataPath.exists()) {
-            return dataPath;
-        }
-
-        File legacySettingsPath = new File(System.getProperty("user.home"), "/.config/signal");
-        if (legacySettingsPath.exists()) {
-            return legacySettingsPath;
-        }
-
-        legacySettingsPath = new File(System.getProperty("user.home"), "/.config/textsecure");
-        if (legacySettingsPath.exists()) {
-            return legacySettingsPath;
+            ns = parser.parseKnownArgs(args, null);
+        } catch (ArgumentParserException e) {
+            return false;

         }
 
         }
 

-        return dataPath;
+        return ns.getBoolean("verbose");

     }
 
     private static Namespace parseArgs(String[] args) {
     }
 
     private static Namespace parseArgs(String[] args) {


@@ -241,31 +93,28 @@ public class Main {
             return null;
         }
 
             return null;
         }
 

-        if ("link".equals(ns.getString("command"))) {
-            if (ns.getString("username") != null) {
-                parser.printUsage();
-                System.err.println("You cannot specify a username (phone number) when linking");
-                System.exit(2);
-            }
-        } else if (!ns.getBoolean("dbus") && !ns.getBoolean("dbus_system")) {
-            if (ns.getString("username") == null) {
-                parser.printUsage();
-                System.err.println("You need to specify a username (phone number)");
-                System.exit(2);
-            }
-            if (!PhoneNumberFormatter.isValidNumber(ns.getString("username"), null)) {
-                System.err.println("Invalid username (phone number), make sure you include the country code.");
-                System.exit(2);
-            }
-        }
-        if (ns.getList("recipient") != null && !ns.getList("recipient").isEmpty() && ns.getString("group") != null) {
-            System.err.println("You cannot specify recipients by phone number and groups at the same time");
-            System.exit(2);
-        }

         return ns;
     }
 
     private static ArgumentParser buildArgumentParser() {
         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);
+        }
+
+        return parser;
+    }
+
+    private static ArgumentParser buildBaseArgumentParser() {

         ArgumentParser parser = ArgumentParsers.newFor("signal-cli")
                 .build()
                 .defaultHelp(true)
         ArgumentParser parser = ArgumentParsers.newFor("signal-cli")
                 .build()
                 .defaultHelp(true)


@@ -273,25 +122,23 @@ public class Main {
                 .version(BaseConfig.PROJECT_NAME + " " + BaseConfig.PROJECT_VERSION);
 
         parser.addArgument("-v", "--version").help("Show package version.").action(Arguments.version());
                 .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("--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();
         MutuallyExclusiveGroup mut = parser.addMutuallyExclusiveGroup();

-        mut.addArgument("-u", "--username").help("Specify your phone number, that will be used for verification.");

         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());
 
         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());
 

-        Subparsers subparsers = parser.addSubparsers()
-                .title("subcommands")
-                .dest("command")
-                .description("valid subcommands")
-                .help("additional help");
+        parser.addArgument("-o", "--output")
+                .help("Choose to output in plain text or JSON")
+                .choices("plain-text", "json")
+                .setDefault("plain-text");

 
 

-        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);
-        }

         return parser;
     }
 }
         return parser;
     }
 }