X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/8ad9c9b0ff3d12c4cdd3557513c8756973244ce4..416f43b225f20e6b40292d00e05ddd9733f3cc2d:/src/main/java/org/asamk/signal/ReceiveMessageHandler.java diff --git a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java index e2cb6636..1460aa61 100644 --- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java +++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java @@ -5,6 +5,7 @@ import org.asamk.signal.storage.contacts.ContactInfo; import org.asamk.signal.storage.groups.GroupInfo; import org.asamk.signal.util.DateUtils; import org.asamk.signal.util.Util; +import org.signal.libsignal.metadata.ProtocolUntrustedIdentityException; import org.whispersystems.signalservice.api.messages.SignalServiceAttachment; import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer; import org.whispersystems.signalservice.api.messages.SignalServiceContent; @@ -25,9 +26,12 @@ import org.whispersystems.signalservice.api.messages.multidevice.ContactsMessage 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.multidevice.StickerPackOperationMessage; import org.whispersystems.signalservice.api.messages.multidevice.VerifiedMessage; +import org.whispersystems.signalservice.api.messages.multidevice.ViewOnceOpenMessage; +import org.whispersystems.signalservice.api.messages.shared.SharedContact; import org.whispersystems.signalservice.api.push.SignalServiceAddress; -import org.whispersystems.signalservice.internal.util.Base64; +import org.whispersystems.util.Base64; import java.io.File; import java.util.List; @@ -42,11 +46,15 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { @Override 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()); + if (!envelope.isUnidentifiedSender() && envelope.hasSource()) { + SignalServiceAddress source = envelope.getSourceAddress(); + ContactInfo sourceContact = m.getContact(source.getNumber().get()); + System.out.println(String.format("Envelope from: %s (device: %d)", (sourceContact == null ? "" : "“" + sourceContact.name + "” ") + source.getNumber().get(), envelope.getSourceDevice())); + if (source.getRelay().isPresent()) { + System.out.println("Relayed by: " + source.getRelay().get()); + } + } else { + System.out.println("Envelope from: unknown source"); } System.out.println("Timestamp: " + DateUtils.formatTimestamp(envelope.getTimestamp())); if (envelope.isUnidentifiedSender()) { @@ -62,6 +70,11 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { 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 if (exception instanceof ProtocolUntrustedIdentityException) { + ProtocolUntrustedIdentityException e = (ProtocolUntrustedIdentityException) 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.getSender() + "', verify the key and run 'signal-cli -u " + m.getUsername() + " trust -v \"FINGER_PRINT\" " + e.getSender() + "' to mark it as trusted"); + System.out.println("If you don't care about security, use 'signal-cli -u " + m.getUsername() + " trust -a " + e.getSender() + "' to trust it without verification"); } else { System.out.println("Exception: " + exception.getMessage() + " (" + exception.getClass().getSimpleName() + ")"); } @@ -69,7 +82,8 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { if (content == null) { System.out.println("Failed to decrypt message."); } else { - System.out.println(String.format("Sender: %s (device: %d)", content.getSender(), content.getSenderDevice())); + ContactInfo sourceContact = m.getContact(content.getSender().getNumber().get()); + System.out.println(String.format("Sender: %s (device: %d)", (sourceContact == null ? "" : "“" + sourceContact.name + "” ") + content.getSender().getNumber().get(), content.getSenderDevice())); if (content.getDataMessage().isPresent()) { SignalServiceDataMessage message = content.getDataMessage().get(); handleSignalServiceDataMessage(message); @@ -94,8 +108,8 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { if (syncMessage.getRead().isPresent()) { 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: " + DateUtils.formatTimestamp(rm.getTimestamp())); + ContactInfo fromContact = m.getContact(rm.getSender().getNumber().get()); + System.out.println("From: " + (fromContact == null ? "" : "“" + fromContact.name + "” ") + rm.getSender().getNumber().get() + " Message timestamp: " + DateUtils.formatTimestamp(rm.getTimestamp())); } } if (syncMessage.getRequest().isPresent()) { @@ -112,9 +126,16 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { final SentTranscriptMessage sentTranscriptMessage = syncMessage.getSent().get(); String to; if (sentTranscriptMessage.getDestination().isPresent()) { - String dest = sentTranscriptMessage.getDestination().get(); + String dest = sentTranscriptMessage.getDestination().get().getNumber().get(); ContactInfo destContact = m.getContact(dest); to = (destContact == null ? "" : "“" + destContact.name + "” ") + dest; + } else if (sentTranscriptMessage.getRecipients().size() > 0) { + StringBuilder toBuilder = new StringBuilder(); + for (SignalServiceAddress dest : sentTranscriptMessage.getRecipients()) { + ContactInfo destContact = m.getContact(dest.getNumber().get()); + toBuilder.append(destContact == null ? "" : "“" + destContact.name + "” ").append(dest.getNumber().get()).append(" "); + } + to = toBuilder.toString(); } else { to = "Unknown"; } @@ -129,15 +150,15 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { 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); + for (SignalServiceAddress address : blockedList.getAddresses()) { + System.out.println(" - " + address.getNumber().get()); } } 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())); + String safetyNumber = Util.formatSafetyNumber(m.computeSafetyNumber(verifiedMessage.getDestination().getNumber().get(), verifiedMessage.getIdentityKey())); System.out.println(" " + safetyNumber); } if (syncMessage.getConfiguration().isPresent()) { @@ -147,6 +168,29 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { System.out.println(" - Read receipts: " + (configurationMessage.getReadReceipts().get() ? "enabled" : "disabled")); } } + if (syncMessage.getFetchType().isPresent()) { + final SignalServiceSyncMessage.FetchType fetchType = syncMessage.getFetchType().get(); + System.out.println("Received sync message with fetch type: " + fetchType.toString()); + } + if (syncMessage.getViewOnceOpen().isPresent()) { + final ViewOnceOpenMessage viewOnceOpenMessage = syncMessage.getViewOnceOpen().get(); + System.out.println("Received sync message with view once open message:"); + System.out.println(" - Sender:" + viewOnceOpenMessage.getSender().getNumber().get()); + System.out.println(" - Timestamp:" + viewOnceOpenMessage.getTimestamp()); + } + if (syncMessage.getStickerPackOperations().isPresent()) { + final List stickerPackOperationMessages = syncMessage.getStickerPackOperations().get(); + System.out.println("Received sync message with sticker pack operations:"); + for (StickerPackOperationMessage m : stickerPackOperationMessages) { + System.out.println(" - " + m.getType().toString()); + if (m.getPackId().isPresent()) { + System.out.println(" packId: " + Base64.encodeBytes(m.getPackId().get())); + } + if (m.getPackKey().isPresent()) { + System.out.println(" packKey: " + Base64.encodeBytes(m.getPackKey().get())); + } + } + } } if (content.getCallMessage().isPresent()) { System.out.println("Received a call message"); @@ -232,8 +276,8 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { } System.out.println(" Type: " + groupInfo.getType()); if (groupInfo.getMembers().isPresent()) { - for (String member : groupInfo.getMembers().get()) { - System.out.println(" Member: " + member); + for (SignalServiceAddress member : groupInfo.getMembers().get()) { + System.out.println(" Member: " + member.getNumber().get()); } } if (groupInfo.getAvatar().isPresent()) { @@ -241,6 +285,33 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { printAttachment(groupInfo.getAvatar().get()); } } + if (message.getPreviews().isPresent()) { + final List previews = message.getPreviews().get(); + System.out.println("Previes:"); + for (SignalServiceDataMessage.Preview preview : previews) { + System.out.println(" - Title: " + preview.getTitle()); + System.out.println(" - Url: " + preview.getUrl()); + if (preview.getImage().isPresent()) { + printAttachment(preview.getImage().get()); + } + } + } + if (message.getSharedContacts().isPresent()) { + final List sharedContacts = message.getSharedContacts().get(); + System.out.println("Contacts:"); + for (SharedContact contact : sharedContacts) { + System.out.println(" - Name: " + contact.getName()); + // TODO show or store rest of the contact info + } + } + if (message.getSticker().isPresent()) { + final SignalServiceDataMessage.Sticker sticker = message.getSticker().get(); + System.out.println("Sticker:"); + System.out.println(" - Pack id: " + Base64.encodeBytes(sticker.getPackId())); + System.out.println(" - Pack key: " + Base64.encodeBytes(sticker.getPackKey())); + System.out.println(" - Sticker id: " + sticker.getStickerId()); + // TODO also download sticker image ?? + } if (message.isEndSession()) { System.out.println("Is end session"); } @@ -254,10 +325,19 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { System.out.println("Profile key update, key length:" + message.getProfileKey().get().length); } + if (message.getReaction().isPresent()) { + final SignalServiceDataMessage.Reaction reaction = message.getReaction().get(); + System.out.println("Reaction:"); + System.out.println(" - Emoji: " + reaction.getEmoji()); + System.out.println(" - Target author: " + reaction.getTargetAuthor().getNumber().get()); + System.out.println(" - Target timestamp: " + reaction.getTargetSentTimestamp()); + System.out.println(" - Is remove: " + reaction.isRemove()); + } + 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(" Author: " + quote.getAuthor().getNumber().get()); System.out.println(" Text: " + quote.getText()); if (quote.getAttachments().size() > 0) { System.out.println(" Attachments: ");