X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/28e192c519c59d97d70aea6fabe18927e1aff42a..9f5b55fa7e2ef893cbb841d75c9fe9589f57942d:/src/main/java/cli/Manager.java?ds=inline
diff --git a/src/main/java/cli/Manager.java b/src/main/java/cli/Manager.java
index 97070c97..2398f3bc 100644
--- a/src/main/java/cli/Manager.java
+++ b/src/main/java/cli/Manager.java
@@ -1,16 +1,16 @@
/**
* 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 .
*/
@@ -20,22 +20,29 @@ import org.apache.commons.io.IOUtils;
import org.json.JSONObject;
import org.whispersystems.libaxolotl.IdentityKeyPair;
import org.whispersystems.libaxolotl.InvalidKeyException;
+import org.whispersystems.libaxolotl.InvalidKeyIdException;
import org.whispersystems.libaxolotl.InvalidVersionException;
+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;
+import org.whispersystems.libaxolotl.util.Medium;
import org.whispersystems.libaxolotl.util.guava.Optional;
import org.whispersystems.textsecure.api.TextSecureAccountManager;
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.TextSecureMessage;
+import org.whispersystems.textsecure.api.push.TextSecureAddress;
import org.whispersystems.textsecure.api.push.TrustStore;
+import org.whispersystems.textsecure.api.util.InvalidNumberException;
+import org.whispersystems.textsecure.api.util.PhoneNumberFormatter;
import java.io.*;
-import java.nio.file.Path;
+import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
@@ -49,6 +56,8 @@ public class Manager {
private String username;
private String password;
private String signalingKey;
+ private int preKeyIdOffset;
+ private int nextSignedPreKeyId;
private boolean registered = false;
@@ -81,7 +90,19 @@ public class Manager {
JSONObject in = new JSONObject(IOUtils.toString(new FileInputStream(getFileName())));
username = in.getString("username");
password = in.getString("password");
- signalingKey = in.getString("signalingKey");
+ if (in.has("signalingKey")) {
+ signalingKey = in.getString("signalingKey");
+ }
+ if (in.has("preKeyIdOffset")) {
+ preKeyIdOffset = in.getInt("preKeyIdOffset");
+ } else {
+ preKeyIdOffset = 0;
+ }
+ if (in.has("nextSignedPreKeyId")) {
+ nextSignedPreKeyId = in.getInt("nextSignedPreKeyId");
+ } else {
+ nextSignedPreKeyId = 0;
+ }
axolotlStore = new JsonAxolotlStore(in.getJSONObject("axolotlStore"));
registered = in.getBoolean("registered");
accountManager = new TextSecureAccountManager(URL, TRUST_STORE, username, password);
@@ -91,6 +112,8 @@ public class Manager {
String out = new JSONObject().put("username", username)
.put("password", password)
.put("signalingKey", signalingKey)
+ .put("preKeyIdOffset", preKeyIdOffset)
+ .put("nextSignedPreKeyId", nextSignedPreKeyId)
.put("axolotlStore", axolotlStore.getJson())
.put("registered", registered).toString();
try {
@@ -115,15 +138,69 @@ public class Manager {
return registered;
}
- public void register() throws IOException {
+ public void register(boolean voiceVerication) throws IOException {
password = Util.getSecret(18);
accountManager = new TextSecureAccountManager(URL, TRUST_STORE, username, password);
- accountManager.requestSmsVerificationCode();
+ if (voiceVerication)
+ accountManager.requestVoiceVerificationCode();
+ else
+ accountManager.requestSmsVerificationCode();
+
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);
@@ -131,18 +208,13 @@ public class Manager {
//accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));
registered = true;
- int start = 0;
- List oneTimePreKeys = KeyHelper.generatePreKeys(start, 100);
- PreKeyRecord lastResortKey = KeyHelper.generateLastResortPreKey();
- int signedPreKeyId = 0;
- SignedPreKeyRecord signedPreKeyRecord;
- try {
- signedPreKeyRecord = KeyHelper.generateSignedPreKey(axolotlStore.getIdentityKeyPair(), signedPreKeyId);
- } catch (InvalidKeyException e) {
- // Should really not happen
- System.out.println("invalid key");
- return;
- }
+
+ List oneTimePreKeys = generatePreKeys();
+
+ PreKeyRecord lastResortKey = generateLastResortPreKey();
+
+ SignedPreKeyRecord signedPreKeyRecord = generateSignedPreKey(axolotlStore.getIdentityKeyPair());
+
accountManager.setPreKeys(axolotlStore.getIdentityKeyPair().getPublicKey(), lastResortKey, signedPreKeyRecord, oneTimePreKeys);
}
@@ -151,31 +223,58 @@ public class Manager {
axolotlStore, Optional.absent());
}
- public TextSecureMessage receiveMessage() throws IOException, InvalidVersionException {
+ public TextSecureContent decryptMessage(TextSecureEnvelope envelope) {
+ TextSecureCipher cipher = new TextSecureCipher(new TextSecureAddress(username), axolotlStore);
+ try {
+ return cipher.decrypt(envelope);
+ } catch (Exception e) {
+ // TODO handle all exceptions
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+ public void handleEndSession(String source) {
+ axolotlStore.deleteAllSessions(source);
+ }
+
+ public interface ReceiveMessageHandler {
+ void handleMessage(TextSecureEnvelope envelope);
+ }
+
+ public void receiveMessages(int timeoutSeconds, boolean returnOnTimeout, ReceiveMessageHandler handler) throws IOException {
TextSecureMessageReceiver messageReceiver = new TextSecureMessageReceiver(URL, TRUST_STORE, username, password, signalingKey);
TextSecureMessagePipe messagePipe = null;
try {
messagePipe = messageReceiver.createMessagePipe();
- TextSecureEnvelope envelope;
- try {
- envelope = messagePipe.read(5, TimeUnit.SECONDS);
- } catch (TimeoutException e) {
- return null;
+ while (true) {
+ TextSecureEnvelope envelope;
+ try {
+ envelope = messagePipe.read(timeoutSeconds, TimeUnit.SECONDS);
+ handler.handleMessage(envelope);
+ } catch (TimeoutException e) {
+ if (returnOnTimeout)
+ return;
+ } catch (InvalidVersionException e) {
+ System.out.println("Ignoring error: " + e.getMessage());
+ }
+ save();
}
- TextSecureCipher cipher = new TextSecureCipher(axolotlStore);
- TextSecureMessage message = null;
- try {
- message = cipher.decrypt(envelope);
- } catch (Exception e) {
- // TODO handle all exceptions
- e.printStackTrace();
- }
- return message;
} finally {
if (messagePipe != null)
messagePipe.shutdown();
}
}
+
+ public String canonicalizeNumber(String number) throws InvalidNumberException {
+ String localNumber = username;
+ return PhoneNumberFormatter.formatNumber(number, localNumber);
+ }
+
+ protected TextSecureAddress getPushAddress(String number) throws InvalidNumberException {
+ String e164number = canonicalizeNumber(number);
+ return new TextSecureAddress(e164number);
+ }
}