@wireapp/core 43.14.0 → 43.14.1

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

@@ -1,3 +1,4 @@
+import { AcmeService } from './Connection/AcmeServer';
 import { InitParams, RotateBundle } from './E2EIService.types';
 export declare class E2EIServiceInternal {
     private readonly coreCryptoClient;
@@ -9,11 +10,10 @@ export declare class E2EIServiceInternal {
     private readonly dispatchNewCrlDistributionPoints;
     private static instance;
     private readonly logger;
-    private identity?;
-    private acmeService?;
-    private isInitialized;
+    private _acmeService?;
     private constructor();
     static getInstance(params?: InitParams): Promise<E2EIServiceInternal>;
+    get acmeService(): AcmeService;
     startCertificateProcess(hasActiveCertificate: boolean): Promise<{
         challenge: {
             url: string;

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

@@ -1 +1 @@
-{"version":3,"file":"E2EIServiceInternal.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/E2EIdentityService/E2EIServiceInternal.ts"],"names":[],"mappings":"AAyBA,OAAO,EAAyD,UAAU,EAAE,YAAY,EAAC,MAAM,qBAAqB,CAAC;AAcrH,qBAAa,mBAAmB;IAQ5B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,wDAAwD;IACxD,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,gCAAgC;IAbnD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAsB;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuD;IAC9E,OAAO,CAAC,QAAQ,CAAC,CAAiB;IAClC,OAAO,CAAC,WAAW,CAAC,CAAc;IAClC,OAAO,CAAC,aAAa,CAAS;IAE9B,OAAO;WAYa,WAAW,CAAC,MAAM,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAkCrE,uBAAuB,CAAC,oBAAoB,EAAE,OAAO;;;;;;;;IAOrD,0BAA0B,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;YAUlF,YAAY;YAyBZ,IAAI;YAUJ,YAAY;YAUZ,eAAe;IAQ7B;;;;;OAKG;YACW,uBAAuB;IAiDrC;;;;;;;OAOG;YACW,sCAAsC;IAiEpD;;;OAGG;YACW,iBAAiB;IAwB/B;;;;;;OAMG;YACW,iBAAiB;IAe/B;;;;;OAKG;IACU,0BAA0B,CAAC,YAAY,EAAE,MAAM,EAAE,oBAAoB,EAAE,OAAO;CAa5F"}
+{"version":3,"file":"E2EIServiceInternal.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/E2EIdentityService/E2EIServiceInternal.ts"],"names":[],"mappings":"AAwBA,OAAO,EAAC,WAAW,EAAC,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAyD,UAAU,EAAE,YAAY,EAAC,MAAM,qBAAqB,CAAC;AAcrH,qBAAa,mBAAmB;IAM5B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,wDAAwD;IACxD,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,gCAAgC;IAXnD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAsB;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuD;IAC9E,OAAO,CAAC,YAAY,CAAC,CAAc;IAEnC,OAAO;WAYa,WAAW,CAAC,MAAM,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAkClF,IAAI,WAAW,IAAI,WAAW,CAK7B;IAEY,uBAAuB,CAAC,oBAAoB,EAAE,OAAO;;;;;;;;IAOrD,0BAA0B,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;YAUlF,YAAY;YAuBZ,IAAI;YASJ,YAAY;YAUZ,eAAe;IAQ7B;;;;;OAKG;YACW,uBAAuB;IA6CrC;;;;;;;OAOG;YACW,sCAAsC;IAiEpD;;;OAGG;YACW,iBAAiB;IAoB/B;;;;;;OAMG;YACW,iBAAiB;IAU/B;;;;;OAKG;IACU,0BAA0B,CAAC,YAAY,EAAE,MAAM,EAAE,oBAAoB,EAAE,OAAO;CAQ5F"}

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

@@ -45,7 +45,6 @@ class E2EIServiceInternal {
         this.keyPackagesAmount = keyPackagesAmount;
         this.dispatchNewCrlDistributionPoints = dispatchNewCrlDistributionPoints;
         this.logger = (0, logdown_1.default)('@wireapp/core/E2EIdentityServiceInternal');
-        this.isInitialized = false;
     }
     // ############ Public Functions ############
     static async getInstance(params) {
@@ -66,11 +65,17 @@ class E2EIServiceInternal {
         }
         return E2EIServiceInternal.instance;
     }
+    get acmeService() {
+        if (!this._acmeService) {
+            throw new Error('Error while trying to get AcmeService. E2EIServiceInternal has not been initialized');
+        }
+        return this._acmeService;
+    }
     async startCertificateProcess(hasActiveCertificate) {
         // Step 0: Check if we have a handle in local storage
         // If we don't have a handle, we need to start a new OAuth flow
-        await this.initIdentity(hasActiveCertificate);
-        return this.startNewOAuthFlow();
+        const identity = await this.initIdentity(hasActiveCertificate);
+        return this.startNewOAuthFlow(identity);
     }
     async continueCertificateProcess(oAuthIdToken) {
         // If we don't have a handle, we need to start a new OAuth flow
@@ -84,12 +89,9 @@ class E2EIServiceInternal {
         const { user } = E2EIStorage_1.E2EIStorage.get.initialData();
         // How long the issued certificate should be maximal valid
         const ciphersuite = E2EIService_types_1.Ciphersuite.MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519;
-        if (hasActiveCertificate) {
-            this.identity = await this.coreCryptoClient.e2eiNewRotateEnrollment(this.certificateTtl, ciphersuite, user.displayName, user.handle, user.teamId);
-        }
-        else {
-            this.identity = await this.coreCryptoClient.e2eiNewActivationEnrollment(user.displayName, user.handle, this.certificateTtl, ciphersuite, user.teamId);
-        }
+        return hasActiveCertificate
+            ? this.coreCryptoClient.e2eiNewRotateEnrollment(this.certificateTtl, ciphersuite, user.displayName, user.handle, user.teamId)
+            : this.coreCryptoClient.e2eiNewActivationEnrollment(user.displayName, user.handle, this.certificateTtl, ciphersuite, user.teamId);
     }
     async init(params) {
         const { user, clientId, discoveryUrl } = params;
@@ -97,8 +99,7 @@ class E2EIServiceInternal {
             this.logger.error('user and clientId are required to initialize E2eIdentityService');
             throw new Error();
         }
-        this.acmeService = new AcmeServer_1.AcmeService(discoveryUrl);
-        this.isInitialized = true;
+        this._acmeService = new AcmeServer_1.AcmeService(discoveryUrl);
     }
     async getDirectory(identity, connection) {
         const directory = await connection.getDirectory();
@@ -121,21 +122,18 @@ class E2EIServiceInternal {
      *
      * @returns authData
      */
-    async getEnrollmentChallenges() {
-        if (!this.isInitialized || !this.identity || !this.acmeService) {
-            throw new Error('Error while trying to start OAuth flow. E2eIdentityService is not fully initialized');
-        }
+    async getEnrollmentChallenges(identity) {
         // Get the directory
-        const directory = await this.getDirectory(this.identity, this.acmeService);
+        const { acmeService: acmeService } = this;
+        const directory = await this.getDirectory(identity, acmeService);
         if (!directory) {
             throw new Error('Error while trying to start OAuth flow. No directory received');
         }
         // Step 1: Get a new nonce from ACME server
-        const nonce = await this.getInitialNonce(directory, this.acmeService);
+        const nonce = await this.getInitialNonce(directory, acmeService);
         if (!nonce) {
             throw new Error('Error while trying to start OAuth flow. No nonce received');
         }
-        const { acmeService, identity } = this;
         // Step 2: Create a new account
         const newAccountNonce = await (0, Account_1.createNewAccount)({
             connection: acmeService,
@@ -170,16 +168,13 @@ class E2EIServiceInternal {
      * @param oAuthIdToken
      * @returns RotateBundle
      */
-    async getRotateBundleAndStoreCertificateData(oAuthIdToken, authData) {
-        if (!this.isInitialized || !this.identity || !this.acmeService) {
-            throw new Error('Error while trying to start OAuth flow. E2eIdentityService is not fully initialized');
-        }
+    async getRotateBundleAndStoreCertificateData(identity, oAuthIdToken, authData) {
         // Step 7: Do OIDC client challenge
         const oidcData = await (0, OidcChallenge_1.doWireOidcChallenge)({
             oAuthIdToken,
             authData,
             connection: this.acmeService,
-            identity: this.identity,
+            identity,
             nonce: authData.nonce,
         });
         this.logger.log('received oidcData', oidcData);
@@ -192,7 +187,7 @@ class E2EIServiceInternal {
             authData,
             clientId,
             connection: this.acmeService,
-            identity: this.identity,
+            identity,
             userDomain: wireUser.domain,
             apiClient: this.apiClient,
             expirySecs: 30,
@@ -206,7 +201,7 @@ class E2EIServiceInternal {
         const orderData = E2EIStorage_1.E2EIStorage.get.orderData();
         const finalizeOrderData = await (0, Order_1.finalizeOrder)({
             connection: this.acmeService,
-            identity: this.identity,
+            identity,
             nonce: dpopData.nonce,
             orderUrl: orderData.orderUrl,
         });
@@ -218,13 +213,13 @@ class E2EIServiceInternal {
             certificateUrl: finalizeOrderData.certificateUrl,
             nonce: finalizeOrderData.nonce,
             connection: this.acmeService,
-            identity: this.identity,
+            identity,
         });
         if (!certificate) {
             throw new Error('Error while trying to continue OAuth flow. No certificate received');
         }
         // Step 10: Initialize MLS with the certificate
-        const rotateBundle = await this.coreCryptoClient.e2eiRotateAll(this.identity, certificate, this.keyPackagesAmount);
+        const rotateBundle = await this.coreCryptoClient.e2eiRotateAll(identity, certificate, this.keyPackagesAmount);
         this.dispatchNewCrlDistributionPoints(rotateBundle);
         return rotateBundle;
     }
@@ -232,19 +227,16 @@ class E2EIServiceInternal {
      *  This function starts a new ACME enrollment flow for either a new client
      *  or a client that wants to refresh its certificate but has no valid refresh token
      */
-    async startNewOAuthFlow() {
+    async startNewOAuthFlow(identity) {
         if (this.e2eiServiceExternal.isEnrollmentInProgress()) {
             throw new Error('Error while trying to start OAuth flow. There is already a flow in progress');
         }
-        if (!this.isInitialized || !this.identity) {
-            throw new Error('Error while trying to start OAuth flow. E2eIdentityService is not fully initialized');
-        }
-        const { authorization: { oidcChallenge: wireOidcChallenge, keyauth }, } = await this.getEnrollmentChallenges();
+        const { authorization: { oidcChallenge: wireOidcChallenge, keyauth }, } = await this.getEnrollmentChallenges(identity);
         if (!wireOidcChallenge || !keyauth) {
             throw new Error('missing wireOidcChallenge or keyauth');
         }
         // stash the identity for later use
-        const handle = await this.coreCryptoClient.e2eiEnrollmentStash(this.identity);
+        const handle = await this.coreCryptoClient.e2eiEnrollmentStash(identity);
         // stash the handle in local storage
         E2EIStorage_1.E2EIStorage.store.handle(bazinga64_1.Encoder.toBase64(handle).asString);
         // we need to pass back the aquired wireOidcChallenge to the UI
@@ -258,15 +250,11 @@ class E2EIServiceInternal {
      * @returns RotateBundle | undefined
      */
     async continueOAuthFlow(oAuthIdToken) {
-        // If we have a handle, the user has already started the process to authenticate with the OIDC provider. We can continue the flow.
-        if (!this.acmeService) {
-            throw new Error('Error while trying to continue OAuth flow. AcmeService is not initialized');
-        }
         const handle = E2EIStorage_1.E2EIStorage.get.handle();
         const authData = E2EIStorage_1.E2EIStorage.get.authData();
-        this.identity = await this.coreCryptoClient.e2eiEnrollmentStashPop(bazinga64_1.Decoder.fromBase64(handle).asBytes);
+        const identity = await this.coreCryptoClient.e2eiEnrollmentStashPop(bazinga64_1.Decoder.fromBase64(handle).asBytes);
         this.logger.log('retrieved identity from stash');
-        return this.getRotateBundleAndStoreCertificateData(oAuthIdToken, authData);
+        return this.getRotateBundleAndStoreCertificateData(identity, oAuthIdToken, authData);
     }
     /**
      * This function starts a ACME refresh flow for an existing client with a valid refresh token
@@ -275,14 +263,10 @@ class E2EIServiceInternal {
      * @returns
      */
     async startRefreshCertficateFlow(oAuthIdToken, hasActiveCertificate) {
-        // we dont have an oauth flow since we already get the oAuthIdToken from the client
-        if (!this.acmeService) {
-            throw new Error('Error while trying to continue OAuth flow. AcmeService is not initialized');
-        }
         // We need to initialize the identity
-        await this.initIdentity(hasActiveCertificate);
-        const authData = await this.getEnrollmentChallenges();
-        return this.getRotateBundleAndStoreCertificateData(oAuthIdToken, authData);
+        const identity = await this.initIdentity(hasActiveCertificate);
+        const authData = await this.getEnrollmentChallenges(identity);
+        return this.getRotateBundleAndStoreCertificateData(identity, oAuthIdToken, authData);
     }
 }
 exports.E2EIServiceInternal = E2EIServiceInternal;

package/lib/messagingProtocols/mls/MLSService/MLSService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MLSService.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/MLSService/MLSService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MLSService.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/MLSService/MLSService.ts"],"names":[],"mappings":"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"}

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

@@ -636,67 +636,61 @@ class MLSService extends commons_1.TypedEventEmitter {
      * @returns AcmeChallenge if the user is not authenticated, true if the user is authenticated
      */
     async enrollE2EI(discoveryUrl, e2eiServiceExternal, user, client, nbPrekeys, certificateTtl, oAuthIdToken) {
-        try {
-            const hasActiveCertificate = await this.coreCryptoClient.e2eiIsEnabled(this.config.cipherSuite);
-            const instance = await E2EIServiceInternal_1.E2EIServiceInternal.getInstance({
-                apiClient: this.apiClient,
-                coreCryptClient: this.coreCryptoClient,
-                e2eiServiceExternal,
-                user,
-                clientId: client.id,
-                discoveryUrl,
-                keyPackagesAmount: nbPrekeys,
-                dispatchNewCrlDistributionPoints: payload => this.dispatchNewCrlDistributionPoints(payload),
-                certificateTtl,
-            });
-            // If we don't have an OAuth id token, we need to start the certificate process with Oauth
-            if (!oAuthIdToken) {
-                const data = await instance.startCertificateProcess(hasActiveCertificate);
-                const oidcChallenge = data.challenge;
-                if (!oidcChallenge) {
-                    throw new Error('Not oidc challenge found');
-                }
-                return { status: 'authentication', authenticationChallenge: data };
-            }
-            // If we have an OAuth id token, we can continue the certificate process / start a refresh
-            const rotateBundle = !hasActiveCertificate
-                ? // If we are not refreshing the active certificate, we need to continue the certificate process with Oauth
-                    await instance.continueCertificateProcess(oAuthIdToken)
-                : // If we are refreshing the active certificate, can start the refresh process
-                    await instance.startRefreshCertficateFlow(oAuthIdToken, hasActiveCertificate);
-            if (rotateBundle === undefined) {
-                throw new Error('Could not get the rotate bundle');
-            }
-            this.dispatchNewCrlDistributionPoints(rotateBundle);
-            // upload the clients public keys
-            if (!hasActiveCertificate) {
-                // we only upload public keys for the initial certification process. Renewals do not need to upload new public keys
-                await this.uploadMLSPublicKeys(client);
-            }
-            // Remove old key packages
-            await this.deleteMLSKeyPackages(client.id, rotateBundle.keyPackageRefsToRemove);
-            // Upload new key packages with x509 certificate
-            await this.uploadMLSKeyPackages(client.id, rotateBundle.newKeyPackages);
-            // Verify that we have enough key packages
-            await this.verifyRemoteMLSKeyPackagesAmount(client.id);
-            // Update keying material
-            for (const [groupId, commitBundle] of rotateBundle.commits) {
-                const groupIdAsBytes = bazinga64_1.Converter.hexStringToArrayBufferView(groupId);
-                // manual copy of the commit bundle data because of a problem while cloning it
-                const newCommitBundle = {
-                    commit: commitBundle.commit,
-                    // @ts-ignore
-                    groupInfo: (commitBundle === null || commitBundle === void 0 ? void 0 : commitBundle.group_info) || commitBundle.groupInfo,
-                    welcome: commitBundle === null || commitBundle === void 0 ? void 0 : commitBundle.welcome,
-                };
-                await this.uploadCommitBundle(groupIdAsBytes, newCommitBundle);
+        const hasActiveCertificate = await this.coreCryptoClient.e2eiIsEnabled(this.config.cipherSuite);
+        const instance = await E2EIServiceInternal_1.E2EIServiceInternal.getInstance({
+            apiClient: this.apiClient,
+            coreCryptClient: this.coreCryptoClient,
+            e2eiServiceExternal,
+            user,
+            clientId: client.id,
+            discoveryUrl,
+            keyPackagesAmount: nbPrekeys,
+            dispatchNewCrlDistributionPoints: payload => this.dispatchNewCrlDistributionPoints(payload),
+            certificateTtl,
+        });
+        // If we don't have an OAuth id token, we need to start the certificate process with Oauth
+        if (!oAuthIdToken) {
+            const data = await instance.startCertificateProcess(hasActiveCertificate);
+            const oidcChallenge = data.challenge;
+            if (!oidcChallenge) {
+                throw new Error('Not oidc challenge found');
             }
-            return { status: 'successful' };
+            return { status: 'authentication', authenticationChallenge: data };
         }
-        catch (error) {
-            this.logger.error('E2EI - Failed to enroll', error);
-            throw error;
+        // If we have an OAuth id token, we can continue the certificate process / start a refresh
+        const rotateBundle = !hasActiveCertificate
+            ? // If we are not refreshing the active certificate, we need to continue the certificate process with Oauth
+                await instance.continueCertificateProcess(oAuthIdToken)
+            : // If we are refreshing the active certificate, can start the refresh process
+                await instance.startRefreshCertficateFlow(oAuthIdToken, hasActiveCertificate);
+        if (rotateBundle === undefined) {
+            throw new Error('Could not get the rotate bundle');
+        }
+        this.dispatchNewCrlDistributionPoints(rotateBundle);
+        // upload the clients public keys
+        if (!hasActiveCertificate) {
+            // we only upload public keys for the initial certification process. Renewals do not need to upload new public keys
+            await this.uploadMLSPublicKeys(client);
+        }
+        // Remove old key packages
+        await this.deleteMLSKeyPackages(client.id, rotateBundle.keyPackageRefsToRemove);
+        // Upload new key packages with x509 certificate
+        await this.uploadMLSKeyPackages(client.id, rotateBundle.newKeyPackages);
+        // Verify that we have enough key packages
+        await this.verifyRemoteMLSKeyPackagesAmount(client.id);
+        // Update keying material
+        for (const [groupId, commitBundle] of rotateBundle.commits) {
+            const groupIdAsBytes = bazinga64_1.Converter.hexStringToArrayBufferView(groupId);
+            // manual copy of the commit bundle data because of a problem while cloning it
+            const newCommitBundle = {
+                commit: commitBundle.commit,
+                // @ts-ignore
+                groupInfo: (commitBundle === null || commitBundle === void 0 ? void 0 : commitBundle.group_info) || commitBundle.groupInfo,
+                welcome: commitBundle === null || commitBundle === void 0 ? void 0 : commitBundle.welcome,
+            };
+            await this.uploadCommitBundle(groupIdAsBytes, newCommitBundle);
         }
+        return { status: 'successful' };
     }
 }
 exports.MLSService = MLSService;

package/package.json

@@ -61,6 +61,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "43.14.0",
-  "gitHead": "f6c5af785bf95e3dab9dc8f888012e3dfaaae3c4"
+  "version": "43.14.1",
+  "gitHead": "be5c29911af8df6a7ba7367d927a32e8354387fb"
 }