Update textsecure-java to 1.8.0

[signal-cli] / src / main / java / cli / Manager.java

diff --git a/src/main/java/cli/Manager.java b/src/main/java/cli/Manager.java
index 433c43dc3dc360bbb5a6a5f8c1150f2eb2148899..3f9237fb3839b483db6bb18b684a1dc1daf1e517 100644 (file)
--- a/src/main/java/cli/Manager.java
+++ b/src/main/java/cli/Manager.java
@@ -1,16 +1,16 @@
 /**
  * Copyright (C) 2015 AsamK
 /**
  * Copyright (C) 2015 AsamK

- * <p>
+ *

  * 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 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.

- * <p>
+ *

  * 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.
  * 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.

- * <p>
+ *

  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */


@@ -18,59 +18,68 @@ package cli;
 
 import org.apache.commons.io.IOUtils;
 import org.json.JSONObject;
 
 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.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.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.TextSecureAttachmentPointer;

 import org.whispersystems.textsecure.api.messages.TextSecureContent;
 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.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.io.*;

+import java.util.LinkedList;

 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 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 URL = "https://textsecure-service.whispersystems.org";
     private final static TrustStore TRUST_STORE = new WhisperTrustStore();
 

+    private final static String USER_AGENT = "textsecure-cli";
+

     private final static String settingsPath = System.getProperty("user.home") + "/.config/textsecure";
     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 String username;
     private String password;
     private String signalingKey;

+    private int preKeyIdOffset;
+    private int nextSignedPreKeyId;

 
     private boolean registered = false;
 
     private JsonAxolotlStore axolotlStore;
 
     private boolean registered = false;
 
     private JsonAxolotlStore axolotlStore;

-    TextSecureAccountManager accountManager;
+    private TextSecureAccountManager accountManager;

 
     public Manager(String username) {
         this.username = username;
     }
 
 
     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());
     }
 
     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() {
     }
 
     public boolean userHasKeys() {


@@ -84,15 +93,27 @@ public class Manager {
         if (in.has("signalingKey")) {
             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");
         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)
                 .put("password", password)
                 .put("signalingKey", signalingKey)
     }
 
     public void save() {
         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 {
                 .put("axolotlStore", axolotlStore.getJson())
                 .put("registered", registered).toString();
         try {


@@ -101,8 +122,7 @@ public class Manager {
             writer.flush();
             writer.close();
         } catch (Exception e) {
             writer.flush();
             writer.close();
         } catch (Exception e) {

-            System.out.println("Saving file error: " + e.getMessage());
-            return;
+            System.err.println("Saving file error: " + e.getMessage());

         }
     }
 
         }
     }
 


@@ -120,7 +140,7 @@ public class Manager {
     public void register(boolean voiceVerication) throws IOException {
         password = Util.getSecret(18);
 
     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();
 
         if (voiceVerication)
             accountManager.requestVoiceVerificationCode();


@@ -130,58 +150,163 @@ public class Manager {
         registered = false;
     }
 
         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);
     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;
 
         //accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));
         registered = true;

-        int start = 0;
-        List<PreKeyRecord> oneTimePreKeys = KeyHelper.generatePreKeys(start, 100);
-        PreKeyRecord lastResortKey = KeyHelper.generateLastResortPreKey();
-        int signedPreKeyId = 0;
-        SignedPreKeyRecord signedPreKeyRecord;
+
+        List<PreKeyRecord> oneTimePreKeys = generatePreKeys();
+
+        PreKeyRecord lastResortKey = generateLastResortPreKey();
+
+        SignedPreKeyRecord signedPreKeyRecord = generateSignedPreKey(axolotlStore.getIdentityKeyPair());
+
+        accountManager.setPreKeys(axolotlStore.getIdentityKeyPair().getPublicKey(), lastResortKey, signedPreKeyRecord, oneTimePreKeys);
+    }
+
+    public void sendMessage(List<TextSecureAddress> recipients, TextSecureDataMessage message)
+            throws IOException, EncapsulatedExceptions {
+        TextSecureMessageSender messageSender = new TextSecureMessageSender(URL, TRUST_STORE, username, password,
+                axolotlStore, USER_AGENT, Optional.<TextSecureMessageSender.EventListener>absent());
+        messageSender.sendMessage(recipients, message);
+    }
+
+    public TextSecureContent decryptMessage(TextSecureEnvelope envelope) {
+        TextSecureCipher cipher = new TextSecureCipher(new TextSecureAddress(username), axolotlStore);

         try {
         try {

-            signedPreKeyRecord = KeyHelper.generateSignedPreKey(axolotlStore.getIdentityKeyPair(), signedPreKeyId);
-        } catch (InvalidKeyException e) {
-            // Should really not happen
-            System.out.println("invalid key");
-            return;
+            return cipher.decrypt(envelope);
+        } catch (Exception e) {
+            // TODO handle all exceptions
+            e.printStackTrace();
+            return null;

         }
         }

-        accountManager.setPreKeys(axolotlStore.getIdentityKeyPair().getPublicKey(), lastResortKey, signedPreKeyRecord, oneTimePreKeys);

     }
 
     }
 

-    public TextSecureMessageSender getMessageSender() {
-        return new TextSecureMessageSender(URL, TRUST_STORE, username, password,
-                axolotlStore, Optional.<TextSecureMessageSender.EventListener>absent());
+    public void handleEndSession(String source) {
+        axolotlStore.deleteAllSessions(source);
+    }
+
+    public interface ReceiveMessageHandler {
+        void handleMessage(TextSecureEnvelope envelope);

     }
 
     }
 

-    public TextSecureContent receiveMessage() throws IOException, InvalidVersionException {
-        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 {
             messagePipe = messageReceiver.createMessagePipe();
 
         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.err.println("Ignoring error: " + e.getMessage());
+                }
+                save();

             }
             }

-            TextSecureCipher cipher = new TextSecureCipher(new TextSecureAddress(username), axolotlStore);
-            TextSecureContent message = null;
-            try {
-                message = cipher.decrypt(envelope);
-            } catch (Exception e) {
-                // TODO handle all exceptions
-                e.printStackTrace();
-            }
-            return message;

         } finally {
             if (messagePipe != null)
                 messagePipe.shutdown();
         }
     }
         } finally {
             if (messagePipe != null)
                 messagePipe.shutdown();
         }
     }

+
+    public 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 = 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();
+            }
+            if (!tmpFile.delete()) {
+                System.err.println("Failed to delete temp file: " + tmpFile);
+            }
+        }
+        return outputFile;
+    }
+
+    private String canonicalizeNumber(String number) throws InvalidNumberException {
+        String localNumber = username;
+        return PhoneNumberFormatter.formatNumber(number, localNumber);
+    }
+
+    TextSecureAddress getPushAddress(String number) throws InvalidNumberException {
+        String e164number = canonicalizeNumber(number);
+        return new TextSecureAddress(e164number);
+    }

 }
 }