-/**
- * Copyright (C) 2015 AsamK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+/*
+ Copyright (C) 2015-2018 AsamK
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.asamk.signal;
import net.sourceforge.argparse4j.inf.*;
import org.apache.http.util.TextUtils;
import org.asamk.Signal;
+import org.asamk.signal.manager.BaseConfig;
+import org.asamk.signal.manager.Manager;
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 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) {
m = new Manager(username, settingsPath);
ts = m;
- if (m.userExists()) {
- try {
- m.init();
- } catch (Exception e) {
- System.err.println("Error loading state file \"" + m.getFileName() + "\": " + e.getMessage());
- return 2;
- }
+ try {
+ m.init();
+ } catch (Exception e) {
+ System.err.println("Error loading state file: " + e.getMessage());
+ return 2;
}
}
System.err.println("register is not yet implemented via dbus");
return 1;
}
- if (!m.userHasKeys()) {
- m.createNewIdentity();
- }
try {
m.register(ns.getBoolean("voice"));
} catch (IOException e) {
return 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";
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) {
}
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.");
System.err.println("Aborting sending.");
}
-
private static void handleDBusExecutionException(DBusExecutionException e) {
System.err.println("Cannot connect to dbus: " + e.getMessage());
System.err.println("Aborting.");
.build()
.defaultHelp(true)
.description("Commandline interface for Signal.")
- .version(Manager.PROJECT_NAME + " " + Manager.PROJECT_VERSION);
+ .version(BaseConfig.PROJECT_NAME + " " + BaseConfig.PROJECT_VERSION);
parser.addArgument("-v", "--version")
.help("Show package version.")
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;
public ReceiveMessageHandler(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()) {
if (content.getReceiptMessage().isPresent()) {
System.out.println("Received a receipt message");
SignalServiceReceiptMessage receiptMessage = content.getReceiptMessage().get();
- System.out.println(" - When: " + formatTimestamp(receiptMessage.getWhen()));
+ System.out.println(" - When: " + DateUtils.formatTimestamp(receiptMessage.getWhen()));
if (receiptMessage.isDeliveryReceipt()) {
System.out.println(" - Is delivery receipt");
}
}
System.out.println(" - Timestamps:");
for (long timestamp : receiptMessage.getTimestamps()) {
- System.out.println(" " + formatTimestamp(timestamp));
+ 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>");
+ }
}
}
}
}
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.isProfileKeyUpdate() && message.getProfileKey().isPresent()) {
+ if (message.getProfileKey().isPresent()) {
System.out.println("Profile key update, key length:" + message.getProfileKey().get().length);
}
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"));
}
private static class DbusReceiveMessageHandler extends ReceiveMessageHandler {
+
final DBusConnection conn;
public DbusReceiveMessageHandler(Manager m, DBusConnection conn) {
public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) {
super.handleMessage(envelope, content, exception);
- if (envelope.isReceipt()) {
- try {
- conn.sendSignal(new Signal.ReceiptReceived(
- SIGNAL_OBJECTPATH,
- envelope.getTimestamp(),
- envelope.getSource()
- ));
- } catch (DBusException e) {
- e.printStackTrace();
- }
- } else if (content != null && content.getDataMessage().isPresent()) {
- SignalServiceDataMessage message = content.getDataMessage().get();
-
- if (!message.isEndSession() &&
- !(message.getGroupInfo().isPresent() &&
- message.getGroupInfo().get().getType() != SignalServiceGroup.Type.DELIVER)) {
- List<String> attachments = new ArrayList<>();
- if (message.getAttachments().isPresent()) {
- for (SignalServiceAttachment attachment : message.getAttachments().get()) {
- if (attachment.isPointer()) {
- attachments.add(m.getAttachmentFile(attachment.asPointer().getId()).getAbsolutePath());
- }
- }
- }
-
- try {
- conn.sendSignal(new Signal.MessageReceived(
- SIGNAL_OBJECTPATH,
- message.getTimestamp(),
- envelope.getSource(),
- message.getGroupInfo().isPresent() ? message.getGroupInfo().get().getGroupId() : new byte[0],
- message.getBody().isPresent() ? message.getBody().get() : "",
- attachments));
- } catch (DBusException e) {
- e.printStackTrace();
- }
- }
- }
+ JsonDbusReceiveMessageHandler.sendReceivedMessageToDbus(envelope, content, conn, m);
}
}
private static class JsonReceiveMessageHandler implements Manager.ReceiveMessageHandler {
+
final Manager m;
final ObjectMapper jsonProcessor;
}
private static class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
+
final DBusConnection conn;
public JsonDbusReceiveMessageHandler(Manager m, DBusConnection conn) {
this.conn = conn;
}
- @Override
- public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) {
- super.handleMessage(envelope, content, exception);
-
+ private static void sendReceivedMessageToDbus(SignalServiceEnvelope envelope, SignalServiceContent content, DBusConnection conn, Manager m) {
if (envelope.isReceipt()) {
try {
conn.sendSignal(new Signal.ReceiptReceived(
}
}
}
- }
- 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) + ")";
+ @Override
+ public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) {
+ super.handleMessage(envelope, content, exception);
+
+ sendReceivedMessageToDbus(envelope, content, conn, m);
+ }
}
}
git.nmode.ca / signal-cli / blobdiff
