import org.asamk.signal.storage.contacts.ContactInfo;
import org.asamk.signal.storage.groups.GroupInfo;
import org.asamk.signal.storage.protocol.JsonIdentityKeyStore;
+import org.asamk.signal.util.DateUtils;
import org.asamk.signal.util.Hex;
+import org.asamk.signal.util.IOUtils;
+import org.asamk.signal.util.Util;
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.libsignal.util.guava.Optional;
import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
import org.whispersystems.signalservice.api.messages.*;
+import org.whispersystems.signalservice.api.messages.calls.*;
import org.whispersystems.signalservice.api.messages.multidevice.*;
import org.whispersystems.signalservice.api.push.SignalServiceAddress;
import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;
import org.whispersystems.signalservice.api.push.exceptions.NetworkFailureException;
import org.whispersystems.signalservice.api.push.exceptions.UnregisteredUserException;
import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
+import org.whispersystems.signalservice.internal.push.LockedException;
import org.whispersystems.signalservice.internal.util.Base64;
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.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
public static final String SIGNAL_BUSNAME = "org.asamk.Signal";
public static final String SIGNAL_OBJECTPATH = "/org/asamk/Signal";
- private static final TimeZone tzUTC = TimeZone.getTimeZone("UTC");
-
public static void main(String[] args) {
// Workaround for BKS truststore
Security.insertProviderAt(new org.bouncycastle.jce.provider.BouncyCastleProvider(), 1);
busType = DBusConnection.SESSION;
}
dBusConn = DBusConnection.getConnection(busType);
- ts = (Signal) dBusConn.getRemoteObject(
+ ts = dBusConn.getRemoteObject(
SIGNAL_BUSNAME, SIGNAL_OBJECTPATH,
Signal.class);
} catch (UnsatisfiedLinkError e) {
return 3;
}
break;
+ case "setPin":
+ if (dBusConn != null) {
+ System.err.println("setPin is not yet implemented via dbus");
+ return 1;
+ }
+ if (!m.isRegistered()) {
+ System.err.println("User is not registered.");
+ return 1;
+ }
+ try {
+ String registrationLockPin = ns.getString("registrationLockPin");
+ m.setRegistrationLockPin(Optional.of(registrationLockPin));
+ } catch (IOException e) {
+ System.err.println("Set pin error: " + e.getMessage());
+ return 3;
+ }
+ break;
+ case "removePin":
+ if (dBusConn != null) {
+ System.err.println("removePin is not yet implemented via dbus");
+ return 1;
+ }
+ if (!m.isRegistered()) {
+ System.err.println("User is not registered.");
+ return 1;
+ }
+ try {
+ m.setRegistrationLockPin(Optional.<String>absent());
+ } catch (IOException e) {
+ System.err.println("Remove pin error: " + e.getMessage());
+ return 3;
+ }
+ break;
case "verify":
if (dBusConn != null) {
System.err.println("verify is not yet implemented via dbus");
return 1;
}
try {
- m.verifyAccount(ns.getString("verificationCode"));
+ String verificationCode = ns.getString("verificationCode");
+ String pin = ns.getString("pin");
+ m.verifyAccount(verificationCode, pin);
+ } catch (LockedException e) {
+ System.err.println("Verification failed! This number is locked with a pin. Hours remaining until reset: " + (e.getTimeRemaining() / 1000 / 60 / 60));
+ System.err.println("Use '--pin PIN_CODE' to specify the registration lock PIN");
+ return 3;
} catch (IOException e) {
System.err.println("Verify error: " + e.getMessage());
return 3;
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: " + formatTimestamp(d.getCreated()));
- System.out.println(" Last seen: " + formatTimestamp(d.getLastSeen()));
+ System.out.println(" Created: " + DateUtils.formatTimestamp(d.getCreated()));
+ System.out.println(" Last seen: " + DateUtils.formatTimestamp(d.getLastSeen()));
}
} catch (IOException e) {
e.printStackTrace();
String messageText = ns.getString("message");
if (messageText == null) {
try {
- messageText = readAll(System.in);
+ messageText = IOUtils.readAll(System.in, Charset.defaultCharset());
} catch (IOException e) {
System.err.println("Failed to read message from stdin: " + e.getMessage());
System.err.println("Aborting sending.");
@Override
public void handle(Signal.MessageReceived s) {
System.out.print(String.format("Envelope from: %s\nTimestamp: %s\nBody: %s\n",
- s.getSender(), formatTimestamp(s.getTimestamp()), s.getMessage()));
+ s.getSender(), DateUtils.formatTimestamp(s.getTimestamp()), s.getMessage()));
if (s.getGroupId().length > 0) {
System.out.println("Group info:");
System.out.println(" Id: " + Base64.encodeBytes(s.getGroupId()));
@Override
public void handle(Signal.ReceiptReceived s) {
System.out.print(String.format("Receipt from: %s\nTimestamp: %s\n",
- s.getSender(), formatTimestamp(s.getTimestamp())));
+ s.getSender(), DateUtils.formatTimestamp(s.getTimestamp())));
}
});
} catch (UnsatisfiedLinkError e) {
}
ignoreAttachments = ns.getBoolean("ignore_attachments");
try {
- m.receiveMessages(1, TimeUnit.HOURS, false, ignoreAttachments, new DbusReceiveMessageHandler(m, conn));
+ m.receiveMessages(1, TimeUnit.HOURS, false, ignoreAttachments, ns.getBoolean("json") ? new JsonDbusReceiveMessageHandler(m, conn) : new DbusReceiveMessageHandler(m, conn));
} catch (IOException e) {
System.err.println("Error while receiving messages: " + e.getMessage());
return 3;
}
private static void printIdentityFingerprint(Manager m, String theirUsername, JsonIdentityKeyStore.Identity theirId) {
- String digits = formatSafetyNumber(m.computeSafetyNumber(theirUsername, theirId.getIdentityKey()));
+ String digits = Util.formatSafetyNumber(m.computeSafetyNumber(theirUsername, theirId.getIdentityKey()));
System.out.println(String.format("%s: %s Added: %s Fingerprint: %s Safety Number: %s", theirUsername,
theirId.getTrustLevel(), theirId.getDateAdded(), Hex.toStringCondensed(theirId.getFingerprint()), digits));
}
}
}
- private static String formatSafetyNumber(String digits) {
- final int partCount = 12;
- int partSize = digits.length() / partCount;
- StringBuilder f = new StringBuilder(digits.length() + partCount);
- for (int i = 0; i < partCount; i++) {
- f.append(digits.substring(i * partSize, (i * partSize) + partSize)).append(" ");
- }
- return f.toString();
- }
-
private static void handleGroupNotFoundException(GroupNotFoundException e) {
System.err.println("Failed to send to group: " + e.getMessage());
System.err.println("Aborting sending.");
}
private static Namespace parseArgs(String[] args) {
- ArgumentParser parser = ArgumentParsers.newArgumentParser("signal-cli")
+ ArgumentParser parser = ArgumentParsers.newFor("signal-cli")
+ .build()
.defaultHelp(true)
.description("Commandline interface for Signal.")
.version(Manager.PROJECT_NAME + " " + Manager.PROJECT_VERSION);
Subparser parserUpdateAccount = subparsers.addParser("updateAccount");
parserUpdateAccount.help("Update the account attributes on the signal server.");
+ Subparser parserSetPin = subparsers.addParser("setPin");
+ parserSetPin.addArgument("registrationLockPin")
+ .help("The registration lock PIN, that will be required for new registrations (resets after 7 days of inactivity)");
+
+ Subparser parserRemovePin = subparsers.addParser("removePin");
+
Subparser parserVerify = subparsers.addParser("verify");
parserVerify.addArgument("verificationCode")
.help("The verification code you received via sms or voice call.");
+ parserVerify.addArgument("-p", "--pin")
+ .help("The registration lock PIN, that was set by the user (Optional)");
Subparser parserSend = subparsers.addParser("send");
parserSend.addArgument("-g", "--group")
parserDaemon.addArgument("--ignore-attachments")
.help("Don’t download attachments of received messages.")
.action(Arguments.storeTrue());
+ parserDaemon.addArgument("--json")
+ .help("Output received messages in json format, one json object per line.")
+ .action(Arguments.storeTrue());
try {
Namespace ns = parser.parseArgs(args);
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;
if (source.getRelay().isPresent()) {
System.out.println("Relayed by: " + source.getRelay().get());
}
- System.out.println("Timestamp: " + formatTimestamp(envelope.getTimestamp()));
+ System.out.println("Timestamp: " + DateUtils.formatTimestamp(envelope.getTimestamp()));
+ if (envelope.isUnidentifiedSender()) {
+ System.out.println("Sent by unidentified/sealed sender");
+ }
if (envelope.isReceipt()) {
System.out.println("Got receipt.");
System.out.println("Received sync read messages list");
for (ReadMessage rm : syncMessage.getRead().get()) {
ContactInfo fromContact = m.getContact(rm.getSender());
- System.out.println("From: " + (fromContact == null ? "" : "“" + fromContact.name + "” ") + rm.getSender() + " Message timestamp: " + formatTimestamp(rm.getTimestamp()));
+ System.out.println("From: " + (fromContact == null ? "" : "“" + fromContact.name + "” ") + rm.getSender() + " Message timestamp: " + DateUtils.formatTimestamp(rm.getTimestamp()));
}
}
if (syncMessage.getRequest().isPresent()) {
} else {
to = "Unknown";
}
- System.out.println("To: " + to + " , Message timestamp: " + formatTimestamp(sentTranscriptMessage.getTimestamp()));
+ System.out.println("To: " + to + " , Message timestamp: " + DateUtils.formatTimestamp(sentTranscriptMessage.getTimestamp()));
if (sentTranscriptMessage.getExpirationStartTimestamp() > 0) {
- System.out.println("Expiration started at: " + formatTimestamp(sentTranscriptMessage.getExpirationStartTimestamp()));
+ System.out.println("Expiration started at: " + DateUtils.formatTimestamp(sentTranscriptMessage.getExpirationStartTimestamp()));
}
SignalServiceDataMessage message = sentTranscriptMessage.getMessage();
handleSignalServiceDataMessage(message);
System.out.println("Received sync message with verified identities:");
final VerifiedMessage verifiedMessage = syncMessage.getVerified().get();
System.out.println(" - " + verifiedMessage.getDestination() + ": " + verifiedMessage.getVerified());
- String safetyNumber = formatSafetyNumber(m.computeSafetyNumber(verifiedMessage.getDestination(), verifiedMessage.getIdentityKey()));
+ String safetyNumber = Util.formatSafetyNumber(m.computeSafetyNumber(verifiedMessage.getDestination(), verifiedMessage.getIdentityKey()));
System.out.println(" " + safetyNumber);
}
+ if (syncMessage.getConfiguration().isPresent()) {
+ System.out.println("Received sync message with configuration:");
+ final ConfigurationMessage configurationMessage = syncMessage.getConfiguration().get();
+ if (configurationMessage.getReadReceipts().isPresent()) {
+ System.out.println(" - Read receipts: " + (configurationMessage.getReadReceipts().get() ? "enabled" : "disabled"));
+ }
+ }
+ }
+ if (content.getCallMessage().isPresent()) {
+ System.out.println("Received a call message");
+ SignalServiceCallMessage callMessage = content.getCallMessage().get();
+ if (callMessage.getAnswerMessage().isPresent()) {
+ AnswerMessage answerMessage = callMessage.getAnswerMessage().get();
+ System.out.println("Answer message: " + answerMessage.getId() + ": " + answerMessage.getDescription());
+ }
+ if (callMessage.getBusyMessage().isPresent()) {
+ BusyMessage busyMessage = callMessage.getBusyMessage().get();
+ System.out.println("Busy message: " + busyMessage.getId());
+ }
+ if (callMessage.getHangupMessage().isPresent()) {
+ HangupMessage hangupMessage = callMessage.getHangupMessage().get();
+ System.out.println("Hangup message: " + hangupMessage.getId());
+ }
+ if (callMessage.getIceUpdateMessages().isPresent()) {
+ List<IceUpdateMessage> iceUpdateMessages = callMessage.getIceUpdateMessages().get();
+ for (IceUpdateMessage iceUpdateMessage : iceUpdateMessages) {
+ System.out.println("Ice update message: " + iceUpdateMessage.getId() + ", sdp: " + iceUpdateMessage.getSdp());
+ }
+ }
+ if (callMessage.getOfferMessage().isPresent()) {
+ OfferMessage offerMessage = callMessage.getOfferMessage().get();
+ System.out.println("Offer message: " + offerMessage.getId() + ": " + offerMessage.getDescription());
+ }
+ }
+ if (content.getReceiptMessage().isPresent()) {
+ System.out.println("Received a receipt message");
+ SignalServiceReceiptMessage receiptMessage = content.getReceiptMessage().get();
+ System.out.println(" - When: " + DateUtils.formatTimestamp(receiptMessage.getWhen()));
+ if (receiptMessage.isDeliveryReceipt()) {
+ System.out.println(" - Is delivery receipt");
+ }
+ if (receiptMessage.isReadReceipt()) {
+ System.out.println(" - Is read receipt");
+ }
+ System.out.println(" - Timestamps:");
+ for (long timestamp : receiptMessage.getTimestamps()) {
+ System.out.println(" " + DateUtils.formatTimestamp(timestamp));
+ }
+ }
+ if (content.getTypingMessage().isPresent()) {
+ System.out.println("Received a typing message");
+ SignalServiceTypingMessage typingMessage = content.getTypingMessage().get();
+ System.out.println(" - Action: " + typingMessage.getAction());
+ System.out.println(" - Timestamp: " + DateUtils.formatTimestamp(typingMessage.getTimestamp()));
+ if (typingMessage.getGroupId().isPresent()) {
+ GroupInfo group = m.getGroup(typingMessage.getGroupId().get());
+ if (group != null) {
+ System.out.println(" Name: " + group.name);
+ } else {
+ System.out.println(" Name: <Unknown group>");
+ }
+ }
}
}
} else {
}
private void handleSignalServiceDataMessage(SignalServiceDataMessage message) {
- System.out.println("Message timestamp: " + formatTimestamp(message.getTimestamp()));
+ System.out.println("Message timestamp: " + DateUtils.formatTimestamp(message.getTimestamp()));
if (message.getBody().isPresent()) {
System.out.println("Body: " + message.getBody().get());
if (message.getExpiresInSeconds() > 0) {
System.out.println("Expires in: " + message.getExpiresInSeconds() + " seconds");
}
+ if (message.getProfileKey().isPresent()) {
+ System.out.println("Profile key update, key length:" + message.getProfileKey().get().length);
+ }
+
+ if (message.getQuote().isPresent()) {
+ SignalServiceDataMessage.Quote quote = message.getQuote().get();
+ System.out.println("Quote: (" + quote.getId() + ")");
+ System.out.println(" Author: " + quote.getAuthor().getNumber());
+ System.out.println(" Text: " + quote.getText());
+ if (quote.getAttachments().size() > 0) {
+ System.out.println(" Attachments: ");
+ for (SignalServiceDataMessage.Quote.QuotedAttachment attachment : quote.getAttachments()) {
+ System.out.println(" Filename: " + attachment.getFileName());
+ System.out.println(" Type: " + attachment.getContentType());
+ System.out.println(" Thumbnail:");
+ if (attachment.getThumbnail() != null) {
+ printAttachment(attachment.getThumbnail());
+ }
+ }
+ }
+ }
if (message.getAttachments().isPresent()) {
System.out.println("Attachments: ");
System.out.println("- " + attachment.getContentType() + " (" + (attachment.isPointer() ? "Pointer" : "") + (attachment.isStream() ? "Stream" : "") + ")");
if (attachment.isPointer()) {
final SignalServiceAttachmentPointer pointer = attachment.asPointer();
- System.out.println(" Id: " + pointer.getId() + " Key length: " + pointer.getKey().length + (pointer.getRelay().isPresent() ? " Relay: " + pointer.getRelay().get() : ""));
+ System.out.println(" Id: " + pointer.getId() + " Key length: " + pointer.getKey().length);
System.out.println(" Filename: " + (pointer.getFileName().isPresent() ? pointer.getFileName().get() : "-"));
System.out.println(" Size: " + (pointer.getSize().isPresent() ? pointer.getSize().get() + " bytes" : "<unavailable>") + (pointer.getPreview().isPresent() ? " (Preview is available: " + pointer.getPreview().get().length + " bytes)" : ""));
System.out.println(" Voice note: " + (pointer.getVoiceNote() ? "yes" : "no"));
+ System.out.println(" Dimensions: " + pointer.getWidth() + "x" + pointer.getHeight());
File file = m.getAttachmentFile(pointer.getId());
if (file.exists()) {
System.out.println(" Stored plaintext in: " + file);
public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) {
super.handleMessage(envelope, content, exception);
+ JsonDbusReceiveMessageHandler.sendReceivedMessageToDbus(envelope, content, conn, m);
+ }
+ }
+
+ private static class JsonReceiveMessageHandler implements Manager.ReceiveMessageHandler {
+ final Manager m;
+ final ObjectMapper jsonProcessor;
+
+ public JsonReceiveMessageHandler(Manager m) {
+ this.m = m;
+ this.jsonProcessor = new ObjectMapper();
+ jsonProcessor.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); // disable autodetect
+ jsonProcessor.enable(SerializationFeature.WRITE_NULL_MAP_VALUES);
+ jsonProcessor.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+ jsonProcessor.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
+ }
+
+ @Override
+ public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) {
+ ObjectNode result = jsonProcessor.createObjectNode();
+ if (exception != null) {
+ result.putPOJO("error", new JsonError(exception));
+ }
+ if (envelope != null) {
+ result.putPOJO("envelope", new JsonMessageEnvelope(envelope, content));
+ }
+ try {
+ jsonProcessor.writeValue(System.out, result);
+ System.out.println();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ private static class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
+ final DBusConnection conn;
+
+ public JsonDbusReceiveMessageHandler(Manager m, DBusConnection conn) {
+ super(m);
+ this.conn = conn;
+ }
+
+ @Override
+ public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) {
+ super.handleMessage(envelope, content, exception);
+
+ sendReceivedMessageToDbus(envelope, content, conn, m);
+ }
+
+ private static void sendReceivedMessageToDbus(SignalServiceEnvelope envelope, SignalServiceContent content, DBusConnection conn, Manager m) {
if (envelope.isReceipt()) {
try {
conn.sendSignal(new Signal.ReceiptReceived(
}
}
}
-
- private static class JsonReceiveMessageHandler implements Manager.ReceiveMessageHandler {
- final Manager m;
- final ObjectMapper jsonProcessor;
-
- public JsonReceiveMessageHandler(Manager m) {
- this.m = m;
- this.jsonProcessor = new ObjectMapper();
- jsonProcessor.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); // disable autodetect
- jsonProcessor.enable(SerializationFeature.WRITE_NULL_MAP_VALUES);
- jsonProcessor.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
- jsonProcessor.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
- }
-
- @Override
- public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) {
- ObjectNode result = jsonProcessor.createObjectNode();
- if (exception != null) {
- result.putPOJO("error", new JsonError(exception));
- }
- if (envelope != null) {
- result.putPOJO("envelope", new JsonMessageEnvelope(envelope, content));
- }
- try {
- jsonProcessor.writeValue(System.out, result);
- System.out.println();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
-
- private static String formatTimestamp(long timestamp) {
- Date date = new Date(timestamp);
- final DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"); // Quoted "Z" to indicate UTC, no timezone offset
- df.setTimeZone(tzUTC);
- return timestamp + " (" + df.format(date) + ")";
- }
}
git.nmode.ca / signal-cli / blobdiff
