X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/1e0aa8929d059b0740da496f6f4ac62159e75141..5c754b6f5d5bd3273b3c0722cf3eabbcd02c20b9:/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 562267c4..97e3f9b2 100644 --- a/src/main/java/org/asamk/signal/Main.java +++ b/src/main/java/org/asamk/signal/Main.java @@ -41,18 +41,21 @@ 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; -import static org.whispersystems.signalservice.internal.util.Util.isEmpty; - public class Main { + final static Logger logger = LoggerFactory.getLogger(Main.class); + public static void main(String[] args) { installSecurityProviderWorkaround(); @@ -61,7 +64,7 @@ public class Main { System.exit(1); } - int res = handleCommands(ns); + int res = init(ns); System.exit(res); } @@ -71,69 +74,81 @@ public class Main { Security.addProvider(new BouncyCastleProvider()); } - private static int handleCommands(Namespace ns) { - final String username = ns.getString("username"); - + public static int init(Namespace ns) { if (ns.getBoolean("dbus") || ns.getBoolean("dbus_system")) { - try { - DBusConnection.DBusBusType busType; - if (ns.getBoolean("dbus_system")) { - 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 initDbusClient(ns, ns.getBoolean("dbus_system")); + } - return handleCommands(ns, ts, dBusConn); - } - } catch (UnsatisfiedLinkError e) { - System.err.println("Missing native library dependency for dbus service: " + e.getMessage()); - return 1; - } catch (DBusException | IOException e) { - e.printStackTrace(); - return 3; - } + final String username = ns.getString("username"); + + final File dataPath; + String config = ns.getString("config"); + if (config != null) { + dataPath = new File(config); } else { - String dataPath = ns.getString("config"); - if (isEmpty(dataPath)) { - dataPath = getDefaultDataPath(); - } + dataPath = getDefaultDataPath(); + } - if (username == null) { - ProvisioningManager pm = new ProvisioningManager(dataPath, ServiceConfig.createDefaultServiceConfiguration(BaseConfig.USER_AGENT), BaseConfig.USER_AGENT); - return handleCommands(ns, pm); - } + 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; + } - Manager manager; + try (Manager m = manager) { try { - manager = Manager.init(username, dataPath, ServiceConfig.createDefaultServiceConfiguration(BaseConfig.USER_AGENT), BaseConfig.USER_AGENT); - } catch (Throwable e) { - System.err.println("Error loading state file: " + e.getMessage()); + 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; } - 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) { - System.err.println("Error while checking account: " + e.getMessage()); - return 2; - } + return handleCommands(ns, m); + } catch (IOException e) { + logger.error("Cleanup failed", e); + return 3; + } + } - return handleCommands(ns, m); - } catch (IOException e) { - e.printStackTrace(); - return 3; + private static int initDbusClient(final Namespace ns, final boolean systemBus) { + 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; } } @@ -196,19 +211,19 @@ public class Main { * * @return the data directory to be used by signal-cli. */ - private static String getDefaultDataPath() { - String dataPath = IOUtils.getDataHomeDir() + "/signal-cli"; - if (new File(dataPath).exists()) { + private static File getDefaultDataPath() { + File dataPath = new File(IOUtils.getDataHomeDir(), "/signal-cli"); + if (dataPath.exists()) { return dataPath; } - String legacySettingsPath = System.getProperty("user.home") + "/.config/signal"; - if (new File(legacySettingsPath).exists()) { + File legacySettingsPath = new File(System.getProperty("user.home"), "/.config/signal"); + if (legacySettingsPath.exists()) { return legacySettingsPath; } - legacySettingsPath = System.getProperty("user.home") + "/.config/textsecure"; - if (new File(legacySettingsPath).exists()) { + legacySettingsPath = new File(System.getProperty("user.home"), "/.config/textsecure"); + if (legacySettingsPath.exists()) { return legacySettingsPath; } @@ -216,39 +231,7 @@ public class Main { } private static Namespace parseArgs(String[] args) { - 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("--config") - .help("Set the path, where to store the config (Default: $XDG_DATA_HOME/signal-cli , $HOME/.local/share/signal-cli)."); - - 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()); - - Subparsers subparsers = parser.addSubparsers() - .title("subcommands") - .dest("command") - .description("valid subcommands") - .help("additional help"); - - final Map commands = Commands.getCommands(); - for (Map.Entry entry : commands.entrySet()) { - Subparser subparser = subparsers.addParser(entry.getKey()); - entry.getValue().attachToSubparser(subparser); - } + ArgumentParser parser = buildArgumentParser(); Namespace ns; try { @@ -281,4 +264,34 @@ public class Main { } return ns; } + + private static ArgumentParser buildArgumentParser() { + 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("--config") + .help("Set the path, where to store the config (Default: $XDG_DATA_HOME/signal-cli , $HOME/.local/share/signal-cli)."); + + 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()); + + Subparsers subparsers = parser.addSubparsers() + .title("subcommands") + .dest("command") + .description("valid subcommands") + .help("additional help"); + + final Map commands = Commands.getCommands(); + for (Map.Entry entry : commands.entrySet()) { + Subparser subparser = subparsers.addParser(entry.getKey()); + entry.getValue().attachToSubparser(subparser); + } + return parser; + } }