X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/76a1e8ec2f3ef857285ed9df775cf1a174557f8b..5859e7b9f78b5d8963c56c66b75530ee3f094bee:/src/main/java/cli/Main.java?ds=sidebyside diff --git a/src/main/java/cli/Main.java b/src/main/java/cli/Main.java index 31979d8c..2884ef91 100644 --- a/src/main/java/cli/Main.java +++ b/src/main/java/cli/Main.java @@ -20,22 +20,18 @@ 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.freedesktop.dbus.DBusConnection; +import org.freedesktop.dbus.exceptions.DBusException; 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; @@ -52,116 +48,309 @@ public class Main { } final String username = ns.getString("username"); - final Manager m = new Manager(username); - if (m.userExists()) { - try { - m.load(); - } catch (Exception e) { - System.err.println("Error loading state file \"" + m.getFileName() + "\": " + e.getMessage()); - System.exit(2); - } - } - - switch (ns.getString("command")) { - case "register": - if (!m.userHasKeys()) { - m.createNewIdentity(); - } - try { - m.register(ns.getBoolean("voice")); - } catch (IOException e) { - System.err.println("Request verify error: " + e.getMessage()); - System.exit(3); - } - break; - case "verify": - if (!m.userHasKeys()) { - System.err.println("User has no keys, first call register."); - System.exit(1); - } - if (m.isRegistered()) { - System.err.println("User registration is already verified"); - System.exit(1); - } + Manager m; + TextSecure ts; + DBusConnection dBusConn = null; + try { + if (ns.getBoolean("dbus") || ns.getBoolean("dbus_system")) { try { - m.verifyAccount(ns.getString("verificationCode")); - } catch (IOException e) { - System.err.println("Verify error: " + e.getMessage()); + m = null; + int busType; + if (ns.getBoolean("dbus_system")) { + busType = DBusConnection.SYSTEM; + } else { + busType = DBusConnection.SESSION; + } + dBusConn = DBusConnection.getConnection(busType); + ts = (TextSecure) dBusConn.getRemoteObject( + "org.asamk.TextSecure", "/org/asamk/TextSecure", + TextSecure.class); + } catch (DBusException e) { + e.printStackTrace(); + if (dBusConn != null) { + dBusConn.disconnect(); + } System.exit(3); + return; } - break; - case "send": - if (!m.isRegistered()) { - System.err.println("User is not registered."); - System.exit(1); + } else { + m = new Manager(username); + ts = m; + if (m.userExists()) { + try { + m.load(); + } catch (Exception e) { + System.err.println("Error loading state file \"" + m.getFileName() + "\": " + e.getMessage()); + System.exit(2); + return; + } } - String messageText = ns.getString("message"); - if (messageText == null) { + } + + switch (ns.getString("command")) { + case "register": + if (dBusConn != null) { + System.err.println("register is not yet implementd via dbus"); + System.exit(1); + } + if (!m.userHasKeys()) { + m.createNewIdentity(); + } try { - messageText = IOUtils.toString(System.in); + m.register(ns.getBoolean("voice")); } catch (IOException e) { - System.err.println("Failed to read message from stdin: " + e.getMessage()); + System.err.println("Request verify error: " + e.getMessage()); + System.exit(3); + } + break; + case "verify": + if (dBusConn != null) { + System.err.println("verify is not yet implementd via dbus"); System.exit(1); } - } + if (!m.userHasKeys()) { + System.err.println("User has no keys, first call register."); + System.exit(1); + } + if (m.isRegistered()) { + System.err.println("User registration is already verified"); + System.exit(1); + } + try { + m.verifyAccount(ns.getString("verificationCode")); + } catch (IOException e) { + System.err.println("Verify error: " + e.getMessage()); + System.exit(3); + } + break; + case "send": + if (dBusConn == null && !m.isRegistered()) { + System.err.println("User is not registered."); + System.exit(1); + } + + if (ns.getBoolean("endsession")) { + if (ns.getList("recipient") == null) { + System.err.println("No recipients given"); + System.err.println("Aborting sending."); + System.exit(1); + } + try { + ts.sendEndSessionMessage(ns.getList("recipient")); + } catch (IOException e) { + handleIOException(e); + } catch (EncapsulatedExceptions e) { + handleEncapsulatedExceptions(e); + } catch (AssertionError e) { + handleAssertionError(e); + } + } else { + String messageText = ns.getString("message"); + if (messageText == null) { + try { + messageText = IOUtils.toString(System.in); + } catch (IOException e) { + System.err.println("Failed to read message from stdin: " + e.getMessage()); + System.err.println("Aborting sending."); + System.exit(1); + } + } - final List attachments = ns.getList("attachment"); - List textSecureAttachments = null; - if (attachments != null) { - textSecureAttachments = new ArrayList(attachments.size()); - for (String attachment : attachments) { 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)); + List attachments = ns.getList("attachment"); + if (attachments == null) { + attachments = new ArrayList<>(); + } + if (ns.getString("group") != null) { + byte[] groupId = decodeGroupId(ns.getString("group")); + ts.sendGroupMessage(messageText, attachments, groupId); + } else { + ts.sendMessage(messageText, attachments, ns.getList("recipient")); + } } catch (IOException e) { - System.err.println("Failed to add attachment \"" + attachment + "\": " + e.getMessage()); + 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); } } - } - List recipients = new ArrayList<>(ns.getList("recipient").size()); - for (String recipient : ns.getList("recipient")) { + break; + case "receive": + if (dBusConn != null) { + System.err.println("receive is not yet implementd via dbus"); + System.exit(1); + } + if (!m.isRegistered()) { + System.err.println("User is not registered."); + System.exit(1); + } + int timeout = 5; + if (ns.getInt("timeout") != null) { + timeout = ns.getInt("timeout"); + } + boolean returnOnTimeout = true; + if (timeout < 0) { + returnOnTimeout = false; + timeout = 3600; + } try { - recipients.add(m.getPushAddress(recipient)); - } catch (InvalidNumberException e) { - System.err.println("Failed to add recipient \"" + recipient + "\": " + e.getMessage()); + m.receiveMessages(timeout, returnOnTimeout, new ReceiveMessageHandler(m)); + } catch (IOException e) { + System.err.println("Error while receiving messages: " + e.getMessage()); + System.exit(3); + } catch (AssertionError e) { + handleAssertionError(e); + } + break; + case "quitGroup": + if (dBusConn != null) { + System.err.println("quitGroup is not yet implementd via dbus"); + System.exit(1); + } + 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 (dBusConn != null) { + System.err.println("updateGroup is not yet implementd via dbus"); + System.exit(1); + } + 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); } - } - sendMessage(m, messageText, textSecureAttachments, recipients); - break; - case "receive": - if (!m.isRegistered()) { - System.err.println("User is not registered."); - System.exit(1); - } - try { - m.receiveMessages(5, true, new ReceiveMessageHandler(m)); - } catch (IOException e) { - System.err.println("Error while receiving message: " + e.getMessage()); - System.exit(3); - } catch (AssertionError e) { - System.err.println("Failed to receive 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); - } - break; + + break; + case "daemon": + if (dBusConn != null) { + System.err.println("Stop it."); + System.exit(1); + } + if (!m.isRegistered()) { + System.err.println("User is not registered."); + System.exit(1); + } + DBusConnection conn = null; + try { + try { + int busType; + if (ns.getBoolean("system")) { + busType = DBusConnection.SYSTEM; + } else { + busType = DBusConnection.SESSION; + } + conn = DBusConnection.getConnection(busType); + conn.requestBusName("org.asamk.TextSecure"); + conn.exportObject("/org/asamk/TextSecure", m); + } catch (DBusException e) { + e.printStackTrace(); + System.exit(3); + } + try { + m.receiveMessages(3600, false, new ReceiveMessageHandler(m)); + } catch (IOException e) { + System.err.println("Error while receiving messages: " + e.getMessage()); + System.exit(3); + } catch (AssertionError e) { + handleAssertionError(e); + } + } finally { + if (conn != null) { + conn.disconnect(); + } + } + + break; + } + System.exit(0); + } finally { + if (dBusConn != null) { + dBusConn.disconnect(); + } + } + } + + 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; } - m.save(); - System.exit(0); } private static Namespace parseArgs(String[] args) { ArgumentParser parser = ArgumentParsers.newArgumentParser("textsecure-cli") .defaultHelp(true) - .description("Commandline interface for TextSecure."); + .description("Commandline interface for TextSecure.") + .version(Manager.PROJECT_NAME + " " + Manager.PROJECT_VERSION); + + parser.addArgument("-v", "--version") + .help("Show package version.") + .action(Arguments.version()); + + MutuallyExclusiveGroup mut = parser.addMutuallyExclusiveGroup(); + mut.addArgument("-u", "--username") + .help("Specify your phone number, that will be used for verification."); + mut.addArgument("--dbus") + .help("Make request via user dbus.") + .action(Arguments.storeTrue()); + mut.addArgument("--dbus-system") + .help("Make request via system dbus.") + .action(Arguments.storeTrue()); + Subparsers subparsers = parser.addSubparsers() .title("subcommands") .dest("command") @@ -178,6 +367,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("*"); @@ -186,49 +377,82 @@ 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 parserReceive = subparsers.addParser("receive"); - parser.addArgument("-u", "--username") + Subparser parserLeaveGroup = subparsers.addParser("quitGroup"); + parserLeaveGroup.addArgument("-g", "--group") .required(true) - .help("Specify your phone number, that will be used for verification."); + .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") + .type(int.class) + .help("Number of seconds to wait for new messages (negative values disable timeout)"); + + Subparser parserDaemon = subparsers.addParser("daemon"); + parserDaemon.addArgument("--system") + .action(Arguments.storeTrue()) + .help("Use DBus system bus instead of user bus."); try { - return parser.parseArgs(args); + Namespace ns = parser.parseArgs(args); + if (!ns.getBoolean("dbus") && !ns.getBoolean("dbus_system")) { + if (ns.getString("username") == null) { + parser.printUsage(); + 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 null; } } - 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/receive 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 { @@ -239,37 +463,54 @@ 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 { if (content.getDataMessage().isPresent()) { TextSecureDataMessage message = content.getDataMessage().get(); - System.out.println("Body: " + message.getBody().get()); + System.out.println("Message timestamp: " + message.getTimestamp()); + + if (message.getBody().isPresent()) { + System.out.println("Body: " + message.getBody().get()); + } + if (message.getGroupInfo().isPresent()) { + TextSecureGroup groupInfo = message.getGroupInfo().get(); + System.out.println("Group info:"); + 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()) { + for (String member : groupInfo.getMembers().get()) { + System.out.println(" Member: " + member); + } + } + if (groupInfo.getAvatar().isPresent()) { + System.out.println(" Avatar:"); + printAttachment(groupInfo.getAvatar().get()); + } + } if (message.isEndSession()) { - m.handleEndSession(envelope.getSource()); - } else if (message.getAttachments().isPresent()) { + System.out.println("Is end session"); + } + + if (message.getAttachments().isPresent()) { System.out.println("Attachments: "); for (TextSecureAttachment attachment : message.getAttachments().get()) { - System.out.println("- " + attachment.getContentType() + " (" + (attachment.isPointer() ? "Pointer" : "") + (attachment.isStream() ? "Stream" : "") + ")"); - if (attachment.isPointer()) { - System.out.println(" Id: " + attachment.asPointer().getId() + " Key length: " + attachment.asPointer().getKey().length + (attachment.asPointer().getRelay().isPresent() ? " Relay: " + attachment.asPointer().getRelay().get() : "")); - try { - File file = m.retrieveAttachment(attachment.asPointer()); - System.out.println(" Stored plaintext in: " + file); - } catch (IOException | InvalidMessageException e) { - System.out.println("Failed to retrieve attachment: " + e.getMessage()); - } - } + printAttachment(attachment); } } } @@ -283,5 +524,18 @@ public class Main { } System.out.println(); } + + private void printAttachment(TextSecureAttachment attachment) { + System.out.println("- " + attachment.getContentType() + " (" + (attachment.isPointer() ? "Pointer" : "") + (attachment.isStream() ? "Stream" : "") + ")"); + if (attachment.isPointer()) { + 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)" : "")); + File file = m.getAttachmentFile(pointer.getId()); + if (file.exists()) { + System.out.println(" Stored plaintext in: " + file); + } + } + } } }