X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/207764e0be91aeb9a6c52fa8639a822555f8759a..783201d12e7ef621554fe16640ddfd7f0534ff37:/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 058ae6bb..6352aa13 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,29 +16,18 @@ 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.manager.Manager; 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; import org.slf4j.LoggerFactory; @@ -50,10 +38,11 @@ import java.io.OutputStreamWriter; import java.util.Set; import static net.sourceforge.argparse4j.DefaultSettings.VERSION_0_9_0_DEFAULT_SETTINGS; +import static org.asamk.signal.dbus.DbusCommandHandler.initDbusClient; public class App { - private final static Logger logger = LoggerFactory.getLogger(App.class); + private static final Logger logger = LoggerFactory.getLogger(App.class); private final Namespace ns; @@ -87,6 +76,10 @@ public class App { .dest("global-dbus-system") .help("Make request via system dbus.") .action(Arguments.storeTrue()); + parser.addArgument("--bus-name") + .dest("global-bus-name") + .setDefault(DbusConfig.getBusname()) + .help("Specify the D-Bus bus name to connect to."); parser.addArgument("-o", "--output") .help("Choose to output in plain text or JSON") @@ -106,6 +99,9 @@ public class App { .help("Disable message send log (for resending messages that recipient couldn't decrypt)") .action(Arguments.storeTrue()); + parser.epilog( + "The global arguments are shown with 'signal-cli -h' and need to come before the subcommand, while the subcommand-specific arguments (shown with 'signal-cli SUBCOMMAND -h') need to be given after the subcommand."); + var subparsers = parser.addSubparsers().title("subcommands").dest("command"); Commands.getCommandSubparserAttachers().forEach((key, value) -> { @@ -121,41 +117,110 @@ 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, IOUtils.getConsoleCharset())); - 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"); final var useDbus = Boolean.TRUE.equals(ns.getBoolean("global-dbus")); final var useDbusSystem = Boolean.TRUE.equals(ns.getBoolean("global-dbus-system")); if (useDbus || useDbusSystem) { + final var busName = ns.getString("global-bus-name"); // If account is null, it will connect to the default object path - initDbusClient(command, account, useDbusSystem, outputWriter); + initDbusClient(command, account, useDbusSystem, busName, commandHandler); return; } - if (!ServiceConfig.isSignalClientAvailable()) { + if (!Manager.isSignalClientAvailable()) { throw new UserErrorException("Missing required native library dependency: libsignal-client"); } + final var signalAccountFiles = loadSignalAccountFiles(); + + 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, signalAccountFiles, commandHandler); + return; + } + + if (account == null) { + if (command instanceof MultiLocalCommand multiLocalCommand) { + handleMultiLocalCommand(multiLocalCommand, signalAccountFiles, commandHandler); + return; + } + + account = getAccountIfOnlyOne(signalAccountFiles); + } 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, signalAccountFiles, commandHandler); + return; + } + + if (command instanceof LocalCommand localCommand) { + handleLocalCommand(localCommand, account, signalAccountFiles, commandHandler); + return; + } + + throw new UserErrorException("Command only works in multi-account mode"); + } + + private static String getAccountIfOnlyOne(final SignalAccountFiles signalAccountFiles) throws IOErrorException, UserErrorException { + Set accounts; + try { + accounts = signalAccountFiles.getAllLocalAccountNumbers(); + } catch (IOException e) { + throw new IOErrorException("Failed to load local accounts file", e); + } + if (accounts.isEmpty()) { + 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.stream().findFirst().get(); + } + + 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 SignalAccountFiles loadSignalAccountFiles() throws IOErrorException { final File configPath; - var config = ns.getString("config"); + final var config = ns.getString("config"); if (config != null) { configPath = new File(config); } else { @@ -174,167 +239,66 @@ public class App { final var disableSendLog = Boolean.TRUE.equals(ns.getBoolean("disable-send-log")); - final SignalAccountFiles signalAccountFiles; try { - signalAccountFiles = new SignalAccountFiles(configPath, + 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); } - - if (command instanceof ProvisioningCommand provisioningCommand) { - if (account != null) { - throw new UserErrorException("You cannot specify a account (phone number) when linking"); - } - - handleProvisioningCommand(provisioningCommand, signalAccountFiles, outputWriter); - return; - } - - if (account == null) { - if (command instanceof MultiLocalCommand multiLocalCommand) { - handleMultiLocalCommand(multiLocalCommand, signalAccountFiles, outputWriter); - return; - } - - Set accounts = null; - 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) { - throw new UserErrorException( - "Multiple users found, you need to specify an account (phone number) with -a"); - } - - 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, signalAccountFiles); - return; - } - - if (!(command instanceof LocalCommand)) { - throw new UserErrorException("Command only works in multi-account mode"); - } - - handleLocalCommand((LocalCommand) command, account, signalAccountFiles, outputWriter); } private void handleProvisioningCommand( final ProvisioningCommand command, final SignalAccountFiles signalAccountFiles, - final OutputWriter outputWriter + final CommandHandler commandHandler ) throws CommandException { var pm = signalAccountFiles.initProvisioningManager(); - command.handleCommand(ns, pm, 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); - 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); - } + commandHandler.handleProvisioningCommand(command, pm); } private void handleRegistrationCommand( - final RegistrationCommand command, final String account, final SignalAccountFiles signalAccountFiles + final RegistrationCommand command, + final String account, + final SignalAccountFiles signalAccountFiles, + final CommandHandler commandHandler ) throws CommandException { - try (final var manager = loadRegistrationManager(account, signalAccountFiles)) { - 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 SignalAccountFiles signalAccountFiles, - final OutputWriter outputWriter + final CommandHandler commandHandler ) throws CommandException { try (var m = loadManager(account, signalAccountFiles)) { - command.handleCommand(ns, m, outputWriter); - } 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); + commandHandler.handleLocalCommand(command, m); } } private void handleMultiLocalCommand( final MultiLocalCommand command, final SignalAccountFiles signalAccountFiles, - final OutputWriter outputWriter + final CommandHandler commandHandler ) throws CommandException { try (var multiAccountManager = signalAccountFiles.initMultiAccountManager()) { - command.handleCommand(ns, multiAccountManager, outputWriter); + 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); + } catch (AccountCheckException e) { + throw new UnexpectedErrorException("Failed to load account file", e); } } private RegistrationManager loadRegistrationManager( - final String account, final SignalAccountFiles signalAccountFiles + final String account, + final SignalAccountFiles signalAccountFiles ) throws UnexpectedErrorException { try { return signalAccountFiles.initRegistrationManager(account); @@ -348,7 +312,8 @@ public class App { } private Manager loadManager( - final String account, final SignalAccountFiles signalAccountFiles + final String account, + final SignalAccountFiles signalAccountFiles ) throws CommandException { logger.trace("Loading account file for {}", account); try { @@ -373,74 +338,6 @@ public class App { } } - private void initDbusClient( - final Command command, final String account, final boolean systemBus, final OutputWriter outputWriter - ) throws CommandException { - try { - DBusConnection.DBusBusType busType; - if (systemBus) { - busType = DBusConnection.DBusBusType.SYSTEM; - } else { - busType = DBusConnection.DBusBusType.SESSION; - } - try (var dBusConn = DBusConnectionBuilder.forType(busType).build()) { - 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); - } - } 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); - } - } - - 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. */