@wireapp/core 17.20.1 → 17.21.1

package/src/main/cryptography/CryptographyService.ts

@@ -20,7 +20,13 @@
 import type {APIClient} from '@wireapp/api-client';
 import type {PreKey as SerializedPreKey} from '@wireapp/api-client/src/auth/';
 import type {RegisteredClient} from '@wireapp/api-client/src/client/';
-import type {OTRClientMap, OTRRecipients, QualifiedOTRRecipients} from '@wireapp/api-client/src/conversation/';
+import type {
+  OTRClientMap,
+  OTRRecipients,
+  QualifiedOTRRecipients,
+  QualifiedUserClients,
+  UserClients,
+} from '@wireapp/api-client/src/conversation/';
 import type {ConversationOtrMessageAddEvent} from '@wireapp/api-client/src/event';
 import type {QualifiedUserPreKeyBundleMap, UserPreKeyBundleMap} from '@wireapp/api-client/src/user/';
 import {Cryptobox} from '@wireapp/cryptobox';
@@ -32,6 +38,7 @@ import logdown from 'logdown';
 
 import {GenericMessageType, PayloadBundle, PayloadBundleSource} from '../conversation';
 import type {SessionPayloadBundle} from '../cryptography/';
+import {isUserClients} from '../util';
 import {CryptographyDatabaseRepository} from './CryptographyDatabaseRepository';
 import {GenericMessageMapper} from './GenericMessageMapper';
 
@@ -118,7 +125,7 @@ export class CryptographyService {
 
   public async encryptQualified(
     plainText: Uint8Array,
-    preKeyBundles: QualifiedUserPreKeyBundleMap,
+    preKeyBundles: QualifiedUserPreKeyBundleMap | QualifiedUserClients,
   ): Promise<QualifiedOTRRecipients> {
     const qualifiedOTRRecipients: QualifiedOTRRecipients = {};
 
@@ -131,17 +138,15 @@ export class CryptographyService {
 
   public async encrypt(
     plainText: Uint8Array,
-    preKeyBundles: UserPreKeyBundleMap,
+    users: UserPreKeyBundleMap | UserClients,
     domain?: string,
   ): Promise<OTRRecipients<Uint8Array>> {
-    const recipients: OTRRecipients<Uint8Array> = {};
     const bundles: Promise<SessionPayloadBundle>[] = [];
 
-    for (const userId in preKeyBundles) {
-      recipients[userId] = {};
-
-      for (const clientId in preKeyBundles[userId]) {
-        const {key: base64PreKey} = preKeyBundles[userId][clientId];
+    for (const userId in users) {
+      const clientIds = isUserClients(users) ? users[userId] : Object.keys(users[userId]);
+      for (const clientId of clientIds) {
+        const base64PreKey = isUserClients(users) ? undefined : users[userId][clientId].key;
         const sessionId = CryptographyService.constructSessionId(userId, clientId, domain || null);
         bundles.push(this.encryptPayloadForSession(sessionId, plainText, base64PreKey));
       }
@@ -149,27 +154,29 @@ export class CryptographyService {
 
     const payloads = await Promise.all(bundles);
 
-    payloads.forEach(payload => {
+    return payloads.reduce((recipients, payload) => {
       const {encryptedPayload, sessionId} = payload;
       const {userId, clientId} = CryptographyService.dismantleSessionId(sessionId);
+      recipients[userId] ||= {};
       recipients[userId][clientId] = encryptedPayload;
-    });
-
-    return recipients;
+      return recipients;
+    }, {} as OTRRecipients<Uint8Array>);
   }
 
   private async encryptPayloadForSession(
     sessionId: string,
     plainText: Uint8Array,
-    base64EncodedPreKey: string,
+    base64EncodedPreKey?: string,
   ): Promise<SessionPayloadBundle> {
     this.logger.log(`Encrypting payload for session ID "${sessionId}"`);
 
     let encryptedPayload: Uint8Array;
 
     try {
-      const decodedPreKeyBundle = Decoder.fromBase64(base64EncodedPreKey).asBytes;
-      const payloadAsArrayBuffer = await this.cryptobox.encrypt(sessionId, plainText, decodedPreKeyBundle.buffer);
+      const decodedPreKeyBundle = base64EncodedPreKey
+        ? Decoder.fromBase64(base64EncodedPreKey).asBytes.buffer
+        : undefined;
+      const payloadAsArrayBuffer = await this.cryptobox.encrypt(sessionId, plainText, decodedPreKeyBundle);
       encryptedPayload = new Uint8Array(payloadAsArrayBuffer);
     } catch (error) {
       this.logger.error(`Could not encrypt payload: ${(error as Error).message}`);

package/src/main/util/TypePredicateUtil.js

@@ -35,7 +35,7 @@ function isQualifiedUserClients(obj) {
             const firstClientIdArray = Object.values(firstUserClientObject)[0];
             if (Array.isArray(firstClientIdArray)) {
                 const firstClientId = firstClientIdArray[0];
-                return typeof firstClientId === 'string';
+                return typeof firstClientId === 'string' || typeof firstClientId === 'undefined';
             }
         }
     }

package/src/main/util/TypePredicateUtil.js.map

@@ -1 +1 @@
-{"version":3,"file":"TypePredicateUtil.js","sourceRoot":"","sources":["TypePredicateUtil.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;AAKH,SAAgB,aAAa,CAAC,GAAQ;IACpC,OAAO,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,OAAO,GAAG,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC;AAC1D,CAAC;AAFD,sCAEC;AAED,SAAgB,kBAAkB,CAAC,GAAQ;IACzC,OAAO,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,OAAO,GAAG,CAAC,CAAC,CAAC,KAAK,QAAQ,IAAI,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,QAAQ,CAAC;AAClG,CAAC;AAFD,gDAEC;AAED,SAAgB,sBAAsB,CAAC,GAAQ;;IAC7C,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;QAC3B,MAAM,qBAAqB,GAAG,MAAA,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,0CAAG,CAAC,CAAC,CAAC;QACtD,IAAI,OAAO,qBAAqB,KAAK,QAAQ,EAAE;YAC7C,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,CAAC,qBAA+B,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7E,IAAI,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE;gBACrC,MAAM,aAAa,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;gBAC5C,OAAO,OAAO,aAAa,KAAK,QAAQ,CAAC;aAC1C;SACF;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAZD,wDAYC;AAED,SAAgB,aAAa,CAAC,GAAQ;;IACpC,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;QAC3B,MAAM,oBAAoB,GAAG,MAAA,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,0CAAG,CAAC,CAAC,CAAC;QACrD,IAAI,KAAK,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE;YACvC,MAAM,aAAa,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAC;YAC9C,OAAO,OAAO,aAAa,KAAK,QAAQ,CAAC;SAC1C;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AATD,sCASC"}
+{"version":3,"file":"TypePredicateUtil.js","sourceRoot":"","sources":["TypePredicateUtil.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;AAKH,SAAgB,aAAa,CAAC,GAAQ;IACpC,OAAO,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,OAAO,GAAG,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC;AAC1D,CAAC;AAFD,sCAEC;AAED,SAAgB,kBAAkB,CAAC,GAAQ;IACzC,OAAO,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,OAAO,GAAG,CAAC,CAAC,CAAC,KAAK,QAAQ,IAAI,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,QAAQ,CAAC;AAClG,CAAC;AAFD,gDAEC;AAED,SAAgB,sBAAsB,CAAC,GAAQ;;IAC7C,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;QAC3B,MAAM,qBAAqB,GAAG,MAAA,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,0CAAG,CAAC,CAAC,CAAC;QACtD,IAAI,OAAO,qBAAqB,KAAK,QAAQ,EAAE;YAC7C,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,CAAC,qBAA+B,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7E,IAAI,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE;gBACrC,MAAM,aAAa,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;gBAC5C,OAAO,OAAO,aAAa,KAAK,QAAQ,IAAI,OAAO,aAAa,KAAK,WAAW,CAAC;aAClF;SACF;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAZD,wDAYC;AAED,SAAgB,aAAa,CAAC,GAAQ;;IACpC,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;QAC3B,MAAM,oBAAoB,GAAG,MAAA,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,0CAAG,CAAC,CAAC,CAAC;QACrD,IAAI,KAAK,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE;YACvC,MAAM,aAAa,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAC;YAC9C,OAAO,OAAO,aAAa,KAAK,QAAQ,CAAC;SAC1C;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AATD,sCASC"}

package/src/main/util/TypePredicateUtil.test.node.d.ts

@@ -0,0 +1 @@
+export {};

package/src/main/util/TypePredicateUtil.test.node.js

@@ -0,0 +1,42 @@
+"use strict";
+/*
+ * Wire
+ * Copyright (C) 2021 Wire Swiss GmbH
+ *
+ * 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 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const TypePredicateUtil_1 = require("./TypePredicateUtil");
+describe('TypePredicatUtil', () => {
+    describe('isQualifiedUserClients', () => {
+        it('detects QualifiedUserClients', () => {
+            const validUserClients = [
+                { domain1: { user1: ['client1'] } },
+                { domain1: { user1: [] } }, // When a user has no clients
+            ];
+            validUserClients.forEach(payload => expect((0, TypePredicateUtil_1.isQualifiedUserClients)(payload)).toBeTrue());
+        });
+        it('rejects non QualifiedUserClients', () => {
+            const invalidUserClients = [
+                { domain1: { user1: '' } },
+                { domain1: { user1: {} } },
+                { domain1: [] },
+                { domain1: { user1: [{}] } },
+            ];
+            invalidUserClients.forEach(payload => expect((0, TypePredicateUtil_1.isQualifiedUserClients)(payload)).toBeFalse());
+        });
+    });
+});
+//# sourceMappingURL=TypePredicateUtil.test.node.js.map

package/src/main/util/TypePredicateUtil.test.node.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TypePredicateUtil.test.node.js","sourceRoot":"","sources":["TypePredicateUtil.test.node.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;AAEH,2DAA2D;AAE3D,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;QACtC,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;YACtC,MAAM,gBAAgB,GAAG;gBACvB,EAAC,OAAO,EAAE,EAAC,KAAK,EAAE,CAAC,SAAS,CAAC,EAAC,EAAC;gBAC/B,EAAC,OAAO,EAAE,EAAC,KAAK,EAAE,EAAE,EAAC,EAAC,EAAE,6BAA6B;aACtD,CAAC;YAEF,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,IAAA,0CAAsB,EAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1F,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;YAC1C,MAAM,kBAAkB,GAAG;gBACzB,EAAC,OAAO,EAAE,EAAC,KAAK,EAAE,EAAE,EAAC,EAAC;gBACtB,EAAC,OAAO,EAAE,EAAC,KAAK,EAAE,EAAE,EAAC,EAAC;gBACtB,EAAC,OAAO,EAAE,EAAE,EAAC;gBACb,EAAC,OAAO,EAAE,EAAC,KAAK,EAAE,CAAC,EAAE,CAAC,EAAC,EAAC;aACzB,CAAC;YAEF,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,IAAA,0CAAsB,EAAC,OAAO,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC;QAC7F,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/src/main/util/TypePredicateUtil.test.node.ts

@@ -0,0 +1,44 @@
+/*
+ * Wire
+ * Copyright (C) 2021 Wire Swiss GmbH
+ *
+ * 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 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {isQualifiedUserClients} from './TypePredicateUtil';
+
+describe('TypePredicatUtil', () => {
+  describe('isQualifiedUserClients', () => {
+    it('detects QualifiedUserClients', () => {
+      const validUserClients = [
+        {domain1: {user1: ['client1']}},
+        {domain1: {user1: []}}, // When a user has no clients
+      ];
+
+      validUserClients.forEach(payload => expect(isQualifiedUserClients(payload)).toBeTrue());
+    });
+
+    it('rejects non QualifiedUserClients', () => {
+      const invalidUserClients = [
+        {domain1: {user1: ''}},
+        {domain1: {user1: {}}},
+        {domain1: []},
+        {domain1: {user1: [{}]}},
+      ];
+
+      invalidUserClients.forEach(payload => expect(isQualifiedUserClients(payload)).toBeFalse());
+    });
+  });
+});

package/src/main/util/TypePredicateUtil.ts

@@ -35,7 +35,7 @@ export function isQualifiedUserClients(obj: any): obj is QualifiedUserClients {
       const firstClientIdArray = Object.values(firstUserClientObject as object)[0];
       if (Array.isArray(firstClientIdArray)) {
         const firstClientId = firstClientIdArray[0];
-        return typeof firstClientId === 'string';
+        return typeof firstClientId === 'string' || typeof firstClientId === 'undefined';
       }
     }
   }