X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/c41ac8e7a32e0eaa3ab8786be14da46f4c20a08a..ef5d3a65f8de2ae8e17adfb7c307d88b0c04778a:/src/main/java/cli/Manager.java?ds=sidebyside diff --git a/src/main/java/cli/Manager.java b/src/main/java/cli/Manager.java index 2258c99d..730923ad 100644 --- a/src/main/java/cli/Manager.java +++ b/src/main/java/cli/Manager.java @@ -44,8 +44,9 @@ import org.whispersystems.textsecure.api.util.InvalidNumberException; import org.whispersystems.textsecure.api.util.PhoneNumberFormatter; import java.io.*; -import java.util.LinkedList; -import java.util.List; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; @@ -129,6 +130,9 @@ class Manager { if (groupStoreNode != null) { groupStore = jsonProcessot.convertValue(groupStoreNode, JsonGroupStore.class); } + if (groupStore == null) { + groupStore = new JsonGroupStore(); + } accountManager = new TextSecureAccountManager(URL, TRUST_STORE, username, password, USER_AGENT); } @@ -242,14 +246,157 @@ class Manager { accountManager.setPreKeys(axolotlStore.getIdentityKeyPair().getPublicKey(), lastResortKey, signedPreKeyRecord, oneTimePreKeys); } - public void sendMessage(List recipients, TextSecureDataMessage message) + + private static List getTextSecureAttachments(List attachments) throws AttachmentInvalidException { + List textSecureAttachments = null; + if (attachments != null) { + textSecureAttachments = new ArrayList<>(attachments.size()); + for (String attachment : attachments) { + try { + textSecureAttachments.add(createAttachment(attachment)); + } catch (IOException e) { + throw new AttachmentInvalidException(attachment, e); + } + } + } + return textSecureAttachments; + } + + private static TextSecureAttachmentStream createAttachment(String attachment) throws IOException { + File attachmentFile = new File(attachment); + InputStream attachmentStream = new FileInputStream(attachmentFile); + final long attachmentSize = attachmentFile.length(); + String mime = Files.probeContentType(Paths.get(attachment)); + return new TextSecureAttachmentStream(attachmentStream, mime, attachmentSize, null); + } + + public void sendGroupMessage(String messageText, List attachments, + byte[] groupId) + throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException { + final TextSecureDataMessage.Builder messageBuilder = TextSecureDataMessage.newBuilder().withBody(messageText); + if (attachments != null) { + messageBuilder.withAttachments(getTextSecureAttachments(attachments)); + } + if (groupId != null) { + TextSecureGroup group = TextSecureGroup.newBuilder(TextSecureGroup.Type.DELIVER) + .withId(groupId) + .build(); + messageBuilder.asGroupMessage(group); + } + TextSecureDataMessage message = messageBuilder.build(); + + sendMessage(message, getGroupInfo(groupId).members); + } + + public void sendQuitGroupMessage(byte[] groupId) throws GroupNotFoundException, IOException, EncapsulatedExceptions { + TextSecureGroup group = TextSecureGroup.newBuilder(TextSecureGroup.Type.QUIT) + .withId(groupId) + .build(); + + TextSecureDataMessage message = TextSecureDataMessage.newBuilder() + .asGroupMessage(group) + .build(); + + sendMessage(message, getGroupInfo(groupId).members); + } + + public byte[] sendUpdateGroupMessage(byte[] groupId, String name, Collection members, String avatarFile) throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException { + GroupInfo g; + if (groupId == null) { + // Create new group + g = new GroupInfo(Util.getSecretBytes(16)); + g.members.add(getUsername()); + } else { + g = getGroupInfo(groupId); + } + + if (name != null) { + g.name = name; + } + + if (members != null) { + for (String member : members) { + try { + g.members.add(canonicalizeNumber(member)); + } catch (InvalidNumberException e) { + System.err.println("Failed to add member \"" + member + "\" to group: " + e.getMessage()); + System.err.println("Aborting…"); + System.exit(1); + } + } + } + + TextSecureGroup.Builder group = TextSecureGroup.newBuilder(TextSecureGroup.Type.UPDATE) + .withId(g.groupId) + .withName(g.name) + .withMembers(new ArrayList<>(g.members)); + + if (avatarFile != null) { + try { + group.withAvatar(createAttachment(avatarFile)); + // TODO + g.avatarId = 0; + } catch (IOException e) { + throw new AttachmentInvalidException(avatarFile, e); + } + } + + setGroupInfo(g); + + TextSecureDataMessage message = TextSecureDataMessage.newBuilder() + .asGroupMessage(group.build()) + .build(); + + sendMessage(message, g.members); + return g.groupId; + } + + public void sendMessage(String messageText, List attachments, + Collection recipients) + throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException { + final TextSecureDataMessage.Builder messageBuilder = TextSecureDataMessage.newBuilder().withBody(messageText); + if (attachments != null) { + messageBuilder.withAttachments(getTextSecureAttachments(attachments)); + } + TextSecureDataMessage message = messageBuilder.build(); + + sendMessage(message, recipients); + } + + public void sendEndSessionMessage(List recipients) throws IOException, EncapsulatedExceptions { + TextSecureDataMessage message = TextSecureDataMessage.newBuilder() + .asEndSessionMessage() + .build(); + + sendMessage(message, recipients); + } + + private void sendMessage(TextSecureDataMessage message, Collection recipients) throws IOException, EncapsulatedExceptions { TextSecureMessageSender messageSender = new TextSecureMessageSender(URL, TRUST_STORE, username, password, axolotlStore, USER_AGENT, Optional.absent()); - messageSender.sendMessage(recipients, message); + + Set recipientsTS = new HashSet<>(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(new ArrayList<>(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); @@ -260,7 +407,7 @@ class Manager { } } - public void handleEndSession(String source) { + private void handleEndSession(String source) { axolotlStore.deleteAllSessions(source); } @@ -290,20 +437,64 @@ class Manager { TextSecureGroup groupInfo = message.getGroupInfo().get(); switch (groupInfo.getType()) { case UPDATE: - group = new GroupInfo(groupInfo.getGroupId(), groupInfo.getName().get(), groupInfo.getMembers().get(), groupInfo.getAvatar().get().asPointer().getId()); + try { + group = groupStore.getGroup(groupInfo.getGroupId()); + } catch (GroupNotFoundException e) { + group = new GroupInfo(groupInfo.getGroupId()); + } + + if (groupInfo.getAvatar().isPresent()) { + TextSecureAttachment avatar = groupInfo.getAvatar().get(); + if (avatar.isPointer()) { + long avatarId = avatar.asPointer().getId(); + try { + retrieveAttachment(avatar.asPointer()); + group.avatarId = avatarId; + } catch (IOException | InvalidMessageException e) { + System.err.println("Failed to retrieve group avatar (" + avatarId + "): " + e.getMessage()); + } + } + } + + if (groupInfo.getName().isPresent()) { + group.name = groupInfo.getName().get(); + } + + if (groupInfo.getMembers().isPresent()) { + group.members.addAll(groupInfo.getMembers().get()); + } + groupStore.updateGroup(group); break; case DELIVER: - group = groupStore.getGroup(groupInfo.getGroupId()); + try { + group = groupStore.getGroup(groupInfo.getGroupId()); + } catch (GroupNotFoundException e) { + } break; case QUIT: - group = groupStore.getGroup(groupInfo.getGroupId()); - if (group != null) { + try { + group = groupStore.getGroup(groupInfo.getGroupId()); group.members.remove(envelope.getSource()); + } catch (GroupNotFoundException e) { } 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()); + } + } + } + } } } } @@ -322,14 +513,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); @@ -369,13 +564,25 @@ class Manager { return outputFile; } - private String canonicalizeNumber(String number) throws InvalidNumberException { + public String canonicalizeNumber(String number) throws InvalidNumberException { String localNumber = username; 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) throws GroupNotFoundException { + return groupStore.getGroup(groupId); + } + + public void setGroupInfo(GroupInfo group) { + groupStore.updateGroup(group); + } + + public String getUsername() { + return username; + } }