@wireapp/core 42.22.1 → 42.23.0

package/lib/Account.js

@@ -321,7 +321,7 @@ class Account extends commons_1.TypedEventEmitter {
         let mlsService;
         let e2eIdentityService;
         if (clientType === CryptoClient_1.CryptoClientType.CORE_CRYPTO && (await this.isMlsEnabled())) {
-            e2eIdentityService = await E2EIdentityService_1.E2EIServiceExternal.getInstance(cryptoClient.getNativeClient());
+            e2eIdentityService = new E2EIdentityService_1.E2EIServiceExternal(cryptoClient.getNativeClient());
             mlsService = new mls_1.MLSService(this.apiClient, cryptoClient.getNativeClient(), this.db, this.recurringTaskScheduler, Object.assign({}, (_a = this.cryptoProtocolConfig) === null || _a === void 0 ? void 0 : _a.mls));
         }
         const proteusService = new proteus_1.ProteusService(this.apiClient, cryptoClient, {

package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.d.ts

@@ -1,18 +1,19 @@
 import { QualifiedId } from '@wireapp/api-client/lib/user';
 import { Ciphersuite, CoreCrypto, E2eiConversationState, WireIdentity } from '@wireapp/core-crypto';
+export type DeviceIdentity = Omit<WireIdentity, 'free'> & {
+    deviceId: string;
+};
 export declare class E2EIServiceExternal {
-    private static instance;
+    private coreCryptoClient;
     private readonly logger;
-    private readonly coreCryptoClient;
-    private constructor();
-    static getInstance(coreCryptoClient: CoreCrypto): Promise<E2EIServiceExternal>;
+    constructor(coreCryptoClient: CoreCrypto);
     hasActiveCertificate(): boolean;
     getCertificateData(): string | undefined;
     isEnrollmentInProgress(): boolean;
     clearAllProgress(): void;
     getConversationState(conversationId: Uint8Array): Promise<E2eiConversationState>;
     isE2EIEnabled(ciphersuite: Ciphersuite): Promise<boolean>;
-    getUsersIdentities(groupId: string, userIds: QualifiedId[]): Promise<Map<string, WireIdentity[]>>;
-    getUserDeviceEntities(groupId: string, userClientsMap: Record<string, QualifiedId>): Promise<WireIdentity[]>;
+    getUsersIdentities(groupId: string, userIds: QualifiedId[]): Promise<Map<string, DeviceIdentity[]>>;
+    getDevicesIdentities(groupId: string, userClientsMap: Record<string, QualifiedId>): Promise<DeviceIdentity[]>;
 }
 //# sourceMappingURL=E2EIServiceExternal.d.ts.map

package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"E2EIServiceExternal.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAIzD,OAAO,EAAC,WAAW,EAAE,UAAU,EAAE,qBAAqB,EAAE,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAMlG,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAsB;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuD;IAC9E,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAa;IAE9C,OAAO;WAIa,WAAW,CAAC,gBAAgB,EAAE,UAAU,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAWpF,oBAAoB,IAAI,OAAO;IAK/B,kBAAkB,IAAI,MAAM,GAAG,SAAS;IAUxC,sBAAsB,IAAI,OAAO;IAIjC,gBAAgB,IAAI,IAAI;IAIxB,oBAAoB,CAAC,cAAc,EAAE,UAAU,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAIhF,aAAa,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAInD,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE;IAQ1D,qBAAqB,CAChC,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAC1C,OAAO,CAAC,YAAY,EAAE,CAAC;CAM3B"}
+{"version":3,"file":"E2EIServiceExternal.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAIzD,OAAO,EAAC,WAAW,EAAE,UAAU,EAAE,qBAAqB,EAAE,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAOlG,MAAM,MAAM,cAAc,GAAG,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,GAAG;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAC,CAAC;AAG7E,qBAAa,mBAAmB;IAGX,OAAO,CAAC,gBAAgB;IAF3C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuD;gBAEnD,gBAAgB,EAAE,UAAU;IAGhD,oBAAoB,IAAI,OAAO;IAK/B,kBAAkB,IAAI,MAAM,GAAG,SAAS;IAUxC,sBAAsB,IAAI,OAAO;IAIjC,gBAAgB,IAAI,IAAI;IAIxB,oBAAoB,CAAC,cAAc,EAAE,UAAU,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAIhF,aAAa,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAInD,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC;IA4BnG,oBAAoB,CAC/B,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAC1C,OAAO,CAAC,cAAc,EAAE,CAAC;CAc7B"}

package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.js

@@ -26,20 +26,12 @@ const bazinga64_1 = require("bazinga64");
 const logdown_1 = __importDefault(require("logdown"));
 const Helper_1 = require("./Helper");
 const E2EIStorage_1 = require("./Storage/E2EIStorage");
+const fullyQualifiedClientIdUtils_1 = require("../../../util/fullyQualifiedClientIdUtils");
 // This export is meant to be accessible from the outside (e.g the Webapp / UI)
 class E2EIServiceExternal {
-    constructor(coreCryptClient) {
+    constructor(coreCryptoClient) {
+        this.coreCryptoClient = coreCryptoClient;
         this.logger = (0, logdown_1.default)('@wireapp/core/E2EIdentityServiceExternal');
-        this.coreCryptoClient = coreCryptClient;
-    }
-    static async getInstance(coreCryptoClient) {
-        if (!E2EIServiceExternal.instance) {
-            if (!coreCryptoClient) {
-                throw new Error('E2EIServiceExternal is not initialized. Please call getInstance with params.');
-            }
-            E2EIServiceExternal.instance = new E2EIServiceExternal(coreCryptoClient);
-        }
-        return E2EIServiceExternal.instance;
     }
     // Checks if there is a certificate stored in the local storage
     hasActiveCertificate() {
@@ -69,12 +61,24 @@ class E2EIServiceExternal {
         return this.coreCryptoClient.e2eiIsEnabled(ciphersuite);
     }
     async getUsersIdentities(groupId, userIds) {
-        return this.coreCryptoClient.getUserIdentities(bazinga64_1.Decoder.fromBase64(groupId).asBytes, userIds.map(userId => (0, Helper_1.uuidTobase64url)(userId.id).asString));
+        // We keep track of the ID we give to CoreCrypto in order to map it back to regular userIds afterwards
+        const hashedIdMap = new Map(userIds.map(userId => [(0, Helper_1.uuidTobase64url)(userId.id).asString, userId]));
+        const userIdentities = await this.coreCryptoClient.getUserIdentities(bazinga64_1.Decoder.fromBase64(groupId).asBytes, Array.from(hashedIdMap.keys()));
+        const mappedUserIdentities = new Map();
+        for (const [base64Id, identities] of userIdentities) {
+            // remapping coreCrypto user ids to regular userIds
+            const userId = hashedIdMap.get(base64Id);
+            if (userId) {
+                mappedUserIdentities.set(userId.id, identities.map(identity => (Object.assign(Object.assign({}, identity), { deviceId: (0, fullyQualifiedClientIdUtils_1.parseFullQualifiedClientId)(identity.client_id).client }))));
+            }
+        }
+        return mappedUserIdentities;
     }
     // Returns devices e2ei certificates
-    async getUserDeviceEntities(groupId, userClientsMap) {
+    async getDevicesIdentities(groupId, userClientsMap) {
         const clientIds = Object.entries(userClientsMap).map(([clientId, userId]) => (0, Helper_1.getE2EIClientId)(clientId, userId.id, userId.domain).asBytes);
-        return this.coreCryptoClient.getDeviceIdentities(bazinga64_1.Decoder.fromBase64(groupId).asBytes, clientIds);
+        const deviceIdentities = await this.coreCryptoClient.getDeviceIdentities(bazinga64_1.Decoder.fromBase64(groupId).asBytes, clientIds);
+        return deviceIdentities.map(identity => (Object.assign(Object.assign({}, identity), { deviceId: (0, fullyQualifiedClientIdUtils_1.parseFullQualifiedClientId)(identity.client_id).client })));
     }
 }
 exports.E2EIServiceExternal = E2EIServiceExternal;

package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=E2EIServiceExternal.test.d.ts.map

package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"E2EIServiceExternal.test.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.test.ts"],"names":[],"mappings":""}

package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.test.js

@@ -0,0 +1,56 @@
+"use strict";
+/*
+ * Wire
+ * Copyright (C) 2023 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 E2EIServiceExternal_1 = require("./E2EIServiceExternal");
+function buildE2EIService() {
+    const coreCrypto = {
+        getUserIdentities: jest.fn(),
+    };
+    return [new E2EIServiceExternal_1.E2EIServiceExternal(coreCrypto), { coreCrypto }];
+}
+function generateCoreCryptoIdentity({ status = 'Valid', deviceId = 'aaaaa' } = {}) {
+    return {
+        client_id: `SKHDsEsOS82TrWTHNEsVNA:${deviceId}@elna.wire.link`,
+        handle: 'adrian_wire2@elna.wire.link',
+        display_name: 'Adrian Weiss 2',
+        domain: 'elna.wire.link',
+        certificate: '-----BEGIN CERTIFICATE-----\nMIICRTCCAeqgAwIBAgIQcpcbKbgHLM5qoB7xgxm6BTAKBggqhkjOPQQDAjAuMSww\nKgYDVQQDEyNlbG5hLndpcmUubGluayBFMkVJIEludGVybWVkaWF0ZSBDQTAeFw0y\nMzExMjIxMTIwMDVaFw0yMzExMjQxMTIwMDVaMDIxFzAVBgNVBAoTDmVsbmEud2ly\nZS5saW5rMRcwFQYDVQQDEw5BZHJpYW4gV2Vpc3MgMjAqMAUGAytlcAMhAMwP5B9X\nwanLL7JUmHEc1SJYAvHUvMnL1MS/D4CK3JaMo4IBEzCCAQ8wDgYDVR0PAQH/BAQD\nAgeAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNVHQ4EFgQUrIPC\nem20zAl1ybZqXm2LkvD2U1swHwYDVR0jBBgwFoAU5bQTjX1Ps09suTYe4tzXUKgl\nN9YwdwYDVR0RBHAwboYpaW06d2lyZWFwcD0lNDBhZHJpYW5fd2lyZTJAZWxuYS53\naXJlLmxpbmuGQWltOndpcmVhcHA9U0tIRHNFc09TODJUcldUSE5Fc1ZOQS9lYjll\nMDM4NjE4MzllOWRhQGVsbmEud2lyZS5saW5rMCUGDCsGAQQBgqRkxihAAQQVMBMC\nAQYEDGRlZmF1bHR0ZWFtcwQAMAoGCCqGSM49BAMCA0kAMEYCIQCQQHVAd6wjp2A+\nVvKIXu4oVlCMZkAUATU5bXY4njvapwIhAO8rION7Mz5rSjixJsdEL8E+HHsNvCax\ndjrSL0FL9SM6\n-----END CERTIFICATE-----\n',
+        status,
+        thumbprint: 'mNyAo88vAF5s7v0UWBNxlQKxP3dfT91A-4PbuzEA5uQ',
+    };
+}
+const groupId = 'AAEAAhJrE+8TbFFUqiagedTYDUMAZWxuYS53aXJlLmxpbms=';
+describe('E2EIServiceExternal', () => {
+    describe('getUsersIdentities', () => {
+        it('returns the user identities', async () => {
+            const [service, { coreCrypto }] = buildE2EIService();
+            const user1 = { domain: 'elna.wire.link', id: '48a1c3b0-4b0e-4bcd-93ad-64c7344b1534' };
+            const user2 = { domain: 'elna.wire.link', id: 'b7d287e4-7bbd-40e0-a550-6b18dcaf5f31' };
+            const userIds = [user1, user2];
+            coreCrypto.getUserIdentities.mockResolvedValue(new Map([
+                ['SKHDsEsOS82TrWTHNEsVNA', [generateCoreCryptoIdentity(), generateCoreCryptoIdentity()]],
+                ['t9KH5Hu9QOClUGsY3K9fMQ', [generateCoreCryptoIdentity()]],
+            ]));
+            const userIdentities = await service.getUsersIdentities(groupId, userIds);
+            expect(userIdentities.get(user1.id)).toBeDefined();
+            expect(userIdentities.get(user2.id)).toBeDefined();
+        });
+    });
+});

package/lib/messagingProtocols/mls/MLSService/MLSService.js

@@ -53,7 +53,7 @@ const optionalToUint8Array = (array) => {
 };
 exports.optionalToUint8Array = optionalToUint8Array;
 const defaultConfig = {
-    keyingMaterialUpdateThreshold: 1000 * 60 * 60 * 24 * 30,
+    keyingMaterialUpdateThreshold: 1000 * 60 * 60 * 24 * 30, //30 days
     nbKeyPackages: 100,
     defaultCiphersuite: core_crypto_1.Ciphersuite.MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519,
     defaultCredentialType: core_crypto_1.CredentialType.Basic,

package/lib/notification/NotificationService.js

@@ -21,8 +21,9 @@ var __await = (this && this.__await) || function (v) { return this instanceof __
 var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
     if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
     var g = generator.apply(thisArg, _arguments || []), i, q = [];
-    return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
-    function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
+    return i = {}, verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function () { return this; }, i;
+    function awaitReturn(f) { return function (v) { return Promise.resolve(v).then(f, reject); }; }
+    function verb(n, f) { if (g[n]) { i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; if (f) i[n] = f(i[n]); } }
     function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
     function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
     function fulfill(value) { resume("next", value); }

package/package.json

@@ -11,7 +11,7 @@
     "./lib/cryptography/AssetCryptography/crypto.node": "./lib/cryptography/AssetCryptography/crypto.browser.js"
   },
   "dependencies": {
-    "@wireapp/api-client": "^26.5.3",
+    "@wireapp/api-client": "^26.5.4",
     "@wireapp/commons": "^5.2.3",
     "@wireapp/core-crypto": "1.0.0-rc.19",
     "@wireapp/cryptobox": "12.8.0",
@@ -61,6 +61,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "42.22.1",
-  "gitHead": "a27913ebd6661bf2bd165eb3fe7770c4f6fee546"
+  "version": "42.23.0",
+  "gitHead": "51af8002058b19edf83bb7b306a35217114087f2"
 }