X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/d0dae4e064ce2b41e4e6fcde786eec6e179656d6..ef5d3a65f8de2ae8e17adfb7c307d88b0c04778a:/src/main/java/cli/Main.java diff --git a/src/main/java/cli/Main.java b/src/main/java/cli/Main.java index 728ea35b..49975daa 100644 --- a/src/main/java/cli/Main.java +++ b/src/main/java/cli/Main.java @@ -20,25 +20,17 @@ import net.sourceforge.argparse4j.ArgumentParsers; 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.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.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,46 +87,56 @@ public class Main { System.err.println("User is not registered."); System.exit(1); } - String messageText = ns.getString("message"); - if (messageText == null) { + + if (ns.getBoolean("endsession")) { + if (ns.getList("recipient") == null) { + System.err.println("No recipients given"); + System.err.println("Aborting sending."); + System.exit(1); + } try { - messageText = IOUtils.toString(System.in); + m.sendEndSessionMessage(ns.getList("recipient")); } catch (IOException e) { - System.err.println("Failed to read message from stdin: " + e.getMessage()); - System.exit(1); + handleIOException(e); + } catch (EncapsulatedExceptions e) { + handleEncapsulatedExceptions(e); + } catch (AssertionError e) { + handleAssertionError(e); } - } - - final List attachments = ns.getList("attachment"); - List textSecureAttachments = null; - if (attachments != null) { - textSecureAttachments = new ArrayList<>(attachments.size()); - for (String attachment : attachments) { + } else { + String messageText = ns.getString("message"); + if (messageText == null) { 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) { - 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); } } - } - List recipients = new ArrayList<>(ns.getList("recipient").size()); - for (String recipient : ns.getList("recipient")) { try { - recipients.add(m.getPushAddress(recipient)); - } catch (InvalidNumberException e) { - System.err.println("Failed to add recipient \"" + recipient + "\": " + e.getMessage()); + 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); } } - sendMessage(m, messageText, textSecureAttachments, recipients); + break; case "receive": if (!m.isRegistered()) { @@ -161,12 +163,76 @@ 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); } + break; + case "quitGroup": + if (!m.isRegistered()) { + System.err.println("User is not registered."); + System.exit(1); + } + + try { + m.sendQuitGroupMessage(decodeGroupId(ns.getString("group"))); + } catch (IOException e) { + handleIOException(e); + } catch (EncapsulatedExceptions e) { + handleEncapsulatedExceptions(e); + } catch (AssertionError e) { + handleAssertionError(e); + } catch (GroupNotFoundException e) { + handleGroupNotFoundException(e); + } + + break; + case "updateGroup": + if (!m.isRegistered()) { + System.err.println("User is not registered."); + System.exit(1); + } + + try { + byte[] groupId = null; + if (ns.getString("group") != null) { + groupId = decodeGroupId(ns.getString("group")); + } + 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) + "\" …"); + } + } catch (IOException e) { + 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; } m.save(); System.exit(0); } + 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 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) { ArgumentParser parser = ArgumentParsers.newArgumentParser("textsecure-cli") .defaultHelp(true) @@ -195,6 +261,8 @@ public class Main { .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("*"); @@ -203,6 +271,25 @@ public class Main { 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") @@ -216,6 +303,14 @@ public class Main { 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); @@ -223,37 +318,30 @@ public class Main { } } - private static void sendMessage(Manager m, String messageText, List textSecureAttachments, - List recipients) { - final TextSecureDataMessage.Builder messageBuilder = TextSecureDataMessage.newBuilder().withBody(messageText); - if (textSecureAttachments != null) { - messageBuilder.withAttachments(textSecureAttachments); - } - TextSecureDataMessage message = messageBuilder.build(); + 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); + } - 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 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 handleIOException(IOException e) { + System.err.println("Failed to send message: " + e.getMessage()); + } + private static class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { final Manager m; @@ -262,15 +350,13 @@ public class Main { } @Override - public void handleMessage(TextSecureEnvelope envelope) { + public void handleMessage(TextSecureEnvelope envelope, TextSecureContent content, GroupInfo group) { System.out.println("Envelope from: " + envelope.getSource()); System.out.println("Timestamp: " + envelope.getTimestamp()); if (envelope.isReceipt()) { System.out.println("Got receipt."); } else if (envelope.isWhisperMessage() | envelope.isPreKeyWhisperMessage()) { - TextSecureContent content = m.decryptMessage(envelope); - if (content == null) { System.out.println("Failed to decrypt message."); } else { @@ -288,6 +374,10 @@ public class Main { System.out.println(" Id: " + Base64.encodeBytes(groupInfo.getGroupId())); if (groupInfo.getName().isPresent()) { System.out.println(" Name: " + groupInfo.getName().get()); + } else if (group != null) { + System.out.println(" Name: " + group.name); + } else { + System.out.println(" Name: "); } System.out.println(" Type: " + groupInfo.getType()); if (groupInfo.getMembers().isPresent()) { @@ -302,7 +392,6 @@ public class Main { } if (message.isEndSession()) { System.out.println("Is end session"); - m.handleEndSession(envelope.getSource()); } if (message.getAttachments().isPresent()) { @@ -329,11 +418,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" : "") + (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); - } catch (IOException | InvalidMessageException e) { - System.out.println("Failed to retrieve attachment: " + e.getMessage()); } } }