X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/1efdf04394d8f5daf919e3ba739d5b32186093ce..7443225d96fd830c8abb2afd49381f6b38ce5aec:/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 4b95d58e..03d1c3cc 100644 --- a/src/main/java/org/asamk/signal/Main.java +++ b/src/main/java/org/asamk/signal/Main.java @@ -16,32 +16,45 @@ */ package org.asamk.signal; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.node.ObjectNode; import net.sourceforge.argparse4j.ArgumentParsers; import net.sourceforge.argparse4j.impl.Arguments; import net.sourceforge.argparse4j.inf.*; import org.apache.http.util.TextUtils; import org.asamk.Signal; +import org.asamk.signal.storage.contacts.ContactInfo; +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.libsignal.InvalidKeyException; +import org.whispersystems.libsignal.util.guava.Optional; 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; +import org.whispersystems.signalservice.api.messages.calls.*; +import org.whispersystems.signalservice.api.messages.multidevice.*; import org.whispersystems.signalservice.api.push.SignalServiceAddress; 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.io.InputStream; -import java.io.StringWriter; import java.net.URI; import java.net.URISyntaxException; import java.nio.charset.Charset; @@ -50,6 +63,7 @@ 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; public class Main { @@ -86,9 +100,12 @@ 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) { @@ -112,7 +129,7 @@ public class Main { ts = m; if (m.userExists()) { try { - m.load(); + m.init(); } catch (Exception e) { System.err.println("Error loading state file \"" + m.getFileName() + "\": " + e.getMessage()); return 2; @@ -136,6 +153,71 @@ public class Main { 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 implemented via dbus"); @@ -150,7 +232,13 @@ public class Main { 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()); return 3; @@ -179,6 +267,9 @@ public class Main { } 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; @@ -204,6 +295,9 @@ public class Main { } catch (InvalidKeyException e) { e.printStackTrace(); return 2; + } catch (AssertionError e) { + handleAssertionError(e); + return 1; } catch (URISyntaxException e) { e.printStackTrace(); return 2; @@ -223,8 +317,8 @@ public class Main { 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()); + System.out.println(" Created: " + DateUtils.formatTimestamp(d.getCreated())); + System.out.println(" Last seen: " + DateUtils.formatTimestamp(d.getLastSeen())); } } catch (IOException e) { e.printStackTrace(); @@ -279,7 +373,7 @@ public class Main { String messageText = ns.getString("message"); if (messageText == null) { try { - messageText = readAll(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."); @@ -330,8 +424,8 @@ public class Main { dBusConn.addSigHandler(Signal.MessageReceived.class, new DBusSigHandler() { @Override public void handle(Signal.MessageReceived s) { - System.out.print(String.format("Envelope from: %s\nTimestamp: %d\nBody: %s\n", - s.getSender(), s.getTimestamp(), s.getMessage())); + 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())); @@ -345,6 +439,16 @@ public class Main { 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; @@ -361,17 +465,19 @@ public class Main { System.err.println("User is not registered."); 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()); return 3; @@ -411,11 +517,7 @@ public class Main { break; case "updateGroup": - if (dBusConn != null) { - System.err.println("updateGroup is not yet implemented via dbus"); - return 1; - } - if (!m.isRegistered()) { + if (dBusConn == null && !m.isRegistered()) { System.err.println("User is not registered."); return 1; } @@ -425,8 +527,23 @@ public class Main { if (ns.getString("group") != null) { groupId = 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) { @@ -447,6 +564,23 @@ public class Main { return 3; } + 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) { @@ -460,13 +594,13 @@ public class Main { 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()))); + printIdentityFingerprint(m, keys.getKey(), id); } } } 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()))); + printIdentityFingerprint(m, number, id); } } break; @@ -489,16 +623,28 @@ public class Main { } 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."); + 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 { @@ -528,12 +674,16 @@ 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(); 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) : new DbusReceiveMessageHandler(m, conn)); } catch (IOException e) { System.err.println("Error while receiving messages: " + e.getMessage()); return 3; @@ -557,6 +707,22 @@ public class Main { } } + 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 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 void handleGroupNotFoundException(GroupNotFoundException e) { System.err.println("Failed to send to group: " + e.getMessage()); System.err.println("Aborting sending."); @@ -586,7 +752,8 @@ public class Main { } 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); @@ -635,9 +802,23 @@ public class Main { .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") @@ -670,6 +851,11 @@ 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."); @@ -687,13 +873,25 @@ public class Main { 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); @@ -748,18 +946,6 @@ 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; @@ -768,18 +954,31 @@ public class Main { } @Override - public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content) { + public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) { SignalServiceAddress source = envelope.getSourceAddress(); 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()); } - System.out.println("Timestamp: " + envelope.getTimestamp()); + System.out.println("Timestamp: " + DateUtils.formatTimestamp(envelope.getTimestamp())); + if (envelope.isUnidentifiedSender()) { + System.out.println("Sent by unidentified/sealed sender"); + } if (envelope.isReceipt()) { System.out.println("Got receipt."); } else if (envelope.isSignalMessage() | envelope.isPreKeySignalMessage()) { + if (exception != null) { + if (exception instanceof org.whispersystems.libsignal.UntrustedIdentityException) { + org.whispersystems.libsignal.UntrustedIdentityException e = (org.whispersystems.libsignal.UntrustedIdentityException) exception; + System.out.println("The user’s key is untrusted, either the user has reinstalled Signal or a third party sent this message."); + System.out.println("Use 'signal-cli -u " + m.getUsername() + " listIdentities -n " + e.getName() + "', verify the key and run 'signal-cli -u " + m.getUsername() + " trust -v \"FINGER_PRINT\" " + e.getName() + "' to mark it as trusted"); + System.out.println("If you don't care about security, use 'signal-cli -u " + m.getUsername() + " trust -a " + e.getName() + "' to trust it without verification"); + } else { + System.out.println("Exception: " + exception.getMessage() + " (" + exception.getClass().getSimpleName() + ")"); + } + } if (content == null) { System.out.println("Failed to decrypt message."); } else { @@ -792,8 +991,13 @@ public class Main { SignalServiceSyncMessage syncMessage = content.getSyncMessage().get(); if (syncMessage.getContacts().isPresent()) { - System.out.println("Received sync contacts"); - printAttachment(syncMessage.getContacts().get()); + final ContactsMessage contactsMessage = syncMessage.getContacts().get(); + if (contactsMessage.isComplete()) { + System.out.println("Received complete sync contacts"); + } else { + System.out.println("Received sync contacts"); + } + printAttachment(contactsMessage.getContactsStream()); } if (syncMessage.getGroups().isPresent()) { System.out.println("Received sync groups"); @@ -803,7 +1007,7 @@ public class Main { System.out.println("Received sync read messages list"); for (ReadMessage rm : syncMessage.getRead().get()) { ContactInfo fromContact = m.getContact(rm.getSender()); - System.out.println("From: " + (fromContact == null ? "" : "“" + fromContact.name + "” ") + rm.getSender() + " Message timestamp: " + rm.getTimestamp()); + System.out.println("From: " + (fromContact == null ? "" : "“" + fromContact.name + "” ") + rm.getSender() + " Message timestamp: " + DateUtils.formatTimestamp(rm.getTimestamp())); } } if (syncMessage.getRequest().isPresent()) { @@ -826,10 +1030,90 @@ public class Main { } else { to = "Unknown"; } - System.out.println("To: " + to + " , Message timestamp: " + sentTranscriptMessage.getTimestamp()); + System.out.println("To: " + to + " , Message timestamp: " + DateUtils.formatTimestamp(sentTranscriptMessage.getTimestamp())); + if (sentTranscriptMessage.getExpirationStartTimestamp() > 0) { + System.out.println("Expiration started at: " + DateUtils.formatTimestamp(sentTranscriptMessage.getExpirationStartTimestamp())); + } SignalServiceDataMessage message = sentTranscriptMessage.getMessage(); handleSignalServiceDataMessage(message); } + if (syncMessage.getBlockedList().isPresent()) { + System.out.println("Received sync message with block list"); + System.out.println("Blocked numbers:"); + final BlockedListMessage blockedList = syncMessage.getBlockedList().get(); + for (String number : blockedList.getNumbers()) { + System.out.println(" - " + number); + } + } + if (syncMessage.getVerified().isPresent()) { + System.out.println("Received sync message with verified identities:"); + final VerifiedMessage verifiedMessage = syncMessage.getVerified().get(); + System.out.println(" - " + verifiedMessage.getDestination() + ": " + verifiedMessage.getVerified()); + String safetyNumber = Util.formatSafetyNumber(m.computeSafetyNumber(verifiedMessage.getDestination(), verifiedMessage.getIdentityKey())); + System.out.println(" " + safetyNumber); + } + if (syncMessage.getConfiguration().isPresent()) { + System.out.println("Received sync message with configuration:"); + final ConfigurationMessage configurationMessage = syncMessage.getConfiguration().get(); + if (configurationMessage.getReadReceipts().isPresent()) { + System.out.println(" - Read receipts: " + (configurationMessage.getReadReceipts().get() ? "enabled" : "disabled")); + } + } + } + if (content.getCallMessage().isPresent()) { + System.out.println("Received a call message"); + SignalServiceCallMessage callMessage = content.getCallMessage().get(); + if (callMessage.getAnswerMessage().isPresent()) { + AnswerMessage answerMessage = callMessage.getAnswerMessage().get(); + System.out.println("Answer message: " + answerMessage.getId() + ": " + answerMessage.getDescription()); + } + if (callMessage.getBusyMessage().isPresent()) { + BusyMessage busyMessage = callMessage.getBusyMessage().get(); + System.out.println("Busy message: " + busyMessage.getId()); + } + if (callMessage.getHangupMessage().isPresent()) { + HangupMessage hangupMessage = callMessage.getHangupMessage().get(); + System.out.println("Hangup message: " + hangupMessage.getId()); + } + if (callMessage.getIceUpdateMessages().isPresent()) { + List iceUpdateMessages = callMessage.getIceUpdateMessages().get(); + for (IceUpdateMessage iceUpdateMessage : iceUpdateMessages) { + System.out.println("Ice update message: " + iceUpdateMessage.getId() + ", sdp: " + iceUpdateMessage.getSdp()); + } + } + if (callMessage.getOfferMessage().isPresent()) { + OfferMessage offerMessage = callMessage.getOfferMessage().get(); + System.out.println("Offer message: " + offerMessage.getId() + ": " + offerMessage.getDescription()); + } + } + if (content.getReceiptMessage().isPresent()) { + System.out.println("Received a receipt message"); + SignalServiceReceiptMessage receiptMessage = content.getReceiptMessage().get(); + System.out.println(" - When: " + DateUtils.formatTimestamp(receiptMessage.getWhen())); + if (receiptMessage.isDeliveryReceipt()) { + System.out.println(" - Is delivery receipt"); + } + if (receiptMessage.isReadReceipt()) { + System.out.println(" - Is read receipt"); + } + System.out.println(" - Timestamps:"); + for (long timestamp : receiptMessage.getTimestamps()) { + System.out.println(" " + DateUtils.formatTimestamp(timestamp)); + } + } + if (content.getTypingMessage().isPresent()) { + System.out.println("Received a typing message"); + SignalServiceTypingMessage typingMessage = content.getTypingMessage().get(); + System.out.println(" - Action: " + typingMessage.getAction()); + System.out.println(" - Timestamp: " + DateUtils.formatTimestamp(typingMessage.getTimestamp())); + if (typingMessage.getGroupId().isPresent()) { + GroupInfo group = m.getGroup(typingMessage.getGroupId().get()); + if (group != null) { + System.out.println(" Name: " + group.name); + } else { + System.out.println(" Name: "); + } + } } } } else { @@ -839,7 +1123,7 @@ public class Main { } private void handleSignalServiceDataMessage(SignalServiceDataMessage message) { - System.out.println("Message timestamp: " + message.getTimestamp()); + System.out.println("Message timestamp: " + DateUtils.formatTimestamp(message.getTimestamp())); if (message.getBody().isPresent()) { System.out.println("Body: " + message.getBody().get()); @@ -872,6 +1156,33 @@ public class Main { if (message.isEndSession()) { System.out.println("Is end session"); } + if (message.isExpirationUpdate()) { + System.out.println("Is Expiration update: " + message.isExpirationUpdate()); + } + if (message.getExpiresInSeconds() > 0) { + System.out.println("Expires in: " + message.getExpiresInSeconds() + " seconds"); + } + if (message.getProfileKey().isPresent()) { + System.out.println("Profile key update, key length:" + message.getProfileKey().get().length); + } + + if (message.getQuote().isPresent()) { + SignalServiceDataMessage.Quote quote = message.getQuote().get(); + System.out.println("Quote: (" + quote.getId() + ")"); + System.out.println(" Author: " + quote.getAuthor().getNumber()); + System.out.println(" Text: " + quote.getText()); + if (quote.getAttachments().size() > 0) { + System.out.println(" Attachments: "); + for (SignalServiceDataMessage.Quote.QuotedAttachment attachment : quote.getAttachments()) { + System.out.println(" Filename: " + attachment.getFileName()); + System.out.println(" Type: " + attachment.getContentType()); + System.out.println(" Thumbnail:"); + if (attachment.getThumbnail() != null) { + printAttachment(attachment.getThumbnail()); + } + } + } + } if (message.getAttachments().isPresent()) { System.out.println("Attachments: "); @@ -885,8 +1196,11 @@ public class Main { 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(" Id: " + pointer.getId() + " Key length: " + pointer.getKey().length); + System.out.println(" Filename: " + (pointer.getFileName().isPresent() ? pointer.getFileName().get() : "-")); System.out.println(" Size: " + (pointer.getSize().isPresent() ? pointer.getSize().get() + " bytes" : "") + (pointer.getPreview().isPresent() ? " (Preview is available: " + pointer.getPreview().get().length + " bytes)" : "")); + System.out.println(" Voice note: " + (pointer.getVoiceNote() ? "yes" : "no")); + System.out.println(" Dimensions: " + pointer.getWidth() + "x" + pointer.getHeight()); File file = m.getAttachmentFile(pointer.getId()); if (file.exists()) { System.out.println(" Stored plaintext in: " + file); @@ -904,10 +1218,71 @@ public class Main { } @Override - public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content) { - super.handleMessage(envelope, content); + public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) { + super.handleMessage(envelope, content, exception); + + JsonDbusReceiveMessageHandler.sendReceivedMessageToDbus(envelope, content, conn, m); + } + } + + private static class JsonReceiveMessageHandler implements Manager.ReceiveMessageHandler { + final Manager m; + final ObjectMapper jsonProcessor; + + public JsonReceiveMessageHandler(Manager m) { + this.m = m; + this.jsonProcessor = new ObjectMapper(); + jsonProcessor.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); // disable autodetect + jsonProcessor.enable(SerializationFeature.WRITE_NULL_MAP_VALUES); + jsonProcessor.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); + jsonProcessor.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET); + } + + @Override + public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) { + ObjectNode result = jsonProcessor.createObjectNode(); + if (exception != null) { + result.putPOJO("error", new JsonError(exception)); + } + if (envelope != null) { + result.putPOJO("envelope", new JsonMessageEnvelope(envelope, content)); + } + try { + jsonProcessor.writeValue(System.out, result); + System.out.println(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + + private static class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler { + final DBusConnection conn; + + public JsonDbusReceiveMessageHandler(Manager m, DBusConnection conn) { + super(m); + this.conn = conn; + } + + @Override + public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) { + super.handleMessage(envelope, content, exception); - if (!envelope.isReceipt() && content != null && content.getDataMessage().isPresent()) { + sendReceivedMessageToDbus(envelope, content, conn, m); + } + + private static void sendReceivedMessageToDbus(SignalServiceEnvelope envelope, SignalServiceContent content, DBusConnection conn, Manager m) { + if (envelope.isReceipt()) { + try { + conn.sendSignal(new Signal.ReceiptReceived( + SIGNAL_OBJECTPATH, + envelope.getTimestamp(), + envelope.getSource() + )); + } catch (DBusException e) { + e.printStackTrace(); + } + } else if (content != null && content.getDataMessage().isPresent()) { SignalServiceDataMessage message = content.getDataMessage().get(); if (!message.isEndSession() && @@ -936,6 +1311,5 @@ public class Main { } } } - } }