X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/b2efef4d8c3238b413fe9fe758bd6a5c428498a2..591c0fe8a3744608575a6dcb1f6f4f9f818948d2:/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 eeac7cb5..2e9654a0 100644 --- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java +++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java @@ -11,6 +11,8 @@ import org.whispersystems.signalservice.api.messages.SignalServiceContent; import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage; import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope; import org.whispersystems.signalservice.api.messages.SignalServiceGroup; +import org.whispersystems.signalservice.api.messages.SignalServiceGroupContext; +import org.whispersystems.signalservice.api.messages.SignalServiceGroupV2; import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage; import org.whispersystems.signalservice.api.messages.SignalServiceTypingMessage; import org.whispersystems.signalservice.api.messages.calls.AnswerMessage; @@ -22,12 +24,17 @@ import org.whispersystems.signalservice.api.messages.calls.SignalServiceCallMess import org.whispersystems.signalservice.api.messages.multidevice.BlockedListMessage; import org.whispersystems.signalservice.api.messages.multidevice.ConfigurationMessage; import org.whispersystems.signalservice.api.messages.multidevice.ContactsMessage; +import org.whispersystems.signalservice.api.messages.multidevice.KeysMessage; +import org.whispersystems.signalservice.api.messages.multidevice.MessageRequestResponseMessage; 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 +49,17 @@ 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.getLegacyIdentifier()); + System.out.println(String.format("Envelope from: %s (device: %d)", + (sourceContact == null ? "" : "“" + sourceContact.name + "” ") + source.getLegacyIdentifier(), + 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()) { @@ -55,20 +68,39 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { if (envelope.isReceipt()) { System.out.println("Got receipt."); - } else if (envelope.isSignalMessage() | envelope.isPreKeySignalMessage()) { + } else if (envelope.isSignalMessage() || envelope.isPreKeySignalMessage() || envelope.isUnidentifiedSender()) { 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"); + 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() + ")"); + System.out.println("Exception: " + exception.getMessage() + " (" + exception.getClass() + .getSimpleName() + ")"); } } if (content == null) { System.out.println("Failed to decrypt message."); } else { + ContactInfo sourceContact = m.getContact(content.getSender().getLegacyIdentifier()); + System.out.println(String.format("Sender: %s (device: %d)", + (sourceContact == null ? "" : "“" + sourceContact.name + "” ") + content.getSender() + .getLegacyIdentifier(), + content.getSenderDevice())); if (content.getDataMessage().isPresent()) { SignalServiceDataMessage message = content.getDataMessage().get(); handleSignalServiceDataMessage(message); @@ -93,8 +125,12 @@ 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().getLegacyIdentifier()); + System.out.println("From: " + + (fromContact == null ? "" : "“" + fromContact.name + "” ") + + rm.getSender().getLegacyIdentifier() + + " Message timestamp: " + + DateUtils.formatTimestamp(rm.getTimestamp())); } } if (syncMessage.getRequest().isPresent()) { @@ -105,21 +141,41 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { if (syncMessage.getRequest().get().isGroupsRequest()) { System.out.println(" - groups request"); } + if (syncMessage.getRequest().get().isBlockedListRequest()) { + System.out.println(" - blocked list request"); + } + if (syncMessage.getRequest().get().isConfigurationRequest()) { + System.out.println(" - configuration request"); + } + if (syncMessage.getRequest().get().isKeysRequest()) { + System.out.println(" - keys request"); + } } if (syncMessage.getSent().isPresent()) { System.out.println("Received sync sent message"); final SentTranscriptMessage sentTranscriptMessage = syncMessage.getSent().get(); String to; if (sentTranscriptMessage.getDestination().isPresent()) { - String dest = sentTranscriptMessage.getDestination().get(); + String dest = sentTranscriptMessage.getDestination().get().getLegacyIdentifier(); 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.getLegacyIdentifier()); + toBuilder.append(destContact == null ? "" : "“" + destContact.name + "” ") + .append(dest.getLegacyIdentifier()) + .append(" "); + } + to = toBuilder.toString(); } else { to = "Unknown"; } - System.out.println("To: " + to + " , Message timestamp: " + DateUtils.formatTimestamp(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())); + System.out.println("Expiration started at: " + DateUtils.formatTimestamp( + sentTranscriptMessage.getExpirationStartTimestamp())); } SignalServiceDataMessage message = sentTranscriptMessage.getMessage(); handleSignalServiceDataMessage(message); @@ -128,22 +184,95 @@ 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.getLegacyIdentifier()); } } 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(" - " + + 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")); + System.out.println(" - Read receipts: " + ( + configurationMessage.getReadReceipts().get() ? "enabled" : "disabled" + )); + } + if (configurationMessage.getLinkPreviews().isPresent()) { + System.out.println(" - Link previews: " + ( + configurationMessage.getLinkPreviews().get() ? "enabled" : "disabled" + )); + } + if (configurationMessage.getTypingIndicators().isPresent()) { + System.out.println(" - Typing indicators: " + ( + configurationMessage.getTypingIndicators().get() ? "enabled" : "disabled" + )); + } + if (configurationMessage.getUnidentifiedDeliveryIndicators().isPresent()) { + System.out.println(" - Unidentified Delivery Indicators: " + ( + configurationMessage.getUnidentifiedDeliveryIndicators().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().getLegacyIdentifier()); + 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 (syncMessage.getMessageRequestResponse().isPresent()) { + final MessageRequestResponseMessage requestResponseMessage = syncMessage.getMessageRequestResponse() + .get(); + System.out.println("Received message request response:"); + System.out.println(" Type: " + requestResponseMessage.getType()); + if (requestResponseMessage.getGroupId().isPresent()) { + System.out.println(" Group id: " + Base64.encodeBytes(requestResponseMessage.getGroupId() + .get())); + } + if (requestResponseMessage.getPerson().isPresent()) { + System.out.println(" Person: " + requestResponseMessage.getPerson() + .get() + .getLegacyIdentifier()); + } + } + if (syncMessage.getKeys().isPresent()) { + final KeysMessage keysMessage = syncMessage.getKeys().get(); + System.out.println("Received sync message with keys:"); + if (keysMessage.getStorageService().isPresent()) { + System.out.println(" With storage key length: " + keysMessage.getStorageService() + .get() + .serialize().length); + } else { + System.out.println(" With empty storage key"); } } } @@ -152,7 +281,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { SignalServiceCallMessage callMessage = content.getCallMessage().get(); if (callMessage.getAnswerMessage().isPresent()) { AnswerMessage answerMessage = callMessage.getAnswerMessage().get(); - System.out.println("Answer message: " + answerMessage.getId() + ": " + answerMessage.getDescription()); + System.out.println("Answer message: " + answerMessage.getId() + ": " + answerMessage.getSdp()); } if (callMessage.getBusyMessage().isPresent()) { BusyMessage busyMessage = callMessage.getBusyMessage().get(); @@ -165,12 +294,15 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { if (callMessage.getIceUpdateMessages().isPresent()) { List iceUpdateMessages = callMessage.getIceUpdateMessages().get(); for (IceUpdateMessage iceUpdateMessage : iceUpdateMessages) { - System.out.println("Ice update message: " + iceUpdateMessage.getId() + ", sdp: " + iceUpdateMessage.getSdp()); + 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()); + System.out.println("Offer message: " + offerMessage.getId() + ": " + offerMessage.getSdp()); } } if (content.getReceiptMessage().isPresent()) { @@ -194,11 +326,13 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { System.out.println(" - Action: " + typingMessage.getAction()); System.out.println(" - Timestamp: " + DateUtils.formatTimestamp(typingMessage.getTimestamp())); if (typingMessage.getGroupId().isPresent()) { + System.out.println(" - Group Info:"); + System.out.println(" Id: " + Base64.encodeBytes(typingMessage.getGroupId().get())); GroupInfo group = m.getGroup(typingMessage.getGroupId().get()); if (group != null) { - System.out.println(" Name: " + group.name); + System.out.println(" Name: " + group.getTitle()); } else { - System.out.println(" Name: "); + System.out.println(" Name: "); } } } @@ -211,35 +345,81 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { private void handleSignalServiceDataMessage(SignalServiceDataMessage message) { System.out.println("Message timestamp: " + DateUtils.formatTimestamp(message.getTimestamp())); + if (message.isViewOnce()) { + System.out.println("=VIEW ONCE="); + } if (message.getBody().isPresent()) { System.out.println("Body: " + message.getBody().get()); } - if (message.getGroupInfo().isPresent()) { - SignalServiceGroup groupInfo = message.getGroupInfo().get(); + if (message.getGroupContext().isPresent()) { System.out.println("Group info:"); - System.out.println(" Id: " + Base64.encodeBytes(groupInfo.getGroupId())); - if (groupInfo.getType() == SignalServiceGroup.Type.UPDATE && groupInfo.getName().isPresent()) { - System.out.println(" Name: " + groupInfo.getName().get()); - } else { - GroupInfo group = m.getGroup(groupInfo.getGroupId()); + final SignalServiceGroupContext groupContext = message.getGroupContext().get(); + if (groupContext.getGroupV1().isPresent()) { + SignalServiceGroup groupInfo = groupContext.getGroupV1().get(); + System.out.println(" Id: " + Base64.encodeBytes(groupInfo.getGroupId())); + if (groupInfo.getType() == SignalServiceGroup.Type.UPDATE && groupInfo.getName().isPresent()) { + System.out.println(" Name: " + groupInfo.getName().get()); + } else { + GroupInfo group = m.getGroup(groupInfo.getGroupId()); + if (group != null) { + System.out.println(" Name: " + group.getTitle()); + } else { + System.out.println(" Name: "); + } + } + System.out.println(" Type: " + groupInfo.getType()); + if (groupInfo.getMembers().isPresent()) { + for (SignalServiceAddress member : groupInfo.getMembers().get()) { + System.out.println(" Member: " + member.getLegacyIdentifier()); + } + } + if (groupInfo.getAvatar().isPresent()) { + System.out.println(" Avatar:"); + printAttachment(groupInfo.getAvatar().get()); + } + } else if (groupContext.getGroupV2().isPresent()) { + final SignalServiceGroupV2 groupInfo = groupContext.getGroupV2().get(); + byte[] groupId = m.getGroupId(groupInfo.getMasterKey()); + System.out.println(" Id: " + Base64.encodeBytes(groupId)); + GroupInfo group = m.getGroup(groupId); if (group != null) { - System.out.println(" Name: " + group.name); + System.out.println(" Name: " + group.getTitle()); } else { System.out.println(" Name: "); } + System.out.println(" Revision: " + groupInfo.getRevision()); + System.out.println(" Master key length: " + groupInfo.getMasterKey().serialize().length); + System.out.println(" Has signed group change: " + groupInfo.hasSignedGroupChange()); } - System.out.println(" Type: " + groupInfo.getType()); - if (groupInfo.getMembers().isPresent()) { - for (String member : groupInfo.getMembers().get()) { - System.out.println(" Member: " + member); + } + if (message.getPreviews().isPresent()) { + final List previews = message.getPreviews().get(); + System.out.println("Previews:"); + 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 (groupInfo.getAvatar().isPresent()) { - System.out.println(" Avatar:"); - printAttachment(groupInfo.getAvatar().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"); } @@ -253,10 +433,20 @@ 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: " + m.resolveSignalServiceAddress(reaction.getTargetAuthor()) + .getLegacyIdentifier()); + 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().getLegacyIdentifier()); System.out.println(" Text: " + quote.getText()); if (quote.getAttachments().size() > 0) { System.out.println(" Attachments: "); @@ -271,6 +461,24 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { } } + if (message.getRemoteDelete().isPresent()) { + final SignalServiceDataMessage.RemoteDelete remoteDelete = message.getRemoteDelete().get(); + System.out.println("Remote delete message: timestamp = " + remoteDelete.getTargetSentTimestamp()); + } + if (message.getMentions().isPresent()) { + final List mentions = message.getMentions().get(); + System.out.println("Mentions: "); + for (SignalServiceDataMessage.Mention mention : mentions) { + System.out.println("- " + + mention.getUuid() + + ": " + + mention.getStart() + + " (length: " + + mention.getLength() + + ")"); + } + } + if (message.getAttachments().isPresent()) { System.out.println("Attachments: "); for (SignalServiceAttachment attachment : message.getAttachments().get()) { @@ -280,15 +488,25 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { } private void printAttachment(SignalServiceAttachment attachment) { - System.out.println("- " + attachment.getContentType() + " (" + (attachment.isPointer() ? "Pointer" : "") + (attachment.isStream() ? "Stream" : "") + ")"); + 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); - 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(" Id: " + pointer.getRemoteId() + " 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()); + File file = m.getAttachmentFile(pointer.getRemoteId()); if (file.exists()) { System.out.println(" Stored plaintext in: " + file); }