X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/f60a10eb6e40921c32045c1e38843d6b87f3d274..995de3ef5b311d2296c4435c380b55c4c82c5175:/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 a0820f24..5e37bf3b 100644 --- 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-2018 AsamK + Copyright (C) 2015-2020 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 @@ -18,25 +18,39 @@ package org.asamk.signal; import net.sourceforge.argparse4j.ArgumentParsers; import net.sourceforge.argparse4j.impl.Arguments; -import net.sourceforge.argparse4j.inf.*; -import org.apache.http.util.TextUtils; +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; -import org.asamk.signal.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.manager.BaseConfig; import org.asamk.signal.manager.Manager; +import org.asamk.signal.util.IOUtils; +import org.asamk.signal.util.SecurityProvider; +import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.freedesktop.dbus.DBusConnection; import org.freedesktop.dbus.exceptions.DBusException; +import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException; import org.whispersystems.signalservice.api.util.PhoneNumberFormatter; import java.io.File; import java.security.Security; import java.util.Map; +import static org.whispersystems.signalservice.internal.util.Util.isEmpty; + public class Main { public static void main(String[] args) { - // Workaround for BKS truststore - Security.insertProviderAt(new org.bouncycastle.jce.provider.BouncyCastleProvider(), 1); + installSecurityProviderWorkaround(); Namespace ns = parseArgs(args); if (ns == null) { @@ -47,6 +61,12 @@ public class Main { System.exit(res); } + public static void installSecurityProviderWorkaround() { + // Register our own security provider + Security.insertProviderAt(new SecurityProvider(), 1); + Security.addProvider(new BouncyCastleProvider()); + } + private static int handleCommands(Namespace ns) { final String username = ns.getString("username"); Manager m; @@ -77,21 +97,21 @@ public class Main { return 3; } } else { - String settingsPath = ns.getString("config"); - if (TextUtils.isEmpty(settingsPath)) { - settingsPath = System.getProperty("user.home") + "/.config/signal"; - if (!new File(settingsPath).exists()) { - String legacySettingsPath = System.getProperty("user.home") + "/.config/textsecure"; - if (new File(legacySettingsPath).exists()) { - settingsPath = legacySettingsPath; - } - } + String dataPath = ns.getString("config"); + if (isEmpty(dataPath)) { + dataPath = getDefaultDataPath(); } - m = new Manager(username, settingsPath); + m = new Manager(username, dataPath); ts = m; try { m.init(); + } 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 (Exception e) { System.err.println("Error loading state file: " + e.getMessage()); return 2; @@ -131,6 +151,32 @@ public class Main { } } + /** + * 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 String getDefaultDataPath() { + String dataPath = IOUtils.getDataHomeDir() + "/signal-cli"; + if (new File(dataPath).exists()) { + return dataPath; + } + + String legacySettingsPath = System.getProperty("user.home") + "/.config/signal"; + if (new File(legacySettingsPath).exists()) { + return legacySettingsPath; + } + + legacySettingsPath = System.getProperty("user.home") + "/.config/textsecure"; + if (new File(legacySettingsPath).exists()) { + return legacySettingsPath; + } + + return dataPath; + } + private static Namespace parseArgs(String[] args) { ArgumentParser parser = ArgumentParsers.newFor("signal-cli") .build() @@ -142,7 +188,7 @@ public class Main { .help("Show package version.") .action(Arguments.version()); parser.addArgument("--config") - .help("Set the path, where to store the config (Default: $HOME/.config/signal)."); + .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") @@ -186,13 +232,13 @@ public class Main { System.err.println("You need to specify a username (phone number)"); System.exit(2); } - if (!PhoneNumberFormatter.isValidNumber(ns.getString("username"))) { + 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 a the same time"); + System.err.println("You cannot specify recipients by phone number and groups at the same time"); System.exit(2); } return ns;