X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/de273586b4106171a3940ce5ec2c2b3712430c8c..b09677a46c4ecf07f305892b51a927e4d7341793:/src/main/java/org/asamk/signal/App.java diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java index 5f0f1cdf..49172f80 100644 --- a/src/main/java/org/asamk/signal/App.java +++ b/src/main/java/org/asamk/signal/App.java @@ -14,6 +14,10 @@ import org.asamk.signal.commands.LocalCommand; import org.asamk.signal.commands.MultiLocalCommand; import org.asamk.signal.commands.ProvisioningCommand; import org.asamk.signal.commands.RegistrationCommand; +import org.asamk.signal.commands.SignalCreator; +import org.asamk.signal.commands.exceptions.CommandException; +import org.asamk.signal.commands.exceptions.UnexpectedErrorException; +import org.asamk.signal.commands.exceptions.UserErrorException; import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.NotRegisteredException; import org.asamk.signal.manager.ProvisioningManager; @@ -29,9 +33,10 @@ import org.whispersystems.signalservice.api.util.PhoneNumberFormatter; import java.io.File; import java.io.IOException; +import java.util.ArrayList; import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; + +import static net.sourceforge.argparse4j.DefaultSettings.VERSION_0_9_0_DEFAULT_SETTINGS; public class App { @@ -40,7 +45,8 @@ public class App { private final Namespace ns; static ArgumentParser buildArgumentParser() { - var parser = ArgumentParsers.newFor("signal-cli") + var parser = ArgumentParsers.newFor("signal-cli", VERSION_0_9_0_DEFAULT_SETTINGS) + .includeArgumentNamesAsKeysInResult(true) .build() .defaultHelp(true) .description("Commandline interface for Signal.") @@ -53,7 +59,7 @@ public class App { 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."); + parser.addArgument("-u", "--username").help("Specify your phone number, that will be your identifier."); var mut = parser.addMutuallyExclusiveGroup(); mut.addArgument("--dbus").help("Make request via user dbus.").action(Arguments.storeTrue()); @@ -64,13 +70,17 @@ public class App { .type(Arguments.enumStringType(OutputType.class)) .setDefault(OutputType.PLAIN_TEXT); + parser.addArgument("--service-environment") + .help("Choose the server environment to use.") + .type(Arguments.enumStringType(ServiceEnvironmentCli.class)) + .setDefault(ServiceEnvironmentCli.LIVE); + var subparsers = parser.addSubparsers().title("subcommands").dest("command"); - final var commands = Commands.getCommands(); - for (var entry : commands.entrySet()) { - var subparser = subparsers.addParser(entry.getKey()); - entry.getValue().attachToSubparser(subparser); - } + Commands.getCommandSubparserAttachers().forEach((key, value) -> { + var subparser = subparsers.addParser(key); + value.attachToSubparser(subparser); + }); return parser; } @@ -79,27 +89,30 @@ public class App { this.ns = ns; } - public int init() { + public void init() throws CommandException { + var outputType = ns.get("output"); + var outputWriter = outputType == OutputType.JSON + ? new JsonWriterImpl(System.out) + : new PlainTextWriterImpl(System.out); + var commandKey = ns.getString("command"); - var command = Commands.getCommand(commandKey); + var command = Commands.getCommand(commandKey, outputWriter); if (command == null) { - logger.error("Command not implemented!"); - return 1; + throw new UserErrorException("Command not implemented!"); } - OutputType outputType = ns.get("output"); if (!command.getSupportedOutputTypes().contains(outputType)) { - logger.error("Command doesn't support output type {}", outputType.toString()); - return 1; + throw new UserErrorException("Command doesn't support output type " + outputType.toString()); } var username = ns.getString("username"); - final boolean useDbus = ns.getBoolean("dbus"); - final boolean useDbusSystem = ns.getBoolean("dbus_system"); + final var useDbus = ns.getBoolean("dbus"); + final var useDbusSystem = ns.getBoolean("dbus-system"); if (useDbus || useDbusSystem) { // If username is null, it will connect to the default object path - return initDbusClient(command, username, useDbusSystem); + initDbusClient(command, username, useDbusSystem); + return; } final File dataPath; @@ -110,7 +123,10 @@ public class App { dataPath = getDefaultDataPath(); } - final var serviceEnvironment = ServiceEnvironment.LIVE; + final var serviceEnvironmentCli = ns.get("service-environment"); + final var serviceEnvironment = serviceEnvironmentCli == ServiceEnvironmentCli.LIVE + ? ServiceEnvironment.LIVE + : ServiceEnvironment.SANDBOX; if (!ServiceConfig.getCapabilities().isGv2()) { logger.warn("WARNING: Support for new group V2 is disabled," @@ -118,111 +134,119 @@ public class App { } if (!ServiceConfig.isSignalClientAvailable()) { - logger.error("Missing required native library dependency: libsignal-client"); - return 1; + throw new UserErrorException("Missing required native library dependency: libsignal-client"); } if (command instanceof ProvisioningCommand) { if (username != null) { - System.err.println("You cannot specify a username (phone number) when linking"); - return 1; + throw new UserErrorException("You cannot specify a username (phone number) when linking"); } - return handleProvisioningCommand((ProvisioningCommand) command, dataPath, serviceEnvironment); + handleProvisioningCommand((ProvisioningCommand) command, dataPath, serviceEnvironment); + return; } if (username == null) { var usernames = Manager.getAllLocalUsernames(dataPath); - if (usernames.size() == 0) { - System.err.println("No local users found, you first need to register or link an account"); - return 1; - } if (command instanceof MultiLocalCommand) { - return handleMultiLocalCommand((MultiLocalCommand) command, dataPath, serviceEnvironment, usernames); + handleMultiLocalCommand((MultiLocalCommand) command, dataPath, serviceEnvironment, usernames); + return; } - if (usernames.size() > 1) { - System.err.println("Multiple users found, you need to specify a username (phone number) with -u"); - return 1; + if (usernames.size() == 0) { + throw new UserErrorException("No local users found, you first need to register or link an account"); + } else if (usernames.size() > 1) { + throw new UserErrorException( + "Multiple users found, you need to specify a username (phone number) with -u"); } username = usernames.get(0); } else if (!PhoneNumberFormatter.isValidNumber(username, null)) { - System.err.println("Invalid username (phone number), make sure you include the country code."); - return 1; + throw new UserErrorException("Invalid username (phone number), make sure you include the country code."); } if (command instanceof RegistrationCommand) { - return handleRegistrationCommand((RegistrationCommand) command, username, dataPath, serviceEnvironment); + handleRegistrationCommand((RegistrationCommand) command, username, dataPath, serviceEnvironment); + return; } if (!(command instanceof LocalCommand)) { - System.err.println("Command only works via dbus"); - return 1; + throw new UserErrorException("Command only works via dbus"); } - return handleLocalCommand((LocalCommand) command, username, dataPath, serviceEnvironment); + handleLocalCommand((LocalCommand) command, username, dataPath, serviceEnvironment); } - private int handleProvisioningCommand( + private void handleProvisioningCommand( final ProvisioningCommand command, final File dataPath, final ServiceEnvironment serviceEnvironment - ) { + ) throws CommandException { var pm = ProvisioningManager.init(dataPath, serviceEnvironment, BaseConfig.USER_AGENT); - return command.handleCommand(ns, pm); + command.handleCommand(ns, pm); } - private int handleRegistrationCommand( + private void handleRegistrationCommand( final RegistrationCommand command, final String username, final File dataPath, final ServiceEnvironment serviceEnvironment - ) { + ) throws CommandException { final RegistrationManager manager; try { manager = RegistrationManager.init(username, dataPath, serviceEnvironment, BaseConfig.USER_AGENT); } catch (Throwable e) { - logger.error("Error loading or creating state file: {}", e.getMessage()); - return 2; + throw new UnexpectedErrorException("Error loading or creating state file: " + + e.getMessage() + + " (" + + e.getClass().getSimpleName() + + ")"); } try (var m = manager) { - return command.handleCommand(ns, m); + command.handleCommand(ns, m); } catch (IOException e) { - logger.error("Cleanup failed", e); - return 2; + logger.warn("Cleanup failed", e); } } - private int handleLocalCommand( + private void handleLocalCommand( final LocalCommand command, final String username, final File dataPath, final ServiceEnvironment serviceEnvironment - ) { + ) throws CommandException { try (var m = loadManager(username, dataPath, serviceEnvironment)) { - if (m == null) { - return 2; - } - - return command.handleCommand(ns, m); + command.handleCommand(ns, m); } catch (IOException e) { - logger.error("Cleanup failed", e); - return 2; + logger.warn("Cleanup failed", e); } } - private int handleMultiLocalCommand( + private void handleMultiLocalCommand( final MultiLocalCommand command, final File dataPath, final ServiceEnvironment serviceEnvironment, final List usernames - ) { - final var managers = usernames.stream() - .map(u -> loadManager(u, dataPath, serviceEnvironment)) - .filter(Objects::nonNull) - .collect(Collectors.toList()); + ) throws CommandException { + final var managers = new ArrayList(); + for (String u : usernames) { + try { + managers.add(loadManager(u, dataPath, serviceEnvironment)); + } catch (CommandException e) { + logger.warn("Ignoring {}: {}", u, e.getMessage()); + } + } + + command.handleCommand(ns, managers, new SignalCreator() { + @Override + public ProvisioningManager getNewProvisioningManager() { + return ProvisioningManager.init(dataPath, serviceEnvironment, BaseConfig.USER_AGENT); + } - var result = command.handleCommand(ns, managers); + @Override + public RegistrationManager getNewRegistrationManager(String username) throws IOException { + return RegistrationManager.init(username, dataPath, serviceEnvironment, BaseConfig.USER_AGENT); + } + }); for (var m : managers) { try { @@ -231,34 +255,39 @@ public class App { logger.warn("Cleanup failed", e); } } - return result; } private Manager loadManager( final String username, final File dataPath, final ServiceEnvironment serviceEnvironment - ) { + ) throws CommandException { Manager manager; try { manager = Manager.init(username, dataPath, serviceEnvironment, BaseConfig.USER_AGENT); } catch (NotRegisteredException e) { - logger.error("User " + username + " is not registered."); - return null; + throw new UserErrorException("User " + username + " is not registered."); } catch (Throwable e) { - logger.error("Error loading state file for user " + username + ": {}", e.getMessage()); - return null; + logger.debug("Loading state file failed", e); + throw new UnexpectedErrorException("Error loading state file for user " + + username + + ": " + + e.getMessage() + + " (" + + e.getClass().getSimpleName() + + ")"); } try { manager.checkAccountState(); } catch (IOException e) { - logger.error("Error while checking account " + username + ": {}", e.getMessage()); - return null; + throw new UnexpectedErrorException("Error while checking account " + username + ": " + e.getMessage()); } return manager; } - private int initDbusClient(final Command command, final String username, final boolean systemBus) { + private void initDbusClient( + final Command command, final String username, final boolean systemBus + ) throws CommandException { try { DBusConnection.DBusBusType busType; if (systemBus) { @@ -271,50 +300,28 @@ public class App { DbusConfig.getObjectPath(username), Signal.class); - return handleCommand(command, ts, dBusConn); + handleCommand(command, ts, dBusConn); } } catch (DBusException | IOException e) { logger.error("Dbus client failed", e); - return 2; + throw new UnexpectedErrorException("Dbus client failed"); } } - private int handleCommand(Command command, Signal ts, DBusConnection dBusConn) { + private void handleCommand(Command command, Signal ts, DBusConnection dBusConn) throws CommandException { if (command instanceof ExtendedDbusCommand) { - return ((ExtendedDbusCommand) command).handleCommand(ns, ts, dBusConn); + ((ExtendedDbusCommand) command).handleCommand(ns, ts, dBusConn); } else if (command instanceof DbusCommand) { - return ((DbusCommand) command).handleCommand(ns, ts); + ((DbusCommand) command).handleCommand(ns, ts); } else { - System.err.println("Command is not yet implemented via dbus"); - return 1; + throw new UserErrorException("Command is not yet implemented via dbus"); } } /** - * 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. + * @return the default data directory to be used by signal-cli. */ private static File getDefaultDataPath() { - var dataPath = new File(IOUtils.getDataHomeDir(), "signal-cli"); - if (dataPath.exists()) { - return dataPath; - } - - var configPath = new File(System.getProperty("user.home"), ".config"); - - var legacySettingsPath = new File(configPath, "signal"); - if (legacySettingsPath.exists()) { - return legacySettingsPath; - } - - legacySettingsPath = new File(configPath, "textsecure"); - if (legacySettingsPath.exists()) { - return legacySettingsPath; - } - - return dataPath; + return new File(IOUtils.getDataHomeDir(), "signal-cli"); } }