@wireapp/core 46.43.0 → 46.44.0

package/lib/conversation/ConversationService/ConversationService.d.ts.map

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

package/lib/conversation/ConversationService/ConversationService.js

@@ -363,6 +363,19 @@ class ConversationService extends commons_1.TypedEventEmitter {
                 this.logger.warn("Tried to add users to MLS conversation but it's broken, resetting the conversation", error);
                 return this.handleBrokenMLSConversation(conversationId, newGroupId => this.addUsersToMLSConversation({ qualifiedUsers, groupId: newGroupId, conversationId, shouldRetry: false }));
             }
+            if ((0, CoreCryptoMLSError_1.isMLSStaleMessageError)(error)) {
+                this.logger.info('Failed to add users to MLS conversation because of stale message, recovering by joining with external commit', {
+                    error,
+                    groupId,
+                });
+                await this.recoverMLSGroupFromEpochMismatch(conversationId);
+                return this.addUsersToMLSConversation({
+                    groupId,
+                    conversationId,
+                    qualifiedUsers,
+                    shouldRetry: false,
+                });
+            }
             if ((0, CoreCryptoMLSError_1.isMLSGroupOutOfSyncError)(error)) {
                 this.logger.info('Failed to send MLS message because of group out of sync, recovering by adding missing users', {
                     error,
@@ -402,6 +415,13 @@ class ConversationService extends commons_1.TypedEventEmitter {
                     shouldRetry: false,
                 }));
             }
+            if ((0, CoreCryptoMLSError_1.isMLSStaleMessageError)(error)) {
+                this.logger.info('Failed to remove users from MLS conversation because of stale message, recovering by joining with external commit', {
+                    error,
+                    groupId,
+                });
+                await this.recoverMLSGroupFromEpochMismatch(conversationId);
+            }
             if ((0, CoreCryptoMLSError_1.isMLSGroupOutOfSyncError)(error)) {
                 this.logger.info('Failed to send MLS message because of group out of sync, recovering by adding missing users', {
                     error,
@@ -413,14 +433,13 @@ class ConversationService extends commons_1.TypedEventEmitter {
                     conversationId,
                     qualifiedUsers: missingUsers,
                 });
-                return this.removeUsersFromMLSConversation({
-                    groupId,
-                    conversationId,
-                    qualifiedUserIds,
-                    shouldRetry: false,
-                });
             }
-            throw error;
+            return this.removeUsersFromMLSConversation({
+                groupId,
+                conversationId,
+                qualifiedUserIds,
+                shouldRetry: false,
+            });
         }
     }
     async joinByExternalCommit(conversationId, shouldRetry = true) {
@@ -437,6 +456,11 @@ class ConversationService extends commons_1.TypedEventEmitter {
                 this.logger.info('Resetting MLS conversation due to broken mls conversation error', error);
                 return this.handleBrokenMLSConversation(conversationId);
             }
+            if ((0, CoreCryptoMLSError_1.isMLSStaleMessageError)(error)) {
+                this.logger.info('Failed to join MLS conversation with external commit because of stale message, recovering by joining with external commit', { error, conversationId });
+                await this.recoverMLSGroupFromEpochMismatch(conversationId);
+                return;
+            }
             throw error;
         }
     }
@@ -473,6 +497,13 @@ class ConversationService extends commons_1.TypedEventEmitter {
                 this.logger.info('Tried to update key material for a broken MLS conversation, initiating reset', error);
                 return this.handleBrokenMLSConversation(conversation.qualified_id);
             }
+            if ((0, CoreCryptoMLSError_1.isMLSStaleMessageError)(error)) {
+                this.logger.info('Tried to update key material for a stale MLS conversation, recovering by joining with external commit', {
+                    error,
+                    groupId,
+                });
+                await this.recoverMLSGroupFromEpochMismatch(conversation.qualified_id);
+            }
             if ((0, CoreCryptoMLSError_1.isMLSGroupOutOfSyncError)(error)) {
                 this.logger.info('Tried to update key material for an out of sync conversation, recovering by adding missing users', {
                     error,

package/lib/conversation/ConversationService/ConversationService.test.js

@@ -130,6 +130,7 @@ describe('ConversationService', () => {
             getClientIdsInGroup: jest.fn(),
             getKeyPackagesPayload: jest.fn(),
             addUsersToExistingConversation: jest.fn(),
+            removeClientsFromConversation: jest.fn(),
             resetKeyMaterialRenewal: jest.fn(),
             handleMLSWelcomeMessageEvent: jest.fn(),
         };
@@ -170,6 +171,80 @@ describe('ConversationService', () => {
             });
         });
     });
+    describe('removeUsersFromMLSConversation', () => {
+        it('recovers and retries when stale-message occurs during remove users commit upload', async () => {
+            const [conversationService, { apiClient, mlsService }] = await buildConversationService();
+            const mockGroupId = 'groupId-stale-remove';
+            const mockConversationId = { id: PayloadHelper.getUUID(), domain: 'staging.zinfra.io' };
+            const qualifiedUserIds = [
+                { id: 'test-id-1', domain: 'test-domain' },
+                { id: 'test-id-2', domain: 'test-domain' },
+            ];
+            const staleMessageError = {
+                type: core_crypto_1.ErrorType.Mls,
+                context: {
+                    type: core_crypto_1.MlsErrorType.MessageRejected,
+                    context: {
+                        reason: (0, CoreCryptoMLSError_1.serializeAbortReason)({ message: CoreCryptoMLSError_1.UPLOAD_COMMIT_BUNDLE_ABORT_REASONS.MLS_STALE_MESSAGE }),
+                    },
+                },
+            };
+            // First removal attempt fails with stale, second succeeds
+            jest
+                .spyOn(mlsService, 'removeClientsFromConversation')
+                .mockRejectedValueOnce(staleMessageError)
+                .mockResolvedValueOnce(undefined);
+            const remoteEpoch = 6;
+            const localEpoch = 5;
+            jest.spyOn(mlsService, 'conversationExists').mockResolvedValueOnce(true);
+            jest.spyOn(mlsService, 'getEpoch').mockResolvedValueOnce(localEpoch);
+            jest.spyOn(apiClient.api.conversation, 'getConversation').mockResolvedValue({
+                qualified_id: mockConversationId,
+                protocol: conversation_1.ConversationProtocol.MLS,
+                epoch: remoteEpoch,
+                group_id: mockGroupId,
+            });
+            await conversationService.removeUsersFromMLSConversation({
+                groupId: mockGroupId,
+                conversationId: mockConversationId,
+                qualifiedUserIds,
+            });
+            expect(conversationService.joinByExternalCommit).toHaveBeenCalledWith(mockConversationId);
+            expect(mlsService.removeClientsFromConversation).toHaveBeenCalledTimes(2);
+            expect(mlsService.resetKeyMaterialRenewal).toHaveBeenCalledWith(mockGroupId);
+        });
+    });
+    describe('joinByExternalCommit', () => {
+        it('retries join when stale-message occurs during external commit join', async () => {
+            const [conversationService, { apiClient, mlsService }] = await buildConversationService();
+            const conversationId = { id: 'conv-join-stale', domain: 'staging.zinfra.io' };
+            const staleMessageError = {
+                type: core_crypto_1.ErrorType.Mls,
+                context: {
+                    type: core_crypto_1.MlsErrorType.MessageRejected,
+                    context: {
+                        reason: (0, CoreCryptoMLSError_1.serializeAbortReason)({ message: CoreCryptoMLSError_1.UPLOAD_COMMIT_BUNDLE_ABORT_REASONS.MLS_STALE_MESSAGE }),
+                    },
+                },
+            };
+            jest
+                .spyOn(mlsService, 'joinByExternalCommit')
+                .mockRejectedValueOnce(staleMessageError)
+                .mockResolvedValueOnce(undefined);
+            const remoteEpoch = 10;
+            const localEpoch = 9;
+            jest.spyOn(mlsService, 'conversationExists').mockResolvedValueOnce(true);
+            jest.spyOn(mlsService, 'getEpoch').mockResolvedValueOnce(localEpoch);
+            jest.spyOn(apiClient.api.conversation, 'getConversation').mockResolvedValueOnce({
+                qualified_id: conversationId,
+                protocol: conversation_1.ConversationProtocol.MLS,
+                epoch: remoteEpoch,
+                group_id: 'gid-join-stale',
+            });
+            await conversationService.joinByExternalCommit(conversationId);
+            expect(mlsService.joinByExternalCommit).toHaveBeenCalledTimes(2);
+        });
+    });
     describe('"send MLS"', () => {
         const groupId = PayloadHelper.getUUID();
         const messages = [
@@ -194,6 +269,43 @@ describe('ConversationService', () => {
                 expect(result.state).toBe(__1.MessageSendingState.OUTGOING_SENT);
             });
         });
+        it('rejoins a MLS group when stale-message error occurs during commit bundle upload', async () => {
+            const [conversationService, { apiClient, mlsService }] = await buildConversationService();
+            const mockGroupId = 'AAEAAH87aajaQ011i+rNLmwpy0sAZGl5YS53aXJlamxpbms=';
+            const mockConversationId = { id: 'mockConversationId', domain: 'staging.zinfra.io' };
+            const mockedMessage = MessageBuilder.buildTextMessage({ text: 'test' });
+            const staleMessageError = new conversation_1.MLSStaleMessageError('', http_1.BackendErrorLabel.MLS_STALE_MESSAGE, http_status_codes_1.StatusCodes.CONFLICT);
+            // First attempt to upload commit bundle fails with stale-message, second attempt succeeds
+            jest
+                .spyOn(mlsService, 'commitPendingProposals')
+                .mockRejectedValueOnce(staleMessageError)
+                .mockResolvedValueOnce(undefined);
+            const remoteEpoch = 5;
+            const localEpoch = 4;
+            jest.spyOn(mlsService, 'conversationExists').mockResolvedValueOnce(true);
+            jest.spyOn(mlsService, 'getEpoch').mockResolvedValueOnce(localEpoch);
+            jest.spyOn(apiClient.api.conversation, 'getConversation').mockResolvedValueOnce({
+                qualified_id: mockConversationId,
+                protocol: conversation_1.ConversationProtocol.MLS,
+                epoch: remoteEpoch,
+                group_id: mockGroupId,
+            });
+            await conversationService.send({
+                protocol: conversation_1.ConversationProtocol.MLS,
+                groupId: mockGroupId,
+                payload: mockedMessage,
+                conversationId: mockConversationId,
+            });
+            // Recovery via external commit should have been triggered
+            expect(conversationService.joinByExternalCommit).toHaveBeenCalledWith(mockConversationId);
+            expect(conversationService.emit).toHaveBeenCalledWith('MLSConversationRecovered', {
+                conversationId: mockConversationId,
+            });
+            // Because the failure happened before posting the message, postMlsMessage should be called only once (after recovery)
+            expect(apiClient.api.conversation.postMlsMessage).toHaveBeenCalledTimes(1);
+            // commitPendingProposals is called twice: first fails, second succeeds
+            expect(mlsService.commitPendingProposals).toHaveBeenCalledTimes(2);
+        });
         it('rejoins a MLS group when failed encrypting MLS message', async () => {
             const [conversationService, { apiClient, mlsService }] = await buildConversationService();
             const mockGroupId = 'AAEAAH87aajaQ011i+rNLmwpy0sAZGl5YS53aXJlamxpbms=';
@@ -599,6 +711,52 @@ describe('ConversationService', () => {
             });
             expect(failedToAdd).toEqual([keysClaimingFailure]);
         });
+        it('recovers and retries when stale-message occurs during add users commit upload', async () => {
+            const [conversationService, { apiClient, mlsService }] = await buildConversationService();
+            const mockGroupId = 'groupId-stale-add';
+            const mockConversationId = { id: PayloadHelper.getUUID(), domain: 'local.wire.com' };
+            const otherUsersToAdd = Array(2)
+                .fill(0)
+                .map(() => ({ id: PayloadHelper.getUUID(), domain: 'local.wire.com' }));
+            const qualifiedUsers = [...otherUsersToAdd];
+            const staleMessageError = {
+                type: core_crypto_1.ErrorType.Mls,
+                context: {
+                    type: core_crypto_1.MlsErrorType.MessageRejected,
+                    context: {
+                        reason: (0, CoreCryptoMLSError_1.serializeAbortReason)({ message: CoreCryptoMLSError_1.UPLOAD_COMMIT_BUNDLE_ABORT_REASONS.MLS_STALE_MESSAGE }),
+                    },
+                },
+            };
+            const getKPSpy = jest.spyOn(mlsService, 'getKeyPackagesPayload');
+            getKPSpy.mockResolvedValue({
+                keyPackages: [new Uint8Array(0)],
+                failures: [],
+            });
+            // Simulate commit upload failing once with stale, then succeeding
+            jest
+                .spyOn(mlsService, 'addUsersToExistingConversation')
+                .mockRejectedValueOnce(staleMessageError)
+                .mockResolvedValueOnce(undefined);
+            const remoteEpoch = 5;
+            const localEpoch = 4;
+            jest.spyOn(mlsService, 'conversationExists').mockResolvedValueOnce(true);
+            jest.spyOn(mlsService, 'getEpoch').mockResolvedValueOnce(localEpoch);
+            const getConvSpy = jest.spyOn(apiClient.api.conversation, 'getConversation');
+            getConvSpy.mockResolvedValue({
+                qualified_id: mockConversationId,
+                protocol: conversation_1.ConversationProtocol.MLS,
+                epoch: remoteEpoch,
+                group_id: mockGroupId,
+            });
+            await conversationService.addUsersToMLSConversation({
+                qualifiedUsers,
+                groupId: mockGroupId,
+                conversationId: mockConversationId,
+            });
+            expect(conversationService.joinByExternalCommit).toHaveBeenCalledWith(mockConversationId);
+            expect(mlsService.addUsersToExistingConversation).toHaveBeenCalledTimes(2);
+        });
     });
     describe('tryEstablishingMLSGroup', () => {
         it('should add all the users to a MLS group after group was established by the self client', async () => {
@@ -746,6 +904,38 @@ describe('ConversationService', () => {
             await Promise.allSettled([p1, p2]);
             expect(resetSpy).toHaveBeenCalledTimes(1);
         });
+        it('handles stale-message by rejoining via external commit and emits recovery event', async () => {
+            const [conversationService, { apiClient, mlsService }] = await buildConversationService();
+            const groupId = 'group-stale';
+            const qualified_id = { id: 'conv-stale', domain: 'staging.zinfra.io' };
+            jest.spyOn(apiClient.api.conversation, 'getConversationList').mockResolvedValueOnce({
+                found: [{ group_id: groupId, qualified_id, protocol: conversation_1.ConversationProtocol.MLS, epoch: 2 }],
+            });
+            const handler = getKeyMaterialFailureHandler(mlsService);
+            const staleMessageError = {
+                type: core_crypto_1.ErrorType.Mls,
+                context: {
+                    type: core_crypto_1.MlsErrorType.MessageRejected,
+                    context: {
+                        reason: (0, CoreCryptoMLSError_1.serializeAbortReason)({ message: CoreCryptoMLSError_1.UPLOAD_COMMIT_BUNDLE_ABORT_REASONS.MLS_STALE_MESSAGE }),
+                    },
+                },
+            };
+            const remoteEpoch = 3;
+            const localEpoch = 2;
+            jest.spyOn(mlsService, 'conversationExists').mockResolvedValueOnce(true);
+            jest.spyOn(mlsService, 'getEpoch').mockResolvedValueOnce(localEpoch);
+            jest.spyOn(apiClient.api.conversation, 'getConversation').mockResolvedValueOnce({
+                qualified_id,
+                protocol: conversation_1.ConversationProtocol.MLS,
+                epoch: remoteEpoch,
+                group_id: groupId,
+            });
+            await handler({ error: staleMessageError, groupId });
+            // Expect a rejoin on stale and a recovery event
+            expect(conversationService.joinByExternalCommit).toHaveBeenCalledWith(qualified_id);
+            expect(conversationService.emit).toHaveBeenCalledWith('MLSConversationRecovered', { conversationId: qualified_id });
+        });
     });
     describe('groupIdConversationMap cache', () => {
         function makeConversation(group_id, id) {

package/package.json

@@ -61,6 +61,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "46.43.0",
-  "gitHead": "54e8913dd88d97c1e6629115c84a8811a5b528bb"
+  "version": "46.44.0",
+  "gitHead": "ad02808b95e5e059ca9b92fc5e46c1dfb9ea2061"
 }