import org.asamk.signal.dbus.DbusProvisioningManagerImpl;
import org.asamk.signal.dbus.DbusRegistrationManagerImpl;
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.errors.UnknownMethod;
import org.freedesktop.dbus.exceptions.DBusException;
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;
.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).");
.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 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);
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.<ServiceEnvironmentCli>get("service-environment");
? 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, outputWriter);
return;
}
if (account == null) {
- var accounts = Manager.getAllLocalAccountNumbers(dataPath);
-
if (command instanceof MultiLocalCommand multiLocalCommand) {
- handleMultiLocalCommand(multiLocalCommand,
- dataPath,
- serviceEnvironment,
- accounts,
- outputWriter,
- trustNewIdentity);
+ handleMultiLocalCommand(multiLocalCommand, signalAccountFiles, outputWriter);
return;
}
+ Set<String> 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) {
"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);
return;
}
throw new UserErrorException("Command only works in multi-account mode");
}
- handleLocalCommand((LocalCommand) command,
- account,
- dataPath,
- serviceEnvironment,
- outputWriter,
- trustNewIdentity);
+ handleLocalCommand((LocalCommand) command, account, signalAccountFiles, outputWriter);
}
private void handleProvisioningCommand(
final ProvisioningCommand command,
- final File dataPath,
- final ServiceEnvironment serviceEnvironment,
+ final SignalAccountFiles signalAccountFiles,
final OutputWriter outputWriter
) throws CommandException {
- var pm = ProvisioningManager.init(dataPath, serviceEnvironment, BaseConfig.USER_AGENT);
+ var pm = signalAccountFiles.initProvisioningManager();
command.handleCommand(ns, pm, outputWriter);
}
}
private void handleRegistrationCommand(
- final RegistrationCommand command,
- final String account,
- final File dataPath,
- final ServiceEnvironment serviceEnvironment
+ final RegistrationCommand command, final String account, final SignalAccountFiles signalAccountFiles
) 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) {
+ try (final var manager = loadRegistrationManager(account, signalAccountFiles)) {
command.handleCommand(ns, manager);
} catch (IOException e) {
logger.warn("Cleanup failed", e);
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 OutputWriter outputWriter
) throws CommandException {
- try (var m = loadManager(account, dataPath, serviceEnvironment, trustNewIdentity)) {
+ try (var m = loadManager(account, signalAccountFiles)) {
command.handleCommand(ns, m, outputWriter);
} catch (IOException e) {
logger.warn("Cleanup failed", e);
private void handleMultiLocalCommand(
final MultiLocalCommand command,
- final File dataPath,
- final ServiceEnvironment serviceEnvironment,
- final List<String> accounts,
- final OutputWriter outputWriter,
- final TrustNewIdentity trustNewIdentity
+ final SignalAccountFiles signalAccountFiles,
+ final OutputWriter outputWriter
) throws CommandException {
- final var managers = new ArrayList<Manager>();
- for (String a : accounts) {
- try {
- managers.add(loadManager(a, dataPath, serviceEnvironment, trustNewIdentity));
- } catch (CommandException e) {
- logger.warn("Ignoring {}: {}", a, e.getMessage());
- }
- }
-
- try (var multiAccountManager = new MultiAccountManagerImpl(managers,
- dataPath,
- serviceEnvironment,
- BaseConfig.USER_AGENT)) {
+ try (var multiAccountManager = signalAccountFiles.initMultiAccountManager()) {
command.handleCommand(ns, multiAccountManager, outputWriter);
+ } catch (IOException e) {
+ throw new IOErrorException("Failed to load local accounts file", 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 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
+ e.getClass().getSimpleName()
+ ")", e);
}
-
- logger.trace("Checking account state");
- 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(
} else {
busType = DBusConnection.DBusBusType.SESSION;
}
- try (var dBusConn = DBusConnection.getConnection(busType)) {
+ 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");
/**
* @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");
}
}
git.nmode.ca / signal-cli / blobdiff
