X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/6ffeb7c4313e589a93b9d8201c85aba95b482e48..a7db3a5610db2cf718030fbe06e5ebb8531459c8:/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 f42fef1e..c31e6f49 100644 --- a/src/main/java/org/asamk/signal/App.java +++ b/src/main/java/org/asamk/signal/App.java @@ -5,8 +5,8 @@ import net.sourceforge.argparse4j.impl.Arguments; import net.sourceforge.argparse4j.inf.ArgumentParser; import net.sourceforge.argparse4j.inf.Namespace; -import org.asamk.Signal; import org.asamk.signal.commands.Command; +import org.asamk.signal.commands.CommandHandler; import org.asamk.signal.commands.Commands; import org.asamk.signal.commands.LocalCommand; import org.asamk.signal.commands.MultiLocalCommand; @@ -16,20 +16,21 @@ 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.UserErrorException; -import org.asamk.signal.dbus.DbusManagerImpl; +import org.asamk.signal.dbus.DbusCommandHandler; import org.asamk.signal.manager.Manager; -import org.asamk.signal.manager.MultiAccountManagerImpl; -import org.asamk.signal.manager.NotRegisteredException; -import org.asamk.signal.manager.ProvisioningManager; import org.asamk.signal.manager.RegistrationManager; -import org.asamk.signal.manager.config.ServiceConfig; -import org.asamk.signal.manager.config.ServiceEnvironment; -import org.asamk.signal.manager.storage.identities.TrustNewIdentity; +import org.asamk.signal.manager.Settings; +import org.asamk.signal.manager.SignalAccountFiles; +import org.asamk.signal.manager.api.AccountCheckException; +import org.asamk.signal.manager.api.NotRegisteredException; +import org.asamk.signal.manager.api.ServiceEnvironment; +import org.asamk.signal.manager.api.TrustNewIdentity; import org.asamk.signal.output.JsonWriterImpl; -import org.asamk.signal.output.OutputWriter; import org.asamk.signal.output.PlainTextWriterImpl; import org.asamk.signal.util.IOUtils; import org.freedesktop.dbus.connections.impl.DBusConnection; +import org.freedesktop.dbus.connections.impl.DBusConnectionBuilder; +import org.freedesktop.dbus.errors.ServiceUnknown; import org.freedesktop.dbus.exceptions.DBusException; import org.freedesktop.dbus.exceptions.DBusExecutionException; import org.slf4j.Logger; @@ -39,9 +40,7 @@ import java.io.BufferedWriter; import java.io.File; import java.io.IOException; import java.io.OutputStreamWriter; -import java.nio.charset.Charset; -import java.util.ArrayList; -import java.util.List; +import java.util.Set; import static net.sourceforge.argparse4j.DefaultSettings.VERSION_0_9_0_DEFAULT_SETTINGS; @@ -59,10 +58,16 @@ public class App { .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("--version").help("Show package version.").action(Arguments.version()); + parser.addArgument("-v", "--verbose") + .help("Raise log level and include lib signal logs. Specify multiple times for even more logs.") + .action(Arguments.count()); + parser.addArgument("--log-file") + .type(File.class) + .help("Write log output to the given file. If --verbose is also given, the detailed logs will only be written to the log file."); + parser.addArgument("--scrub-log") + .action(Arguments.storeTrue()) + .help("Scrub possibly sensitive information from the log, like phone numbers and UUIDs."); parser.addArgument("-c", "--config") .help("Set the path, where to store the config (Default: $XDG_DATA_HOME/signal-cli , $HOME/.local/share/signal-cli)."); @@ -90,6 +95,10 @@ public class App { .type(Arguments.enumStringType(TrustNewIdentityCli.class)) .setDefault(TrustNewIdentityCli.ON_FIRST_USE); + parser.addArgument("--disable-send-log") + .help("Disable message send log (for resending messages that recipient couldn't decrypt)") + .action(Arguments.storeTrue()); + var subparsers = parser.addSubparsers().title("subcommands").dest("command"); Commands.getCommandSubparserAttachers().forEach((key, value) -> { @@ -105,6 +114,7 @@ public class App { } public void init() throws CommandException { + logger.debug("Starting {}", BaseConfig.PROJECT_NAME + " " + BaseConfig.PROJECT_VERSION); var commandKey = ns.getString("command"); var command = Commands.getCommand(commandKey); if (command == null) { @@ -115,7 +125,7 @@ public class App { var outputType = outputTypeInput == null ? command.getSupportedOutputTypes().stream().findFirst().orElse(null) : outputTypeInput; - var writer = new BufferedWriter(new OutputStreamWriter(System.out, Charset.defaultCharset())); + var writer = new BufferedWriter(new OutputStreamWriter(System.out, IOUtils.getConsoleCharset())); var outputWriter = outputType == null ? null : outputType == OutputType.JSON ? new JsonWriterImpl(writer) : new PlainTextWriterImpl(writer); @@ -124,60 +134,73 @@ public class App { throw new UserErrorException("Command doesn't support output type " + outputType); } + final var commandHandler = new CommandHandler(ns, outputWriter); + var account = ns.getString("account"); final var useDbus = Boolean.TRUE.equals(ns.getBoolean("global-dbus")); final var useDbusSystem = Boolean.TRUE.equals(ns.getBoolean("global-dbus-system")); if (useDbus || useDbusSystem) { // If account is null, it will connect to the default object path - initDbusClient(command, account, useDbusSystem, outputWriter); + initDbusClient(command, account, useDbusSystem, commandHandler); return; } - final File dataPath; + if (!Manager.isSignalClientAvailable()) { + throw new UserErrorException("Missing required native library dependency: libsignal-client"); + } + + final File configPath; var config = ns.getString("config"); if (config != null) { - dataPath = new File(config); + configPath = new File(config); } else { - dataPath = getDefaultDataPath(); - } - - if (!ServiceConfig.isSignalClientAvailable()) { - throw new UserErrorException("Missing required native library dependency: libsignal-client"); + configPath = getDefaultConfigPath(); } final var serviceEnvironmentCli = ns.get("service-environment"); final var serviceEnvironment = serviceEnvironmentCli == ServiceEnvironmentCli.LIVE ? ServiceEnvironment.LIVE - : ServiceEnvironment.SANDBOX; + : ServiceEnvironment.STAGING; final var trustNewIdentityCli = ns.get("trust-new-identities"); final var trustNewIdentity = trustNewIdentityCli == TrustNewIdentityCli.ON_FIRST_USE ? TrustNewIdentity.ON_FIRST_USE : trustNewIdentityCli == TrustNewIdentityCli.ALWAYS ? TrustNewIdentity.ALWAYS : TrustNewIdentity.NEVER; + final var disableSendLog = Boolean.TRUE.equals(ns.getBoolean("disable-send-log")); + + final SignalAccountFiles signalAccountFiles; + try { + signalAccountFiles = new SignalAccountFiles(configPath, + serviceEnvironment, + BaseConfig.USER_AGENT, + new Settings(trustNewIdentity, disableSendLog)); + } catch (IOException e) { + throw new IOErrorException("Failed to read local accounts list", e); + } + if (command instanceof ProvisioningCommand provisioningCommand) { if (account != null) { throw new UserErrorException("You cannot specify a account (phone number) when linking"); } - handleProvisioningCommand(provisioningCommand, dataPath, serviceEnvironment, outputWriter); + handleProvisioningCommand(provisioningCommand, signalAccountFiles, commandHandler); return; } if (account == null) { - var accounts = Manager.getAllLocalAccountNumbers(dataPath); - if (command instanceof MultiLocalCommand multiLocalCommand) { - handleMultiLocalCommand(multiLocalCommand, - dataPath, - serviceEnvironment, - accounts, - outputWriter, - trustNewIdentity); + handleMultiLocalCommand(multiLocalCommand, signalAccountFiles, commandHandler); return; } + Set accounts; + try { + accounts = signalAccountFiles.getAllLocalAccountNumbers(); + } catch (IOException e) { + throw new IOErrorException("Failed to load local accounts file", e); + } if (accounts.size() == 0) { throw new UserErrorException("No local users found, you first need to register or link an account"); } else if (accounts.size() > 1) { @@ -185,56 +208,40 @@ public class App { "Multiple users found, you need to specify an account (phone number) with -a"); } - account = accounts.get(0); + account = accounts.stream().findFirst().get(); } else if (!Manager.isValidNumber(account, null)) { throw new UserErrorException("Invalid account (phone number), make sure you include the country code."); } if (command instanceof RegistrationCommand registrationCommand) { - handleRegistrationCommand(registrationCommand, account, dataPath, serviceEnvironment); + handleRegistrationCommand(registrationCommand, account, signalAccountFiles, commandHandler); return; } if (!(command instanceof LocalCommand)) { - throw new UserErrorException("Command only works via dbus"); + throw new UserErrorException("Command only works in multi-account mode"); } - handleLocalCommand((LocalCommand) command, - account, - dataPath, - serviceEnvironment, - outputWriter, - trustNewIdentity); + handleLocalCommand((LocalCommand) command, account, signalAccountFiles, commandHandler); } private void handleProvisioningCommand( final ProvisioningCommand command, - final File dataPath, - final ServiceEnvironment serviceEnvironment, - final OutputWriter outputWriter + final SignalAccountFiles signalAccountFiles, + final CommandHandler commandHandler ) throws CommandException { - var pm = ProvisioningManager.init(dataPath, serviceEnvironment, BaseConfig.USER_AGENT); - command.handleCommand(ns, pm, outputWriter); + var pm = signalAccountFiles.initProvisioningManager(); + commandHandler.handleProvisioningCommand(command, pm); } private void handleRegistrationCommand( final RegistrationCommand command, final String account, - final File dataPath, - final ServiceEnvironment serviceEnvironment + final SignalAccountFiles signalAccountFiles, + final CommandHandler commandHandler ) throws CommandException { - final RegistrationManager manager; - try { - manager = RegistrationManager.init(account, dataPath, serviceEnvironment, BaseConfig.USER_AGENT); - } catch (Throwable e) { - throw new UnexpectedErrorException("Error loading or creating state file: " - + e.getMessage() - + " (" - + e.getClass().getSimpleName() - + ")", e); - } - try (manager) { - command.handleCommand(ns, manager); + try (final var rm = loadRegistrationManager(account, signalAccountFiles)) { + commandHandler.handleRegistrationCommand(command, rm); } catch (IOException e) { logger.warn("Cleanup failed", e); } @@ -243,13 +250,11 @@ public class App { private void handleLocalCommand( final LocalCommand command, final String account, - final File dataPath, - final ServiceEnvironment serviceEnvironment, - final OutputWriter outputWriter, - final TrustNewIdentity trustNewIdentity + final SignalAccountFiles signalAccountFiles, + final CommandHandler commandHandler ) throws CommandException { - try (var m = loadManager(account, dataPath, serviceEnvironment, trustNewIdentity)) { - command.handleCommand(ns, m, outputWriter); + try (var m = loadManager(account, signalAccountFiles)) { + commandHandler.handleLocalCommand(command, m); } catch (IOException e) { logger.warn("Cleanup failed", e); } @@ -257,40 +262,45 @@ public class App { private void handleMultiLocalCommand( final MultiLocalCommand command, - final File dataPath, - final ServiceEnvironment serviceEnvironment, - final List accounts, - final OutputWriter outputWriter, - final TrustNewIdentity trustNewIdentity + final SignalAccountFiles signalAccountFiles, + final CommandHandler commandHandler ) throws CommandException { - final var managers = new ArrayList(); - for (String a : accounts) { - try { - managers.add(loadManager(a, dataPath, serviceEnvironment, trustNewIdentity)); - } catch (CommandException e) { - logger.warn("Ignoring {}: {}", a, e.getMessage()); - } + try (var multiAccountManager = signalAccountFiles.initMultiAccountManager()) { + commandHandler.handleMultiLocalCommand(command, multiAccountManager); + } catch (IOException e) { + throw new IOErrorException("Failed to load local accounts file", e); } + } - try (var multiAccountManager = new MultiAccountManagerImpl(managers, - dataPath, - serviceEnvironment, - BaseConfig.USER_AGENT)) { - command.handleCommand(ns, multiAccountManager, outputWriter); + private RegistrationManager loadRegistrationManager( + final String account, final SignalAccountFiles signalAccountFiles + ) throws UnexpectedErrorException { + try { + return signalAccountFiles.initRegistrationManager(account); + } catch (Throwable e) { + throw new UnexpectedErrorException("Error loading or creating state file: " + + e.getMessage() + + " (" + + e.getClass().getSimpleName() + + ")", e); } } private Manager loadManager( - final String account, - final File dataPath, - final ServiceEnvironment serviceEnvironment, - final TrustNewIdentity trustNewIdentity + final String account, final SignalAccountFiles signalAccountFiles ) throws CommandException { - Manager manager; + logger.trace("Loading account file for {}", account); try { - manager = Manager.init(account, dataPath, serviceEnvironment, BaseConfig.USER_AGENT, trustNewIdentity); + return signalAccountFiles.initManager(account); } catch (NotRegisteredException e) { throw new UserErrorException("User " + account + " is not registered."); + } catch (AccountCheckException ace) { + if (ace.getCause() instanceof IOException e) { + throw new IOErrorException("Error while checking account " + account + ": " + e.getMessage(), e); + } else { + throw new UnexpectedErrorException("Error while checking account " + account + ": " + ace.getMessage(), + ace); + } } catch (Throwable e) { throw new UnexpectedErrorException("Error loading state file for user " + account @@ -300,64 +310,30 @@ public class App { + e.getClass().getSimpleName() + ")", e); } - - try { - manager.checkAccountState(); - } catch (IOException e) { - try { - manager.close(); - } catch (IOException ie) { - logger.warn("Failed to close broken account", ie); - } - throw new IOErrorException("Error while checking account " + account + ": " + e.getMessage(), e); - } - - return manager; } private void initDbusClient( - final Command command, final String account, final boolean systemBus, final OutputWriter outputWriter + final Command command, final String account, final boolean systemBus, final CommandHandler commandHandler ) throws CommandException { try { - DBusConnection.DBusBusType busType; - if (systemBus) { - busType = DBusConnection.DBusBusType.SYSTEM; - } else { - busType = DBusConnection.DBusBusType.SESSION; - } - try (var dBusConn = DBusConnection.getConnection(busType)) { - var ts = dBusConn.getRemoteObject(DbusConfig.getBusname(), - DbusConfig.getObjectPath(account), - Signal.class); - - handleCommand(command, ts, dBusConn, outputWriter); + final var busType = systemBus ? DBusConnection.DBusBusType.SYSTEM : DBusConnection.DBusBusType.SESSION; + try (var dBusConn = DBusConnectionBuilder.forType(busType).build()) { + DbusCommandHandler.handleCommand(command, account, dBusConn, commandHandler); } - } catch (DBusException | IOException e) { - logger.error("Dbus client failed", e); - throw new UnexpectedErrorException("Dbus client failed", e); - } - } - - private void handleCommand( - Command command, Signal ts, DBusConnection dBusConn, OutputWriter outputWriter - ) throws CommandException { - if (command instanceof LocalCommand localCommand) { - try (final var m = new DbusManagerImpl(ts, dBusConn)) { - localCommand.handleCommand(ns, m, outputWriter); - } catch (UnsupportedOperationException e) { - throw new UserErrorException("Command is not yet implemented via dbus", e); - } catch (IOException | DBusExecutionException e) { - throw new UnexpectedErrorException(e.getMessage(), e); - } - } else { - throw new UserErrorException("Command is not yet implemented via dbus"); + } catch (ServiceUnknown e) { + throw new UserErrorException("signal-cli DBus daemon not running on " + + (systemBus ? "system" : "session") + + " bus: " + + e.getMessage(), e); + } catch (DBusExecutionException | DBusException | IOException e) { + throw new UnexpectedErrorException("Dbus client failed: " + e.getMessage(), e); } } /** * @return the default data directory to be used by signal-cli. */ - private static File getDefaultDataPath() { + private static File getDefaultConfigPath() { return new File(IOUtils.getDataHomeDir(), "signal-cli"); } }