X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/1781984221365b75d859e9feb81dcf79e7475e7d..2c6796e3ce830b0285223baa11ec5e8553b4d52f:/src/main/java/cli/Manager.java diff --git a/src/main/java/cli/Manager.java b/src/main/java/cli/Manager.java index 7ca2c123..a1d58f03 100644 --- a/src/main/java/cli/Manager.java +++ b/src/main/java/cli/Manager.java @@ -36,10 +36,7 @@ import org.whispersystems.textsecure.api.TextSecureMessagePipe; import org.whispersystems.textsecure.api.TextSecureMessageReceiver; import org.whispersystems.textsecure.api.TextSecureMessageSender; import org.whispersystems.textsecure.api.crypto.TextSecureCipher; -import org.whispersystems.textsecure.api.messages.TextSecureAttachmentPointer; -import org.whispersystems.textsecure.api.messages.TextSecureContent; -import org.whispersystems.textsecure.api.messages.TextSecureDataMessage; -import org.whispersystems.textsecure.api.messages.TextSecureEnvelope; +import org.whispersystems.textsecure.api.messages.*; import org.whispersystems.textsecure.api.push.TextSecureAddress; import org.whispersystems.textsecure.api.push.TrustStore; import org.whispersystems.textsecure.api.push.exceptions.EncapsulatedExceptions; @@ -47,6 +44,7 @@ import org.whispersystems.textsecure.api.util.InvalidNumberException; import org.whispersystems.textsecure.api.util.PhoneNumberFormatter; import java.io.*; +import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import java.util.concurrent.TimeUnit; @@ -75,6 +73,7 @@ class Manager { private JsonAxolotlStore axolotlStore; private TextSecureAccountManager accountManager; + private JsonGroupStore groupStore; public Manager(String username) { this.username = username; @@ -107,7 +106,6 @@ class Manager { return node; } - public void load() throws IOException, InvalidKeyException { JsonNode rootNode = jsonProcessot.readTree(new File(getFileName())); @@ -128,6 +126,10 @@ class Manager { } axolotlStore = jsonProcessot.convertValue(getNotNullNode(rootNode, "axolotlStore"), JsonAxolotlStore.class); //new JsonAxolotlStore(in.getJSONObject("axolotlStore")); registered = getNotNullNode(rootNode, "registered").asBoolean(); + JsonNode groupStoreNode = rootNode.get("groupStore"); + if (groupStoreNode != null) { + groupStore = jsonProcessot.convertValue(groupStoreNode, JsonGroupStore.class); + } accountManager = new TextSecureAccountManager(URL, TRUST_STORE, username, password, USER_AGENT); } @@ -140,6 +142,7 @@ class Manager { .put("nextSignedPreKeyId", nextSignedPreKeyId) .put("registered", registered) .putPOJO("axolotlStore", axolotlStore) + .putPOJO("groupStore", groupStore) ; try { jsonProcessot.writeValue(new File(getFileName()), rootNode); @@ -152,6 +155,7 @@ class Manager { IdentityKeyPair identityKey = KeyHelper.generateIdentityKeyPair(); int registrationId = KeyHelper.generateRegistrationId(false); axolotlStore = new JsonAxolotlStore(identityKey, registrationId); + groupStore = new JsonGroupStore(); registered = false; } @@ -239,14 +243,32 @@ class Manager { accountManager.setPreKeys(axolotlStore.getIdentityKeyPair().getPublicKey(), lastResortKey, signedPreKeyRecord, oneTimePreKeys); } - public void sendMessage(List recipients, TextSecureDataMessage message) + public void sendMessage(List recipients, TextSecureDataMessage message) throws IOException, EncapsulatedExceptions { TextSecureMessageSender messageSender = new TextSecureMessageSender(URL, TRUST_STORE, username, password, axolotlStore, USER_AGENT, Optional.absent()); - messageSender.sendMessage(recipients, message); + + List recipientsTS = new ArrayList<>(recipients.size()); + for (String recipient : recipients) { + try { + recipientsTS.add(getPushAddress(recipient)); + } catch (InvalidNumberException e) { + System.err.println("Failed to add recipient \"" + recipient + "\": " + e.getMessage()); + System.err.println("Aborting sending."); + return; + } + } + + messageSender.sendMessage(recipientsTS, message); + + if (message.isEndSession()) { + for (TextSecureAddress recipient : recipientsTS) { + handleEndSession(recipient.getNumber()); + } + } } - public TextSecureContent decryptMessage(TextSecureEnvelope envelope) { + private TextSecureContent decryptMessage(TextSecureEnvelope envelope) { TextSecureCipher cipher = new TextSecureCipher(new TextSecureAddress(username), axolotlStore); try { return cipher.decrypt(envelope); @@ -257,12 +279,12 @@ class Manager { } } - public void handleEndSession(String source) { + private void handleEndSession(String source) { axolotlStore.deleteAllSessions(source); } public interface ReceiveMessageHandler { - void handleMessage(TextSecureEnvelope envelope); + void handleMessage(TextSecureEnvelope envelope, TextSecureContent decryptedContent, GroupInfo group); } public void receiveMessages(int timeoutSeconds, boolean returnOnTimeout, ReceiveMessageHandler handler) throws IOException { @@ -274,9 +296,64 @@ class Manager { while (true) { TextSecureEnvelope envelope; + TextSecureContent content = null; + GroupInfo group = null; try { envelope = messagePipe.read(timeoutSeconds, TimeUnit.SECONDS); - handler.handleMessage(envelope); + if (!envelope.isReceipt()) { + content = decryptMessage(envelope); + if (content != null) { + if (content.getDataMessage().isPresent()) { + TextSecureDataMessage message = content.getDataMessage().get(); + if (message.getGroupInfo().isPresent()) { + TextSecureGroup groupInfo = message.getGroupInfo().get(); + switch (groupInfo.getType()) { + case UPDATE: + long avatarId = 0; + if (groupInfo.getAvatar().isPresent()) { + TextSecureAttachment avatar = groupInfo.getAvatar().get(); + if (avatar.isPointer()) { + avatarId = avatar.asPointer().getId(); + try { + retrieveAttachment(avatar.asPointer()); + } catch (IOException | InvalidMessageException e) { + System.err.println("Failed to retrieve group avatar (" + avatarId + "): " + e.getMessage()); + } + } + } + + group = new GroupInfo(groupInfo.getGroupId(), groupInfo.getName().get(), groupInfo.getMembers().get(), avatarId); + groupStore.updateGroup(group); + break; + case DELIVER: + group = groupStore.getGroup(groupInfo.getGroupId()); + break; + case QUIT: + group = groupStore.getGroup(groupInfo.getGroupId()); + if (group != null) { + group.members.remove(envelope.getSource()); + } + break; + } + } + if (message.isEndSession()) { + handleEndSession(envelope.getSource()); + } + if (message.getAttachments().isPresent()) { + for (TextSecureAttachment attachment : message.getAttachments().get()) { + if (attachment.isPointer()) { + try { + retrieveAttachment(attachment.asPointer()); + } catch (IOException | InvalidMessageException e) { + System.err.println("Failed to retrieve attachment (" + attachment.asPointer().getId() + "): " + e.getMessage()); + } + } + } + } + } + } + } + handler.handleMessage(envelope, content, group); } catch (TimeoutException e) { if (returnOnTimeout) return; @@ -291,14 +368,18 @@ class Manager { } } - public File retrieveAttachment(TextSecureAttachmentPointer pointer) throws IOException, InvalidMessageException { + public File getAttachmentFile(long attachmentId) { + return new File(attachmentsPath + "/" + attachmentId); + } + + private File retrieveAttachment(TextSecureAttachmentPointer pointer) throws IOException, InvalidMessageException { final TextSecureMessageReceiver messageReceiver = new TextSecureMessageReceiver(URL, TRUST_STORE, username, password, signalingKey, USER_AGENT); File tmpFile = File.createTempFile("ts_attach_" + pointer.getId(), ".tmp"); InputStream input = messageReceiver.retrieveAttachment(pointer, tmpFile); new File(attachmentsPath).mkdirs(); - File outputFile = new File(attachmentsPath + "/" + pointer.getId()); + File outputFile = getAttachmentFile(pointer.getId()); OutputStream output = null; try { output = new FileOutputStream(outputFile); @@ -343,8 +424,12 @@ class Manager { return PhoneNumberFormatter.formatNumber(number, localNumber); } - TextSecureAddress getPushAddress(String number) throws InvalidNumberException { + private TextSecureAddress getPushAddress(String number) throws InvalidNumberException { String e164number = canonicalizeNumber(number); return new TextSecureAddress(e164number); } + + public GroupInfo getGroupInfo(byte[] groupId) { + return groupStore.getGroup(groupId); + } }