X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/5c117bd863c6b01e21b2865ebffd04c5cb23003c..f095d947f892830e1ced4af450df77a8f7ae6d5d:/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 e5a2288f..25807a6b 100644 --- a/src/main/java/org/asamk/signal/Main.java +++ b/src/main/java/org/asamk/signal/Main.java @@ -19,15 +19,16 @@ 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.freedesktop.dbus.DBusConnection; import org.freedesktop.dbus.DBusSigHandler; import org.freedesktop.dbus.exceptions.DBusException; import org.freedesktop.dbus.exceptions.DBusExecutionException; +import org.whispersystems.libsignal.InvalidKeyException; import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException; import org.whispersystems.signalservice.api.messages.*; +import org.whispersystems.signalservice.api.messages.multidevice.DeviceInfo; import org.whispersystems.signalservice.api.messages.multidevice.ReadMessage; import org.whispersystems.signalservice.api.messages.multidevice.SentTranscriptMessage; import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage; @@ -39,9 +40,17 @@ import org.whispersystems.signalservice.api.util.PhoneNumberFormatter; import java.io.File; import java.io.IOException; +import java.io.InputStream; +import java.io.StringWriter; +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.TimeoutException; public class Main { @@ -57,6 +66,11 @@ public class Main { 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; @@ -80,8 +94,7 @@ public class Main { if (dBusConn != null) { dBusConn.disconnect(); } - System.exit(3); - return; + return 3; } } else { String settingsPath = ns.getString("config"); @@ -102,8 +115,7 @@ public class Main { m.load(); } catch (Exception e) { System.err.println("Error loading state file \"" + m.getFileName() + "\": " + e.getMessage()); - System.exit(2); - return; + return 2; } } } @@ -112,7 +124,7 @@ public class Main { case "register": if (dBusConn != null) { System.err.println("register is not yet implemented via dbus"); - System.exit(1); + return 1; } if (!m.userHasKeys()) { m.createNewIdentity(); @@ -121,63 +133,157 @@ public class Main { m.register(ns.getBoolean("voice")); } catch (IOException e) { System.err.println("Request verify error: " + e.getMessage()); - System.exit(3); + return 3; } break; case "verify": if (dBusConn != null) { System.err.println("verify is not yet implemented via dbus"); - System.exit(1); + 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")); } 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; + } + + // When linking, username is null and we always have to create keys + m.createNewIdentity(); + + 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 (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 e) { + e.printStackTrace(); + return 2; + } catch (URISyntaxException e) { + e.printStackTrace(); + return 2; + } + 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: " + d.getCreated()); + System.out.println(" Last seen: " + 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); - } catch (UntrustedIdentityException e) { - e.printStackTrace(); + return 1; } } else { String messageText = ns.getString("message"); if (messageText == null) { try { - messageText = IOUtils.toString(System.in); + messageText = readAll(System.in); } catch (IOException e) { System.err.println("Failed to read message from stdin: " + e.getMessage()); System.err.println("Aborting sending."); - System.exit(1); + return 1; } } @@ -194,20 +300,23 @@ public class Main { } } 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 (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); - } catch (UntrustedIdentityException e) { - e.printStackTrace(); + return 1; } } @@ -235,18 +344,19 @@ public class Main { }); } catch (DBusException e) { e.printStackTrace(); + return 1; } while (true) { try { Thread.sleep(10000); } catch (InterruptedException e) { - System.exit(0); + 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) { @@ -261,44 +371,47 @@ public class Main { m.receiveMessages(timeout, returnOnTimeout, new ReceiveMessageHandler(m)); } 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 implemented via dbus"); - System.exit(1); + return 1; } if (!m.isRegistered()) { System.err.println("User is not registered."); - System.exit(1); + return 1; } try { m.sendQuitGroupMessage(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); - } catch (UntrustedIdentityException e) { - e.printStackTrace(); + return 1; } break; case "updateGroup": if (dBusConn != null) { System.err.println("updateGroup is not yet implemented via dbus"); - System.exit(1); + return 1; } if (!m.isRegistered()) { System.err.println("User is not registered."); - System.exit(1); + return 1; } try { @@ -312,27 +425,87 @@ public class Main { } } 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 (EncapsulatedExceptions e) { handleEncapsulatedExceptions(e); - } catch (UntrustedIdentityException e) { - e.printStackTrace(); + return 3; } + 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()) { + System.out.println(String.format("%s: %s Added: %s Fingerprint: %s", keys.getKey(), id.trustLevel, id.added, Hex.toStringCondensed(id.getFingerprint()))); + } + } + } else { + String number = ns.getString("number"); + for (JsonIdentityKeyStore.Identity id : m.getIdentities(number)) { + System.out.println(String.format("%s: %s Added: %s Fingerprint: %s", number, id.trustLevel, id.added, Hex.toStringCondensed(id.getFingerprint()))); + } + } + 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) { + byte[] fingerprintBytes; + try { + fingerprintBytes = Hex.toByteArray(fingerprint.replaceAll(" ", "").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 { + 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 { @@ -348,15 +521,16 @@ public class Main { conn.requestBusName(SIGNAL_BUSNAME); } catch (DBusException e) { e.printStackTrace(); - System.exit(3); + return 2; } try { m.receiveMessages(3600, false, new DbusReceiveMessageHandler(m, conn)); } 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) { @@ -366,7 +540,7 @@ public class Main { break; } - System.exit(0); + return 0; } finally { if (dBusConn != null) { dBusConn.disconnect(); @@ -377,13 +551,11 @@ 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 byte[] decodeGroupId(String groupId) { @@ -407,7 +579,7 @@ public class Main { .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") @@ -425,6 +597,23 @@ 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.") @@ -465,6 +654,21 @@ public class Main { .nargs("*") .help("Specify one or more members to add to the group"); + 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) @@ -477,7 +681,13 @@ public class Main { 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)"); @@ -503,7 +713,6 @@ public class Main { 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) { @@ -523,6 +732,18 @@ public class Main { System.err.println("Failed to send message: " + e.getMessage()); } + private static String readAll(InputStream in) throws IOException { + StringWriter output = new StringWriter(); + byte[] buffer = new byte[4096]; + long count = 0; + int n; + while (-1 != (n = System.in.read(buffer))) { + output.write(new String(buffer, 0, n, Charset.defaultCharset())); + count += n; + } + return output.toString(); + } + private static class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { final Manager m; @@ -531,9 +752,10 @@ public class Main { } @Override - public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, GroupInfo group) { + public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content) { SignalServiceAddress source = envelope.getSourceAddress(); - System.out.println(String.format("Envelope from: %s (device: %d)", source.getNumber(), envelope.getSourceDevice())); + ContactInfo sourceContact = m.getContact(source.getNumber()); + System.out.println(String.format("Envelope from: %s (device: %d)", (sourceContact == null ? "" : "“" + sourceContact.name + "” ") + source.getNumber(), envelope.getSourceDevice())); if (source.getRelay().isPresent()) { System.out.println("Relayed by: " + source.getRelay().get()); } @@ -547,9 +769,10 @@ public class Main { } else { if (content.getDataMessage().isPresent()) { SignalServiceDataMessage message = content.getDataMessage().get(); - handleSignalServiceDataMessage(message, group); + handleSignalServiceDataMessage(message); } if (content.getSyncMessage().isPresent()) { + System.out.println("Received a sync message"); SignalServiceSyncMessage syncMessage = content.getSyncMessage().get(); if (syncMessage.getContacts().isPresent()) { @@ -563,7 +786,8 @@ public class Main { if (syncMessage.getRead().isPresent()) { System.out.println("Received sync read messages list"); for (ReadMessage rm : syncMessage.getRead().get()) { - System.out.println("From: " + rm.getSender() + " Message timestamp: " + rm.getTimestamp()); + ContactInfo fromContact = m.getContact(rm.getSender()); + System.out.println("From: " + (fromContact == null ? "" : "“" + fromContact.name + "” ") + rm.getSender() + " Message timestamp: " + rm.getTimestamp()); } } if (syncMessage.getRequest().isPresent()) { @@ -578,9 +802,17 @@ public class Main { if (syncMessage.getSent().isPresent()) { System.out.println("Received sync sent message"); final SentTranscriptMessage sentTranscriptMessage = syncMessage.getSent().get(); - System.out.println("To: " + (sentTranscriptMessage.getDestination().isPresent() ? sentTranscriptMessage.getDestination().get() : "Unknown") + " , Message timestamp: " + sentTranscriptMessage.getTimestamp()); + String to; + if (sentTranscriptMessage.getDestination().isPresent()) { + String dest = sentTranscriptMessage.getDestination().get(); + ContactInfo destContact = m.getContact(dest); + to = (destContact == null ? "" : "“" + destContact.name + "” ") + dest; + } else { + to = "Unknown"; + } + System.out.println("To: " + to + " , Message timestamp: " + sentTranscriptMessage.getTimestamp()); SignalServiceDataMessage message = sentTranscriptMessage.getMessage(); - handleSignalServiceDataMessage(message, null); + handleSignalServiceDataMessage(message); } } } @@ -590,8 +822,7 @@ public class Main { System.out.println(); } - // TODO remove group parameter - private void handleSignalServiceDataMessage(SignalServiceDataMessage message, GroupInfo group) { + private void handleSignalServiceDataMessage(SignalServiceDataMessage message) { System.out.println("Message timestamp: " + message.getTimestamp()); if (message.getBody().isPresent()) { @@ -601,12 +832,15 @@ public class Main { SignalServiceGroup groupInfo = message.getGroupInfo().get(); System.out.println("Group info:"); System.out.println(" Id: " + Base64.encodeBytes(groupInfo.getGroupId())); - if (groupInfo.getName().isPresent()) { + if (groupInfo.getType() == SignalServiceGroup.Type.UPDATE && 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: "); + GroupInfo group = m.getGroup(groupInfo.getGroupId()); + if (group != null) { + System.out.println(" Name: " + group.name); + } else { + System.out.println(" Name: "); + } } System.out.println(" Type: " + groupInfo.getType()); if (groupInfo.getMembers().isPresent()) { @@ -654,8 +888,8 @@ public class Main { } @Override - public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, GroupInfo group) { - super.handleMessage(envelope, content, group); + public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content) { + super.handleMessage(envelope, content); if (!envelope.isReceipt() && content != null && content.getDataMessage().isPresent()) { SignalServiceDataMessage message = content.getDataMessage().get(); @@ -687,17 +921,5 @@ public class Main { } } - 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); - } - } - } } }