Save prekeys optimistically, track confirms, new clean behavior (#1846)

* Re-enable libtextsecure unit tests, get passing, run in CI

* Save prekeys optimistically, track confirmed, new clean behavior

* Eliminate potential conflicts when rotating on startup

* Remove last symlink: get libtextsecure tests running on windows

libtextsecure/test/_test.js

@@ -1,5 +1,6 @@
 mocha.setup("bdd");
 window.assert = chai.assert;
+window.PROTO_ROOT = '../../protos';
 
 (function() {
   var OriginalReporter = mocha._reporter;
@@ -52,3 +53,5 @@ function hexToArrayBuffer(str) {
     array[i] = parseInt(str.substr(i*2, 2), 16);
   return ret;
 };
+
+window.MockSocket.prototype.addEventListener = function() {};

libtextsecure/test/account_manager_test.js

@@ -0,0 +1,156 @@
+'use strict';
+
+describe("AccountManager", function() {
+  let accountManager;
+  let originalServer;
+
+  before(function() {
+    originalServer = window.TextSecureServer;
+    window.TextSecureServer = function() {};
+  });
+  after(function() {
+    window.TextSecureServer = originalServer;
+  });
+
+  beforeEach(function() {
+    accountManager = new window.textsecure.AccountManager();
+  });
+
+  describe('#cleanSignedPreKeys', function() {
+    let originalProtocolStorage;
+    let signedPreKeys;
+    const DAY = 1000 * 60 * 60 * 24;
+
+    beforeEach(function() {
+      originalProtocolStorage = window.textsecure.storage.protocol;
+      window.textsecure.storage.protocol = {
+        loadSignedPreKeys: function() {
+          return Promise.resolve(signedPreKeys);
+        },
+      };
+    });
+    afterEach(function() {
+      window.textsecure.storage.protocol = originalProtocolStorage;
+    });
+
+    it('keeps three confirmed keys even if over a week old', function() {
+      const now = Date.now();
+      signedPreKeys = [{
+        keyId: 1,
+        created_at: now - DAY * 21,
+        confirmed: true,
+      }, {
+        keyId: 2,
+        created_at: now - DAY * 14,
+        confirmed: true,
+      }, {
+        keyId: 3,
+        created_at: now - DAY * 18,
+        confirmed: true,
+      }];
+
+      // should be no calls to store.removeSignedPreKey, would cause crash
+      return accountManager.cleanSignedPreKeys();
+    });
+
+    it('eliminates confirmed keys over a week old, if more than three', function() {
+      const now = Date.now();
+      signedPreKeys = [{
+        keyId: 1,
+        created_at: now - DAY * 21,
+        confirmed: true,
+      }, {
+        keyId: 2,
+        created_at: now - DAY * 14,
+        confirmed: true,
+      }, {
+        keyId: 3,
+        created_at: now - DAY * 4,
+        confirmed: true,
+      }, {
+        keyId: 4,
+        created_at: now - DAY * 18,
+        confirmed: true,
+      }, {
+        keyId: 5,
+        created_at: now - DAY,
+        confirmed: true,
+      }];
+
+      let count = 0;
+      window.textsecure.storage.protocol.removeSignedPreKey = function(keyId) {
+        if (keyId !== 1 && keyId !== 4) {
+          throw new Error('Wrong keys were eliminated! ' + keyId);
+        }
+
+        count++;
+      };
+
+      return accountManager.cleanSignedPreKeys().then(function() {
+        assert.strictEqual(count, 2);
+      });
+    });
+
+    it('keeps at least three unconfirmed keys if no confirmed', function() {
+      const now = Date.now();
+      signedPreKeys = [{
+        keyId: 1,
+        created_at: now - DAY * 14,
+      }, {
+        keyId: 2,
+        created_at: now - DAY * 21,
+      }, {
+        keyId: 3,
+        created_at: now - DAY * 18,
+      }, {
+        keyId: 4,
+        created_at: now - DAY
+      }];
+
+      let count = 0;
+      window.textsecure.storage.protocol.removeSignedPreKey = function(keyId) {
+        if (keyId !== 2) {
+          throw new Error('Wrong keys were eliminated! ' + keyId);
+        }
+
+        count++;
+      };
+
+      return accountManager.cleanSignedPreKeys().then(function() {
+        assert.strictEqual(count, 1);
+      });
+    });
+
+    it('if some confirmed keys, keeps unconfirmed to addd up to three total', function() {
+      const now = Date.now();
+      signedPreKeys = [{
+        keyId: 1,
+        created_at: now - DAY * 21,
+        confirmed: true,
+      }, {
+        keyId: 2,
+        created_at: now - DAY * 14,
+        confirmed: true,
+      }, {
+        keyId: 3,
+        created_at: now - DAY * 12,
+      }, {
+        keyId: 4,
+        created_at: now - DAY * 8,
+      }];
+
+      let count = 0;
+      window.textsecure.storage.protocol.removeSignedPreKey = function(keyId) {
+        if (keyId !== 3) {
+          throw new Error('Wrong keys were eliminated! ' + keyId);
+        }
+
+        count++;
+      };
+
+      return accountManager.cleanSignedPreKeys().then(function() {
+        assert.strictEqual(count, 1);
+      });
+    });
+  });
+});

libtextsecure/test/index.html

@@ -1,6 +1,7 @@
 <html>
 
 <head>
+  <meta charset='utf-8'>
   <title>libTextSecure test runner</title>
   <link rel="stylesheet" href="../../components/mocha/mocha.css" />
 </head>
@@ -12,7 +13,6 @@
   </div>
 
   <script type="text/javascript" src="test.js"></script>
-  <script type="text/javascript" src="blanket_mocha.js"></script>
   <script type="text/javascript" src="in_memory_signal_protocol_store.js"></script>
 
   <script type="text/javascript" src="../components.js"></script>
@@ -23,12 +23,12 @@
   <script type="text/javascript" src="../storage.js" data-cover></script>
   <script type="text/javascript" src="../protocol_wrapper.js" data-cover></script>
 
+  <script type="text/javascript" src="../event_target.js" data-cover></script>
   <script type="text/javascript" src="../websocket-resources.js" data-cover></script>
   <script type="text/javascript" src="../helpers.js" data-cover></script>
   <script type="text/javascript" src="../stringview.js" data-cover></script>
   <script type="text/javascript" src="../api.js"></script>
   <script type="text/javascript" src="../sendmessage.js" data-cover></script>
-  <script type="text/javascript" src="../event_target.js" data-cover></script>
   <script type="text/javascript" src="../account_manager.js" data-cover></script>
   <script type="text/javascript" src="../contacts_parser.js" data-cover></script>
   <script type="text/javascript" src="../task_with_timeout.js" data-cover></script>
@@ -42,5 +42,14 @@
   <script type="text/javascript" src="generate_keys_test.js"></script>
   <script type="text/javascript" src="websocket-resources_test.js"></script>
   <script type="text/javascript" src="task_with_timeout_test.js"></script>
+  <script type="text/javascript" src="account_manager_test.js"></script>
+
+  <!-- Comment out to turn off code coverage. Useful for getting real callstacks. -->
+  <script type="text/javascript" src="blanket_mocha.js"></script>
+
+  <!-- Uncomment to start tests without code coverage enabled -->
+  <!-- <script type="text/javascript">
+    mocha.run();
+  </script> -->
 </body>
 </html>

libtextsecure/test/protos

@@ -1 +0,0 @@
-../../protos/

libtextsecure/test/test.js

@@ -22054,6 +22054,7 @@ Library.prototype.test = function(obj, type) {
 });
 mocha.setup("bdd");
 window.assert = chai.assert;
+window.PROTO_ROOT = '../../protos';
 
 (function() {
   var OriginalReporter = mocha._reporter;
@@ -22106,3 +22107,5 @@ function hexToArrayBuffer(str) {
     array[i] = parseInt(str.substr(i*2, 2), 16);
   return ret;
 };
+
+window.MockSocket.prototype.addEventListener = function() {};

libtextsecure/test/websocket-resources_test.js

@@ -18,7 +18,8 @@
                         assert.strictEqual(message.response.status, 200);
                         assert.strictEqual(message.response.id.toString(), request_id);
                         done();
-                    }
+                    },
+                    addEventListener: function() {},
                 };
 
                 // actual test
@@ -58,7 +59,8 @@
                         assert.strictEqual(message.request.path, '/some/path');
                         assertEqualArrayBuffers(message.request.body.toArrayBuffer(), new Uint8Array([1,2,3]).buffer);
                         request_id = message.request.id;
-                    }
+                    },
+                    addEventListener: function() {},
                 };
 
                 // actual test