Skip to content

The open alternative to Salesforce, designed for AI.

fix(auth): additional workspace and identity validation in auth flows (#21347)

Félix Malfait06d68f665dfc
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/reset-password.service.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/services/reset-password.service.spec.ts
index 25dbd7f1603..7ba3a0528fb 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/services/reset-password.service.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/reset-password.service.spec.ts
@@ -115,6 +115,9 @@ describe('ResetPasswordService', () => {
jest
.spyOn(userService, 'findUserByEmailOrThrow')
.mockResolvedValue(mockUser as UserEntity);
+ jest
+ .spyOn(workspaceRepository, 'findOne')
+ .mockResolvedValue({ id: 'workspace-id' } as WorkspaceEntity);
jest.spyOn(appTokenRepository, 'findOne').mockResolvedValue(null);
jest
.spyOn(appTokenRepository, 'save')
@@ -135,6 +138,45 @@ describe('ResetPasswordService', () => {
type: AppTokenType.PasswordResetToken,
}),
);
+ expect(workspaceRepository.findOne).toHaveBeenCalledWith(
+ expect.objectContaining({
+ where: expect.objectContaining({
+ id: 'workspace-id',
+ isPasswordAuthEnabled: true,
+ }),
+ }),
+ );
+ });
+
+ it('falls back to the user own workspace when the provided workspaceId is not one they belong to', async () => {
+ const mockUser = { id: '1', email: '[email protected]' };
+
+ jest
+ .spyOn(userService, 'findUserByEmailOrThrow')
+ .mockResolvedValue(mockUser as UserEntity);
+ jest
+ .spyOn(workspaceRepository, 'findOne')
+ .mockResolvedValueOnce(null)
+ .mockResolvedValueOnce({
+ id: 'fallback-workspace-id',
+ } as WorkspaceEntity);
+ jest.spyOn(appTokenRepository, 'findOne').mockResolvedValue(null);
+ jest
+ .spyOn(appTokenRepository, 'save')
+ .mockResolvedValue({} as AppTokenEntity);
+ jest.spyOn(twentyConfigService, 'get').mockReturnValue('1h');
+
+ const result = await service.generatePasswordResetToken(
+ 'foreign-workspace-id',
+ );
+
+ expect(result.workspaceId).toBe('fallback-workspace-id');
+ expect(appTokenRepository.save).toHaveBeenCalledWith(
+ expect.objectContaining({
+ workspaceId: 'fallback-workspace-id',
+ }),
+ );
});
it('should resolve workspace when workspaceId is missing', async () => {
@@ -205,6 +247,9 @@ describe('ResetPasswordService', () => {
jest
.spyOn(userService, 'findUserByEmailOrThrow')
.mockResolvedValue(mockUser as UserEntity);
+ jest
+ .spyOn(workspaceRepository, 'findOne')
+ .mockResolvedValue({ id: 'workspace-id' } as WorkspaceEntity);
jest
.spyOn(appTokenRepository, 'findOne')
.mockResolvedValue(mockExistingToken as AppTokenEntity);
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/reset-password.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/reset-password.service.ts
index bb27dac35eb..33e781f0f88 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/services/reset-password.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/reset-password.service.ts
@@ -62,9 +62,10 @@ export class ResetPasswordService {
}),
);
- const targetWorkspaceId =
- workspaceId ??
- (await this.findFirstPasswordAuthEnabledWorkspaceIdOrThrow(user.id));
+ const targetWorkspaceId = await this.resolveTargetWorkspaceId(
+ user.id,
+ workspaceId,
+ );
const expiresIn = this.twentyConfigService.get(
'PASSWORD_RESET_TOKEN_EXPIRES_IN',
@@ -124,6 +125,31 @@ export class ResetPasswordService {
};
}
+ private async resolveTargetWorkspaceId(
+ userId: string,
+ workspaceId?: string,
+ ): Promise<string> {
+ if (!isDefined(workspaceId)) {
+ return this.findFirstPasswordAuthEnabledWorkspaceIdOrThrow(userId);
+ }
+
+ const requestedWorkspace = await this.workspaceRepository.findOne({
+ where: {
+ id: workspaceId,
+ isPasswordAuthEnabled: true,
+ workspaceUsers: {
+ user: {
+ id: userId,
+ },
+ },
+ },
+ });
+
+ return isDefined(requestedWorkspace)
+ ? requestedWorkspace.id
+ : this.findFirstPasswordAuthEnabledWorkspaceIdOrThrow(userId);
+ }
+
async sendEmailPasswordResetLink({
resetToken,
email,
diff --git a/packages/twenty-server/src/engine/core-modules/auth/strategies/jwt.auth.strategy.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/strategies/jwt.auth.strategy.spec.ts
index 3c99e875558..b9cd3858696 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/strategies/jwt.auth.strategy.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/strategies/jwt.auth.strategy.spec.ts
@@ -332,6 +332,61 @@ describe('JwtAuthStrategy', () => {
expect(user.user?.lastName).toBe('lastNameDefault');
expect(user.userWorkspaceId).toBe(validUserWorkspaceId);
});
+
+ it('should reject when the user workspace belongs to a different workspace than the token', async () => {
+ const validUserId = 'valid-user-id';
+ const validUserWorkspaceId = randomUUID();
+ const tokenWorkspaceId = randomUUID();
+ const otherWorkspaceId = randomUUID();
+
+ const payload = {
+ sub: validUserId,
+ type: JwtTokenTypeEnum.ACCESS,
+ userWorkspaceId: validUserWorkspaceId,
+ workspaceId: tokenWorkspaceId,
+ };
+
+ const mockWorkspace = new WorkspaceEntity();
+
+ mockWorkspace.id = tokenWorkspaceId;
+ workspaceStore[tokenWorkspaceId] = mockWorkspace;
+ userStore[validUserId] = { id: validUserId, lastName: 'lastNameDefault' };
+
+ coreEntityCacheService.get.mockImplementation(
+ async (keyName: string, entityId: string) => {
+ if (keyName === 'workspaceEntity') {
+ return workspaceStore[entityId] ?? null;
+ }
+
+ if (keyName === 'user') {
+ return userStore[entityId] ?? null;
+ }
+
+ if (keyName === 'userWorkspaceEntity') {
+ return {
+ id: validUserWorkspaceId,
+ workspaceId: otherWorkspaceId,
+ user: { id: validUserId },
+ workspace: { id: otherWorkspaceId },
+ };
+ }
+
+ return null;
+ },
+ );
+
+ strategy = createStrategy();
+
+ await expect(strategy.validate(payload as JwtPayload)).rejects.toThrow(
+ new AuthException(
+ 'User or user workspace not found',
+ expect.any(String),
+ {
+ userFriendlyMessage: msg`User does not have access to this workspace`,
+ },
+ ),
+ );
+ });
});
describe('APPLICATION_ACCESS token validation', () => {
@@ -516,6 +571,7 @@ describe('JwtAuthStrategy', () => {
if (keyName === 'userWorkspaceEntity') {
return {
id: validUserWorkspaceId,
+ workspaceId: validWorkspaceId,
user: mockUser,
workspace: mockWorkspace,
};
@@ -583,6 +639,7 @@ describe('JwtAuthStrategy', () => {
if (keyName === 'userWorkspaceEntity') {
return {
id: validUserWorkspaceId,
+ workspaceId: validWorkspaceId,
user: mockUser,
workspace: mockWorkspace,
};
@@ -644,6 +701,7 @@ describe('JwtAuthStrategy', () => {
if (keyName === 'userWorkspaceEntity') {
return {
id: validUserWorkspaceId,
+ workspaceId: validWorkspaceId,
user: mockUser,
workspace: mockWorkspace,
};
@@ -718,6 +776,7 @@ describe('JwtAuthStrategy', () => {
if (keyName === 'userWorkspaceEntity') {
return {
id: validUserWorkspaceId,
+ workspaceId: validWorkspaceId,
user: mockUser,
workspace: mockWorkspace,
};
@@ -826,6 +885,7 @@ describe('JwtAuthStrategy', () => {
if (keyName === 'userWorkspaceEntity') {
return {
id: validUserWorkspaceId,
+ workspaceId: validWorkspaceId,
user: mockUser,
workspace: mockWorkspace,
};
@@ -906,6 +966,7 @@ describe('JwtAuthStrategy', () => {
if (keyName === 'userWorkspaceEntity') {
return {
id: validUserWorkspaceId,
+ workspaceId: validWorkspaceId,
user: mockUser,
workspace: mockWorkspace,
};
diff --git a/packages/twenty-server/src/engine/core-modules/auth/strategies/jwt.auth.strategy.ts b/packages/twenty-server/src/engine/core-modules/auth/strategies/jwt.auth.strategy.ts
index 5e200acb1ae..ca2fd73e57f 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/strategies/jwt.auth.strategy.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/strategies/jwt.auth.strategy.ts
@@ -145,6 +145,7 @@ export class JwtAuthStrategy extends PassportStrategy(Strategy, 'jwt') {
const userContext = await this.resolveUserContext({
userId,
userWorkspaceId: payload.userWorkspaceId,
+ expectedWorkspaceId: workspace.id,
});
assertIsDefinedOrThrow(