Passive UUID support

Co-authored-by: Scott Nonnenberg <scott@signal.org>

libtextsecure/test/contacts_parser_test.js

@@ -13,6 +13,7 @@ describe('ContactBuffer', () => {
     const contactInfo = new textsecure.protobuf.ContactDetails({
       name: 'Zero Cool',
       number: '+10000000000',
+      uuid: '7198E1BD-1293-452A-A098-F982FF201902',
       avatar: { contentType: 'image/jpeg', length: avatarLen },
     });
     const contactInfoBuffer = contactInfo.encode().toArrayBuffer();
@@ -37,6 +38,7 @@ describe('ContactBuffer', () => {
       count += 1;
       assert.strictEqual(contact.name, 'Zero Cool');
       assert.strictEqual(contact.number, '+10000000000');
+      assert.strictEqual(contact.uuid, '7198e1bd-1293-452a-a098-f982ff201902');
       assert.strictEqual(contact.avatar.contentType, 'image/jpeg');
       assert.strictEqual(contact.avatar.length, 255);
       assert.strictEqual(contact.avatar.data.byteLength, 255);
@@ -63,7 +65,13 @@ describe('GroupBuffer', () => {
     const groupInfo = new textsecure.protobuf.GroupDetails({
       id: new Uint8Array([1, 3, 3, 7]).buffer,
       name: 'Hackers',
-      members: ['cereal', 'burn', 'phreak', 'joey'],
+      membersE164: ['cereal', 'burn', 'phreak', 'joey'],
+      members: [
+        { uuid: '3EA23646-92E8-4604-8833-6388861971C1', e164: 'cereal' },
+        { uuid: 'B8414169-7149-4736-8E3B-477191931301', e164: 'burn' },
+        { uuid: '64C97B95-A782-4E1E-BBCC-5A4ACE8d71f6', e164: 'phreak' },
+        { uuid: 'CA334652-C35B-4FDC-9CC7-5F2060C771EE', e164: 'joey' },
+      ],
       avatar: { contentType: 'image/jpeg', length: avatarLen },
     });
     const groupInfoBuffer = groupInfo.encode().toArrayBuffer();
@@ -91,7 +99,21 @@ describe('GroupBuffer', () => {
         group.id.toArrayBuffer(),
         new Uint8Array([1, 3, 3, 7]).buffer
       );
-      assert.sameMembers(group.members, ['cereal', 'burn', 'phreak', 'joey']);
+      assert.sameMembers(group.membersE164, [
+        'cereal',
+        'burn',
+        'phreak',
+        'joey',
+      ]);
+      assert.sameDeepMembers(
+        group.members.map(({ uuid, e164 }) => ({ uuid, e164 })),
+        [
+          { uuid: '3ea23646-92e8-4604-8833-6388861971c1', e164: 'cereal' },
+          { uuid: 'b8414169-7149-4736-8e3b-477191931301', e164: 'burn' },
+          { uuid: '64c97b95-a782-4e1e-bbcc-5a4ace8d71f6', e164: 'phreak' },
+          { uuid: 'ca334652-c35b-4fdc-9cc7-5f2060c771ee', e164: 'joey' },
+        ]
+      );
       assert.strictEqual(group.avatar.contentType, 'image/jpeg');
       assert.strictEqual(group.avatar.length, 255);
       assert.strictEqual(group.avatar.data.byteLength, 255);

libtextsecure/test/fake_web_api.js

@@ -1,6 +1,6 @@
 window.setImmediate = window.nodeSetImmediate;
 
-const getKeysForNumberMap = {};
+const getKeysForIdentifierMap = {};
 const messagesSentMap = {};
 
 const fakeCall = () => Promise.resolve();
@@ -10,7 +10,7 @@ const fakeAPI = {
   getAttachment: fakeCall,
   getAvatar: fakeCall,
   getDevices: fakeCall,
-  // getKeysForNumber: fakeCall,
+  // getKeysForIdentifier : fakeCall,
   getMessageSocket: fakeCall,
   getMyKeys: fakeCall,
   getProfile: fakeCall,
@@ -22,13 +22,13 @@ const fakeAPI = {
   // sendMessages: fakeCall,
   setSignedPreKey: fakeCall,
 
-  getKeysForNumber(number) {
-    const res = getKeysForNumberMap[number];
+  getKeysForIdentifier(number) {
+    const res = getKeysForIdentifierMap[number];
     if (res !== undefined) {
-      delete getKeysForNumberMap[number];
+      delete getKeysForIdentifierMap[number];
       return Promise.resolve(res);
     }
-    throw new Error('getKeysForNumber of unknown/used number');
+    throw new Error('getKeysForIdentfier of unknown/used number');
   },
 
   sendMessages(destination, messageArray) {

libtextsecure/test/in_memory_signal_protocol_store.js

@@ -4,6 +4,12 @@ function SignalProtocolStore() {
 
 SignalProtocolStore.prototype = {
   Direction: { SENDING: 1, RECEIVING: 2 },
+  VerifiedStatus: {
+    DEFAULT: 0,
+    VERIFIED: 1,
+    UNVERIFIED: 2,
+  },
+
   getIdentityKeyPair() {
     return Promise.resolve(this.get('identityKey'));
   },

libtextsecure/test/index.html

@@ -23,7 +23,6 @@
   <script type="text/javascript" src="../protobufs.js" data-cover></script>
   <script type="text/javascript" src="../errors.js" data-cover></script>
   <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>
@@ -34,6 +33,16 @@
   <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>
+  <script type="text/javascript" src="../storage/user.js" data-cover></script>
+
+  <script type="text/javascript" src="../protocol_wrapper.js" data-cover></script>
+  <script type="text/javascript" src="../../js/libphonenumber-util.js"></script>
+  <script type="text/javascript" src="../../js/components.js" data-cover></script>
+  <script type="text/javascript" src="../../js/signal_protocol_store.js" data-cover></script>
+  <script type="text/javascript" src="../../js/storage.js" data-cover></script>
+  <script type="text/javascript" src="../../js/models/messages.js" data-cover></script>
+  <script type="text/javascript" src="../../js/models/conversations.js" data-cover></script>
+  <script type="text/javascript" src="../../js/conversation_controller.js" data-cover></script>
 
   <script type="text/javascript" src="errors_test.js"></script>
   <script type="text/javascript" src="helpers_test.js"></script>

libtextsecure/test/message_receiver_test.js

@@ -4,12 +4,14 @@ describe('MessageReceiver', () => {
   textsecure.storage.impl = new SignalProtocolStore();
   const { WebSocket } = window;
   const number = '+19999999999';
+  const uuid = 'AAAAAAAA-BBBB-4CCC-9DDD-EEEEEEEEEEEE';
   const deviceId = 1;
   const signalingKey = libsignal.crypto.getRandomBytes(32 + 20);
 
   before(() => {
     window.WebSocket = MockSocket;
     textsecure.storage.user.setNumberAndDeviceId(number, deviceId, 'name');
+    textsecure.storage.user.setUuidAndDeviceId(uuid, deviceId);
     textsecure.storage.put('password', 'password');
     textsecure.storage.put('signaling_key', signalingKey);
   });
@@ -21,6 +23,7 @@ describe('MessageReceiver', () => {
     const attrs = {
       type: textsecure.protobuf.Envelope.Type.CIPHERTEXT,
       source: number,
+      sourceUuid: uuid,
       sourceDevice: deviceId,
       timestamp: Date.now(),
     };
@@ -72,7 +75,7 @@ describe('MessageReceiver', () => {
     it('connects', done => {
       const mockServer = new MockServer(
         `ws://localhost:8080/v1/websocket/?login=${encodeURIComponent(
-          number
+          uuid
         )}.1&password=password`
       );
 

libtextsecure/test/storage_test.js

@@ -1,9 +1,7 @@
-/* global libsignal, textsecure */
+/* global libsignal, textsecure, storage, ConversationController */
 
 describe('SignalProtocolStore', () => {
-  before(() => {
-    localStorage.clear();
-  });
+  // debugger;
   const store = textsecure.storage.protocol;
   const identifier = '+5558675309';
   const identityKey = {
@@ -14,6 +12,14 @@ describe('SignalProtocolStore', () => {
     pubKey: libsignal.crypto.getRandomBytes(33),
     privKey: libsignal.crypto.getRandomBytes(32),
   };
+  before(async () => {
+    localStorage.clear();
+    ConversationController.reset();
+    // store.hydrateCaches();
+    await storage.fetch();
+    await ConversationController.load();
+    await ConversationController.getOrCreateAndWait(identifier, 'private');
+  });
   it('retrieves my registration id', async () => {
     store.put('registrationId', 1337);