X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/aa8a23aceb6cd9cb63723f4d783c7ef07e365610..4608fb433b1af1753bdf73584d5c0f5f9e70f1bf:/src/main/java/org/asamk/signal/Main.java diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java index def569df..4b22605c 100644 --- a/src/main/java/org/asamk/signal/Main.java +++ b/src/main/java/org/asamk/signal/Main.java @@ -19,15 +19,16 @@ package org.asamk.signal; import net.sourceforge.argparse4j.ArgumentParsers; import net.sourceforge.argparse4j.impl.Arguments; import net.sourceforge.argparse4j.inf.*; -import org.apache.commons.io.IOUtils; import org.apache.http.util.TextUtils; import org.asamk.Signal; import org.freedesktop.dbus.DBusConnection; import org.freedesktop.dbus.DBusSigHandler; import org.freedesktop.dbus.exceptions.DBusException; import org.freedesktop.dbus.exceptions.DBusExecutionException; +import org.whispersystems.libsignal.InvalidKeyException; import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException; import org.whispersystems.signalservice.api.messages.*; +import org.whispersystems.signalservice.api.messages.multidevice.DeviceInfo; import org.whispersystems.signalservice.api.messages.multidevice.ReadMessage; import org.whispersystems.signalservice.api.messages.multidevice.SentTranscriptMessage; import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage; @@ -39,9 +40,15 @@ import org.whispersystems.signalservice.api.util.PhoneNumberFormatter; import java.io.File; import java.io.IOException; +import java.io.InputStream; +import java.io.StringWriter; +import java.net.URI; +import java.net.URISyntaxException; +import java.nio.charset.Charset; import java.security.Security; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.TimeoutException; public class Main { @@ -144,6 +151,98 @@ public class Main { System.exit(3); } break; + case "link": + if (dBusConn != null) { + System.err.println("link is not yet implemented via dbus"); + System.exit(1); + } + + // When linking, username is null and we always have to create keys + m.createNewIdentity(); + + String deviceName = ns.getString("name"); + if (deviceName == null) { + deviceName = "cli"; + } + try { + System.out.println(m.getDeviceLinkUri()); + m.finishDeviceLink(deviceName); + System.out.println("Associated with: " + m.getUsername()); + } catch (TimeoutException e) { + System.err.println("Link request timed out, please try again."); + System.exit(3); + } catch (IOException e) { + System.err.println("Link request error: " + e.getMessage()); + System.exit(3); + } catch (InvalidKeyException e) { + e.printStackTrace(); + System.exit(3); + } catch (UserAlreadyExists e) { + System.err.println("The user " + e.getUsername() + " already exists\nDelete \"" + e.getFileName() + "\" before trying again."); + System.exit(3); + } + break; + case "addDevice": + if (dBusConn != null) { + System.err.println("link is not yet implemented via dbus"); + System.exit(1); + } + if (!m.isRegistered()) { + System.err.println("User is not registered."); + System.exit(1); + } + try { + m.addDeviceLink(new URI(ns.getString("uri"))); + } catch (IOException e) { + e.printStackTrace(); + System.exit(3); + } catch (InvalidKeyException e) { + e.printStackTrace(); + System.exit(2); + } catch (URISyntaxException e) { + e.printStackTrace(); + System.exit(2); + } + break; + case "listDevices": + if (dBusConn != null) { + System.err.println("listDevices is not yet implemented via dbus"); + System.exit(1); + } + if (!m.isRegistered()) { + System.err.println("User is not registered."); + System.exit(1); + } + try { + List devices = m.getLinkedDevices(); + for (DeviceInfo d : devices) { + System.out.println("Device " + d.getId() + (d.getId() == m.getDeviceId() ? " (this device)" : "") + ":"); + System.out.println(" Name: " + d.getName()); + System.out.println(" Created: " + d.getCreated()); + System.out.println(" Last seen: " + d.getLastSeen()); + } + } catch (IOException e) { + e.printStackTrace(); + System.exit(3); + } + break; + case "removeDevice": + if (dBusConn != null) { + System.err.println("removeDevice is not yet implemented via dbus"); + System.exit(1); + } + if (!m.isRegistered()) { + System.err.println("User is not registered."); + System.exit(1); + } + try { + int deviceId = ns.getInt("deviceId"); + m.removeLinkedDevices(deviceId); + } catch (IOException e) { + e.printStackTrace(); + System.exit(3); + } + break; case "send": if (dBusConn == null && !m.isRegistered()) { System.err.println("User is not registered."); @@ -166,12 +265,14 @@ public class Main { handleAssertionError(e); } catch (DBusExecutionException e) { handleDBusExecutionException(e); + } catch (UntrustedIdentityException e) { + e.printStackTrace(); } } else { String messageText = ns.getString("message"); if (messageText == null) { try { - messageText = IOUtils.toString(System.in); + messageText = readAll(System.in); } catch (IOException e) { System.err.println("Failed to read message from stdin: " + e.getMessage()); System.err.println("Aborting sending."); @@ -204,6 +305,8 @@ public class Main { System.exit(1); } catch (DBusExecutionException e) { handleDBusExecutionException(e); + } catch (UntrustedIdentityException e) { + e.printStackTrace(); } } @@ -282,6 +385,8 @@ public class Main { handleAssertionError(e); } catch (GroupNotFoundException e) { handleGroupNotFoundException(e); + } catch (UntrustedIdentityException e) { + e.printStackTrace(); } break; @@ -314,6 +419,8 @@ public class Main { handleGroupNotFoundException(e); } catch (EncapsulatedExceptions e) { handleEncapsulatedExceptions(e); + } catch (UntrustedIdentityException e) { + e.printStackTrace(); } break; @@ -399,7 +506,7 @@ public class Main { .help("Show package version.") .action(Arguments.version()); parser.addArgument("--config") - .help("Set the path, where to store the config (Default: $HOME/.config/signal-cli)."); + .help("Set the path, where to store the config (Default: $HOME/.config/signal)."); MutuallyExclusiveGroup mut = parser.addMutuallyExclusiveGroup(); mut.addArgument("-u", "--username") @@ -417,6 +524,23 @@ public class Main { .description("valid subcommands") .help("additional help"); + Subparser parserLink = subparsers.addParser("link"); + parserLink.addArgument("-n", "--name") + .help("Specify a name to describe this new device."); + + Subparser parserAddDevice = subparsers.addParser("addDevice"); + parserAddDevice.addArgument("--uri") + .required(true) + .help("Specify the uri contained in the QR code shown by the new device."); + + Subparser parserDevices = subparsers.addParser("listDevices"); + + Subparser parserRemoveDevice = subparsers.addParser("removeDevice"); + parserRemoveDevice.addArgument("-d", "--deviceId") + .type(int.class) + .required(true) + .help("Specify the device you want to remove. Use listDevices to see the deviceIds."); + Subparser parserRegister = subparsers.addParser("register"); parserRegister.addArgument("-v", "--voice") .help("The verification should be done over voice, not sms.") @@ -469,7 +593,13 @@ public class Main { try { Namespace ns = parser.parseArgs(args); - if (!ns.getBoolean("dbus") && !ns.getBoolean("dbus_system")) { + if ("link".equals(ns.getString("command"))) { + if (ns.getString("username") != null) { + parser.printUsage(); + System.err.println("You cannot specify a username (phone number) when linking"); + System.exit(2); + } + } else 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)"); @@ -515,6 +645,18 @@ public class Main { System.err.println("Failed to send message: " + e.getMessage()); } + private static String readAll(InputStream in) throws IOException { + StringWriter output = new StringWriter(); + byte[] buffer = new byte[4096]; + long count = 0; + int n; + while (-1 != (n = System.in.read(buffer))) { + output.write(new String(buffer, 0, n, Charset.defaultCharset())); + count += n; + } + return output.toString(); + } + private static class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { final Manager m; @@ -542,6 +684,7 @@ public class Main { handleSignalServiceDataMessage(message, group); } if (content.getSyncMessage().isPresent()) { + System.out.println("Received a sync message"); SignalServiceSyncMessage syncMessage = content.getSyncMessage().get(); if (syncMessage.getContacts().isPresent()) {