X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/5cccf521032954d7ad8e3f70e3cbef2ce1293e85..2ae5297f7db07cae8c708cceac33481b7b13ddab:/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 4e5b1e9f..fdd88e7c 100644 --- a/src/main/java/org/asamk/signal/App.java +++ b/src/main/java/org/asamk/signal/App.java @@ -5,9 +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.SignalControl; 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; @@ -17,26 +16,22 @@ 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.DbusMultiAccountManagerImpl; -import org.asamk.signal.dbus.DbusProvisioningManagerImpl; -import org.asamk.signal.dbus.DbusRegistrationManagerImpl; +import org.asamk.signal.dbus.DbusCommandHandler; import org.asamk.signal.manager.Manager; -import org.asamk.signal.manager.MultiAccountManager; -import org.asamk.signal.manager.ProvisioningManager; import org.asamk.signal.manager.RegistrationManager; +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.config.ServiceConfig; -import org.asamk.signal.manager.config.ServiceEnvironment; -import org.asamk.signal.manager.storage.identities.TrustNewIdentity; +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.errors.UnknownMethod; import org.freedesktop.dbus.exceptions.DBusException; import org.freedesktop.dbus.exceptions.DBusExecutionException; import org.slf4j.Logger; @@ -46,7 +41,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.Set; import static net.sourceforge.argparse4j.DefaultSettings.VERSION_0_9_0_DEFAULT_SETTINGS; @@ -64,13 +59,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") + 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)."); @@ -98,6 +96,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) -> { @@ -113,24 +115,15 @@ 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) { throw new UserErrorException("Command not implemented!"); } - var outputTypeInput = ns.get("output"); - var outputType = outputTypeInput == null - ? command.getSupportedOutputTypes().stream().findFirst().orElse(null) - : outputTypeInput; - var writer = new BufferedWriter(new OutputStreamWriter(System.out, Charset.defaultCharset())); - var outputWriter = outputType == null - ? null - : outputType == OutputType.JSON ? new JsonWriterImpl(writer) : new PlainTextWriterImpl(writer); - - if (outputWriter != null && !command.getSupportedOutputTypes().contains(outputType)) { - throw new UserErrorException("Command doesn't support output type " + outputType); - } + final var outputWriter = getOutputWriter(command); + final var commandHandler = new CommandHandler(ns, outputWriter); var account = ns.getString("account"); @@ -138,52 +131,46 @@ public class App { 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; } - if (!ServiceConfig.isSignalClientAvailable()) { + if (!Manager.isSignalClientAvailable()) { throw new UserErrorException("Missing required native library dependency: libsignal-client"); } - final File configPath; - var config = ns.getString("config"); - if (config != null) { - configPath = new File(config); - } else { - configPath = getDefaultConfigPath(); - } - - final var serviceEnvironmentCli = ns.get("service-environment"); - final var serviceEnvironment = serviceEnvironmentCli == ServiceEnvironmentCli.LIVE - ? ServiceEnvironment.LIVE - : ServiceEnvironment.STAGING; + final var signalAccountFiles = loadSignalAccountFiles(); - 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; + handleCommand(command, commandHandler, account, signalAccountFiles); + } + private void handleCommand( + final Command command, + final CommandHandler commandHandler, + String account, + final SignalAccountFiles signalAccountFiles + ) throws CommandException { if (command instanceof ProvisioningCommand provisioningCommand) { if (account != null) { throw new UserErrorException("You cannot specify a account (phone number) when linking"); } - handleProvisioningCommand(provisioningCommand, configPath, serviceEnvironment, outputWriter); + handleProvisioningCommand(provisioningCommand, signalAccountFiles, commandHandler); return; } if (account == null) { if (command instanceof MultiLocalCommand multiLocalCommand) { - handleMultiLocalCommand(multiLocalCommand, - configPath, - serviceEnvironment, - outputWriter, - trustNewIdentity); + handleMultiLocalCommand(multiLocalCommand, signalAccountFiles, commandHandler); return; } - var accounts = MultiAccountManager.getAllLocalAccountNumbers(configPath); + 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) { @@ -191,160 +178,138 @@ 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, configPath, serviceEnvironment); + handleRegistrationCommand(registrationCommand, account, signalAccountFiles, commandHandler); return; } - if (!(command instanceof LocalCommand)) { - throw new UserErrorException("Command only works in multi-account mode"); + if (command instanceof LocalCommand localCommand) { + handleLocalCommand(localCommand, account, signalAccountFiles, commandHandler); } - handleLocalCommand((LocalCommand) command, - account, - configPath, - serviceEnvironment, - outputWriter, - trustNewIdentity); + throw new UserErrorException("Command only works in multi-account mode"); } - private void handleProvisioningCommand( - final ProvisioningCommand command, - final File configPath, - final ServiceEnvironment serviceEnvironment, - final OutputWriter outputWriter - ) throws CommandException { - var pm = ProvisioningManager.init(configPath, serviceEnvironment, BaseConfig.USER_AGENT); - command.handleCommand(ns, pm, outputWriter); + private OutputWriter getOutputWriter(final Command command) throws UserErrorException { + final var outputTypeInput = ns.get("output"); + final var outputType = outputTypeInput == null ? command.getSupportedOutputTypes() + .stream() + .findFirst() + .orElse(null) : outputTypeInput; + final var writer = new BufferedWriter(new OutputStreamWriter(System.out, IOUtils.getConsoleCharset())); + final var outputWriter = outputType == null + ? null + : outputType == OutputType.JSON ? new JsonWriterImpl(writer) : new PlainTextWriterImpl(writer); + + if (outputWriter != null && !command.getSupportedOutputTypes().contains(outputType)) { + throw new UserErrorException("Command doesn't support output type " + outputType); + } + return outputWriter; } - private void handleProvisioningCommand( - final ProvisioningCommand c, final DBusConnection dBusConn, final OutputWriter outputWriter - ) throws CommandException, DBusException { - final var signalControl = dBusConn.getRemoteObject(DbusConfig.getBusname(), - DbusConfig.getObjectPath(), - SignalControl.class); - final var provisioningManager = new DbusProvisioningManagerImpl(signalControl, dBusConn); + private SignalAccountFiles loadSignalAccountFiles() throws IOErrorException { + final File configPath; + final var config = ns.getString("config"); + if (config != null) { + configPath = new File(config); + } else { + configPath = getDefaultConfigPath(); + } + + final var serviceEnvironmentCli = ns.get("service-environment"); + final var serviceEnvironment = serviceEnvironmentCli == ServiceEnvironmentCli.LIVE + ? ServiceEnvironment.LIVE + : 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")); + try { - c.handleCommand(ns, provisioningManager, outputWriter); - } catch (UnsupportedOperationException e) { - throw new UserErrorException("Command is not yet implemented via dbus", e); - } catch (DBusExecutionException e) { - throw new UnexpectedErrorException(e.getMessage(), e); + return new SignalAccountFiles(configPath, + serviceEnvironment, + BaseConfig.USER_AGENT, + new Settings(trustNewIdentity, disableSendLog)); + } catch (IOException e) { + throw new IOErrorException("Failed to read local accounts list", e); } } + private void handleProvisioningCommand( + final ProvisioningCommand command, + final SignalAccountFiles signalAccountFiles, + final CommandHandler commandHandler + ) throws CommandException { + var pm = signalAccountFiles.initProvisioningManager(); + commandHandler.handleProvisioningCommand(command, pm); + } + private void handleRegistrationCommand( final RegistrationCommand command, final String account, - final File configPath, - final ServiceEnvironment serviceEnvironment + final SignalAccountFiles signalAccountFiles, + final CommandHandler commandHandler ) throws CommandException { - final RegistrationManager manager; - try { - manager = RegistrationManager.init(account, configPath, 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); } } - private void handleRegistrationCommand( - final RegistrationCommand c, String account, final DBusConnection dBusConn, final OutputWriter outputWriter - ) throws CommandException, DBusException { - final var signalControl = dBusConn.getRemoteObject(DbusConfig.getBusname(), - DbusConfig.getObjectPath(), - SignalControl.class); - try (final var registrationManager = new DbusRegistrationManagerImpl(account, signalControl, dBusConn)) { - c.handleCommand(ns, registrationManager); - } catch (UnsupportedOperationException e) { - throw new UserErrorException("Command is not yet implemented via dbus", e); - } catch (DBusExecutionException e) { - throw new UnexpectedErrorException(e.getMessage(), e); - } - } - private void handleLocalCommand( final LocalCommand command, final String account, - final File configPath, - final ServiceEnvironment serviceEnvironment, - final OutputWriter outputWriter, - final TrustNewIdentity trustNewIdentity + final SignalAccountFiles signalAccountFiles, + final CommandHandler commandHandler ) throws CommandException { - try (var m = loadManager(account, configPath, 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); } } - private void handleLocalCommand( - final LocalCommand c, - String accountObjectPath, - final DBusConnection dBusConn, - final OutputWriter outputWriter - ) throws CommandException, DBusException { - var signal = dBusConn.getRemoteObject(DbusConfig.getBusname(), accountObjectPath, Signal.class); - try (final var m = new DbusManagerImpl(signal, dBusConn)) { - c.handleCommand(ns, m, outputWriter); - } catch (UnsupportedOperationException e) { - throw new UserErrorException("Command is not yet implemented via dbus", e); - } catch (DBusExecutionException e) { - throw new UnexpectedErrorException(e.getMessage(), e); - } - } - private void handleMultiLocalCommand( final MultiLocalCommand command, - final File configPath, - final ServiceEnvironment serviceEnvironment, - final OutputWriter outputWriter, - final TrustNewIdentity trustNewIdentity + final SignalAccountFiles signalAccountFiles, + final CommandHandler commandHandler ) throws CommandException { - try (var multiAccountManager = MultiAccountManager.init(configPath, - serviceEnvironment, - BaseConfig.USER_AGENT, - trustNewIdentity)) { - command.handleCommand(ns, multiAccountManager, outputWriter); + try (var multiAccountManager = signalAccountFiles.initMultiAccountManager()) { + commandHandler.handleMultiLocalCommand(command, multiAccountManager); + } catch (IOException e) { + throw new IOErrorException("Failed to load local accounts file", e); } } - private void handleMultiLocalCommand( - final MultiLocalCommand c, final DBusConnection dBusConn, final OutputWriter outputWriter - ) throws CommandException, DBusException { - final var signalControl = dBusConn.getRemoteObject(DbusConfig.getBusname(), - DbusConfig.getObjectPath(), - SignalControl.class); - try (final var multiAccountManager = new DbusMultiAccountManagerImpl(signalControl, dBusConn)) { - c.handleCommand(ns, multiAccountManager, outputWriter); - } catch (UnsupportedOperationException e) { - throw new UserErrorException("Command is not yet implemented via dbus", e); + 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 configPath, - final ServiceEnvironment serviceEnvironment, - final TrustNewIdentity trustNewIdentity + final String account, final SignalAccountFiles signalAccountFiles ) throws CommandException { logger.trace("Loading account file for {}", account); try { - return Manager.init(account, configPath, serviceEnvironment, BaseConfig.USER_AGENT, trustNewIdentity); + return signalAccountFiles.initManager(account); } catch (NotRegisteredException e) { throw new UserErrorException("User " + account + " is not registered."); } catch (AccountCheckException ace) { @@ -366,42 +331,12 @@ public class App { } 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)) { - if (command instanceof ProvisioningCommand c) { - if (account != null) { - throw new UserErrorException("You cannot specify a account (phone number) when linking"); - } - - handleProvisioningCommand(c, dBusConn, outputWriter); - return; - } - - if (account == null && command instanceof MultiLocalCommand c) { - handleMultiLocalCommand(c, dBusConn, outputWriter); - return; - } - if (account != null && command instanceof RegistrationCommand c) { - handleRegistrationCommand(c, account, dBusConn, outputWriter); - return; - } - if (!(command instanceof LocalCommand localCommand)) { - throw new UserErrorException("Command only works in multi-account mode"); - } - - var accountObjectPath = account == null ? tryGetSingleAccountObjectPath(dBusConn) : null; - if (accountObjectPath == null) { - accountObjectPath = DbusConfig.getObjectPath(account); - } - handleLocalCommand(localCommand, accountObjectPath, 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 (ServiceUnknown e) { throw new UserErrorException("signal-cli DBus daemon not running on " @@ -413,26 +348,6 @@ public class App { } } - private String tryGetSingleAccountObjectPath(final DBusConnection dBusConn) throws DBusException, CommandException { - var control = dBusConn.getRemoteObject(DbusConfig.getBusname(), - DbusConfig.getObjectPath(), - SignalControl.class); - try { - final var accounts = control.listAccounts(); - 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) { - throw new UserErrorException( - "Multiple users found, you need to specify an account (phone number) with -a"); - } - - return accounts.get(0).getPath(); - } catch (UnknownMethod e) { - // dbus daemon not running in multi-account mode - return null; - } - } - /** * @return the default data directory to be used by signal-cli. */