X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/0a7a6a5c546c3cb951f4c43aec896e3bfcce08a6..fb862e4dde44caf0b5f32f6d55ea00e27146af0d:/src/main/java/cli/Manager.java
diff --git a/src/main/java/cli/Manager.java b/src/main/java/cli/Manager.java
index cd5f6305..a0fb5b01 100644
--- a/src/main/java/cli/Manager.java
+++ b/src/main/java/cli/Manager.java
@@ -1,26 +1,31 @@
/**
* 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 .
*/
package cli;
-import org.apache.commons.io.IOUtils;
-import org.json.JSONObject;
-import org.whispersystems.libaxolotl.IdentityKeyPair;
-import org.whispersystems.libaxolotl.InvalidKeyException;
-import org.whispersystems.libaxolotl.InvalidVersionException;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.whispersystems.libaxolotl.*;
+import org.whispersystems.libaxolotl.ecc.Curve;
+import org.whispersystems.libaxolotl.ecc.ECKeyPair;
import org.whispersystems.libaxolotl.state.PreKeyRecord;
import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
import org.whispersystems.libaxolotl.util.KeyHelper;
@@ -31,81 +36,116 @@ import org.whispersystems.textsecure.api.TextSecureMessagePipe;
import org.whispersystems.textsecure.api.TextSecureMessageReceiver;
import org.whispersystems.textsecure.api.TextSecureMessageSender;
import org.whispersystems.textsecure.api.crypto.TextSecureCipher;
-import org.whispersystems.textsecure.api.messages.TextSecureContent;
-import org.whispersystems.textsecure.api.messages.TextSecureEnvelope;
+import org.whispersystems.textsecure.api.messages.*;
import org.whispersystems.textsecure.api.push.TextSecureAddress;
import org.whispersystems.textsecure.api.push.TrustStore;
+import org.whispersystems.textsecure.api.push.exceptions.EncapsulatedExceptions;
import org.whispersystems.textsecure.api.util.InvalidNumberException;
import org.whispersystems.textsecure.api.util.PhoneNumberFormatter;
import java.io.*;
-import java.util.List;
+import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-public class Manager {
+class Manager {
private final static String URL = "https://textsecure-service.whispersystems.org";
private final static TrustStore TRUST_STORE = new WhisperTrustStore();
+ public final static String PROJECT_NAME = Manager.class.getPackage().getImplementationTitle();
+ public final static String PROJECT_VERSION = Manager.class.getPackage().getImplementationVersion();
+ private final static String USER_AGENT = PROJECT_NAME + " " + PROJECT_VERSION;
+
private final static String settingsPath = System.getProperty("user.home") + "/.config/textsecure";
+ private final static String dataPath = settingsPath + "/data";
+ private final static String attachmentsPath = settingsPath + "/attachments";
+ private final ObjectMapper jsonProcessot = new ObjectMapper();
private String username;
private String password;
private String signalingKey;
+ private int preKeyIdOffset;
+ private int nextSignedPreKeyId;
private boolean registered = false;
private JsonAxolotlStore axolotlStore;
- TextSecureAccountManager accountManager;
+ private TextSecureAccountManager accountManager;
+ private JsonGroupStore groupStore;
public Manager(String username) {
this.username = username;
+ jsonProcessot.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.NONE); // disable autodetect
+ jsonProcessot.enable(SerializationFeature.INDENT_OUTPUT); // for pretty print, you can disable it.
+ jsonProcessot.enable(SerializationFeature.WRITE_NULL_MAP_VALUES);
+ jsonProcessot.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
}
- private String getFileName() {
- String path = settingsPath + "/data";
- new File(path).mkdirs();
- return path + "/" + username;
+ public String getFileName() {
+ new File(dataPath).mkdirs();
+ return dataPath + "/" + username;
}
public boolean userExists() {
File f = new File(getFileName());
- if (!f.exists() || f.isDirectory()) {
- return false;
- }
- return true;
+ return !(!f.exists() || f.isDirectory());
}
public boolean userHasKeys() {
return axolotlStore != null;
}
+ private JsonNode getNotNullNode(JsonNode parent, String name) throws InvalidObjectException {
+ JsonNode node = parent.get(name);
+ if (node == null) {
+ throw new InvalidObjectException(String.format("Incorrect file format: expected parameter %s not found ", name));
+ }
+
+ return node;
+ }
+
public void load() throws IOException, InvalidKeyException {
- JSONObject in = new JSONObject(IOUtils.toString(new FileInputStream(getFileName())));
- username = in.getString("username");
- password = in.getString("password");
- if (in.has("signalingKey")) {
- signalingKey = in.getString("signalingKey");
+ JsonNode rootNode = jsonProcessot.readTree(new File(getFileName()));
+
+ username = getNotNullNode(rootNode, "username").asText();
+ password = getNotNullNode(rootNode, "password").asText();
+ if (rootNode.has("signalingKey")) {
+ signalingKey = getNotNullNode(rootNode, "signalingKey").asText();
+ }
+ if (rootNode.has("preKeyIdOffset")) {
+ preKeyIdOffset = getNotNullNode(rootNode, "preKeyIdOffset").asInt(0);
+ } else {
+ preKeyIdOffset = 0;
+ }
+ if (rootNode.has("nextSignedPreKeyId")) {
+ nextSignedPreKeyId = getNotNullNode(rootNode, "nextSignedPreKeyId").asInt();
+ } else {
+ nextSignedPreKeyId = 0;
+ }
+ axolotlStore = jsonProcessot.convertValue(getNotNullNode(rootNode, "axolotlStore"), JsonAxolotlStore.class); //new JsonAxolotlStore(in.getJSONObject("axolotlStore"));
+ registered = getNotNullNode(rootNode, "registered").asBoolean();
+ JsonNode groupStoreNode = rootNode.get("groupStore");
+ if (groupStoreNode != null) {
+ groupStore = jsonProcessot.convertValue(groupStoreNode, JsonGroupStore.class);
}
- axolotlStore = new JsonAxolotlStore(in.getJSONObject("axolotlStore"));
- registered = in.getBoolean("registered");
- accountManager = new TextSecureAccountManager(URL, TRUST_STORE, username, password);
+ accountManager = new TextSecureAccountManager(URL, TRUST_STORE, username, password, USER_AGENT);
}
public void save() {
- String out = new JSONObject().put("username", username)
+ ObjectNode rootNode = jsonProcessot.createObjectNode();
+ rootNode.put("username", username)
.put("password", password)
.put("signalingKey", signalingKey)
- .put("axolotlStore", axolotlStore.getJson())
- .put("registered", registered).toString();
+ .put("preKeyIdOffset", preKeyIdOffset)
+ .put("nextSignedPreKeyId", nextSignedPreKeyId)
+ .put("registered", registered)
+ .putPOJO("axolotlStore", axolotlStore)
+ .putPOJO("groupStore", groupStore)
+ ;
try {
- OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(getFileName()));
- writer.write(out);
- writer.flush();
- writer.close();
+ jsonProcessot.writeValue(new File(getFileName()), rootNode);
} catch (Exception e) {
- System.out.println("Saving file error: " + e.getMessage());
- return;
+ System.err.println(String.format("Error saving file: %s", e.getMessage()));
}
}
@@ -113,6 +153,7 @@ public class Manager {
IdentityKeyPair identityKey = KeyHelper.generateIdentityKeyPair();
int registrationId = KeyHelper.generateRegistrationId(false);
axolotlStore = new JsonAxolotlStore(identityKey, registrationId);
+ groupStore = new JsonGroupStore();
registered = false;
}
@@ -123,7 +164,7 @@ public class Manager {
public void register(boolean voiceVerication) throws IOException {
password = Util.getSecret(18);
- accountManager = new TextSecureAccountManager(URL, TRUST_STORE, username, password);
+ accountManager = new TextSecureAccountManager(URL, TRUST_STORE, username, password, USER_AGENT);
if (voiceVerication)
accountManager.requestVoiceVerificationCode();
@@ -133,42 +174,99 @@ public class Manager {
registered = false;
}
+ private static final int BATCH_SIZE = 100;
+
+ private List generatePreKeys() {
+ List records = new LinkedList<>();
+
+ for (int i = 0; i < BATCH_SIZE; i++) {
+ int preKeyId = (preKeyIdOffset + i) % Medium.MAX_VALUE;
+ ECKeyPair keyPair = Curve.generateKeyPair();
+ PreKeyRecord record = new PreKeyRecord(preKeyId, keyPair);
+
+ axolotlStore.storePreKey(preKeyId, record);
+ records.add(record);
+ }
+
+ preKeyIdOffset = (preKeyIdOffset + BATCH_SIZE + 1) % Medium.MAX_VALUE;
+ return records;
+ }
+
+ private PreKeyRecord generateLastResortPreKey() {
+ if (axolotlStore.containsPreKey(Medium.MAX_VALUE)) {
+ try {
+ return axolotlStore.loadPreKey(Medium.MAX_VALUE);
+ } catch (InvalidKeyIdException e) {
+ axolotlStore.removePreKey(Medium.MAX_VALUE);
+ }
+ }
+
+ ECKeyPair keyPair = Curve.generateKeyPair();
+ PreKeyRecord record = new PreKeyRecord(Medium.MAX_VALUE, keyPair);
+
+ axolotlStore.storePreKey(Medium.MAX_VALUE, record);
+
+ return record;
+ }
+
+ private SignedPreKeyRecord generateSignedPreKey(IdentityKeyPair identityKeyPair) {
+ try {
+ ECKeyPair keyPair = Curve.generateKeyPair();
+ byte[] signature = Curve.calculateSignature(identityKeyPair.getPrivateKey(), keyPair.getPublicKey().serialize());
+ SignedPreKeyRecord record = new SignedPreKeyRecord(nextSignedPreKeyId, System.currentTimeMillis(), keyPair, signature);
+
+ axolotlStore.storeSignedPreKey(nextSignedPreKeyId, record);
+ nextSignedPreKeyId = (nextSignedPreKeyId + 1) % Medium.MAX_VALUE;
+
+ return record;
+ } catch (InvalidKeyException e) {
+ throw new AssertionError(e);
+ }
+ }
+
public void verifyAccount(String verificationCode) throws IOException {
verificationCode = verificationCode.replace("-", "");
signalingKey = Util.getSecret(52);
- accountManager.verifyAccount(verificationCode, signalingKey, false, axolotlStore.getLocalRegistrationId());
+ accountManager.verifyAccountWithCode(verificationCode, signalingKey, axolotlStore.getLocalRegistrationId(), false);
//accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));
registered = true;
- int start = 0;
- List oneTimePreKeys = KeyHelper.generatePreKeys(start, 100);
- for (int i = start; i < oneTimePreKeys.size(); i++) {
- axolotlStore.storePreKey(i, oneTimePreKeys.get(i));
- }
+ List oneTimePreKeys = generatePreKeys();
- PreKeyRecord lastResortKey = KeyHelper.generateLastResortPreKey();
- axolotlStore.storePreKey(Medium.MAX_VALUE, lastResortKey);
+ PreKeyRecord lastResortKey = generateLastResortPreKey();
+
+ SignedPreKeyRecord signedPreKeyRecord = generateSignedPreKey(axolotlStore.getIdentityKeyPair());
- int signedPreKeyId = 0;
- SignedPreKeyRecord signedPreKeyRecord;
- try {
- signedPreKeyRecord = KeyHelper.generateSignedPreKey(axolotlStore.getIdentityKeyPair(), signedPreKeyId);
- axolotlStore.storeSignedPreKey(signedPreKeyId, signedPreKeyRecord);
- } catch (InvalidKeyException e) {
- // Should really not happen
- System.out.println("invalid key");
- return;
- }
accountManager.setPreKeys(axolotlStore.getIdentityKeyPair().getPublicKey(), lastResortKey, signedPreKeyRecord, oneTimePreKeys);
}
- public TextSecureMessageSender getMessageSender() {
- return new TextSecureMessageSender(URL, TRUST_STORE, username, password,
- axolotlStore, Optional.absent());
+ public void sendMessage(List recipients, TextSecureDataMessage message)
+ throws IOException, EncapsulatedExceptions {
+ TextSecureMessageSender messageSender = new TextSecureMessageSender(URL, TRUST_STORE, username, password,
+ axolotlStore, USER_AGENT, Optional.absent());
+
+ Set recipientsTS = new HashSet<>(recipients.size());
+ for (String recipient : recipients) {
+ try {
+ recipientsTS.add(getPushAddress(recipient));
+ } catch (InvalidNumberException e) {
+ System.err.println("Failed to add recipient \"" + recipient + "\": " + e.getMessage());
+ System.err.println("Aborting sending.");
+ return;
+ }
+ }
+
+ messageSender.sendMessage(new ArrayList<>(recipientsTS), message);
+
+ if (message.isEndSession()) {
+ for (TextSecureAddress recipient : recipientsTS) {
+ handleEndSession(recipient.getNumber());
+ }
+ }
}
- public TextSecureContent decryptMessage(TextSecureEnvelope envelope) {
+ private TextSecureContent decryptMessage(TextSecureEnvelope envelope) {
TextSecureCipher cipher = new TextSecureCipher(new TextSecureAddress(username), axolotlStore);
try {
return cipher.decrypt(envelope);
@@ -179,12 +277,16 @@ public class Manager {
}
}
+ private void handleEndSession(String source) {
+ axolotlStore.deleteAllSessions(source);
+ }
+
public interface ReceiveMessageHandler {
- void handleMessage(TextSecureEnvelope envelope);
+ void handleMessage(TextSecureEnvelope envelope, TextSecureContent decryptedContent, GroupInfo group);
}
- public void receiveMessages(ReceiveMessageHandler handler) throws IOException {
- TextSecureMessageReceiver messageReceiver = new TextSecureMessageReceiver(URL, TRUST_STORE, username, password, signalingKey);
+ public void receiveMessages(int timeoutSeconds, boolean returnOnTimeout, ReceiveMessageHandler handler) throws IOException {
+ final TextSecureMessageReceiver messageReceiver = new TextSecureMessageReceiver(URL, TRUST_STORE, username, password, signalingKey, USER_AGENT);
TextSecureMessagePipe messagePipe = null;
try {
@@ -192,12 +294,81 @@ public class Manager {
while (true) {
TextSecureEnvelope envelope;
+ TextSecureContent content = null;
+ GroupInfo group = null;
try {
- envelope = messagePipe.read(1, TimeUnit.MINUTES);
- handler.handleMessage(envelope);
+ envelope = messagePipe.read(timeoutSeconds, TimeUnit.SECONDS);
+ if (!envelope.isReceipt()) {
+ content = decryptMessage(envelope);
+ if (content != null) {
+ if (content.getDataMessage().isPresent()) {
+ TextSecureDataMessage message = content.getDataMessage().get();
+ if (message.getGroupInfo().isPresent()) {
+ TextSecureGroup groupInfo = message.getGroupInfo().get();
+ switch (groupInfo.getType()) {
+ case UPDATE:
+ group = groupStore.getGroup(groupInfo.getGroupId());
+ if (group == null) {
+ group = new GroupInfo(groupInfo.getGroupId());
+ }
+
+ if (groupInfo.getAvatar().isPresent()) {
+ TextSecureAttachment avatar = groupInfo.getAvatar().get();
+ if (avatar.isPointer()) {
+ long avatarId = avatar.asPointer().getId();
+ try {
+ retrieveAttachment(avatar.asPointer());
+ group.avatarId = avatarId;
+ } catch (IOException | InvalidMessageException e) {
+ System.err.println("Failed to retrieve group avatar (" + avatarId + "): " + e.getMessage());
+ }
+ }
+ }
+
+ if (groupInfo.getName().isPresent()) {
+ group.name = groupInfo.getName().get();
+ }
+
+ if (groupInfo.getMembers().isPresent()) {
+ group.members.addAll(groupInfo.getMembers().get());
+ }
+
+ groupStore.updateGroup(group);
+ break;
+ case DELIVER:
+ group = groupStore.getGroup(groupInfo.getGroupId());
+ break;
+ case QUIT:
+ group = groupStore.getGroup(groupInfo.getGroupId());
+ if (group != null) {
+ group.members.remove(envelope.getSource());
+ }
+ break;
+ }
+ }
+ if (message.isEndSession()) {
+ handleEndSession(envelope.getSource());
+ }
+ if (message.getAttachments().isPresent()) {
+ for (TextSecureAttachment attachment : message.getAttachments().get()) {
+ if (attachment.isPointer()) {
+ try {
+ retrieveAttachment(attachment.asPointer());
+ } catch (IOException | InvalidMessageException e) {
+ System.err.println("Failed to retrieve attachment (" + attachment.asPointer().getId() + "): " + e.getMessage());
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ handler.handleMessage(envelope, content, group);
} catch (TimeoutException e) {
+ if (returnOnTimeout)
+ return;
} catch (InvalidVersionException e) {
- System.out.println("Ignoring error: " + e.getMessage());
+ System.err.println("Ignoring error: " + e.getMessage());
}
save();
}
@@ -206,4 +377,77 @@ public class Manager {
messagePipe.shutdown();
}
}
+
+ public File getAttachmentFile(long attachmentId) {
+ return new File(attachmentsPath + "/" + attachmentId);
+ }
+
+ private File retrieveAttachment(TextSecureAttachmentPointer pointer) throws IOException, InvalidMessageException {
+ final TextSecureMessageReceiver messageReceiver = new TextSecureMessageReceiver(URL, TRUST_STORE, username, password, signalingKey, USER_AGENT);
+
+ File tmpFile = File.createTempFile("ts_attach_" + pointer.getId(), ".tmp");
+ InputStream input = messageReceiver.retrieveAttachment(pointer, tmpFile);
+
+ new File(attachmentsPath).mkdirs();
+ File outputFile = getAttachmentFile(pointer.getId());
+ OutputStream output = null;
+ try {
+ output = new FileOutputStream(outputFile);
+ byte[] buffer = new byte[4096];
+ int read;
+
+ while ((read = input.read(buffer)) != -1) {
+ output.write(buffer, 0, read);
+ }
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ return null;
+ } finally {
+ if (output != null) {
+ output.close();
+ output = null;
+ }
+ if (!tmpFile.delete()) {
+ System.err.println("Failed to delete temp file: " + tmpFile);
+ }
+ }
+ if (pointer.getPreview().isPresent()) {
+ File previewFile = new File(outputFile + ".preview");
+ try {
+ output = new FileOutputStream(previewFile);
+ byte[] preview = pointer.getPreview().get();
+ output.write(preview, 0, preview.length);
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ return null;
+ } finally {
+ if (output != null) {
+ output.close();
+ }
+ }
+ }
+ return outputFile;
+ }
+
+ public String canonicalizeNumber(String number) throws InvalidNumberException {
+ String localNumber = username;
+ return PhoneNumberFormatter.formatNumber(number, localNumber);
+ }
+
+ private TextSecureAddress getPushAddress(String number) throws InvalidNumberException {
+ String e164number = canonicalizeNumber(number);
+ return new TextSecureAddress(e164number);
+ }
+
+ public GroupInfo getGroupInfo(byte[] groupId) {
+ return groupStore.getGroup(groupId);
+ }
+
+ public void setGroupInfo(GroupInfo group) {
+ groupStore.updateGroup(group);
+ }
+
+ public String getUsername() {
+ return username;
+ }
}