X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/af8a27e87f7844e733d1b42419c3976f0b41ae58..860ec6f5dcda56b55e0e756e862c8c55865ccd19:/src/main/java/org/asamk/signal/Main.java
diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index d562c4e1..604c51ee 100644
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -1,59 +1,80 @@
-/**
- * Copyright (C) 2015 AsamK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+/*
+ Copyright (C) 2015-2018 AsamK
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
*/
package org.asamk.signal;
import net.sourceforge.argparse4j.ArgumentParsers;
import net.sourceforge.argparse4j.impl.Arguments;
import net.sourceforge.argparse4j.inf.*;
-import org.apache.commons.io.IOUtils;
import org.apache.http.util.TextUtils;
import org.asamk.Signal;
+import org.asamk.signal.manager.BaseConfig;
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.storage.groups.GroupInfo;
+import org.asamk.signal.storage.protocol.JsonIdentityKeyStore;
+import org.asamk.signal.util.DateUtils;
+import org.asamk.signal.util.Hex;
+import org.asamk.signal.util.IOUtils;
+import org.asamk.signal.util.Util;
import org.freedesktop.dbus.DBusConnection;
+import org.freedesktop.dbus.DBusSigHandler;
import org.freedesktop.dbus.exceptions.DBusException;
import org.freedesktop.dbus.exceptions.DBusExecutionException;
-import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
-import org.whispersystems.signalservice.api.messages.*;
-import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
-import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.whispersystems.libsignal.InvalidKeyException;
+import org.whispersystems.libsignal.util.guava.Optional;
+import org.whispersystems.signalservice.api.messages.multidevice.DeviceInfo;
import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;
-import org.whispersystems.signalservice.api.push.exceptions.NetworkFailureException;
-import org.whispersystems.signalservice.api.push.exceptions.UnregisteredUserException;
import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
+import org.whispersystems.signalservice.internal.push.LockedException;
+import org.whispersystems.signalservice.internal.util.Base64;
import java.io.File;
import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.charset.Charset;
import java.security.Security;
import java.util.ArrayList;
import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import static org.asamk.signal.util.ErrorUtils.*;
public class Main {
- public static final String SIGNAL_BUSNAME = "org.asamk.Signal";
- public static final String SIGNAL_OBJECTPATH = "/org/asamk/Signal";
+ private static final String SIGNAL_BUSNAME = "org.asamk.Signal";
+ private static final String SIGNAL_OBJECTPATH = "/org/asamk/Signal";
public static void main(String[] args) {
// Workaround for BKS truststore
- Security.insertProviderAt(new org.spongycastle.jce.provider.BouncyCastleProvider(), 1);
+ Security.insertProviderAt(new org.bouncycastle.jce.provider.BouncyCastleProvider(), 1);
Namespace ns = parseArgs(args);
if (ns == null) {
System.exit(1);
}
+ int res = handleCommands(ns);
+ System.exit(res);
+ }
+
+ private static int handleCommands(Namespace ns) {
final String username = ns.getString("username");
Manager m;
Signal ts;
@@ -69,16 +90,18 @@ public class Main {
busType = DBusConnection.SESSION;
}
dBusConn = DBusConnection.getConnection(busType);
- ts = (Signal) dBusConn.getRemoteObject(
+ ts = dBusConn.getRemoteObject(
SIGNAL_BUSNAME, SIGNAL_OBJECTPATH,
Signal.class);
+ } catch (UnsatisfiedLinkError e) {
+ System.err.println("Missing native library dependency for dbus service: " + e.getMessage());
+ return 1;
} catch (DBusException e) {
e.printStackTrace();
if (dBusConn != null) {
dBusConn.disconnect();
}
- System.exit(3);
- return;
+ return 3;
}
} else {
String settingsPath = ns.getString("config");
@@ -94,85 +117,246 @@ public class Main {
m = new Manager(username, settingsPath);
ts = m;
- if (m.userExists()) {
- try {
- m.load();
- } catch (Exception e) {
- System.err.println("Error loading state file \"" + m.getFileName() + "\": " + e.getMessage());
- System.exit(2);
- return;
- }
+ try {
+ m.init();
+ } catch (Exception e) {
+ System.err.println("Error loading state file: " + e.getMessage());
+ return 2;
}
}
switch (ns.getString("command")) {
case "register":
if (dBusConn != null) {
- System.err.println("register is not yet implementd via dbus");
- System.exit(1);
- }
- if (!m.userHasKeys()) {
- m.createNewIdentity();
+ System.err.println("register is not yet implemented via dbus");
+ return 1;
}
try {
m.register(ns.getBoolean("voice"));
} catch (IOException e) {
System.err.println("Request verify error: " + e.getMessage());
- System.exit(3);
+ return 3;
+ }
+ break;
+ case "unregister":
+ if (dBusConn != null) {
+ System.err.println("unregister is not yet implemented via dbus");
+ return 1;
+ }
+ if (!m.isRegistered()) {
+ System.err.println("User is not registered.");
+ return 1;
+ }
+ try {
+ m.unregister();
+ } catch (IOException e) {
+ System.err.println("Unregister error: " + e.getMessage());
+ return 3;
+ }
+ break;
+ case "updateAccount":
+ if (dBusConn != null) {
+ System.err.println("updateAccount is not yet implemented via dbus");
+ return 1;
+ }
+ if (!m.isRegistered()) {
+ System.err.println("User is not registered.");
+ return 1;
+ }
+ try {
+ m.updateAccountAttributes();
+ } catch (IOException e) {
+ System.err.println("UpdateAccount error: " + e.getMessage());
+ return 3;
+ }
+ break;
+ case "setPin":
+ if (dBusConn != null) {
+ System.err.println("setPin is not yet implemented via dbus");
+ return 1;
+ }
+ if (!m.isRegistered()) {
+ System.err.println("User is not registered.");
+ return 1;
+ }
+ try {
+ String registrationLockPin = ns.getString("registrationLockPin");
+ m.setRegistrationLockPin(Optional.of(registrationLockPin));
+ } catch (IOException e) {
+ System.err.println("Set pin error: " + e.getMessage());
+ return 3;
+ }
+ break;
+ case "removePin":
+ if (dBusConn != null) {
+ System.err.println("removePin is not yet implemented via dbus");
+ return 1;
+ }
+ if (!m.isRegistered()) {
+ System.err.println("User is not registered.");
+ return 1;
+ }
+ try {
+ m.setRegistrationLockPin(Optional.absent());
+ } catch (IOException e) {
+ System.err.println("Remove pin error: " + e.getMessage());
+ return 3;
}
break;
case "verify":
if (dBusConn != null) {
- System.err.println("verify is not yet implementd via dbus");
- System.exit(1);
+ System.err.println("verify is not yet implemented via dbus");
+ return 1;
}
if (!m.userHasKeys()) {
System.err.println("User has no keys, first call register.");
- System.exit(1);
+ return 1;
}
if (m.isRegistered()) {
System.err.println("User registration is already verified");
- System.exit(1);
+ return 1;
}
try {
- m.verifyAccount(ns.getString("verificationCode"));
+ String verificationCode = ns.getString("verificationCode");
+ String pin = ns.getString("pin");
+ m.verifyAccount(verificationCode, pin);
+ } catch (LockedException e) {
+ System.err.println("Verification failed! This number is locked with a pin. Hours remaining until reset: " + (e.getTimeRemaining() / 1000 / 60 / 60));
+ System.err.println("Use '--pin PIN_CODE' to specify the registration lock PIN");
+ return 3;
} catch (IOException e) {
System.err.println("Verify error: " + e.getMessage());
- System.exit(3);
+ return 3;
+ }
+ break;
+ case "link":
+ if (dBusConn != null) {
+ System.err.println("link is not yet implemented via dbus");
+ return 1;
+ }
+
+ String deviceName = ns.getString("name");
+ if (deviceName == null) {
+ deviceName = "cli";
+ }
+ try {
+ System.out.println(m.getDeviceLinkUri());
+ m.finishDeviceLink(deviceName);
+ System.out.println("Associated with: " + m.getUsername());
+ } catch (TimeoutException e) {
+ System.err.println("Link request timed out, please try again.");
+ return 3;
+ } catch (IOException e) {
+ System.err.println("Link request error: " + e.getMessage());
+ return 3;
+ } catch (AssertionError e) {
+ handleAssertionError(e);
+ return 1;
+ } catch (InvalidKeyException e) {
+ e.printStackTrace();
+ return 2;
+ } catch (UserAlreadyExists e) {
+ System.err.println("The user " + e.getUsername() + " already exists\nDelete \"" + e.getFileName() + "\" before trying again.");
+ return 1;
+ }
+ break;
+ case "addDevice":
+ if (dBusConn != null) {
+ System.err.println("link is not yet implemented via dbus");
+ return 1;
+ }
+ if (!m.isRegistered()) {
+ System.err.println("User is not registered.");
+ return 1;
+ }
+ try {
+ m.addDeviceLink(new URI(ns.getString("uri")));
+ } catch (IOException e) {
+ e.printStackTrace();
+ return 3;
+ } catch (InvalidKeyException | URISyntaxException e) {
+ e.printStackTrace();
+ return 2;
+ } catch (AssertionError e) {
+ handleAssertionError(e);
+ return 1;
+ }
+ break;
+ case "listDevices":
+ if (dBusConn != null) {
+ System.err.println("listDevices is not yet implemented via dbus");
+ return 1;
+ }
+ if (!m.isRegistered()) {
+ System.err.println("User is not registered.");
+ return 1;
+ }
+ try {
+ List devices = m.getLinkedDevices();
+ for (DeviceInfo d : devices) {
+ System.out.println("Device " + d.getId() + (d.getId() == m.getDeviceId() ? " (this device)" : "") + ":");
+ System.out.println(" Name: " + d.getName());
+ System.out.println(" Created: " + DateUtils.formatTimestamp(d.getCreated()));
+ System.out.println(" Last seen: " + DateUtils.formatTimestamp(d.getLastSeen()));
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ return 3;
+ }
+ break;
+ case "removeDevice":
+ if (dBusConn != null) {
+ System.err.println("removeDevice is not yet implemented via dbus");
+ return 1;
+ }
+ if (!m.isRegistered()) {
+ System.err.println("User is not registered.");
+ return 1;
+ }
+ try {
+ int deviceId = ns.getInt("deviceId");
+ m.removeLinkedDevices(deviceId);
+ } catch (IOException e) {
+ e.printStackTrace();
+ return 3;
}
break;
case "send":
if (dBusConn == null && !m.isRegistered()) {
System.err.println("User is not registered.");
- System.exit(1);
+ return 1;
}
if (ns.getBoolean("endsession")) {
if (ns.getList("recipient") == null) {
System.err.println("No recipients given");
System.err.println("Aborting sending.");
- System.exit(1);
+ return 1;
}
try {
ts.sendEndSessionMessage(ns.getList("recipient"));
} catch (IOException e) {
handleIOException(e);
+ return 3;
} catch (EncapsulatedExceptions e) {
handleEncapsulatedExceptions(e);
+ return 3;
} catch (AssertionError e) {
handleAssertionError(e);
+ return 1;
} catch (DBusExecutionException e) {
handleDBusExecutionException(e);
+ return 1;
}
} else {
String messageText = ns.getString("message");
if (messageText == null) {
try {
- messageText = IOUtils.toString(System.in);
+ messageText = IOUtils.readAll(System.in, Charset.defaultCharset());
} catch (IOException e) {
System.err.println("Failed to read message from stdin: " + e.getMessage());
System.err.println("Aborting sending.");
- System.exit(1);
+ return 1;
}
}
@@ -182,119 +366,289 @@ public class Main {
attachments = new ArrayList<>();
}
if (ns.getString("group") != null) {
- byte[] groupId = decodeGroupId(ns.getString("group"));
+ byte[] groupId = Util.decodeGroupId(ns.getString("group"));
ts.sendGroupMessage(messageText, attachments, groupId);
} else {
ts.sendMessage(messageText, attachments, ns.getList("recipient"));
}
} catch (IOException e) {
handleIOException(e);
+ return 3;
} catch (EncapsulatedExceptions e) {
handleEncapsulatedExceptions(e);
+ return 3;
} catch (AssertionError e) {
handleAssertionError(e);
+ return 1;
} catch (GroupNotFoundException e) {
handleGroupNotFoundException(e);
+ return 1;
+ } catch (NotAGroupMemberException e) {
+ handleNotAGroupMemberException(e);
+ return 1;
} catch (AttachmentInvalidException e) {
System.err.println("Failed to add attachment: " + e.getMessage());
System.err.println("Aborting sending.");
- System.exit(1);
+ return 1;
} catch (DBusExecutionException e) {
handleDBusExecutionException(e);
+ return 1;
+ } catch (GroupIdFormatException e) {
+ handleGroupIdFormatException(e);
+ return 1;
}
}
break;
case "receive":
if (dBusConn != null) {
- System.err.println("receive is not yet implementd via dbus");
- System.exit(1);
+ try {
+ dBusConn.addSigHandler(Signal.MessageReceived.class, new DBusSigHandler() {
+ @Override
+ public void handle(Signal.MessageReceived s) {
+ System.out.print(String.format("Envelope from: %s\nTimestamp: %s\nBody: %s\n",
+ s.getSender(), DateUtils.formatTimestamp(s.getTimestamp()), s.getMessage()));
+ if (s.getGroupId().length > 0) {
+ System.out.println("Group info:");
+ System.out.println(" Id: " + Base64.encodeBytes(s.getGroupId()));
+ }
+ if (s.getAttachments().size() > 0) {
+ System.out.println("Attachments: ");
+ for (String attachment : s.getAttachments()) {
+ System.out.println("- Stored plaintext in: " + attachment);
+ }
+ }
+ System.out.println();
+ }
+ });
+ dBusConn.addSigHandler(Signal.ReceiptReceived.class, new DBusSigHandler() {
+ @Override
+ public void handle(Signal.ReceiptReceived s) {
+ System.out.print(String.format("Receipt from: %s\nTimestamp: %s\n",
+ s.getSender(), DateUtils.formatTimestamp(s.getTimestamp())));
+ }
+ });
+ } catch (UnsatisfiedLinkError e) {
+ System.err.println("Missing native library dependency for dbus service: " + e.getMessage());
+ return 1;
+ } catch (DBusException e) {
+ e.printStackTrace();
+ return 1;
+ }
+ while (true) {
+ try {
+ Thread.sleep(10000);
+ } catch (InterruptedException e) {
+ return 0;
+ }
+ }
}
if (!m.isRegistered()) {
System.err.println("User is not registered.");
- System.exit(1);
+ return 1;
}
- int timeout = 5;
- if (ns.getInt("timeout") != null) {
- timeout = ns.getInt("timeout");
+ double timeout = 5;
+ if (ns.getDouble("timeout") != null) {
+ timeout = ns.getDouble("timeout");
}
boolean returnOnTimeout = true;
if (timeout < 0) {
returnOnTimeout = false;
timeout = 3600;
}
+ boolean ignoreAttachments = ns.getBoolean("ignore_attachments");
try {
- m.receiveMessages(timeout, returnOnTimeout, new ReceiveMessageHandler(m));
+ final Manager.ReceiveMessageHandler handler = ns.getBoolean("json") ? new JsonReceiveMessageHandler(m) : new ReceiveMessageHandler(m);
+ m.receiveMessages((long) (timeout * 1000), TimeUnit.MILLISECONDS, returnOnTimeout, ignoreAttachments, handler);
} catch (IOException e) {
System.err.println("Error while receiving messages: " + e.getMessage());
- System.exit(3);
+ return 3;
} catch (AssertionError e) {
handleAssertionError(e);
+ return 1;
}
break;
case "quitGroup":
if (dBusConn != null) {
- System.err.println("quitGroup is not yet implementd via dbus");
- System.exit(1);
+ System.err.println("quitGroup is not yet implemented via dbus");
+ return 1;
}
if (!m.isRegistered()) {
System.err.println("User is not registered.");
- System.exit(1);
+ return 1;
}
try {
- m.sendQuitGroupMessage(decodeGroupId(ns.getString("group")));
+ m.sendQuitGroupMessage(Util.decodeGroupId(ns.getString("group")));
} catch (IOException e) {
handleIOException(e);
+ return 3;
} catch (EncapsulatedExceptions e) {
handleEncapsulatedExceptions(e);
+ return 3;
} catch (AssertionError e) {
handleAssertionError(e);
+ return 1;
} catch (GroupNotFoundException e) {
handleGroupNotFoundException(e);
+ return 1;
+ } catch (NotAGroupMemberException e) {
+ handleNotAGroupMemberException(e);
+ return 1;
+ } catch (GroupIdFormatException e) {
+ handleGroupIdFormatException(e);
+ return 1;
}
break;
case "updateGroup":
- if (dBusConn != null) {
- System.err.println("updateGroup is not yet implementd via dbus");
- System.exit(1);
- }
- if (!m.isRegistered()) {
+ if (dBusConn == null && !m.isRegistered()) {
System.err.println("User is not registered.");
- System.exit(1);
+ return 1;
}
try {
byte[] groupId = null;
if (ns.getString("group") != null) {
- groupId = decodeGroupId(ns.getString("group"));
+ groupId = Util.decodeGroupId(ns.getString("group"));
}
- byte[] newGroupId = m.sendUpdateGroupMessage(groupId, ns.getString("name"), ns.getList("member"), ns.getString("avatar"));
if (groupId == null) {
+ groupId = new byte[0];
+ }
+ String groupName = ns.getString("name");
+ if (groupName == null) {
+ groupName = "";
+ }
+ List groupMembers = ns.getList("member");
+ if (groupMembers == null) {
+ groupMembers = new ArrayList<>();
+ }
+ String groupAvatar = ns.getString("avatar");
+ if (groupAvatar == null) {
+ groupAvatar = "";
+ }
+ byte[] newGroupId = ts.updateGroup(groupId, groupName, groupMembers, groupAvatar);
+ if (groupId.length != newGroupId.length) {
System.out.println("Creating new group \"" + Base64.encodeBytes(newGroupId) + "\" â¦");
}
} catch (IOException e) {
handleIOException(e);
+ return 3;
} catch (AttachmentInvalidException e) {
System.err.println("Failed to add avatar attachment for group\": " + e.getMessage());
System.err.println("Aborting sending.");
- System.exit(1);
+ return 1;
} catch (GroupNotFoundException e) {
handleGroupNotFoundException(e);
+ return 1;
+ } catch (NotAGroupMemberException e) {
+ handleNotAGroupMemberException(e);
+ return 1;
} catch (EncapsulatedExceptions e) {
handleEncapsulatedExceptions(e);
+ return 3;
+ } catch (GroupIdFormatException e) {
+ handleGroupIdFormatException(e);
+ return 1;
+ }
+
+ break;
+ case "listGroups":
+ if (dBusConn != null) {
+ System.err.println("listGroups is not yet implemented via dbus");
+ return 1;
+ }
+ if (!m.isRegistered()) {
+ System.err.println("User is not registered.");
+ return 1;
}
+ List groups = m.getGroups();
+ boolean detailed = ns.getBoolean("detailed");
+
+ for (GroupInfo group : groups) {
+ printGroup(group, detailed);
+ }
+ break;
+ case "listIdentities":
+ if (dBusConn != null) {
+ System.err.println("listIdentities is not yet implemented via dbus");
+ return 1;
+ }
+ if (!m.isRegistered()) {
+ System.err.println("User is not registered.");
+ return 1;
+ }
+ if (ns.get("number") == null) {
+ for (Map.Entry> keys : m.getIdentities().entrySet()) {
+ for (JsonIdentityKeyStore.Identity id : keys.getValue()) {
+ printIdentityFingerprint(m, keys.getKey(), id);
+ }
+ }
+ } else {
+ String number = ns.getString("number");
+ for (JsonIdentityKeyStore.Identity id : m.getIdentities(number)) {
+ printIdentityFingerprint(m, number, id);
+ }
+ }
+ break;
+ case "trust":
+ if (dBusConn != null) {
+ System.err.println("trust is not yet implemented via dbus");
+ return 1;
+ }
+ if (!m.isRegistered()) {
+ System.err.println("User is not registered.");
+ return 1;
+ }
+ String number = ns.getString("number");
+ if (ns.getBoolean("trust_all_known_keys")) {
+ boolean res = m.trustIdentityAllKeys(number);
+ if (!res) {
+ System.err.println("Failed to set the trust for this number, make sure the number is correct.");
+ return 1;
+ }
+ } else {
+ String fingerprint = ns.getString("verified_fingerprint");
+ if (fingerprint != null) {
+ fingerprint = fingerprint.replaceAll(" ", "");
+ if (fingerprint.length() == 66) {
+ byte[] fingerprintBytes;
+ try {
+ fingerprintBytes = Hex.toByteArray(fingerprint.toLowerCase(Locale.ROOT));
+ } catch (Exception e) {
+ System.err.println("Failed to parse the fingerprint, make sure the fingerprint is a correctly encoded hex string without additional characters.");
+ return 1;
+ }
+ boolean res = m.trustIdentityVerified(number, fingerprintBytes);
+ if (!res) {
+ System.err.println("Failed to set the trust for the fingerprint of this number, make sure the number and the fingerprint are correct.");
+ return 1;
+ }
+ } else if (fingerprint.length() == 60) {
+ boolean res = m.trustIdentityVerifiedSafetyNumber(number, fingerprint);
+ if (!res) {
+ System.err.println("Failed to set the trust for the safety number of this phone number, make sure the phone number and the safety number are correct.");
+ return 1;
+ }
+ } else {
+ System.err.println("Fingerprint has invalid format, either specify the old hex fingerprint or the new safety number");
+ return 1;
+ }
+ } else {
+ System.err.println("You need to specify the fingerprint you have verified with -v FINGERPRINT");
+ return 1;
+ }
+ }
break;
case "daemon":
if (dBusConn != null) {
System.err.println("Stop it.");
- System.exit(1);
+ return 1;
}
if (!m.isRegistered()) {
System.err.println("User is not registered.");
- System.exit(1);
+ return 1;
}
DBusConnection conn = null;
try {
@@ -308,17 +662,22 @@ public class Main {
conn = DBusConnection.getConnection(busType);
conn.exportObject(SIGNAL_OBJECTPATH, m);
conn.requestBusName(SIGNAL_BUSNAME);
+ } catch (UnsatisfiedLinkError e) {
+ System.err.println("Missing native library dependency for dbus service: " + e.getMessage());
+ return 1;
} catch (DBusException e) {
e.printStackTrace();
- System.exit(3);
+ return 2;
}
+ ignoreAttachments = ns.getBoolean("ignore_attachments");
try {
- m.receiveMessages(3600, false, new DbusReceiveMessageHandler(m, conn));
+ m.receiveMessages(1, TimeUnit.HOURS, false, ignoreAttachments, ns.getBoolean("json") ? new JsonDbusReceiveMessageHandler(m, conn, Main.SIGNAL_OBJECTPATH) : new DbusReceiveMessageHandler(m, conn, Main.SIGNAL_OBJECTPATH));
} catch (IOException e) {
System.err.println("Error while receiving messages: " + e.getMessage());
- System.exit(3);
+ return 3;
} catch (AssertionError e) {
handleAssertionError(e);
+ return 1;
}
} finally {
if (conn != null) {
@@ -328,7 +687,7 @@ public class Main {
break;
}
- System.exit(0);
+ return 0;
} finally {
if (dBusConn != null) {
dBusConn.disconnect();
@@ -336,40 +695,34 @@ public class Main {
}
}
- private static void handleGroupNotFoundException(GroupNotFoundException e) {
- System.err.println("Failed to send to group: " + e.getMessage());
- System.err.println("Aborting sending.");
- System.exit(1);
- }
-
- private static void handleDBusExecutionException(DBusExecutionException e) {
- System.err.println("Cannot connect to dbus: " + e.getMessage());
- System.err.println("Aborting.");
- System.exit(1);
+ private static void printIdentityFingerprint(Manager m, String theirUsername, JsonIdentityKeyStore.Identity theirId) {
+ String digits = Util.formatSafetyNumber(m.computeSafetyNumber(theirUsername, theirId.getIdentityKey()));
+ System.out.println(String.format("%s: %s Added: %s Fingerprint: %s Safety Number: %s", theirUsername,
+ theirId.getTrustLevel(), theirId.getDateAdded(), Hex.toStringCondensed(theirId.getFingerprint()), digits));
}
- private static byte[] decodeGroupId(String groupId) {
- try {
- return Base64.decode(groupId);
- } catch (IOException e) {
- System.err.println("Failed to decode groupId (must be base64) \"" + groupId + "\": " + e.getMessage());
- System.err.println("Aborting sending.");
- System.exit(1);
- return null;
+ private static void printGroup(GroupInfo group, boolean detailed) {
+ if (detailed) {
+ System.out.println(String.format("Id: %s Name: %s Active: %s Members: %s",
+ Base64.encodeBytes(group.groupId), group.name, group.active, group.members));
+ } else {
+ System.out.println(String.format("Id: %s Name: %s Active: %s", Base64.encodeBytes(group.groupId),
+ group.name, group.active));
}
}
private static Namespace parseArgs(String[] args) {
- ArgumentParser parser = ArgumentParsers.newArgumentParser("signal-cli")
+ ArgumentParser parser = ArgumentParsers.newFor("signal-cli")
+ .build()
.defaultHelp(true)
.description("Commandline interface for Signal.")
- .version(Manager.PROJECT_NAME + " " + Manager.PROJECT_VERSION);
+ .version(BaseConfig.PROJECT_NAME + " " + BaseConfig.PROJECT_VERSION);
parser.addArgument("-v", "--version")
.help("Show package version.")
.action(Arguments.version());
parser.addArgument("--config")
- .help("Set the path, where to store the config (Default: $HOME/.config/signal-cli).");
+ .help("Set the path, where to store the config (Default: $HOME/.config/signal).");
MutuallyExclusiveGroup mut = parser.addMutuallyExclusiveGroup();
mut.addArgument("-u", "--username")
@@ -387,14 +740,45 @@ public class Main {
.description("valid subcommands")
.help("additional help");
+ Subparser parserLink = subparsers.addParser("link");
+ parserLink.addArgument("-n", "--name")
+ .help("Specify a name to describe this new device.");
+
+ Subparser parserAddDevice = subparsers.addParser("addDevice");
+ parserAddDevice.addArgument("--uri")
+ .required(true)
+ .help("Specify the uri contained in the QR code shown by the new device.");
+
+ Subparser parserDevices = subparsers.addParser("listDevices");
+
+ Subparser parserRemoveDevice = subparsers.addParser("removeDevice");
+ parserRemoveDevice.addArgument("-d", "--deviceId")
+ .type(int.class)
+ .required(true)
+ .help("Specify the device you want to remove. Use listDevices to see the deviceIds.");
+
Subparser parserRegister = subparsers.addParser("register");
parserRegister.addArgument("-v", "--voice")
.help("The verification should be done over voice, not sms.")
.action(Arguments.storeTrue());
+ Subparser parserUnregister = subparsers.addParser("unregister");
+ parserUnregister.help("Unregister the current device from the signal server.");
+
+ Subparser parserUpdateAccount = subparsers.addParser("updateAccount");
+ parserUpdateAccount.help("Update the account attributes on the signal server.");
+
+ Subparser parserSetPin = subparsers.addParser("setPin");
+ parserSetPin.addArgument("registrationLockPin")
+ .help("The registration lock PIN, that will be required for new registrations (resets after 7 days of inactivity)");
+
+ Subparser parserRemovePin = subparsers.addParser("removePin");
+
Subparser parserVerify = subparsers.addParser("verify");
parserVerify.addArgument("verificationCode")
.help("The verification code you received via sms or voice call.");
+ parserVerify.addArgument("-p", "--pin")
+ .help("The registration lock PIN, that was set by the user (Optional)");
Subparser parserSend = subparsers.addParser("send");
parserSend.addArgument("-g", "--group")
@@ -427,19 +811,57 @@ public class Main {
.nargs("*")
.help("Specify one or more members to add to the group");
+ Subparser parserListGroups = subparsers.addParser("listGroups");
+ parserListGroups.addArgument("-d", "--detailed").action(Arguments.storeTrue())
+ .help("List members of each group");
+ parserListGroups.help("List group name and ids");
+
+ Subparser parserListIdentities = subparsers.addParser("listIdentities");
+ parserListIdentities.addArgument("-n", "--number")
+ .help("Only show identity keys for the given phone number.");
+
+ Subparser parserTrust = subparsers.addParser("trust");
+ parserTrust.addArgument("number")
+ .help("Specify the phone number, for which to set the trust.")
+ .required(true);
+ MutuallyExclusiveGroup mutTrust = parserTrust.addMutuallyExclusiveGroup();
+ mutTrust.addArgument("-a", "--trust-all-known-keys")
+ .help("Trust all known keys of this user, only use this for testing.")
+ .action(Arguments.storeTrue());
+ mutTrust.addArgument("-v", "--verified-fingerprint")
+ .help("Specify the fingerprint of the key, only use this option if you have verified the fingerprint.");
+
Subparser parserReceive = subparsers.addParser("receive");
parserReceive.addArgument("-t", "--timeout")
- .type(int.class)
+ .type(double.class)
.help("Number of seconds to wait for new messages (negative values disable timeout)");
+ parserReceive.addArgument("--ignore-attachments")
+ .help("Donât download attachments of received messages.")
+ .action(Arguments.storeTrue());
+ parserReceive.addArgument("--json")
+ .help("Output received messages in json format, one json object per line.")
+ .action(Arguments.storeTrue());
Subparser parserDaemon = subparsers.addParser("daemon");
parserDaemon.addArgument("--system")
.action(Arguments.storeTrue())
.help("Use DBus system bus instead of user bus.");
+ parserDaemon.addArgument("--ignore-attachments")
+ .help("Donât download attachments of received messages.")
+ .action(Arguments.storeTrue());
+ parserDaemon.addArgument("--json")
+ .help("Output received messages in json format, one json object per line.")
+ .action(Arguments.storeTrue());
try {
Namespace ns = parser.parseArgs(args);
- if (!ns.getBoolean("dbus") && !ns.getBoolean("dbus_system")) {
+ if ("link".equals(ns.getString("command"))) {
+ if (ns.getString("username") != null) {
+ parser.printUsage();
+ System.err.println("You cannot specify a username (phone number) when linking");
+ System.exit(2);
+ }
+ } else if (!ns.getBoolean("dbus") && !ns.getBoolean("dbus_system")) {
if (ns.getString("username") == null) {
parser.printUsage();
System.err.println("You need to specify a username (phone number)");
@@ -460,172 +882,4 @@ public class Main {
return null;
}
}
-
- private static void handleAssertionError(AssertionError e) {
- System.err.println("Failed to send/receive message (Assertion): " + e.getMessage());
- e.printStackTrace();
- System.err.println("If you use an Oracle JRE please check if you have unlimited strength crypto enabled, see README");
- System.exit(1);
- }
-
- private static void handleEncapsulatedExceptions(EncapsulatedExceptions e) {
- System.err.println("Failed to send (some) messages:");
- for (NetworkFailureException n : e.getNetworkExceptions()) {
- System.err.println("Network failure for \"" + n.getE164number() + "\": " + n.getMessage());
- }
- for (UnregisteredUserException n : e.getUnregisteredUserExceptions()) {
- System.err.println("Unregistered user \"" + n.getE164Number() + "\": " + n.getMessage());
- }
- for (UntrustedIdentityException n : e.getUntrustedIdentityExceptions()) {
- System.err.println("Untrusted Identity for \"" + n.getE164Number() + "\": " + n.getMessage());
- }
- }
-
- private static void handleIOException(IOException e) {
- System.err.println("Failed to send message: " + e.getMessage());
- }
-
- private static class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
- final Manager m;
-
- public ReceiveMessageHandler(Manager m) {
- this.m = m;
- }
-
- @Override
- public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, GroupInfo group) {
- SignalServiceAddress source = envelope.getSourceAddress();
- System.out.println(String.format("Envelope from: %s (device: %d)", source.getNumber(), envelope.getSourceDevice()));
- if (source.getRelay().isPresent()) {
- System.out.println("Relayed by: " + source.getRelay().get());
- }
- System.out.println("Timestamp: " + envelope.getTimestamp());
-
- if (envelope.isReceipt()) {
- System.out.println("Got receipt.");
- } else if (envelope.isSignalMessage() | envelope.isPreKeySignalMessage()) {
- if (content == null) {
- System.out.println("Failed to decrypt message.");
- } else {
- if (content.getDataMessage().isPresent()) {
- SignalServiceDataMessage message = content.getDataMessage().get();
-
- System.out.println("Message timestamp: " + message.getTimestamp());
-
- if (message.getBody().isPresent()) {
- System.out.println("Body: " + message.getBody().get());
- }
- if (message.getGroupInfo().isPresent()) {
- SignalServiceGroup groupInfo = message.getGroupInfo().get();
- System.out.println("Group info:");
- System.out.println(" Id: " + Base64.encodeBytes(groupInfo.getGroupId()));
- if (groupInfo.getName().isPresent()) {
- System.out.println(" Name: " + groupInfo.getName().get());
- } else if (group != null) {
- System.out.println(" Name: " + group.name);
- } else {
- System.out.println(" Name: ");
- }
- System.out.println(" Type: " + groupInfo.getType());
- if (groupInfo.getMembers().isPresent()) {
- for (String member : groupInfo.getMembers().get()) {
- System.out.println(" Member: " + member);
- }
- }
- if (groupInfo.getAvatar().isPresent()) {
- System.out.println(" Avatar:");
- printAttachment(groupInfo.getAvatar().get());
- }
- }
- if (message.isEndSession()) {
- System.out.println("Is end session");
- }
-
- if (message.getAttachments().isPresent()) {
- System.out.println("Attachments: ");
- for (SignalServiceAttachment attachment : message.getAttachments().get()) {
- printAttachment(attachment);
- }
- }
- }
- if (content.getSyncMessage().isPresent()) {
- SignalServiceSyncMessage syncMessage = content.getSyncMessage().get();
- System.out.println("Received sync message");
- }
- }
- } else {
- System.out.println("Unknown message received.");
- }
- System.out.println();
- }
-
- private void printAttachment(SignalServiceAttachment attachment) {
- System.out.println("- " + attachment.getContentType() + " (" + (attachment.isPointer() ? "Pointer" : "") + (attachment.isStream() ? "Stream" : "") + ")");
- if (attachment.isPointer()) {
- final SignalServiceAttachmentPointer pointer = attachment.asPointer();
- System.out.println(" Id: " + pointer.getId() + " Key length: " + pointer.getKey().length + (pointer.getRelay().isPresent() ? " Relay: " + pointer.getRelay().get() : ""));
- System.out.println(" Size: " + (pointer.getSize().isPresent() ? pointer.getSize().get() + " bytes" : "") + (pointer.getPreview().isPresent() ? " (Preview is available: " + pointer.getPreview().get().length + " bytes)" : ""));
- File file = m.getAttachmentFile(pointer.getId());
- if (file.exists()) {
- System.out.println(" Stored plaintext in: " + file);
- }
- }
- }
- }
-
- private static class DbusReceiveMessageHandler extends ReceiveMessageHandler {
- final DBusConnection conn;
-
- public DbusReceiveMessageHandler(Manager m, DBusConnection conn) {
- super(m);
- this.conn = conn;
- }
-
- @Override
- public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, GroupInfo group) {
- super.handleMessage(envelope, content, group);
-
- if (!envelope.isReceipt() && content != null && content.getDataMessage().isPresent()) {
- SignalServiceDataMessage message = content.getDataMessage().get();
-
- if (!message.isEndSession() &&
- !(message.getGroupInfo().isPresent() &&
- message.getGroupInfo().get().getType() != SignalServiceGroup.Type.DELIVER)) {
- List attachments = new ArrayList<>();
- if (message.getAttachments().isPresent()) {
- for (SignalServiceAttachment attachment : message.getAttachments().get()) {
- if (attachment.isPointer()) {
- attachments.add(m.getAttachmentFile(attachment.asPointer().getId()).getAbsolutePath());
- }
- }
- }
-
- try {
- conn.sendSignal(new Signal.MessageReceived(
- SIGNAL_OBJECTPATH,
- message.getTimestamp(),
- envelope.getSource(),
- message.getGroupInfo().isPresent() ? message.getGroupInfo().get().getGroupId() : new byte[0],
- message.getBody().isPresent() ? message.getBody().get() : "",
- attachments));
- } catch (DBusException e) {
- e.printStackTrace();
- }
- }
- }
- }
-
- private void printAttachment(SignalServiceAttachment attachment) {
- System.out.println("- " + attachment.getContentType() + " (" + (attachment.isPointer() ? "Pointer" : "") + (attachment.isStream() ? "Stream" : "") + ")");
- if (attachment.isPointer()) {
- final SignalServiceAttachmentPointer pointer = attachment.asPointer();
- System.out.println(" Id: " + pointer.getId() + " Key length: " + pointer.getKey().length + (pointer.getRelay().isPresent() ? " Relay: " + pointer.getRelay().get() : ""));
- System.out.println(" Size: " + (pointer.getSize().isPresent() ? pointer.getSize().get() + " bytes" : "") + (pointer.getPreview().isPresent() ? " (Preview is available: " + pointer.getPreview().get().length + " bytes)" : ""));
- File file = m.getAttachmentFile(pointer.getId());
- if (file.exists()) {
- System.out.println(" Stored plaintext in: " + file);
- }
- }
- }
- }
}