@wireapp/core 46.1.0-hotfix-1.1 → 46.1.0-hotfix-1.5

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":"AAqBA,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAG9C,OAAO,EAAgB,WAAW,EAAE,UAAU,EAAiB,MAAM,qBAAqB,CAAC;AAS3F,OAAO,EAAqB,WAAW,EAAiC,MAAM,8BAA8B,CAAC;AAE7G,OAAO,EAAC,YAAY,EAAC,MAAM,yBAAyB,CAAC;AAErD,MAAM,MAAM,gBAAgB,GAAG,CAAC,cAAc,CAAC,EAAE;IAAC,SAAS,EAAE,GAAG,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;AACnH,qBAAa,mBAAmB;IAO5B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,wDAAwD;IACxD,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAX9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuD;IAC9E,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,iBAAiB,CAAiD;gBAGxE,MAAM,EAAE,YAAY,EACH,gBAAgB,EAAE,UAAU,EAC5B,SAAS,EAAE,SAAS;IACrC,wDAAwD;IACvC,cAAc,EAAE,MAAM,EACtB,iBAAiB,EAAE,MAAM,EACzB,WAAW,EAAE,WAAW;IAO3C;;;;OAIG;IACU,mBAAmB,CAAC,aAAa,EAAE,gBAAgB,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW;YAkC9F,6BAA6B;YAQ7B,YAAY;YAoBZ,YAAY;YAUZ,eAAe;IAQ7B;;;;;OAKG;YACW,uBAAuB;IAyCrC;;;;;;;OAOG;YACW,eAAe;CAgE9B"}
+{"version":3,"file":"E2EIServiceInternal.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/E2EIdentityService/E2EIServiceInternal.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAG9C,OAAO,EAA6B,UAAU,EAAiB,MAAM,qBAAqB,CAAC;AAS3F,OAAO,EAAqB,WAAW,EAAiC,MAAM,8BAA8B,CAAC;AAE7G,OAAO,EAAC,YAAY,EAAC,MAAM,yBAAyB,CAAC;AAErD,MAAM,MAAM,gBAAgB,GAAG,CAAC,cAAc,CAAC,EAAE;IAAC,SAAS,EAAE,GAAG,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;AACnH,qBAAa,mBAAmB;IAO5B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,wDAAwD;IACxD,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAX9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuD;IAC9E,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,iBAAiB,CAAiD;gBAGxE,MAAM,EAAE,YAAY,EACH,gBAAgB,EAAE,UAAU,EAC5B,SAAS,EAAE,SAAS;IACrC,wDAAwD;IACvC,cAAc,EAAE,MAAM,EACtB,iBAAiB,EAAE,MAAM,EACzB,WAAW,EAAE,WAAW;IAO3C;;;;OAIG;IACU,mBAAmB,CAAC,aAAa,EAAE,gBAAgB,EAAE,OAAO,EAAE,OAAO;YAkCpE,6BAA6B;YAQ7B,YAAY;YAuBZ,YAAY;YAUZ,eAAe;IAQ7B;;;;;OAKG;YACW,uBAAuB;IAyCrC;;;;;;;OAOG;YACW,eAAe;CAgE9B"}

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

@@ -24,6 +24,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.E2EIServiceInternal = void 0;
 const logdown_1 = __importDefault(require("logdown"));
 const AcmeServer_1 = require("./Connection/AcmeServer");
+const E2EIService_types_1 = require("./E2EIService.types");
 const Helper_1 = require("./Helper");
 const Account_1 = require("./Steps/Account");
 const Authorization_1 = require("./Steps/Authorization");
@@ -51,7 +52,7 @@ class E2EIServiceInternal {
      * @param getOAuthToken function called when the process needs an oauth token
      * @param refresh should the process refresh the current certificate or get a new one
      */
-    async generateCertificate(getOAuthToken, refresh, ciphersuite) {
+    async generateCertificate(getOAuthToken, refresh) {
         const stashedEnrollmentData = await this.enrollmentStorage.getPendingEnrollmentData();
         if (stashedEnrollmentData) {
             // In case we have stashed data, we continue the enrollment flow (we are coming back from a redirect)
@@ -62,7 +63,7 @@ class E2EIServiceInternal {
             return this.continueCertificateGeneration(oAuthToken, stashedEnrollmentData);
         }
         // We first get the challenges needed to validate the user identity
-        const identity = await this.initIdentity(refresh, ciphersuite);
+        const identity = await this.initIdentity(refresh);
         const enrollmentChallenges = await this.getEnrollmentChallenges(identity);
         const { keyauth, oidcChallenge } = enrollmentChallenges.authorization;
         const challengeData = { challenge: oidcChallenge, keyAuth: keyauth };
@@ -83,8 +84,10 @@ class E2EIServiceInternal {
         return this.getRotateBundle(identity, oAuthToken, enrollmentData);
     }
     // ############ Internal Functions ############
-    async initIdentity(hasActiveCertificate, ciphersuite) {
+    async initIdentity(hasActiveCertificate) {
         const { user } = this.initialData;
+        // How long the issued certificate should be maximal valid
+        const ciphersuite = E2EIService_types_1.Ciphersuite.MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519;
         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);

package/lib/messagingProtocols/mls/E2EIdentityService/Helper/index.d.ts

@@ -1,5 +1,4 @@
-import { MLSPublicKeyAlgorithmKeys, RegisteredClient } from '@wireapp/api-client/lib/client';
-import { Ciphersuite } from '@wireapp/core-crypto';
+import { RegisteredClient } from '@wireapp/api-client/lib/client';
 import { ClientIdStringType } from '../../../../util/fullyQualifiedClientIdUtils';
 export declare const jsonToByteArray: (data: any) => Uint8Array;
 type GetE2EIClientIdReturnType = {
@@ -7,8 +6,7 @@ type GetE2EIClientIdReturnType = {
     asBytes: Uint8Array;
 };
 export declare const getE2EIClientId: (clientId: string, userId: string, userDomain: string) => GetE2EIClientIdReturnType;
-export declare const getSignatureAlgorithmForCiphersuite: (ciphersuite: Ciphersuite) => MLSPublicKeyAlgorithmKeys;
-export declare const isMLSDevice: ({ mls_public_keys }: RegisteredClient, ciphersuite: Ciphersuite) => boolean;
+export declare const isMLSDevice: ({ mls_public_keys }: RegisteredClient) => boolean;
 export declare const isResponseStatusValid: (status: string | undefined) => boolean | "" | undefined;
 export {};
 //# sourceMappingURL=index.d.ts.map

package/lib/messagingProtocols/mls/E2EIdentityService/Helper/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/mls/E2EIdentityService/Helper/index.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,yBAAyB,EAAE,gBAAgB,EAAC,MAAM,gCAAgC,CAAC;AAE3F,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAC,kBAAkB,EAAkC,MAAM,8CAA8C,CAAC;AAEjH,eAAO,MAAM,eAAe,SAAU,GAAG,KAAG,UAG3C,CAAC;AAEF,KAAK,yBAAyB,GAAG;IAC/B,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,OAAO,EAAE,UAAU,CAAC;CACrB,CAAC;AACF,eAAO,MAAM,eAAe,aAAc,MAAM,UAAU,MAAM,cAAc,MAAM,KAAG,yBAOtF,CAAC;AAeF,eAAO,MAAM,mCAAmC,gBAAiB,WAAW,KAAG,yBAE9E,CAAC;AAEF,eAAO,MAAM,WAAW,wBAAuB,gBAAgB,eAAe,WAAW,YAIxF,CAAC;AAEF,eAAO,MAAM,qBAAqB,WAAY,MAAM,GAAG,SAAS,6BAAiC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/mls/E2EIdentityService/Helper/index.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,gBAAgB,EAAC,MAAM,gCAAgC,CAAC;AAEhE,OAAO,EAAC,kBAAkB,EAAkC,MAAM,8CAA8C,CAAC;AAEjH,eAAO,MAAM,eAAe,SAAU,GAAG,KAAG,UAG3C,CAAC;AAEF,KAAK,yBAAyB,GAAG;IAC/B,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,OAAO,EAAE,UAAU,CAAC;CACrB,CAAC;AACF,eAAO,MAAM,eAAe,aAAc,MAAM,UAAU,MAAM,cAAc,MAAM,KAAG,yBAOtF,CAAC;AAEF,eAAO,MAAM,WAAW,wBAAuB,gBAAgB,YACoB,CAAC;AAEpF,eAAO,MAAM,qBAAqB,WAAY,MAAM,GAAG,SAAS,6BAAiC,CAAC"}

package/lib/messagingProtocols/mls/E2EIdentityService/Helper/index.js

@@ -18,9 +18,7 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isResponseStatusValid = exports.isMLSDevice = exports.getSignatureAlgorithmForCiphersuite = exports.getE2EIClientId = exports.jsonToByteArray = void 0;
-const client_1 = require("@wireapp/api-client/lib/client");
-const core_crypto_1 = require("@wireapp/core-crypto");
+exports.isResponseStatusValid = exports.isMLSDevice = exports.getE2EIClientId = exports.jsonToByteArray = void 0;
 const fullyQualifiedClientIdUtils_1 = require("../../../../util/fullyQualifiedClientIdUtils");
 const jsonToByteArray = (data) => {
     const encoder = new TextEncoder();
@@ -36,27 +34,7 @@ const getE2EIClientId = (clientId, userId, userDomain) => {
     };
 };
 exports.getE2EIClientId = getE2EIClientId;
-/**
- * depending on the ciphersuite used, the signature algorithm used is different. We need to keep a mapping of the ciphersuite to the signature algorithm
- */
-const ciphersuiteSignatureAlgorithmMap = {
-    [core_crypto_1.Ciphersuite.MLS_128_DHKEMP256_AES128GCM_SHA256_P256]: client_1.MLSPublicKeyAlgorithmKeys.ECDSA_SECP256R1_SHA256,
-    [core_crypto_1.Ciphersuite.MLS_256_DHKEMP384_AES256GCM_SHA384_P384]: client_1.MLSPublicKeyAlgorithmKeys.ECDSA_SECP384R1_SHA384,
-    [core_crypto_1.Ciphersuite.MLS_256_DHKEMP521_AES256GCM_SHA512_P521]: client_1.MLSPublicKeyAlgorithmKeys.ECDSA_SECP521R1_SHA512,
-    [core_crypto_1.Ciphersuite.MLS_256_DHKEMX448_AES256GCM_SHA512_Ed448]: client_1.MLSPublicKeyAlgorithmKeys.ED448,
-    [core_crypto_1.Ciphersuite.MLS_256_DHKEMX448_CHACHA20POLY1305_SHA512_Ed448]: client_1.MLSPublicKeyAlgorithmKeys.ED448,
-    [core_crypto_1.Ciphersuite.MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519]: client_1.MLSPublicKeyAlgorithmKeys.ED25519,
-    [core_crypto_1.Ciphersuite.MLS_128_DHKEMX25519_CHACHA20POLY1305_SHA256_Ed25519]: client_1.MLSPublicKeyAlgorithmKeys.ED25519,
-};
-const getSignatureAlgorithmForCiphersuite = (ciphersuite) => {
-    return ciphersuiteSignatureAlgorithmMap[ciphersuite];
-};
-exports.getSignatureAlgorithmForCiphersuite = getSignatureAlgorithmForCiphersuite;
-const isMLSDevice = ({ mls_public_keys }, ciphersuite) => {
-    const signatureAlogrithm = (0, exports.getSignatureAlgorithmForCiphersuite)(ciphersuite);
-    const signature = mls_public_keys[signatureAlogrithm];
-    return typeof signature === 'string' && signature.length > 0;
-};
+const isMLSDevice = ({ mls_public_keys }) => typeof mls_public_keys.ed25519 === 'string' && mls_public_keys.ed25519.length > 0;
 exports.isMLSDevice = isMLSDevice;
 const isResponseStatusValid = (status) => status && status === 'valid';
 exports.isResponseStatusValid = isResponseStatusValid;

package/lib/messagingProtocols/mls/E2EIdentityService/Steps/OidcChallenge.d.ts

@@ -14,11 +14,11 @@ export declare const doWireOidcChallenge: ({ connection, authData, identity, non
     target: string;
     status: string;
     token: string;
+    validated?: string | undefined;
     error?: {
         type: string;
         detail: string;
     } | undefined;
-    validated?: string | undefined;
 }>>;
 export {};
 //# sourceMappingURL=OidcChallenge.d.ts.map

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

@@ -1,36 +1,25 @@
-import type { MLSPublicKeyRecord, RegisteredClient } from '@wireapp/api-client/lib/client';
+import type { RegisteredClient } from '@wireapp/api-client/lib/client';
 import { PostMlsMessageResponse, SUBCONVERSATION_ID } from '@wireapp/api-client/lib/conversation';
 import { ConversationMLSMessageAddEvent, ConversationMLSWelcomeEvent } from '@wireapp/api-client/lib/event';
 import { QualifiedId } from '@wireapp/api-client/lib/user';
 import logdown from 'logdown';
 import { APIClient } from '@wireapp/api-client';
 import { TypedEventEmitter } from '@wireapp/commons';
-import { AddProposalArgs, Ciphersuite, ConversationId, CoreCrypto, DecryptedMessage, ProposalArgs, ProposalType, RemoveProposalArgs } from '@wireapp/core-crypto';
+import { AddProposalArgs, ConversationId, CoreCrypto, DecryptedMessage, ProposalArgs, ProposalType, RemoveProposalArgs } from '@wireapp/core-crypto';
+import { MLSServiceConfig } from './MLSService.types';
 import { AddUsersFailure, KeyPackageClaimUser } from '../../../conversation';
 import { CoreDatabase } from '../../../storage/CoreDB';
 import { RecurringTaskScheduler } from '../../../util/RecurringTaskScheduler';
 import { User } from '../E2EIdentityService';
 import { getTokenCallback } from '../E2EIdentityService/E2EIServiceInternal';
 import { ClientId, HandlePendingProposalsParams } from '../types';
-type Optional<T, K extends keyof T> = Pick<Partial<T>, K> & Omit<T, K>;
-interface MLSConfig {
-    /** List of ciphersuites that could be used for MLS */
-    ciphersuites: Ciphersuite[];
-    /** preferred ciphersuite to use */
-    defaultCiphersuite: Ciphersuite;
-    /**
-     * (milliseconds) period of time between automatic updates of the keying material (30 days by default)
-     */
-    keyingMaterialUpdateThreshold: number;
+export declare const optionalToUint8Array: (array: Uint8Array | []) => Uint8Array;
+interface LocalMLSServiceConfig extends MLSServiceConfig {
     /**
-     * number of key packages client should upload to the server (100 by default)
+     * minimum number of key packages client should have available (configured to half of nbKeyPackages)
      */
-    nbKeyPackages: number;
+    minRequiredNumberOfAvailableKeyPackages: number;
 }
-export type InitClientOptions = Optional<MLSConfig, 'keyingMaterialUpdateThreshold' | 'nbKeyPackages'> & {
-    skipInitIdentity?: boolean;
-};
-export declare const optionalToUint8Array: (array: Uint8Array | []) => Uint8Array;
 type Events = {
     newEpoch: {
         epoch: number;
@@ -44,29 +33,18 @@ export declare class MLSService extends TypedEventEmitter<Events> {
     private readonly coreDatabase;
     private readonly recurringTaskScheduler;
     logger: logdown.Logger;
-    private _config?;
+    config: LocalMLSServiceConfig;
     private readonly textEncoder;
     private readonly textDecoder;
     private readonly conflictBackoffQueue;
-    constructor(apiClient: APIClient, coreCryptoClient: CoreCrypto, coreDatabase: CoreDatabase, recurringTaskScheduler: RecurringTaskScheduler);
-    /**
-     * return true if the MLS service if configured and ready to be used
-     */
-    get isEnabled(): boolean;
-    get config(): MLSConfig;
-    private get minRequiredKeyPackages();
+    constructor(apiClient: APIClient, coreCryptoClient: CoreCrypto, coreDatabase: CoreDatabase, recurringTaskScheduler: RecurringTaskScheduler, { keyingMaterialUpdateThreshold, nbKeyPackages, cipherSuite, }: Partial<MLSServiceConfig>);
     /**
      * Will initialize an MLS client
      * @param userId the user owning the client
      * @param client id of the client to initialize
      * @param skipInitIdentity avoid registering the client's identity to the backend (needed for e2eidentity as the identity will be uploaded and signed only when enrollment is successful)
      */
-    initClient(userId: QualifiedId, client: RegisteredClient, { skipInitIdentity, ...mlsConfig }: InitClientOptions): Promise<void>;
-    /**
-     * returns true if the client has a valid MLS identity in regard of the default ciphersuite set
-     * @param client the client to check
-     */
-    isInitializedMLSClient: (client: RegisteredClient) => boolean;
+    initClient(userId: QualifiedId, client: RegisteredClient, skipInitIdentity?: boolean): Promise<void>;
     private getCredentialType;
     private uploadCommitBundle;
     private readonly _uploadCommitBundle;
@@ -109,7 +87,7 @@ export declare class MLSService extends TypedEventEmitter<Events> {
      * @param groupId the id of the group to create inside of coreCrypto
      * @param parentGroupId in case the conversation is a subconversation, the id of the parent conversation
      */
-    registerEmptyConversation(groupId: string, parentGroupId?: string, removalKeyFor1to1Signature?: MLSPublicKeyRecord): Promise<void>;
+    registerEmptyConversation(groupId: string, parentGroupId?: string): Promise<void>;
     /**
      * Will create a conversation inside of coreCrypto, add users to it or update the keying material if empty key packages list is provided.
      * @param groupId the id of the group to create inside of coreCrypto
@@ -126,18 +104,6 @@ export declare class MLSService extends TypedEventEmitter<Events> {
     }): Promise<PostMlsMessageResponse & {
         failures: AddUsersFailure[];
     }>;
-    /**
-     * Will create a 1:1 conversation inside of coreCrypto, try claiming key packages for user and (if succesfull) add them to the MLS group.
-     * @param groupId the id of the group to create inside of coreCrypto
-     * @param userId the id of the user to register the conversation with
-     * @param selfUser the self user that is creating the 1:1 conversation (user and client ids)
-     */
-    register1to1Conversation(groupId: string, userId: QualifiedId, selfUser: {
-        user: QualifiedId;
-        client: string;
-    }, removalKeyFor1to1Signature?: MLSPublicKeyRecord): Promise<PostMlsMessageResponse & {
-        failures: AddUsersFailure[];
-    }>;
     /**
      * Will try to register mls group and send an empty commit to establish it.
      *

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.guards.d.ts

@@ -0,0 +1,4 @@
+import { BackendError } from '@wireapp/api-client/lib/http';
+export declare const isObject: (value: unknown) => value is {};
+export declare function isBackendError(errorCandidate: unknown): errorCandidate is BackendError;
+//# sourceMappingURL=MLSService.guards.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"MLSService.guards.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/MLSService/MLSService.guards.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAC,MAAM,8BAA8B,CAAC;AAE1D,eAAO,MAAM,QAAQ,UAAW,OAAO,gBAA6D,CAAC;AAGrG,wBAAgB,cAAc,CAAC,cAAc,EAAE,OAAO,GAAG,cAAc,IAAI,YAAY,CAEtF"}

package/lib/messagingProtocols/mls/MLSService/{ClientMLSError.js → MLSService.guards.js}

@@ -18,16 +18,11 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ClientMLSError = exports.ClientMLSErrorLabel = void 0;
-var ClientMLSErrorLabel;
-(function (ClientMLSErrorLabel) {
-    ClientMLSErrorLabel["NO_KEY_PACKAGES_AVAILABLE"] = "no-key-packages-available";
-})(ClientMLSErrorLabel || (exports.ClientMLSErrorLabel = ClientMLSErrorLabel = {}));
-class ClientMLSError extends Error {
-    constructor(label) {
-        super();
-        this.label = label;
-        Object.setPrototypeOf(this, new.target.prototype);
-    }
+exports.isBackendError = exports.isObject = void 0;
+const isObject = (value) => typeof value === 'object' && value !== null;
+exports.isObject = isObject;
+// ToDo: Remove after this package moved to the Monorepo and use the shared function from webapp
+function isBackendError(errorCandidate) {
+    return (0, exports.isObject)(errorCandidate) && 'label' in errorCandidate && 'message' in errorCandidate;
 }
-exports.ClientMLSError = ClientMLSError;
+exports.isBackendError = isBackendError;

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

@@ -40,8 +40,8 @@ const logdown_1 = __importDefault(require("logdown"));
 const commons_1 = require("@wireapp/commons");
 const core_crypto_1 = require("@wireapp/core-crypto");
 const priority_queue_1 = require("@wireapp/priority-queue");
-const ClientMLSError_1 = require("./ClientMLSError");
 const CoreCryptoMLSError_1 = require("./CoreCryptoMLSError");
+const MLSService_guards_1 = require("./MLSService.guards");
 const conversation_1 = require("../../../conversation");
 const messageSender_1 = require("../../../conversation/message/messageSender");
 const fullyQualifiedClientIdUtils_1 = require("../../../util/fullyQualifiedClientIdUtils");
@@ -61,9 +61,10 @@ exports.optionalToUint8Array = optionalToUint8Array;
 const defaultConfig = {
     keyingMaterialUpdateThreshold: 1000 * 60 * 60 * 24 * 30, //30 days
     nbKeyPackages: 100,
+    cipherSuite: core_crypto_1.Ciphersuite.MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519,
 };
 class MLSService extends commons_1.TypedEventEmitter {
-    constructor(apiClient, coreCryptoClient, coreDatabase, recurringTaskScheduler) {
+    constructor(apiClient, coreCryptoClient, coreDatabase, recurringTaskScheduler, { keyingMaterialUpdateThreshold = defaultConfig.keyingMaterialUpdateThreshold, nbKeyPackages = defaultConfig.nbKeyPackages, cipherSuite = defaultConfig.cipherSuite, }) {
         super();
         this.apiClient = apiClient;
         this.coreCryptoClient = coreCryptoClient;
@@ -76,20 +77,17 @@ class MLSService extends commons_1.TypedEventEmitter {
             maxRetries: 10,
             retryDelay: 500,
             maxRetryDelay: TimeUtil_1.TimeInMillis.SECOND * 32,
-            shouldRetry: error => error instanceof http_1.BackendError && error.code === http_1.StatusCode.CONFLICT,
+            shouldRetry: error => (0, MLSService_guards_1.isBackendError)(error) && error.code === http_1.StatusCode.CONFLICT,
         });
-        /**
-         * returns true if the client has a valid MLS identity in regard of the default ciphersuite set
-         * @param client the client to check
-         */
-        this.isInitializedMLSClient = (client) => (0, Helper_1.isMLSDevice)(client, this.config.defaultCiphersuite);
         this.uploadCommitBundle = async (groupId, commitBundle, { isExternalCommit = false, regenerateCommitBundle } = {}) => {
             try {
                 return await this._uploadCommitBundle(groupId, async () => commitBundle, isExternalCommit);
             }
             catch (error) {
-                if (error instanceof http_1.BackendError && error.code === http_1.StatusCode.CONFLICT && regenerateCommitBundle) {
-                    return this.conflictBackoffQueue.add(async () => this._uploadCommitBundle(groupId, regenerateCommitBundle, isExternalCommit));
+                if ((0, MLSService_guards_1.isBackendError)(error)) {
+                    if (error.code === http_1.StatusCode.CONFLICT && regenerateCommitBundle) {
+                        return this.conflictBackoffQueue.add(async () => this._uploadCommitBundle(groupId, regenerateCommitBundle, isExternalCommit));
+                    }
                 }
                 throw error;
             }
@@ -156,21 +154,12 @@ class MLSService extends commons_1.TypedEventEmitter {
                 return false;
             }
         };
-    }
-    /**
-     * return true if the MLS service if configured and ready to be used
-     */
-    get isEnabled() {
-        return !!this._config;
-    }
-    get config() {
-        if (!this._config) {
-            throw new Error('mls config is not set, did you forget to call initClient?');
-        }
-        return this._config;
-    }
-    get minRequiredKeyPackages() {
-        return Math.floor(this.config.nbKeyPackages / 2);
+        this.config = {
+            keyingMaterialUpdateThreshold,
+            nbKeyPackages,
+            cipherSuite,
+            minRequiredNumberOfAvailableKeyPackages: Math.floor(nbKeyPackages / 2),
+        };
     }
     /**
      * Will initialize an MLS client
@@ -178,19 +167,15 @@ class MLSService extends commons_1.TypedEventEmitter {
      * @param client id of the client to initialize
      * @param skipInitIdentity avoid registering the client's identity to the backend (needed for e2eidentity as the identity will be uploaded and signed only when enrollment is successful)
      */
-    async initClient(userId, client, _a) {
-        var { skipInitIdentity } = _a, mlsConfig = __rest(_a, ["skipInitIdentity"]);
-        // filter out undefined values from mlsConfig
-        const filteredMLSConfig = Object.fromEntries(Object.entries(mlsConfig).filter(([_, value]) => value !== undefined));
-        this._config = Object.assign(Object.assign({}, defaultConfig), filteredMLSConfig);
-        await this.coreCryptoClient.mlsInit((0, MLSId_1.generateMLSDeviceId)(userId, client.id), this.config.ciphersuites, this.config.nbKeyPackages);
+    async initClient(userId, client, skipInitIdentity = false) {
+        await this.coreCryptoClient.mlsInit((0, MLSId_1.generateMLSDeviceId)(userId, client.id), [this.config.cipherSuite], this.config.nbKeyPackages);
         await this.coreCryptoClient.registerCallbacks({
             // All authorization/membership rules are enforced on backend
             clientIsExistingGroupUser: async () => true,
             authorize: async () => true,
             userAuthorize: async () => true,
         });
-        const isFreshMLSSelfClient = !this.isInitializedMLSClient(client);
+        const isFreshMLSSelfClient = typeof client.mls_public_keys.ed25519 !== 'string' || client.mls_public_keys.ed25519.length === 0;
         const shouldinitIdentity = !(isFreshMLSSelfClient && skipInitIdentity);
         if (shouldinitIdentity) {
             // We need to make sure keypackages and public key are uploaded to the backend
@@ -204,7 +189,7 @@ class MLSService extends commons_1.TypedEventEmitter {
         }
     }
     async getCredentialType() {
-        return (await this.coreCryptoClient.e2eiIsEnabled(this.config.defaultCiphersuite))
+        return (await this.coreCryptoClient.e2eiIsEnabled(this.config.cipherSuite))
             ? core_crypto_1.CredentialType.X509
             : core_crypto_1.CredentialType.Basic;
     }
@@ -248,7 +233,7 @@ class MLSService extends commons_1.TypedEventEmitter {
         const emptyKeyPackagesUsers = [];
         const keyPackagesSettledResult = await Promise.allSettled(qualifiedUsers.map(async ({ id, domain, skipOwnClientId }) => {
             try {
-                const keys = await this.apiClient.api.client.claimMLSKeyPackages(id, domain, (0, numberToHex_1.numberToHex)(this.config.defaultCiphersuite), skipOwnClientId);
+                const keys = await this.apiClient.api.client.claimMLSKeyPackages(id, domain, (0, numberToHex_1.numberToHex)(this.config.cipherSuite), skipOwnClientId);
                 const isSelfUser = this.apiClient.userId === id && this.apiClient.domain === domain;
                 // It's possible that user's backend is reachable but they have not uploaded their MLS key packages (or all of them have been claimed already)
                 // We don't care about the self user here.
@@ -388,8 +373,7 @@ class MLSService extends commons_1.TypedEventEmitter {
      * @param groupId the id of the group to create inside of coreCrypto
      * @param parentGroupId in case the conversation is a subconversation, the id of the parent conversation
      */
-    async registerEmptyConversation(groupId, parentGroupId, removalKeyFor1to1Signature) {
-        var _a;
+    async registerEmptyConversation(groupId, parentGroupId) {
         const groupIdBytes = bazinga64_1.Decoder.fromBase64(groupId).asBytes;
         let externalSenders = [];
         if (parentGroupId) {
@@ -398,16 +382,11 @@ class MLSService extends commons_1.TypedEventEmitter {
         }
         else {
             const mlsKeys = (await this.apiClient.api.client.getPublicKeys()).removal;
-            const ciphersuiteSignature = (0, Helper_1.getSignatureAlgorithmForCiphersuite)(this.config.defaultCiphersuite);
-            const removalKeyForSignature = (_a = removalKeyFor1to1Signature === null || removalKeyFor1to1Signature === void 0 ? void 0 : removalKeyFor1to1Signature[ciphersuiteSignature]) !== null && _a !== void 0 ? _a : mlsKeys[ciphersuiteSignature];
-            if (!removalKeyForSignature) {
-                throw new Error(`Cannot create conversation: No backend removal key found for the signature ${ciphersuiteSignature}`);
-            }
-            externalSenders = [bazinga64_1.Decoder.fromBase64(removalKeyForSignature).asBytes];
+            externalSenders = Object.values(mlsKeys).map((key) => bazinga64_1.Decoder.fromBase64(key).asBytes);
         }
         const configuration = {
             externalSenders,
-            ciphersuite: this.config.defaultCiphersuite,
+            ciphersuite: this.config.cipherSuite,
         };
         const credentialType = await this.getCredentialType();
         return this.coreCryptoClient.createConversation(groupIdBytes, credentialType, configuration);
@@ -448,41 +427,6 @@ class MLSService extends commons_1.TypedEventEmitter {
         response.failures = [...keysClaimingFailures, ...response.failures];
         return response;
     }
-    /**
-     * Will create a 1:1 conversation inside of coreCrypto, try claiming key packages for user and (if succesfull) add them to the MLS group.
-     * @param groupId the id of the group to create inside of coreCrypto
-     * @param userId the id of the user to register the conversation with
-     * @param selfUser the self user that is creating the 1:1 conversation (user and client ids)
-     */
-    async register1to1Conversation(groupId, userId, selfUser, removalKeyFor1to1Signature) {
-        try {
-            await this.registerEmptyConversation(groupId, undefined, removalKeyFor1to1Signature);
-            // We fist fetch key packages for the user we want to add
-            const { keyPackages: otherUserKeyPackages, failures: otherUserKeysClaimingFailures } = await this.getKeyPackagesPayload([userId]);
-            // If we're missing key packages for the user we want to add, we can't register the conversation
-            if (otherUserKeyPackages.length <= 0) {
-                if (otherUserKeysClaimingFailures.length > 0 &&
-                    otherUserKeysClaimingFailures.some(({ reason }) => reason === conversation_1.AddUsersFailureReasons.OFFLINE_FOR_TOO_LONG)) {
-                    throw new ClientMLSError_1.ClientMLSError(ClientMLSError_1.ClientMLSErrorLabel.NO_KEY_PACKAGES_AVAILABLE);
-                }
-            }
-            const { keyPackages: selfKeyPackages, failures: selfKeysClaimingFailures } = await this.getKeyPackagesPayload([
-                Object.assign(Object.assign({}, selfUser.user), { skipOwnClientId: selfUser.client }),
-            ]);
-            const response = await this.addUsersToExistingConversation(groupId, [
-                ...otherUserKeyPackages,
-                ...selfKeyPackages,
-            ]);
-            // We schedule a periodic key material renewal
-            await this.scheduleKeyMaterialRenewal(groupId);
-            response.failures = [...otherUserKeysClaimingFailures, ...selfKeysClaimingFailures, ...response.failures];
-            return response;
-        }
-        catch (error) {
-            await this.wipeConversation(groupId);
-            throw error;
-        }
-    }
     /**
      * Will send a removal commit for given clients
      * @param groupId groupId of the conversation
@@ -511,11 +455,11 @@ class MLSService extends commons_1.TypedEventEmitter {
     }
     async clientValidKeypackagesCount() {
         const credentialType = await this.getCredentialType();
-        return this.coreCryptoClient.clientValidKeypackagesCount(this.config.defaultCiphersuite, credentialType);
+        return this.coreCryptoClient.clientValidKeypackagesCount(this.config.cipherSuite, credentialType);
     }
     async clientKeypackages(amountRequested) {
         const credentialType = await this.getCredentialType();
-        return this.coreCryptoClient.clientKeypackages(this.config.defaultCiphersuite, credentialType, amountRequested);
+        return this.coreCryptoClient.clientKeypackages(this.config.cipherSuite, credentialType, amountRequested);
     }
     /**
      * Will send an empty commit into a group (renew key material)
@@ -595,21 +539,21 @@ class MLSService extends commons_1.TypedEventEmitter {
      */
     async verifyLocalMLSKeyPackagesAmount(clientId) {
         const keyPackagesCount = await this.clientValidKeypackagesCount();
-        if (keyPackagesCount <= this.minRequiredKeyPackages) {
+        if (keyPackagesCount <= this.config.minRequiredNumberOfAvailableKeyPackages) {
             return this.verifyRemoteMLSKeyPackagesAmount(clientId);
         }
     }
     async verifyRemoteMLSKeyPackagesAmount(clientId) {
         const backendKeyPackagesCount = await this.getRemoteMLSKeyPackageCount(clientId);
         // If we have enough keys uploaded on backend, there's no need to upload more.
-        if (backendKeyPackagesCount > this.minRequiredKeyPackages) {
+        if (backendKeyPackagesCount > this.config.minRequiredNumberOfAvailableKeyPackages) {
             return;
         }
         const keyPackages = await this.clientKeypackages(this.config.nbKeyPackages);
         return this.uploadMLSKeyPackages(clientId, keyPackages);
     }
     async getRemoteMLSKeyPackageCount(clientId) {
-        return this.apiClient.api.client.getMLSKeyPackageCount(clientId, (0, numberToHex_1.numberToHex)(this.config.defaultCiphersuite));
+        return this.apiClient.api.client.getMLSKeyPackageCount(clientId, (0, numberToHex_1.numberToHex)(this.config.cipherSuite));
     }
     /**
      * Will update the given client on backend with its public key.
@@ -620,15 +564,13 @@ class MLSService extends commons_1.TypedEventEmitter {
     async uploadMLSPublicKeys(client) {
         // If we've already updated a client with its public key, there's no need to do it again.
         const credentialType = await this.getCredentialType();
-        const publicKey = await this.coreCryptoClient.clientPublicKey(this.config.defaultCiphersuite, credentialType);
+        const publicKey = await this.coreCryptoClient.clientPublicKey(this.config.cipherSuite, credentialType);
         return this.apiClient.api.client.putClient(client.id, {
-            mls_public_keys: {
-                [(0, Helper_1.getSignatureAlgorithmForCiphersuite)(this.config.defaultCiphersuite)]: btoa(bazinga64_1.Converter.arrayBufferViewToBaselineString(publicKey)),
-            },
+            mls_public_keys: { ed25519: btoa(bazinga64_1.Converter.arrayBufferViewToBaselineString(publicKey)) },
         });
     }
     async replaceKeyPackages(clientId, keyPackages) {
-        return this.apiClient.api.client.replaceMLSKeyPackages(clientId, keyPackages.map(keyPackage => btoa(bazinga64_1.Converter.arrayBufferViewToBaselineString(keyPackage))), (0, numberToHex_1.numberToHex)(this.config.defaultCiphersuite));
+        return this.apiClient.api.client.replaceMLSKeyPackages(clientId, keyPackages.map(keyPackage => btoa(bazinga64_1.Converter.arrayBufferViewToBaselineString(keyPackage))));
     }
     async uploadMLSKeyPackages(clientId, keyPackages) {
         return this.apiClient.api.client.uploadMLSKeyPackages(clientId, keyPackages.map(keyPackage => btoa(bazinga64_1.Converter.arrayBufferViewToBaselineString(keyPackage))));
@@ -772,12 +714,12 @@ class MLSService extends commons_1.TypedEventEmitter {
      * @returns AcmeChallenge if the user is not authenticated, true if the user is authenticated
      */
     async enrollE2EI(discoveryUrl, user, client, nbPrekeys, certificateTtl, getOAuthToken) {
-        const isCertificateRenewal = await this.coreCryptoClient.e2eiIsEnabled(this.config.defaultCiphersuite);
+        const isCertificateRenewal = await this.coreCryptoClient.e2eiIsEnabled(this.config.cipherSuite);
         const e2eiServiceInternal = new E2EIServiceInternal_1.E2EIServiceInternal(this.coreDatabase, this.coreCryptoClient, this.apiClient, certificateTtl, nbPrekeys, { user, clientId: client.id, discoveryUrl });
-        const rotateBundle = await e2eiServiceInternal.generateCertificate(getOAuthToken, isCertificateRenewal, this.config.defaultCiphersuite);
+        const rotateBundle = await e2eiServiceInternal.generateCertificate(getOAuthToken, isCertificateRenewal);
         this.dispatchNewCrlDistributionPoints(rotateBundle);
         // upload the clients public keys
-        if (!this.isInitializedMLSClient(client)) {
+        if (!(0, Helper_1.isMLSDevice)(client)) {
             // we only upload public keys for the initial certification process if the device is not already a registered MLS device.
             await this.uploadMLSPublicKeys(client);
         }
@@ -795,7 +737,15 @@ class MLSService extends commons_1.TypedEventEmitter {
                 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);
+            try {
+                await this.uploadCommitBundle(groupIdAsBytes, newCommitBundle);
+            }
+            catch (error) {
+                if ((0, MLSService_guards_1.isBackendError)(error) && error.label === http_1.BackendErrorLabel.MLS_MISSING_REFERENCE) {
+                    await this.coreCryptoClient.clearPendingCommit(groupIdAsBytes);
+                    window.location.reload();
+                }
+            }
         }
     }
 }