From ef5d3a65f8de2ae8e17adfb7c307d88b0c04778a Mon Sep 17 00:00:00 2001 From: AsamK Date: Sat, 12 Dec 2015 11:38:15 +0100 Subject: [PATCH] Refactoring, move more functionality into Manager --- .../java/cli/AttachmentInvalidException.java | 14 + src/main/java/cli/GroupNotFoundException.java | 14 + src/main/java/cli/JsonGroupStore.java | 8 +- src/main/java/cli/Main.java | 260 ++++++------------ src/main/java/cli/Manager.java | 146 +++++++++- 5 files changed, 255 insertions(+), 187 deletions(-) create mode 100644 src/main/java/cli/AttachmentInvalidException.java create mode 100644 src/main/java/cli/GroupNotFoundException.java diff --git a/src/main/java/cli/AttachmentInvalidException.java b/src/main/java/cli/AttachmentInvalidException.java new file mode 100644 index 00000000..289855e9 --- /dev/null +++ b/src/main/java/cli/AttachmentInvalidException.java @@ -0,0 +1,14 @@ +package cli; + +public class AttachmentInvalidException extends Exception { + private final String attachment; + + public AttachmentInvalidException(String attachment, Exception e) { + super(e); + this.attachment = attachment; + } + + public String getAttachment() { + return attachment; + } +} diff --git a/src/main/java/cli/GroupNotFoundException.java b/src/main/java/cli/GroupNotFoundException.java new file mode 100644 index 00000000..85e1cf0b --- /dev/null +++ b/src/main/java/cli/GroupNotFoundException.java @@ -0,0 +1,14 @@ +package cli; + +public class GroupNotFoundException extends Exception { + private final byte[] groupId; + + public GroupNotFoundException(byte[] groupId) { + super(); + this.groupId = groupId; + } + + public byte[] getGroupId() { + return groupId; + } +} diff --git a/src/main/java/cli/JsonGroupStore.java b/src/main/java/cli/JsonGroupStore.java index 29f9abfe..0fbfdc85 100644 --- a/src/main/java/cli/JsonGroupStore.java +++ b/src/main/java/cli/JsonGroupStore.java @@ -23,8 +23,12 @@ public class JsonGroupStore { groups.put(Base64.encodeBytes(group.groupId), group); } - GroupInfo getGroup(byte[] groupId) { - return groups.get(Base64.encodeBytes(groupId)); + GroupInfo getGroup(byte[] groupId) throws GroupNotFoundException { + GroupInfo g = groups.get(Base64.encodeBytes(groupId)); + if (g == null) { + throw new GroupNotFoundException(groupId); + } + return g; } public static class MapToListSerializer extends JsonSerializer> { diff --git a/src/main/java/cli/Main.java b/src/main/java/cli/Main.java index 08c7b935..49975daa 100644 --- a/src/main/java/cli/Main.java +++ b/src/main/java/cli/Main.java @@ -26,18 +26,11 @@ import org.whispersystems.textsecure.api.messages.multidevice.TextSecureSyncMess import org.whispersystems.textsecure.api.push.exceptions.EncapsulatedExceptions; import org.whispersystems.textsecure.api.push.exceptions.NetworkFailureException; import org.whispersystems.textsecure.api.push.exceptions.UnregisteredUserException; -import org.whispersystems.textsecure.api.util.InvalidNumberException; import org.whispersystems.textsecure.api.util.PhoneNumberFormatter; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; -import java.io.InputStream; -import java.nio.file.Files; -import java.nio.file.Paths; import java.security.Security; -import java.util.ArrayList; -import java.util.List; public class Main { @@ -95,39 +88,22 @@ public class Main { System.exit(1); } - byte[] groupId = null; - List recipients = null; - if (ns.getString("group") != null) { - try { - GroupInfo g = m.getGroupInfo(Base64.decode(ns.getString("group"))); - if (g == null) { - System.err.println("Failed to send to group \"" + ns.getString("group") + "\": Unknown group"); - System.err.println("Aborting sending."); - System.exit(1); - } - groupId = g.groupId; - recipients = new ArrayList<>(g.members); - } catch (IOException e) { - System.err.println("Failed to send to group \"" + ns.getString("group") + "\": " + e.getMessage()); + if (ns.getBoolean("endsession")) { + if (ns.getList("recipient") == null) { + System.err.println("No recipients given"); System.err.println("Aborting sending."); System.exit(1); } - } else { - recipients = ns.getList("recipient"); - } - - if (ns.getBoolean("endsession")) { - sendEndSessionMessage(m, recipients); - } else { - List textSecureAttachments = null; try { - textSecureAttachments = getTextSecureAttachments(ns.getList("attachment")); + m.sendEndSessionMessage(ns.getList("recipient")); } catch (IOException e) { - System.err.println("Failed to add attachment: " + e.getMessage()); - System.err.println("Aborting sending."); - System.exit(1); + handleIOException(e); + } catch (EncapsulatedExceptions e) { + handleEncapsulatedExceptions(e); + } catch (AssertionError e) { + handleAssertionError(e); } - + } else { String messageText = ns.getString("message"); if (messageText == null) { try { @@ -139,7 +115,26 @@ public class Main { } } - sendMessage(m, messageText, textSecureAttachments, recipients, groupId); + try { + if (ns.getString("group") != null) { + byte[] groupId = decodeGroupId(ns.getString("group")); + m.sendGroupMessage(messageText, ns.getList("attachment"), groupId); + } else { + m.sendMessage(messageText, ns.getList("attachment"), ns.getList("recipient")); + } + } catch (IOException e) { + handleIOException(e); + } catch (EncapsulatedExceptions e) { + handleEncapsulatedExceptions(e); + } catch (AssertionError e) { + handleAssertionError(e); + } catch (GroupNotFoundException e) { + handleGroupNotFoundException(e); + } catch (AttachmentInvalidException e) { + System.err.println("Failed to add attachment (\"" + e.getAttachment() + "\"): " + e.getMessage()); + System.err.println("Aborting sending."); + System.exit(1); + } } break; @@ -176,19 +171,17 @@ public class Main { } try { - GroupInfo g = m.getGroupInfo(Base64.decode(ns.getString("group"))); - if (g == null) { - System.err.println("Failed to send to group \"" + ns.getString("group") + "\": Unknown group"); - System.err.println("Aborting sending."); - System.exit(1); - } - - sendQuitGroupMessage(m, new ArrayList<>(g.members), g.groupId); + m.sendQuitGroupMessage(decodeGroupId(ns.getString("group"))); } catch (IOException e) { - System.err.println("Failed to send to group \"" + ns.getString("group") + "\": " + e.getMessage()); - System.err.println("Aborting sending."); - System.exit(1); + handleIOException(e); + } catch (EncapsulatedExceptions e) { + handleEncapsulatedExceptions(e); + } catch (AssertionError e) { + handleAssertionError(e); + } catch (GroupNotFoundException e) { + handleGroupNotFoundException(e); } + break; case "updateGroup": if (!m.isRegistered()) { @@ -197,65 +190,24 @@ public class Main { } try { - GroupInfo g; + byte[] groupId = null; if (ns.getString("group") != null) { - g = m.getGroupInfo(Base64.decode(ns.getString("group"))); - if (g == null) { - System.err.println("Failed to send to group \"" + ns.getString("group") + "\": Unknown group"); - System.err.println("Aborting sending."); - System.exit(1); - } - } else { - // Create new group - g = new GroupInfo(Util.getSecretBytes(16)); - g.members.add(m.getUsername()); - System.out.println("Creating new group \"" + Base64.encodeBytes(g.groupId) + "\" …"); + groupId = decodeGroupId(ns.getString("group")); } - - String name = ns.getString("name"); - if (name != null) { - g.name = name; - } - - final List members = ns.getList("member"); - - if (members != null) { - for (String member : members) { - try { - g.members.add(m.canonicalizeNumber(member)); - } catch (InvalidNumberException e) { - System.err.println("Failed to add member \"" + member + "\" to group: " + e.getMessage()); - System.err.println("Aborting…"); - System.exit(1); - } - } + byte[] newGroupId = m.sendUpdateGroupMessage(groupId, ns.getString("name"), ns.getList("member"), ns.getString("avatar")); + if (groupId == null) { + System.out.println("Creating new group \"" + Base64.encodeBytes(newGroupId) + "\" …"); } - - TextSecureGroup.Builder group = TextSecureGroup.newBuilder(TextSecureGroup.Type.UPDATE) - .withId(g.groupId) - .withName(g.name) - .withMembers(new ArrayList<>(g.members)); - - String avatar = ns.getString("avatar"); - if (avatar != null) { - try { - group.withAvatar(createAttachment(avatar)); - // TODO - g.avatarId = 0; - } catch (IOException e) { - System.err.println("Failed to add attachment \"" + avatar + "\": " + e.getMessage()); - System.err.println("Aborting sending."); - System.exit(1); - } - } - - m.setGroupInfo(g); - - sendUpdateGroupMessage(m, group.build()); } catch (IOException e) { - System.err.println("Failed to send to group \"" + ns.getString("group") + "\": " + e.getMessage()); + handleIOException(e); + } catch (AttachmentInvalidException e) { + System.err.println("Failed to add avatar attachment (\"" + e.getAttachment() + ") for group\": " + e.getMessage()); System.err.println("Aborting sending."); System.exit(1); + } catch (GroupNotFoundException e) { + handleGroupNotFoundException(e); + } catch (EncapsulatedExceptions e) { + handleEncapsulatedExceptions(e); } break; @@ -264,24 +216,21 @@ public class Main { System.exit(0); } - private static List getTextSecureAttachments(List attachments) { - private static List getTextSecureAttachments(List attachments) throws IOException { - List textSecureAttachments = null; - if (attachments != null) { - textSecureAttachments = new ArrayList<>(attachments.size()); - for (String attachment : attachments) { - textSecureAttachments.add(createAttachment(attachment)); - } - } - return textSecureAttachments; + private static void handleGroupNotFoundException(GroupNotFoundException e) { + System.err.println("Failed to send to group \"" + Base64.encodeBytes(e.getGroupId()) + "\": Unknown group"); + System.err.println("Aborting sending."); + System.exit(1); } - 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); + private static byte[] decodeGroupId(String groupId) { + try { + return Base64.decode(groupId); + } catch (IOException e) { + System.err.println("Failed to decode groupId (must be base64) \"" + groupId + "\": " + e.getMessage()); + System.err.println("Aborting sending."); + System.exit(1); + return null; + } } private static Namespace parseArgs(String[] args) { @@ -369,73 +318,28 @@ public class Main { } } - private static void sendMessage(Manager m, String messageText, List textSecureAttachments, - List recipients, byte[] groupId) { - final TextSecureDataMessage.Builder messageBuilder = TextSecureDataMessage.newBuilder().withBody(messageText); - if (textSecureAttachments != null) { - messageBuilder.withAttachments(textSecureAttachments); - } - if (groupId != null) { - messageBuilder.asGroupMessage(new TextSecureGroup(groupId)); - } - TextSecureDataMessage message = messageBuilder.build(); - - sendMessage(m, message, recipients); + private static void handleAssertionError(AssertionError e) { + System.err.println("Failed to send message (Assertion): " + e.getMessage()); + System.err.println(e.getStackTrace()); + System.err.println("If you use an Oracle JRE please check if you have unlimited strength crypto enabled, see README"); + System.exit(1); } - private static void sendEndSessionMessage(Manager m, List recipients) { - final TextSecureDataMessage.Builder messageBuilder = TextSecureDataMessage.newBuilder().asEndSessionMessage(); - - TextSecureDataMessage message = messageBuilder.build(); - - sendMessage(m, message, recipients); - } - - private static void sendQuitGroupMessage(Manager m, List recipients, byte[] groupId) { - final TextSecureDataMessage.Builder messageBuilder = TextSecureDataMessage.newBuilder(); - TextSecureGroup group = TextSecureGroup.newBuilder(TextSecureGroup.Type.QUIT) - .withId(groupId) - .build(); - - messageBuilder.asGroupMessage(group); - - TextSecureDataMessage message = messageBuilder.build(); - - sendMessage(m, message, recipients); - } - - private static void sendUpdateGroupMessage(Manager m, TextSecureGroup g) { - final TextSecureDataMessage.Builder messageBuilder = TextSecureDataMessage.newBuilder(); - - messageBuilder.asGroupMessage(g); - - TextSecureDataMessage message = messageBuilder.build(); - - sendMessage(m, message, g.getMembers().get()); + private static void handleEncapsulatedExceptions(EncapsulatedExceptions e) { + System.err.println("Failed to send (some) messages:"); + for (NetworkFailureException n : e.getNetworkExceptions()) { + System.err.println("Network failure for \"" + n.getE164number() + "\": " + n.getMessage()); + } + for (UnregisteredUserException n : e.getUnregisteredUserExceptions()) { + System.err.println("Unregistered user \"" + n.getE164Number() + "\": " + n.getMessage()); + } + for (UntrustedIdentityException n : e.getUntrustedIdentityExceptions()) { + System.err.println("Untrusted Identity for \"" + n.getE164Number() + "\": " + n.getMessage()); + } } - private static void sendMessage(Manager m, TextSecureDataMessage message, List recipients) { - try { - m.sendMessage(recipients, message); - } catch (IOException e) { - System.err.println("Failed to send message: " + e.getMessage()); - } catch (EncapsulatedExceptions e) { - System.err.println("Failed to send (some) messages:"); - for (NetworkFailureException n : e.getNetworkExceptions()) { - System.err.println("Network failure for \"" + n.getE164number() + "\": " + n.getMessage()); - } - for (UnregisteredUserException n : e.getUnregisteredUserExceptions()) { - System.err.println("Unregistered user \"" + n.getE164Number() + "\": " + n.getMessage()); - } - for (UntrustedIdentityException n : e.getUntrustedIdentityExceptions()) { - System.err.println("Untrusted Identity for \"" + n.getE164Number() + "\": " + n.getMessage()); - } - } catch (AssertionError e) { - System.err.println("Failed to send message (Assertion): " + e.getMessage()); - System.err.println(e.getStackTrace()); - System.err.println("If you use an Oracle JRE please check if you have unlimited strength crypto enabled, see README"); - System.exit(1); - } + private static void handleIOException(IOException e) { + System.err.println("Failed to send message: " + e.getMessage()); } private static class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { diff --git a/src/main/java/cli/Manager.java b/src/main/java/cli/Manager.java index cc81c14d..730923ad 100644 --- a/src/main/java/cli/Manager.java +++ b/src/main/java/cli/Manager.java @@ -44,6 +44,8 @@ import org.whispersystems.textsecure.api.util.InvalidNumberException; import org.whispersystems.textsecure.api.util.PhoneNumberFormatter; import java.io.*; +import java.nio.file.Files; +import java.nio.file.Paths; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; @@ -244,7 +246,132 @@ 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()); @@ -310,8 +437,9 @@ class Manager { TextSecureGroup groupInfo = message.getGroupInfo().get(); switch (groupInfo.getType()) { case UPDATE: - group = groupStore.getGroup(groupInfo.getGroupId()); - if (group == null) { + try { + group = groupStore.getGroup(groupInfo.getGroupId()); + } catch (GroupNotFoundException e) { group = new GroupInfo(groupInfo.getGroupId()); } @@ -339,12 +467,16 @@ class Manager { 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; } @@ -442,7 +574,7 @@ class Manager { return new TextSecureAddress(e164number); } - public GroupInfo getGroupInfo(byte[] groupId) { + public GroupInfo getGroupInfo(byte[] groupId) throws GroupNotFoundException { return groupStore.getGroup(groupId); } -- 2.50.1