Extract getTextSecureAttachments method

[signal-cli] / src / main / java / cli / Main.java

diff --git a/src/main/java/cli/Main.java b/src/main/java/cli/Main.java
index 85ca227d987744cdb07a71fe5a20731dd050c920..08c7b935393023f965aec38cd9e3aaf0374f9288 100644 (file)
--- a/src/main/java/cli/Main.java
+++ b/src/main/java/cli/Main.java
@@ -20,15 +20,14 @@ import net.sourceforge.argparse4j.ArgumentParsers;
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.*;
 import org.apache.commons.io.IOUtils;
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.*;
 import org.apache.commons.io.IOUtils;

-import org.whispersystems.libaxolotl.InvalidMessageException;

 import org.whispersystems.textsecure.api.crypto.UntrustedIdentityException;
 import org.whispersystems.textsecure.api.messages.*;
 import org.whispersystems.textsecure.api.messages.multidevice.TextSecureSyncMessage;
 import org.whispersystems.textsecure.api.crypto.UntrustedIdentityException;
 import org.whispersystems.textsecure.api.messages.*;
 import org.whispersystems.textsecure.api.messages.multidevice.TextSecureSyncMessage;

-import org.whispersystems.textsecure.api.push.TextSecureAddress;

 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.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.File;
 import java.io.FileInputStream;


@@ -95,46 +94,54 @@ public class Main {
                     System.err.println("User is not registered.");
                     System.exit(1);
                 }
                     System.err.println("User is not registered.");
                     System.exit(1);
                 }

-                String messageText = ns.getString("message");
-                if (messageText == null) {
+
+                byte[] groupId = null;
+                List<String> recipients = null;
+                if (ns.getString("group") != null) {

                     try {
                     try {

-                        messageText = IOUtils.toString(System.in);
+                        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) {
                     } catch (IOException e) {

-                        System.err.println("Failed to read message from stdin: " + e.getMessage());
+                        System.err.println("Failed to send to group \"" + ns.getString("group") + "\": " + e.getMessage());
+                        System.err.println("Aborting sending.");

                         System.exit(1);
                     }
                         System.exit(1);
                     }

+                } else {
+                    recipients = ns.<String>getList("recipient");

                 }
 
                 }
 

-                final List<String> attachments = ns.getList("attachment");
-                List<TextSecureAttachment> textSecureAttachments = null;
-                if (attachments != null) {
-                    textSecureAttachments = new ArrayList<>(attachments.size());
-                    for (String attachment : attachments) {
+                if (ns.getBoolean("endsession")) {
+                    sendEndSessionMessage(m, recipients);
+                } else {
+                    List<TextSecureAttachment> textSecureAttachments = null;
+                    try {
+                        textSecureAttachments = getTextSecureAttachments(ns.<String>getList("attachment"));
+                    } catch (IOException e) {
+                        System.err.println("Failed to add attachment: " + e.getMessage());
+                        System.err.println("Aborting sending.");
+                        System.exit(1);
+                    }
+
+                    String messageText = ns.getString("message");
+                    if (messageText == null) {

                         try {
                         try {

-                            File attachmentFile = new File(attachment);
-                            InputStream attachmentStream = new FileInputStream(attachmentFile);
-                            final long attachmentSize = attachmentFile.length();
-                            String mime = Files.probeContentType(Paths.get(attachment));
-                            textSecureAttachments.add(new TextSecureAttachmentStream(attachmentStream, mime, attachmentSize, null));
+                            messageText = IOUtils.toString(System.in);

                         } catch (IOException e) {
                         } catch (IOException e) {

-                            System.err.println("Failed to add attachment \"" + attachment + "\": " + e.getMessage());
+                            System.err.println("Failed to read message from stdin: " + e.getMessage());

                             System.err.println("Aborting sending.");
                             System.exit(1);
                         }
                     }
                             System.err.println("Aborting sending.");
                             System.exit(1);
                         }
                     }

-                }

 
 

-                List<TextSecureAddress> recipients = new ArrayList<>(ns.<String>getList("recipient").size());
-                for (String recipient : ns.<String>getList("recipient")) {
-                    try {
-                        recipients.add(m.getPushAddress(recipient));
-                    } catch (InvalidNumberException e) {
-                        System.err.println("Failed to add recipient \"" + recipient + "\": " + e.getMessage());
-                        System.err.println("Aborting sending.");
-                        System.exit(1);
-                    }
+                    sendMessage(m, messageText, textSecureAttachments, recipients, groupId);

                 }
                 }

-                sendMessage(m, messageText, textSecureAttachments, recipients);
+

                 break;
             case "receive":
                 if (!m.isRegistered()) {
                 break;
             case "receive":
                 if (!m.isRegistered()) {


@@ -161,12 +168,122 @@ public class Main {
                     System.err.println("If you use an Oracle JRE please check if you have unlimited strength crypto enabled, see README");
                     System.exit(1);
                 }
                     System.err.println("If you use an Oracle JRE please check if you have unlimited strength crypto enabled, see README");
                     System.exit(1);
                 }

+                break;
+            case "quitGroup":
+                if (!m.isRegistered()) {
+                    System.err.println("User is not registered.");
+                    System.exit(1);
+                }
+
+                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);
+                } catch (IOException e) {
+                    System.err.println("Failed to send to group \"" + ns.getString("group") + "\": " + e.getMessage());
+                    System.err.println("Aborting sending.");
+                    System.exit(1);
+                }
+                break;
+            case "updateGroup":
+                if (!m.isRegistered()) {
+                    System.err.println("User is not registered.");
+                    System.exit(1);
+                }
+
+                try {
+                    GroupInfo g;
+                    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) + "\" …");
+                    }
+
+                    String name = ns.getString("name");
+                    if (name != null) {
+                        g.name = name;
+                    }
+
+                    final List<String> 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);
+                            }
+                        }
+                    }
+
+                    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());
+                    System.err.println("Aborting sending.");
+                    System.exit(1);
+                }
+

                 break;
         }
         m.save();
         System.exit(0);
     }
 
                 break;
         }
         m.save();
         System.exit(0);
     }
 

+    private static List<TextSecureAttachment> getTextSecureAttachments(List<String> attachments) {
+    private static List<TextSecureAttachment> getTextSecureAttachments(List<String> attachments) throws IOException {
+        List<TextSecureAttachment> textSecureAttachments = null;
+        if (attachments != null) {
+            textSecureAttachments = new ArrayList<>(attachments.size());
+            for (String attachment : attachments) {
+                textSecureAttachments.add(createAttachment(attachment));
+             }
+        }
+        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);
+    }
+

     private static Namespace parseArgs(String[] args) {
         ArgumentParser parser = ArgumentParsers.newArgumentParser("textsecure-cli")
                 .defaultHelp(true)
     private static Namespace parseArgs(String[] args) {
         ArgumentParser parser = ArgumentParsers.newArgumentParser("textsecure-cli")
                 .defaultHelp(true)


@@ -195,6 +312,8 @@ public class Main {
                 .help("The verification code you received via sms or voice call.");
 
         Subparser parserSend = subparsers.addParser("send");
                 .help("The verification code you received via sms or voice call.");
 
         Subparser parserSend = subparsers.addParser("send");

+        parserSend.addArgument("-g", "--group")
+                .help("Specify the recipient group ID.");

         parserSend.addArgument("recipient")
                 .help("Specify the recipients' phone number.")
                 .nargs("*");
         parserSend.addArgument("recipient")
                 .help("Specify the recipients' phone number.")
                 .nargs("*");


@@ -203,6 +322,25 @@ public class Main {
         parserSend.addArgument("-a", "--attachment")
                 .nargs("*")
                 .help("Add file as attachment");
         parserSend.addArgument("-a", "--attachment")
                 .nargs("*")
                 .help("Add file as attachment");

+        parserSend.addArgument("-e", "--endsession")
+                .help("Clear session state and send end session message.")
+                .action(Arguments.storeTrue());
+
+        Subparser parserLeaveGroup = subparsers.addParser("quitGroup");
+        parserLeaveGroup.addArgument("-g", "--group")
+                .required(true)
+                .help("Specify the recipient group ID.");
+
+        Subparser parserUpdateGroup = subparsers.addParser("updateGroup");
+        parserUpdateGroup.addArgument("-g", "--group")
+                .help("Specify the recipient group ID.");
+        parserUpdateGroup.addArgument("-n", "--name")
+                .help("Specify the new group name.");
+        parserUpdateGroup.addArgument("-a", "--avatar")
+                .help("Specify a new group avatar image file");
+        parserUpdateGroup.addArgument("-m", "--member")
+                .nargs("*")
+                .help("Specify one or more members to add to the group");

 
         Subparser parserReceive = subparsers.addParser("receive");
         parserReceive.addArgument("-t", "--timeout")
 
         Subparser parserReceive = subparsers.addParser("receive");
         parserReceive.addArgument("-t", "--timeout")


@@ -216,6 +354,14 @@ public class Main {
                 System.err.println("You need to specify a username (phone number)");
                 System.exit(2);
             }
                 System.err.println("You need to specify a username (phone number)");
                 System.exit(2);
             }

+            if (!PhoneNumberFormatter.isValidNumber(ns.getString("username"))) {
+                System.err.println("Invalid username (phone number), make sure you include the country code.");
+                System.exit(2);
+            }
+            if (ns.getList("recipient") != null && !ns.getList("recipient").isEmpty() && ns.getString("group") != null) {
+                System.err.println("You cannot specify recipients by phone number and groups a the same time");
+                System.exit(2);
+            }

             return ns;
         } catch (ArgumentParserException e) {
             parser.handleError(e);
             return ns;
         } catch (ArgumentParserException e) {
             parser.handleError(e);


@@ -224,13 +370,51 @@ public class Main {
     }
 
     private static void sendMessage(Manager m, String messageText, List<TextSecureAttachment> textSecureAttachments,
     }
 
     private static void sendMessage(Manager m, String messageText, List<TextSecureAttachment> textSecureAttachments,

-                                    List<TextSecureAddress> recipients) {
+                                    List<String> recipients, byte[] groupId) {

         final TextSecureDataMessage.Builder messageBuilder = TextSecureDataMessage.newBuilder().withBody(messageText);
         if (textSecureAttachments != null) {
             messageBuilder.withAttachments(textSecureAttachments);
         }
         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 sendEndSessionMessage(Manager m, List<String> recipients) {
+        final TextSecureDataMessage.Builder messageBuilder = TextSecureDataMessage.newBuilder().asEndSessionMessage();
+
+        TextSecureDataMessage message = messageBuilder.build();
+
+        sendMessage(m, message, recipients);
+    }
+
+    private static void sendQuitGroupMessage(Manager m, List<String> 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();
 
         TextSecureDataMessage message = messageBuilder.build();
 

+        sendMessage(m, message, g.getMembers().get());
+    }
+
+    private static void sendMessage(Manager m, TextSecureDataMessage message, List<String> recipients) {

         try {
             m.sendMessage(recipients, message);
         } catch (IOException e) {
         try {
             m.sendMessage(recipients, message);
         } catch (IOException e) {


@@ -304,7 +488,6 @@ public class Main {
                         }
                         if (message.isEndSession()) {
                             System.out.println("Is end session");
                         }
                         if (message.isEndSession()) {
                             System.out.println("Is end session");

-                            m.handleEndSession(envelope.getSource());

                         }
 
                         if (message.getAttachments().isPresent()) {
                         }
 
                         if (message.getAttachments().isPresent()) {


@@ -331,11 +514,9 @@ public class Main {
                 final TextSecureAttachmentPointer pointer = attachment.asPointer();
                 System.out.println("  Id: " + pointer.getId() + " Key length: " + pointer.getKey().length + (pointer.getRelay().isPresent() ? " Relay: " + pointer.getRelay().get() : ""));
                 System.out.println("  Size: " + (pointer.getSize().isPresent() ? pointer.getSize().get() + " bytes" : "<unavailable>") + (pointer.getPreview().isPresent() ? " (Preview is available: " + pointer.getPreview().get().length + " bytes)" : ""));
                 final TextSecureAttachmentPointer pointer = attachment.asPointer();
                 System.out.println("  Id: " + pointer.getId() + " Key length: " + pointer.getKey().length + (pointer.getRelay().isPresent() ? " Relay: " + pointer.getRelay().get() : ""));
                 System.out.println("  Size: " + (pointer.getSize().isPresent() ? pointer.getSize().get() + " bytes" : "<unavailable>") + (pointer.getPreview().isPresent() ? " (Preview is available: " + pointer.getPreview().get().length + " bytes)" : ""));

-                try {
-                    File file = m.retrieveAttachment(pointer);
+                File file = m.getAttachmentFile(pointer.getId());
+                if (file.exists()) {

                     System.out.println("  Stored plaintext in: " + file);
                     System.out.println("  Stored plaintext in: " + file);

-                } catch (IOException | InvalidMessageException e) {
-                    System.out.println("Failed to retrieve attachment: " + e.getMessage());

                 }
             }
         }
                 }
             }
         }