Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.
TypeScript cloud-alternativecollaborationcollaborative-editingdropboxfile-serverfile-sharingfile-storagefile-syncfull-text-searchhomelabnextcloudon-premiseopen-sourceprivacy-firstprivate-cloudrealtimesecureself-hostedstorage-serverwebdav
fix(backend:sync): await usersManager.updateAccesses in 2FA recovery code validation
johaven8f553445df33
diff --git a/backend/src/applications/sync/services/sync-clients-manager.service.spec.ts b/backend/src/applications/sync/services/sync-clients-manager.service.spec.tsindex be4e6928..2b1ab62f 100644--- a/backend/src/applications/sync/services/sync-clients-manager.service.spec.ts+++ b/backend/src/applications/sync/services/sync-clients-manager.service.spec.ts@@ -77,6 +77,7 @@ describe(SyncClientsManager.name, () => {let http: { axiosRef: Mock }let authManager: { setCookies: Mock; getTokens: Mock }let authProvider: { validateUser: Mock }+ let authProvider2FA: { validateTwoFactorCode: Mock; validateRecoveryCode: Mock }let usersManager: { fromUserId: Mock; updateAccesses: Mock }let syncQueries: {getOrCreateClient: Mock@@ -117,6 +118,7 @@ describe(SyncClientsManager.name, () => {http = { axiosRef: vi.fn() }authManager = { setCookies: vi.fn(), getTokens: vi.fn() }authProvider = { validateUser: vi.fn() }+ authProvider2FA = { validateTwoFactorCode: vi.fn(), validateRecoveryCode: vi.fn() }usersManager = { fromUserId: vi.fn(), updateAccesses: vi.fn() }syncQueries = {getOrCreateClient: vi.fn(),@@ -142,7 +144,7 @@ describe(SyncClientsManager.name, () => {{ provide: UsersManager, useValue: usersManager },{ provide: AuthManager, useValue: authManager },{ provide: AuthProvider, useValue: authProvider },- { provide: AuthProvider2FA, useValue: {} }+ { provide: AuthProvider2FA, useValue: authProvider2FA }]}).compile()@@ -166,6 +168,9 @@ describe(SyncClientsManager.name, () => {vi.mocked(readFile).mockReset()vi.mocked(syncQueries.updateClientInfo).mockResolvedValue(undefined)vi.mocked(usersManager.updateAccesses).mockResolvedValue(undefined)+ vi.mocked(authProvider2FA.validateTwoFactorCode).mockReturnValue({ success: true, message: '' })+ vi.mocked(authProvider2FA.validateRecoveryCode).mockResolvedValue({ success: true, message: '' })+ ;(configuration as any).auth.mfa.totp.enabled = false;(service as any).cache = cacheMockcacheMock.get.mockResolvedValue(undefined)cacheMock.get.mockClear()@@ -197,6 +202,27 @@ describe(SyncClientsManager.name, () => {expect(syncQueries.getOrCreateClient).toHaveBeenCalledWith(10, 'client-1', baseDto.info, '1.2.3.4')})+ it('should wait for access tracking before rejecting an invalid 2FA code', async () => {+ const user = {+ id: 10,+ login: 'john',+ twoFaEnabled: true,+ secrets: { twoFaSecret: 'secret', recoveryCodes: ['recovery'] },+ havePermission: () => true+ }+ ;(configuration as any).auth.mfa.totp.enabled = true+ authProvider.validateUser.mockResolvedValue(user)+ authProvider2FA.validateTwoFactorCode.mockReturnValue({ success: false, message: 'Invalid code' })+ authProvider2FA.validateRecoveryCode.mockResolvedValue({ success: false, message: 'Invalid recovery code' })++ await expect(service.register({ ...baseDto, code: '000000' } as any, '1.2.3.4')).rejects.toMatchObject({+ status: HttpStatus.UNAUTHORIZED,+ response: 'Invalid code'+ })+ expect(usersManager.updateAccesses).toHaveBeenCalledWith(user, '1.2.3.4', false)+ expect(syncQueries.getOrCreateClient).not.toHaveBeenCalled()+ })+it('should throw Internal Server Error when persistence fails', async () => {authProvider.validateUser.mockResolvedValue({ id: 10, login: 'john', havePermission: () => true })syncQueries.getOrCreateClient.mockRejectedValue(new Error('db error'))diff --git a/backend/src/applications/sync/services/sync-clients-manager.service.ts b/backend/src/applications/sync/services/sync-clients-manager.service.tsindex 6de4a503..80cdcf7d 100644--- a/backend/src/applications/sync/services/sync-clients-manager.service.ts+++ b/backend/src/applications/sync/services/sync-clients-manager.service.ts@@ -70,7 +70,7 @@ export class SyncClientsManager {const authRCode = await this.authProvider2FA.validateRecoveryCode(user.id, clientRegistrationDto.code, user.secrets.recoveryCodes)if (!authRCode.success) {this.logger.warn({ tag: this.register.name, msg: `two-fa recovery code for *${user.login}* (${user.id}) - ${authRCode.message}` })- this.usersManager.updateAccesses(user, ip, false).catch((e: Error) => this.logger.error({ tag: this.register.name, msg: `${e}` }))+ await this.usersManager.updateAccesses(user, ip, false)throw new HttpException(authCode.message, HttpStatus.UNAUTHORIZED)}}