X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/019efbe22cc4a70fc329ef592488fabff96b4105..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 53cbf72b..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,6 +24,8 @@ 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; @@ -48,7 +52,9 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { 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())); + 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()); } @@ -66,18 +72,35 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { 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())); + 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); @@ -103,7 +126,11 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { System.out.println("Received sync read messages list"); for (ReadMessage rm : syncMessage.getRead().get()) { ContactInfo fromContact = m.getContact(rm.getSender().getLegacyIdentifier()); - System.out.println("From: " + (fromContact == null ? "" : "“" + fromContact.name + "” ") + rm.getSender().getLegacyIdentifier() + " Message timestamp: " + DateUtils.formatTimestamp(rm.getTimestamp())); + System.out.println("From: " + + (fromContact == null ? "" : "“" + fromContact.name + "” ") + + rm.getSender().getLegacyIdentifier() + + " Message timestamp: " + + DateUtils.formatTimestamp(rm.getTimestamp())); } } if (syncMessage.getRequest().isPresent()) { @@ -136,15 +163,19 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { 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(" "); + 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); @@ -160,15 +191,38 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { 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()) { @@ -182,7 +236,8 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { System.out.println(" - Timestamp:" + viewOnceOpenMessage.getTimestamp()); } if (syncMessage.getStickerPackOperations().isPresent()) { - final List stickerPackOperationMessages = syncMessage.getStickerPackOperations().get(); + 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()); @@ -194,6 +249,32 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { } } } + 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"); + } + } } if (content.getCallMessage().isPresent()) { System.out.println("Received a call message"); @@ -213,7 +294,10 @@ 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()) { @@ -242,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: "); } } } @@ -266,34 +352,50 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { if (message.getBody().isPresent()) { System.out.println("Body: " + message.getBody().get()); } - if (message.getGroupContext().isPresent() && message.getGroupContext().get().getGroupV1().isPresent()) { - SignalServiceGroup groupInfo = message.getGroupContext().get().getGroupV1().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(" 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()); + 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()); } } if (message.getPreviews().isPresent()) { final List previews = message.getPreviews().get(); - System.out.println("Previes:"); + System.out.println("Previews:"); for (SignalServiceDataMessage.Preview preview : previews) { System.out.println(" - Title: " + preview.getTitle()); System.out.println(" - Url: " + preview.getUrl()); @@ -335,7 +437,8 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { final SignalServiceDataMessage.Reaction reaction = message.getReaction().get(); System.out.println("Reaction:"); System.out.println(" - Emoji: " + reaction.getEmoji()); - System.out.println(" - Target author: " + reaction.getTargetAuthor().getLegacyIdentifier()); // todo resolve + System.out.println(" - Target author: " + m.resolveSignalServiceAddress(reaction.getTargetAuthor()) + .getLegacyIdentifier()); System.out.println(" - Target timestamp: " + reaction.getTargetSentTimestamp()); System.out.println(" - Is remove: " + reaction.isRemove()); } @@ -366,7 +469,13 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { 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() + ")"); + System.out.println("- " + + mention.getUuid() + + ": " + + mention.getStart() + + " (length: " + + mention.getLength() + + ")"); } } @@ -379,12 +488,22 @@ 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.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(" 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.getRemoteId());