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 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;
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.TextSecureAttachmentPointer;
import org.whispersystems.textsecure.api.messages.TextSecureContent;
+import org.whispersystems.textsecure.api.messages.TextSecureDataMessage;
import org.whispersystems.textsecure.api.messages.TextSecureEnvelope;
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.LinkedList;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
private final static TrustStore TRUST_STORE = new WhisperTrustStore();
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 String username;
private String password;
private String signalingKey;
+ private int preKeyIdOffset;
+ private int nextSignedPreKeyId;
private boolean registered = false;
this.username = username;
}
- 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() {
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);
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 {
registered = false;
}
+ private static final int BATCH_SIZE = 100;
+
+ private List<PreKeyRecord> generatePreKeys() {
+ List<PreKeyRecord> 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.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));
registered = true;
- int start = 0;
- List<PreKeyRecord> oneTimePreKeys = KeyHelper.generatePreKeys(start, 100);
- for (int i = start; i < oneTimePreKeys.size(); i++) {
- axolotlStore.storePreKey(i, oneTimePreKeys.get(i));
- }
+ List<PreKeyRecord> 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,
+ public void sendMessage(List<TextSecureAddress> recipients, TextSecureDataMessage message)
+ throws IOException, EncapsulatedExceptions {
+ TextSecureMessageSender messageSender = new TextSecureMessageSender(URL, TRUST_STORE, username, password,
axolotlStore, Optional.<TextSecureMessageSender.EventListener>absent());
+ messageSender.sendMessage(recipients, message);
}
public TextSecureContent decryptMessage(TextSecureEnvelope envelope) {
void handleMessage(TextSecureEnvelope envelope);
}
- 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);
TextSecureMessagePipe messagePipe = null;
try {
while (true) {
TextSecureEnvelope envelope;
try {
- envelope = messagePipe.read(1, TimeUnit.MINUTES);
+ 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());
}
}
}
+ public File retrieveAttachment(TextSecureAttachmentPointer pointer) throws IOException, InvalidMessageException {
+ final TextSecureMessageReceiver messageReceiver = new TextSecureMessageReceiver(URL, TRUST_STORE, username, password, signalingKey);
+
+ File tmpFile = File.createTempFile("ts_attach_" + pointer.getId(), ".tmp");
+ InputStream input = messageReceiver.retrieveAttachment(pointer, tmpFile);
+
+ new File(attachmentsPath).mkdirs();
+ File outputFile = new File(attachmentsPath + "/" + 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();
+ }
+ tmpFile.delete();
+ }
+ return outputFile;
+ }
+
public String canonicalizeNumber(String number) throws InvalidNumberException {
String localNumber = username;
return PhoneNumberFormatter.formatNumber(number, localNumber);
git.nmode.ca / signal-cli / blobdiff
