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;
}
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("Aborting sending.");
+ 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);
}
- }
- 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")) {
+ if (ns.getList("recipient") == null) {
+ System.err.println("No recipients given");
+ System.err.println("Aborting sending.");
+ System.exit(1);
+ }
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));
+ ts.sendEndSessionMessage(ns.<String>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);
+ }
+ } 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);
+ }
+ }
+
+ try {
+ List<String> 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.<String>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);
}
}
- }
- TextSecureGroup group = null;
- List<String> recipientStrings = null;
- if (ns.getString("group") != null) {
+
+ 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 {
- GroupInfo g = m.getGroupInfo(Base64.decode(ns.getString("group")));
- if (g == null) {
- System.err.println("Failed to send to grup \"" + ns.getString("group") + "\": Unknown group");
- System.err.println("Aborting sending.");
- System.exit(1);
- }
- group = new TextSecureGroup(g.groupId);
- recipientStrings = g.members;
+ m.receiveMessages(timeout, returnOnTimeout, new ReceiveMessageHandler(m));
} catch (IOException e) {
- System.err.println("Failed to send to grup \"" + ns.getString("group") + "\": " + e.getMessage());
- System.err.println("Aborting sending.");
+ 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);
}
- } else {
- recipientStrings = ns.<String>getList("recipient");
- }
- List<TextSecureAddress> recipients = new ArrayList<>(ns.<String>getList("recipient").size());
- for (String recipient : recipientStrings) {
try {
- recipients.add(m.getPushAddress(recipient));
- } catch (InvalidNumberException e) {
- System.err.println("Failed to add recipient \"" + recipient + "\": " + e.getMessage());
+ byte[] groupId = null;
+ if (ns.getString("group") != null) {
+ groupId = decodeGroupId(ns.getString("group"));
+ }
+ byte[] newGroupId = m.sendUpdateGroupMessage(groupId, ns.getString("name"), ns.<String>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, group);
- break;
- case "receive":
- 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 {
- m.receiveMessages(timeout, returnOnTimeout, 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) {
.description("Commandline interface for TextSecure.")
.version(Manager.PROJECT_NAME + " " + Manager.PROJECT_VERSION);
- parser.addArgument("-u", "--username")
- .help("Specify your phone number, that will be used for verification.");
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")
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")
.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 {
Namespace ns = parser.parseArgs(args);
- if (ns.getString("username") == null) {
- parser.printUsage();
- System.err.println("You need to specify a username (phone number)");
- System.exit(2);
+ 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");
}
}
- private static void sendMessage(Manager m, String messageText, List<TextSecureAttachment> textSecureAttachments,
- List<TextSecureAddress> recipients, TextSecureGroup group) {
- final TextSecureDataMessage.Builder messageBuilder = TextSecureDataMessage.newBuilder().withBody(messageText);
- if (textSecureAttachments != null) {
- messageBuilder.withAttachments(textSecureAttachments);
+ 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);
+ }
+
+ 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());
}
- if (group != null) {
- messageBuilder.asGroupMessage(group);
+ for (UnregisteredUserException n : e.getUnregisteredUserExceptions()) {
+ System.err.println("Unregistered user \"" + n.getE164Number() + "\": " + n.getMessage());
}
- TextSecureDataMessage message = messageBuilder.build();
-
- 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);
+ 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;
}
if (message.isEndSession()) {
System.out.println("Is end session");
- m.handleEndSession(envelope.getSource());
}
if (message.getAttachments().isPresent()) {
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);
- } catch (IOException | InvalidMessageException e) {
- System.out.println("Failed to retrieve attachment: " + e.getMessage());
}
}
}
git.nmode.ca / signal-cli / blobdiff
