Extract dbus client command handling

[signal-cli] / 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 4aa510d61d2d967fd96df08d33c8d609dc27ba81..c31e6f49de5c9101f1746ca786109529df0c1e46 100644 (file)
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -5,38 +5,42 @@ import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.ArgumentParser;
 import net.sourceforge.argparse4j.inf.Namespace;
 
 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.Command;

+import org.asamk.signal.commands.CommandHandler;

 import org.asamk.signal.commands.Commands;
 import org.asamk.signal.commands.Commands;

-import org.asamk.signal.commands.DbusCommand;
-import org.asamk.signal.commands.ExtendedDbusCommand;

 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.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.IOErrorException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 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.Manager;

-import org.asamk.signal.manager.NotRegisteredException;
-import org.asamk.signal.manager.ProvisioningManager;

 import org.asamk.signal.manager.RegistrationManager;
 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.PlainTextWriterImpl;

 import org.asamk.signal.util.IOUtils;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
 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.DBusException;

+import org.freedesktop.dbus.exceptions.DBusExecutionException;

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

-import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;

 
 

+import java.io.BufferedWriter;

 import java.io.File;
 import java.io.IOException;
 import java.io.File;
 import java.io.IOException;

-import java.util.ArrayList;
-import java.util.List;
+import java.io.OutputStreamWriter;
+import java.util.Set;

 
 import static net.sourceforge.argparse4j.DefaultSettings.VERSION_0_9_0_DEFAULT_SETTINGS;
 
 
 import static net.sourceforge.argparse4j.DefaultSettings.VERSION_0_9_0_DEFAULT_SETTINGS;
 


@@ -54,18 +58,28 @@ public class App {
                 .description("Commandline interface for Signal.")
                 .version(BaseConfig.PROJECT_NAME + " " + BaseConfig.PROJECT_VERSION);
 
                 .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("--config")
+        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).");
 
                 .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 your identifier.");
+        parser.addArgument("-a", "--account", "-u", "--username")
+                .help("Specify your phone number, that will be your identifier.");

 
         var mut = parser.addMutuallyExclusiveGroup();
 
         var mut = parser.addMutuallyExclusiveGroup();

-        mut.addArgument("--dbus").help("Make request via user dbus.").action(Arguments.storeTrue());
-        mut.addArgument("--dbus-system").help("Make request via system dbus.").action(Arguments.storeTrue());
+        mut.addArgument("--dbus").dest("global-dbus").help("Make request via user dbus.").action(Arguments.storeTrue());
+        mut.addArgument("--dbus-system")
+                .dest("global-dbus-system")
+                .help("Make request via system dbus.")
+                .action(Arguments.storeTrue());

 
         parser.addArgument("-o", "--output")
                 .help("Choose to output in plain text or JSON")
 
         parser.addArgument("-o", "--output")
                 .help("Choose to output in plain text or JSON")


@@ -81,6 +95,10 @@ public class App {
                 .type(Arguments.enumStringType(TrustNewIdentityCli.class))
                 .setDefault(TrustNewIdentityCli.ON_FIRST_USE);
 
                 .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) -> {
         var subparsers = parser.addSubparsers().title("subcommands").dest("command");
 
         Commands.getCommandSubparserAttachers().forEach((key, value) -> {


@@ -96,6 +114,7 @@ public class App {
     }
 
     public void init() throws CommandException {
     }
 
     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) {
         var commandKey = ns.getString("command");
         var command = Commands.getCommand(commandKey);
         if (command == null) {


@@ -106,130 +125,123 @@ public class App {
         var outputType = outputTypeInput == null
                 ? command.getSupportedOutputTypes().stream().findFirst().orElse(null)
                 : outputTypeInput;
         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
         var outputWriter = outputType == null
                 ? null

-                : outputType == OutputType.JSON ? new JsonWriterImpl(System.out) : new PlainTextWriterImpl(System.out);
+                : 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);
         }
 
 
         if (outputWriter != null && !command.getSupportedOutputTypes().contains(outputType)) {
             throw new UserErrorException("Command doesn't support output type " + outputType);
         }
 

-        var username = ns.getString("username");
+        final var commandHandler = new CommandHandler(ns, outputWriter);

 
 

-        final var useDbus = ns.getBoolean("dbus");
-        final var useDbusSystem = ns.getBoolean("dbus-system");
+        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 (useDbus || useDbusSystem) {

-            // If username is null, it will connect to the default object path
-            initDbusClient(command, username, useDbusSystem, outputWriter);
+            // If account is null, it will connect to the default object path
+            initDbusClient(command, account, useDbusSystem, commandHandler);

             return;
         }
 
             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) {
         var config = ns.getString("config");
         if (config != null) {

-            dataPath = new File(config);
+            configPath = new File(config);

         } else {
         } else {

-            dataPath = getDefaultDataPath();
-        }
-
-        if (!ServiceConfig.getCapabilities().isGv2()) {
-            logger.warn("WARNING: Support for new group V2 is disabled,"
-                    + " because the required native library dependency is missing: libzkgroup");
-        }
-
-        if (!ServiceConfig.isSignalClientAvailable()) {
-            throw new UserErrorException("Missing required native library dependency: libsignal-client");
+            configPath = getDefaultConfigPath();

         }
 
         final var serviceEnvironmentCli = ns.<ServiceEnvironmentCli>get("service-environment");
         final var serviceEnvironment = serviceEnvironmentCli == ServiceEnvironmentCli.LIVE
                 ? ServiceEnvironment.LIVE
         }
 
         final var serviceEnvironmentCli = ns.<ServiceEnvironmentCli>get("service-environment");
         final var serviceEnvironment = serviceEnvironmentCli == ServiceEnvironmentCli.LIVE
                 ? ServiceEnvironment.LIVE

-                : ServiceEnvironment.SANDBOX;
+                : ServiceEnvironment.STAGING;

 
         final var trustNewIdentityCli = ns.<TrustNewIdentityCli>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 trustNewIdentityCli = ns.<TrustNewIdentityCli>get("trust-new-identities");
         final var trustNewIdentity = trustNewIdentityCli == TrustNewIdentityCli.ON_FIRST_USE
                 ? TrustNewIdentity.ON_FIRST_USE
                 : trustNewIdentityCli == TrustNewIdentityCli.ALWAYS ? TrustNewIdentity.ALWAYS : TrustNewIdentity.NEVER;
 

-        if (command instanceof ProvisioningCommand) {
-            if (username != null) {
-                throw new UserErrorException("You cannot specify a username (phone number) when linking");
+        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) command, dataPath, serviceEnvironment, outputWriter);
+            handleProvisioningCommand(provisioningCommand, signalAccountFiles, commandHandler);

             return;
         }
 
             return;
         }
 

-        if (username == null) {
-            var usernames = Manager.getAllLocalUsernames(dataPath);
-
-            if (command instanceof MultiLocalCommand) {
-                handleMultiLocalCommand((MultiLocalCommand) command,
-                        dataPath,
-                        serviceEnvironment,
-                        usernames,
-                        outputWriter,
-                        trustNewIdentity);
+        if (account == null) {
+            if (command instanceof MultiLocalCommand multiLocalCommand) {
+                handleMultiLocalCommand(multiLocalCommand, signalAccountFiles, commandHandler);

                 return;
             }
 
                 return;
             }
 

-            if (usernames.size() == 0) {
+            Set<String> 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");
                 throw new UserErrorException("No local users found, you first need to register or link an account");

-            } else if (usernames.size() > 1) {
+            } else if (accounts.size() > 1) {

                 throw new UserErrorException(
                 throw new UserErrorException(

-                        "Multiple users found, you need to specify a username (phone number) with -u");
+                        "Multiple users found, you need to specify an account (phone number) with -a");

             }
 
             }
 

-            username = usernames.get(0);
-        } else if (!PhoneNumberFormatter.isValidNumber(username, null)) {
-            throw new UserErrorException("Invalid username (phone number), make sure you include the country code.");
+            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) {
-            handleRegistrationCommand((RegistrationCommand) command, username, dataPath, serviceEnvironment);
+        if (command instanceof RegistrationCommand registrationCommand) {
+            handleRegistrationCommand(registrationCommand, account, signalAccountFiles, commandHandler);

             return;
         }
 
         if (!(command instanceof LocalCommand)) {
             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,
-                username,
-                dataPath,
-                serviceEnvironment,
-                outputWriter,
-                trustNewIdentity);
+        handleLocalCommand((LocalCommand) command, account, signalAccountFiles, commandHandler);

     }
 
     private void handleProvisioningCommand(
             final ProvisioningCommand command,
     }
 
     private void handleProvisioningCommand(
             final ProvisioningCommand command,

-            final File dataPath,
-            final ServiceEnvironment serviceEnvironment,
-            final OutputWriter outputWriter
+            final SignalAccountFiles signalAccountFiles,
+            final CommandHandler commandHandler

     ) throws CommandException {
     ) 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,
     }
 
     private void handleRegistrationCommand(
             final RegistrationCommand command,

-            final String username,
-            final File dataPath,
-            final ServiceEnvironment serviceEnvironment
+            final String account,
+            final SignalAccountFiles signalAccountFiles,
+            final CommandHandler commandHandler

     ) throws CommandException {
     ) throws CommandException {

-        final RegistrationManager manager;
-        try {
-            manager = RegistrationManager.init(username, dataPath, serviceEnvironment, BaseConfig.USER_AGENT);
-        } catch (Throwable e) {
-            throw new UnexpectedErrorException("Error loading or creating state file: "
-                    + e.getMessage()
-                    + " ("
-                    + e.getClass().getSimpleName()
-                    + ")", e);
-        }
-        try (var m = manager) {
-            command.handleCommand(ns, m);
+        try (final var rm = loadRegistrationManager(account, signalAccountFiles)) {
+            commandHandler.handleRegistrationCommand(command, rm);

         } catch (IOException e) {
             logger.warn("Cleanup failed", e);
         }
         } catch (IOException e) {
             logger.warn("Cleanup failed", e);
         }


@@ -237,14 +249,12 @@ public class App {
 
     private void handleLocalCommand(
             final LocalCommand command,
 
     private void handleLocalCommand(
             final LocalCommand command,

-            final String username,
-            final File dataPath,
-            final ServiceEnvironment serviceEnvironment,
-            final OutputWriter outputWriter,
-            final TrustNewIdentity trustNewIdentity
+            final String account,
+            final SignalAccountFiles signalAccountFiles,
+            final CommandHandler commandHandler

     ) throws CommandException {
     ) throws CommandException {

-        try (var m = loadManager(username, 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);
         }
         } catch (IOException e) {
             logger.warn("Cleanup failed", e);
         }


@@ -252,111 +262,78 @@ public class App {
 
     private void handleMultiLocalCommand(
             final MultiLocalCommand command,
 
     private void handleMultiLocalCommand(
             final MultiLocalCommand command,

-            final File dataPath,
-            final ServiceEnvironment serviceEnvironment,
-            final List<String> usernames,
-            final OutputWriter outputWriter,
-            final TrustNewIdentity trustNewIdentity
+            final SignalAccountFiles signalAccountFiles,
+            final CommandHandler commandHandler

     ) throws CommandException {
     ) throws CommandException {

-        final var managers = new ArrayList<Manager>();
-        for (String u : usernames) {
-            try {
-                managers.add(loadManager(u, dataPath, serviceEnvironment, trustNewIdentity));
-            } catch (CommandException e) {
-                logger.warn("Ignoring {}: {}", u, e.getMessage());
-            }
+        try (var multiAccountManager = signalAccountFiles.initMultiAccountManager()) {
+            commandHandler.handleMultiLocalCommand(command, multiAccountManager);
+        } catch (IOException e) {
+            throw new IOErrorException("Failed to load local accounts file", e);

         }
         }

+    }

 
 

-        command.handleCommand(ns, managers, new SignalCreator() {
-            @Override
-            public ProvisioningManager getNewProvisioningManager() {
-                return ProvisioningManager.init(dataPath, serviceEnvironment, BaseConfig.USER_AGENT);
-            }
-
-            @Override
-            public RegistrationManager getNewRegistrationManager(String username) throws IOException {
-                return RegistrationManager.init(username, dataPath, serviceEnvironment, BaseConfig.USER_AGENT);
-            }
-        }, outputWriter);
-
-        for (var m : managers) {
-            try {
-                m.close();
-            } catch (IOException e) {
-                logger.warn("Cleanup failed", 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(
         }
     }
 
     private Manager loadManager(

-            final String username,
-            final File dataPath,
-            final ServiceEnvironment serviceEnvironment,
-            final TrustNewIdentity trustNewIdentity
+            final String account, final SignalAccountFiles signalAccountFiles

     ) throws CommandException {
     ) throws CommandException {

-        Manager manager;
+        logger.trace("Loading account file for {}", account);

         try {
         try {

-            manager = Manager.init(username, dataPath, serviceEnvironment, BaseConfig.USER_AGENT, trustNewIdentity);
+            return signalAccountFiles.initManager(account);

         } catch (NotRegisteredException e) {
         } catch (NotRegisteredException e) {

-            throw new UserErrorException("User " + username + " is not registered.");
+            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 "
         } catch (Throwable e) {
             throw new UnexpectedErrorException("Error loading state file for user "

-                    + username
+                    + account

                     + ": "
                     + e.getMessage()
                     + " ("
                     + e.getClass().getSimpleName()
                     + ")", e);
         }
                     + ": "
                     + e.getMessage()
                     + " ("
                     + e.getClass().getSimpleName()
                     + ")", e);
         }

-
-        try {
-            manager.checkAccountState();
-        } catch (IOException e) {
-            throw new IOErrorException("Error while checking account " + username + ": " + e.getMessage(), e);
-        }
-
-        return manager;

     }
 
     private void initDbusClient(
     }
 
     private void initDbusClient(

-            final Command command, final String username, final boolean systemBus, final OutputWriter outputWriter
+            final Command command, final String account, final boolean systemBus, final CommandHandler commandHandler

     ) throws CommandException {
         try {
     ) throws CommandException {
         try {

-            DBusConnection.DBusBusType busType;
-            if (systemBus) {
-                busType = DBusConnection.DBusBusType.SYSTEM;
-            } else {
-                busType = DBusConnection.DBusBusType.SESSION;
+            final var busType = systemBus ? DBusConnection.DBusBusType.SYSTEM : DBusConnection.DBusBusType.SESSION;
+            try (var dBusConn = DBusConnectionBuilder.forType(busType).build()) {
+                DbusCommandHandler.handleCommand(command, account, dBusConn, commandHandler);

             }
             }

-            try (var dBusConn = DBusConnection.getConnection(busType)) {
-                var ts = dBusConn.getRemoteObject(DbusConfig.getBusname(),
-                        DbusConfig.getObjectPath(username),
-                        Signal.class);
-
-                handleCommand(command, ts, dBusConn, outputWriter);
-            }
-        } 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 ExtendedDbusCommand) {
-            ((ExtendedDbusCommand) command).handleCommand(ns, ts, dBusConn, outputWriter);
-        } else if (command instanceof DbusCommand) {
-            ((DbusCommand) command).handleCommand(ns, ts, outputWriter);
-        } 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.
      */
         }
     }
 
     /**
      * @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");
     }
 }
         return new File(IOUtils.getDataHomeDir(), "signal-cli");
     }
 }