X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/28e192c519c59d97d70aea6fabe18927e1aff42a..1b0df2c7e727a2a88d50799852b49508128822b8:/src/main/java/cli/Main.java diff --git a/src/main/java/cli/Main.java b/src/main/java/cli/Main.java index 34f07a55..f6b6bb70 100644 --- a/src/main/java/cli/Main.java +++ b/src/main/java/cli/Main.java @@ -17,16 +17,25 @@ package cli; 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.InvalidVersionException; import org.whispersystems.textsecure.api.TextSecureMessageSender; -import org.whispersystems.textsecure.api.crypto.UntrustedIdentityException; -import org.whispersystems.textsecure.api.messages.TextSecureMessage; +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.util.InvalidNumberException; +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 { @@ -43,15 +52,21 @@ public class Main { .description("valid subcommands") .help("additional help"); Subparser parserRegister = subparsers.addParser("register"); + parserRegister.addArgument("-v", "--voice") + .help("The verification should be done over voice, not sms.") + .action(Arguments.storeTrue()); Subparser parserVerify = subparsers.addParser("verify"); parserVerify.addArgument("verificationCode") - .help("The verification code you received via sms."); + .help("The verification code you received via sms or voice call."); Subparser parserSend = subparsers.addParser("send"); parserSend.addArgument("recipient") .help("Specify the recipients' phone number.") .nargs("*"); parserSend.addArgument("-m", "--message") .help("Specify the message, if missing standard input is used."); + parserSend.addArgument("-a", "--attachment") + .nargs("*") + .help("Add file as attachment"); Subparser parserReceive = subparsers.addParser("receive"); parser.addArgument("-u", "--username") .required(true) @@ -64,8 +79,8 @@ public class Main { System.exit(1); } - String username = ns.getString("username"); - Manager m = new Manager(username); + final String username = ns.getString("username"); + final Manager m = new Manager(username); if (m.userExists()) { try { m.load(); @@ -80,7 +95,7 @@ public class Main { m.createNewIdentity(); } try { - m.register(); + m.register(ns.getBoolean("voice")); } catch (IOException e) { System.out.println("Request verify error: " + e.getMessage()); System.exit(3); @@ -117,14 +132,39 @@ public class Main { System.exit(1); } } - TextSecureMessage message = TextSecureMessage.newBuilder().withBody(messageText).build(); + final TextSecureDataMessage.Builder messageBuilder = TextSecureDataMessage.newBuilder().withBody(messageText); + final List attachments = ns.getList("attachment"); + if (attachments != null) { + List 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)); + } catch (IOException e) { + System.out.println("Failed to add attachment \"" + attachment + "\": " + e.getMessage()); + System.exit(1); + } + } + messageBuilder.withAttachments(textSecureAttachments); + } + TextSecureDataMessage message = messageBuilder.build(); + + List recipients = new ArrayList<>(ns.getList("recipient").size()); for (String recipient : ns.getList("recipient")) { try { - messageSender.sendMessage(new TextSecureAddress(recipient), message); - } catch (UntrustedIdentityException | IOException e) { - System.out.println("Send message: " + e.getMessage()); + recipients.add(m.getPushAddress(recipient)); + } catch (InvalidNumberException e) { + System.out.println("Failed to send message to \"" + recipient + "\": " + e.getMessage()); } } + try { + messageSender.sendMessage(recipients, message); + } catch (IOException | EncapsulatedExceptions e) { + System.out.println("Failed to send message: " + e.getMessage()); + } break; case "receive": if (!m.isRegistered()) { @@ -132,14 +172,49 @@ public class Main { System.exit(1); } try { - message = m.receiveMessage(); - if (message == null) { - System.exit(0); - } else { - System.out.println("Received message: " + message.getBody().get()); - } - } catch (IOException | InvalidVersionException e) { - System.out.println("Receive message: " + e.getMessage()); + m.receiveMessages(new Manager.ReceiveMessageHandler() { + @Override + public void handleMessage(TextSecureEnvelope envelope) { + 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()); + + if (message.isEndSession()) { + m.handleEndSession(envelope.getSource()); + } else 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() : "")); + } + } + } + } + if (content.getSyncMessage().isPresent()) { + TextSecureSyncMessage syncMessage = content.getSyncMessage().get(); + System.out.println("Received sync message"); + } + } + } else { + System.out.println("Unknown message received."); + } + System.out.println(); + } + }); + } catch (IOException e) { + System.out.println("Error while receiving message: " + e.getMessage()); } break; }