X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/a7db3a5610db2cf718030fbe06e5ebb8531459c8..47e6fc1769ce3f8c6f48352ce2e11ae15f734a05:/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 c31e6f49..f8585386 100644 --- a/src/main/java/org/asamk/signal/App.java +++ b/src/main/java/org/asamk/signal/App.java @@ -16,7 +16,6 @@ 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.DbusCommandHandler; import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.RegistrationManager; import org.asamk.signal.manager.Settings; @@ -26,13 +25,9 @@ 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; import org.slf4j.LoggerFactory; @@ -43,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; @@ -80,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") @@ -121,19 +121,7 @@ public class App { 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"); @@ -141,8 +129,9 @@ public class App { 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, commandHandler); + initDbusClient(command, account, useDbusSystem, busName, commandHandler); return; } @@ -150,36 +139,17 @@ public class App { 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 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 signalAccountFiles = loadSignalAccountFiles(); - 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); - } + 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"); @@ -195,20 +165,7 @@ public class App { 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) { - throw new UserErrorException( - "Multiple users found, you need to specify an account (phone number) with -a"); - } - - account = accounts.stream().findFirst().get(); + account = getAccountIfOnlyOne(signalAccountFiles); } else if (!Manager.isValidNumber(account, null)) { throw new UserErrorException("Invalid account (phone number), make sure you include the country code."); } @@ -218,11 +175,75 @@ public class App { 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); + return; } - handleLocalCommand((LocalCommand) command, account, signalAccountFiles, commandHandler); + 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; + 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 { + 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( @@ -255,8 +276,6 @@ public class App { ) throws CommandException { try (var m = loadManager(account, signalAccountFiles)) { commandHandler.handleLocalCommand(command, m); - } catch (IOException e) { - logger.warn("Cleanup failed", e); } } @@ -312,24 +331,6 @@ public class App { } } - private void initDbusClient( - final Command command, final String account, final boolean systemBus, final CommandHandler commandHandler - ) throws CommandException { - try { - 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 " - + (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. */