X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/704f2d76ba3c24dceecabd3fd473d973c29f7699..9e1cd7e3988aff9db1ac72ec5f597dc9a6c0579a:/src/main/java/cli/Manager.java diff --git a/src/main/java/cli/Manager.java b/src/main/java/cli/Manager.java index acaa1a0c..5650921d 100644 --- a/src/main/java/cli/Manager.java +++ b/src/main/java/cli/Manager.java @@ -18,9 +18,9 @@ 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 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,49 +31,53 @@ 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.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; -public class Manager { +class Manager { private final static String URL = "https://textsecure-service.whispersystems.org"; 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; private JsonAxolotlStore axolotlStore; - TextSecureAccountManager accountManager; + private TextSecureAccountManager accountManager; public Manager(String username) { 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() { File f = new File(getFileName()); - if (!f.exists() || f.isDirectory()) { - return false; - } - return true; + return !(!f.exists() || f.isDirectory()); } public boolean userHasKeys() { @@ -87,6 +91,16 @@ public class Manager { 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); @@ -96,6 +110,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 { @@ -105,7 +121,6 @@ public class Manager { writer.close(); } catch (Exception e) { System.out.println("Saving file error: " + e.getMessage()); - return; } } @@ -133,6 +148,56 @@ 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); @@ -141,31 +206,20 @@ public class Manager { //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, + public void sendMessage(List recipients, TextSecureDataMessage message) + throws IOException, EncapsulatedExceptions { + TextSecureMessageSender messageSender = new TextSecureMessageSender(URL, TRUST_STORE, username, password, axolotlStore, Optional.absent()); + messageSender.sendMessage(recipients, message); } public TextSecureContent decryptMessage(TextSecureEnvelope envelope) { @@ -188,7 +242,7 @@ public class Manager { } public void receiveMessages(int timeoutSeconds, boolean returnOnTimeout, ReceiveMessageHandler handler) throws IOException { - TextSecureMessageReceiver messageReceiver = new TextSecureMessageReceiver(URL, TRUST_STORE, username, password, signalingKey); + final TextSecureMessageReceiver messageReceiver = new TextSecureMessageReceiver(URL, TRUST_STORE, username, password, signalingKey); TextSecureMessagePipe messagePipe = null; try { @@ -213,12 +267,41 @@ public class Manager { } } - public String canonicalizeNumber(String number) throws InvalidNumberException { + 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; + } + + private String canonicalizeNumber(String number) throws InvalidNumberException { String localNumber = username; return PhoneNumberFormatter.formatNumber(number, localNumber); } - protected TextSecureAddress getPushAddress(String number) throws InvalidNumberException { + TextSecureAddress getPushAddress(String number) throws InvalidNumberException { String e164number = canonicalizeNumber(number); return new TextSecureAddress(e164number); }