The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
feat(secret-encryption): drop APP_SECRET from approved-access-domain validation and session cookies (#20580)
Charles Bochet45bea6f99109
diff --git a/packages/twenty-server/src/engine/core-modules/approved-access-domain/approved-access-domain.module.ts b/packages/twenty-server/src/engine/core-modules/approved-access-domain/approved-access-domain.module.tsindex 95b1a719731..de5f2e4c3d4 100644--- a/packages/twenty-server/src/engine/core-modules/approved-access-domain/approved-access-domain.module.ts+++ b/packages/twenty-server/src/engine/core-modules/approved-access-domain/approved-access-domain.module.ts@@ -7,12 +7,14 @@ import { ApprovedAccessDomainResolver } from 'src/engine/core-modules/approved-aimport { ApprovedAccessDomainService } from 'src/engine/core-modules/approved-access-domain/services/approved-access-domain.service';import { WorkspaceDomainsModule } from 'src/engine/core-modules/domain/workspace-domains/workspace-domains.module';import { FileModule } from 'src/engine/core-modules/file/file.module';+import { JwtModule } from 'src/engine/core-modules/jwt/jwt.module';import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';@Module({imports: [WorkspaceDomainsModule,FileModule,+ JwtModule,NestjsQueryTypeOrmModule.forFeature([ApprovedAccessDomainEntity]),PermissionsModule,],diff --git a/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.service.ts b/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.service.tsindex 49a9b8fd08e..21563844f29 100644--- a/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.service.ts+++ b/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.service.ts@@ -1,8 +1,6 @@-import { Injectable } from '@nestjs/common';+import { Injectable, Logger } from '@nestjs/common';import { InjectRepository } from '@nestjs/typeorm';-import crypto from 'crypto';-import { msg } from '@lingui/core/macro';import { render } from '@react-email/render';import { SendApprovedAccessDomainValidation } from 'twenty-emails';@@ -16,16 +14,27 @@ import {ApprovedAccessDomainExceptionCode,} from 'src/engine/core-modules/approved-access-domain/approved-access-domain.exception';import { approvedAccessDomainValidator } from 'src/engine/core-modules/approved-access-domain/approved-access-domain.validate';+import {+ type ApprovedAccessDomainJwtPayload,+ JwtTokenTypeEnum,+} from 'src/engine/core-modules/auth/types/auth-context.type';import { WorkspaceDomainsService } from 'src/engine/core-modules/domain/workspace-domains/services/workspace-domains.service';import { EmailService } from 'src/engine/core-modules/email/email.service';import { FileUrlService } from 'src/engine/core-modules/file/file-url/file-url.service';+import { JwtWrapperService } from 'src/engine/core-modules/jwt/services/jwt-wrapper.service';+import { decodeJwtHeader } from 'src/engine/core-modules/jwt/utils/decode-jwt-header.util';+import { isAsymmetricJwtHeader } from 'src/engine/core-modules/jwt/utils/is-asymmetric-jwt-header.util';import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';import { isWorkDomain } from 'src/utils/is-work-email';+const APPROVED_ACCESS_DOMAIN_TOKEN_EXPIRES_IN = '7d';+@Injectable()export class ApprovedAccessDomainService {+ private readonly logger = new Logger(ApprovedAccessDomainService.name);+constructor(@InjectRepository(ApprovedAccessDomainEntity)private readonly approvedAccessDomainRepository: Repository<ApprovedAccessDomainEntity>,@@ -33,6 +42,7 @@ export class ApprovedAccessDomainService {private readonly twentyConfigService: TwentyConfigService,private readonly fileUrlService: FileUrlService,private readonly workspaceDomainsService: WorkspaceDomainsService,+ private readonly jwtWrapperService: JwtWrapperService,) {}async sendApprovedAccessDomainValidationEmail(@@ -66,7 +76,10 @@ export class ApprovedAccessDomainService {pathname: getSettingsPath(SettingsPath.WorkspaceMembersPage),searchParams: {wtdId: approvedAccessDomain.id,- validationToken: this.generateUniqueHash(approvedAccessDomain),+ validationToken: await this.mintValidationToken({+ approvedAccessDomain,+ workspaceId: workspace.id,+ }),},});@@ -111,19 +124,62 @@ export class ApprovedAccessDomainService {});}- private generateUniqueHash(- approvedAccessDomain: ApprovedAccessDomainEntity,- ): string {- return crypto- .createHash('sha256')- .update(- JSON.stringify({- id: approvedAccessDomain.id,- domain: approvedAccessDomain.domain,- key: this.twentyConfigService.get('APP_SECRET'),- }),- )- .digest('hex');+ private async mintValidationToken({+ approvedAccessDomain,+ workspaceId,+ }: {+ approvedAccessDomain: ApprovedAccessDomainEntity;+ workspaceId: string;+ }): Promise<string> {+ return this.jwtWrapperService.signAsyncOrThrow(+ {+ sub: approvedAccessDomain.id,+ type: JwtTokenTypeEnum.APPROVED_ACCESS_DOMAIN,+ workspaceId,+ approvedAccessDomainId: approvedAccessDomain.id,+ domain: approvedAccessDomain.domain,+ },+ { expiresIn: APPROVED_ACCESS_DOMAIN_TOKEN_EXPIRES_IN },+ );+ }++ private async verifyValidationTokenOrThrow(+ validationToken: string,+ ): Promise<ApprovedAccessDomainJwtPayload> {+ if (!isAsymmetricJwtHeader(decodeJwtHeader(validationToken))) {+ throw new ApprovedAccessDomainException(+ 'Invalid approved access domain validation token',+ ApprovedAccessDomainExceptionCode.APPROVED_ACCESS_DOMAIN_VALIDATION_TOKEN_INVALID,+ );+ }++ let payload: ApprovedAccessDomainJwtPayload;++ try {+ payload = (await this.jwtWrapperService.verifyJwtToken(+ validationToken,+ )) as ApprovedAccessDomainJwtPayload;+ } catch (error) {+ this.logger.warn(+ `Rejected approved-access-domain validation token: ${+ error instanceof Error ? error.message : 'unknown reason'+ }`,+ );++ throw new ApprovedAccessDomainException(+ 'Invalid approved access domain validation token',+ ApprovedAccessDomainExceptionCode.APPROVED_ACCESS_DOMAIN_VALIDATION_TOKEN_INVALID,+ );+ }++ if (payload.type !== JwtTokenTypeEnum.APPROVED_ACCESS_DOMAIN) {+ throw new ApprovedAccessDomainException(+ 'Invalid approved access domain validation token',+ ApprovedAccessDomainExceptionCode.APPROVED_ACCESS_DOMAIN_VALIDATION_TOKEN_INVALID,+ );+ }++ return payload;}async validateApprovedAccessDomain({@@ -133,6 +189,15 @@ export class ApprovedAccessDomainService {validationToken: string;approvedAccessDomainId: string;}) {+ const payload = await this.verifyValidationTokenOrThrow(validationToken);++ if (payload.approvedAccessDomainId !== approvedAccessDomainId) {+ throw new ApprovedAccessDomainException(+ 'Invalid approved access domain validation token',+ ApprovedAccessDomainExceptionCode.APPROVED_ACCESS_DOMAIN_VALIDATION_TOKEN_INVALID,+ );+ }+const approvedAccessDomain =await this.approvedAccessDomainRepository.findOneBy({id: approvedAccessDomainId,@@ -140,6 +205,16 @@ export class ApprovedAccessDomainService {approvedAccessDomainValidator.assertIsDefinedOrThrow(approvedAccessDomain);+ if (+ payload.domain !== approvedAccessDomain.domain ||+ payload.workspaceId !== approvedAccessDomain.workspaceId+ ) {+ throw new ApprovedAccessDomainException(+ 'Invalid approved access domain validation token',+ ApprovedAccessDomainExceptionCode.APPROVED_ACCESS_DOMAIN_VALIDATION_TOKEN_INVALID,+ );+ }+if (approvedAccessDomain.isValidated) {throw new ApprovedAccessDomainException('Approved access domain has already been validated',@@ -150,16 +225,6 @@ export class ApprovedAccessDomainService {);}- const isHashValid =- this.generateUniqueHash(approvedAccessDomain) === validationToken;-- if (!isHashValid) {- throw new ApprovedAccessDomainException(- 'Invalid approved access domain validation token',- ApprovedAccessDomainExceptionCode.APPROVED_ACCESS_DOMAIN_VALIDATION_TOKEN_INVALID,- );- }-return await this.approvedAccessDomainRepository.save({...approvedAccessDomain,isValidated: true,diff --git a/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.spec.ts b/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.spec.tsindex 556aa9a6828..47a50896f9e 100644--- a/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.spec.ts@@ -10,8 +10,10 @@ import {ApprovedAccessDomainException,ApprovedAccessDomainExceptionCode,} from 'src/engine/core-modules/approved-access-domain/approved-access-domain.exception';+import { JwtTokenTypeEnum } from 'src/engine/core-modules/auth/types/auth-context.type';import { WorkspaceDomainsService } from 'src/engine/core-modules/domain/workspace-domains/services/workspace-domains.service';import { EmailService } from 'src/engine/core-modules/email/email.service';+import { JwtWrapperService } from 'src/engine/core-modules/jwt/services/jwt-wrapper.service';import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { type WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';@@ -36,6 +38,7 @@ describe('ApprovedAccessDomainService', () => {let emailService: EmailService;let twentyConfigService: TwentyConfigService;let workspaceDomainsService: WorkspaceDomainsService;+ let jwtWrapperService: jest.Mocked<JwtWrapperService>;beforeEach(async () => {const module: TestingModule = await Test.createTestingModule({@@ -76,6 +79,13 @@ describe('ApprovedAccessDomainService', () => {.mockReturnValue('https://signed-url.com/logo.png'),},},+ {+ provide: JwtWrapperService,+ useValue: {+ signAsyncOrThrow: jest.fn(),+ verifyJwtToken: jest.fn(),+ },+ },],}).compile();@@ -90,6 +100,9 @@ describe('ApprovedAccessDomainService', () => {workspaceDomainsService = module.get<WorkspaceDomainsService>(WorkspaceDomainsService,);+ jwtWrapperService = module.get(+ JwtWrapperService,+ ) as unknown as jest.Mocked<JwtWrapperService>;});describe('createApprovedAccessDomain', () => {@@ -277,11 +290,13 @@ describe('ApprovedAccessDomainService', () => {locale: 'en',} as WorkspaceMemberWorkspaceEntity;const workspace = {+ id: 'workspace-id',displayName: 'Test Workspace',logo: '/logo.png',} as WorkspaceEntity;const email = '[email protected]';const approvedAccessDomain = {+ id: 'approved-access-domain-id',isValidated: false,domain: 'custom-domain.com',} as ApprovedAccessDomainEntity;@@ -301,6 +316,8 @@ describe('ApprovedAccessDomainService', () => {if (key === 'SERVER_URL') return 'https://api.example.com';});+ jwtWrapperService.signAsyncOrThrow.mockResolvedValue('signed.jwt.token');+await service.sendApprovedAccessDomainValidationEmail(sender,email,@@ -308,10 +325,23 @@ describe('ApprovedAccessDomainService', () => {approvedAccessDomain,);+ expect(jwtWrapperService.signAsyncOrThrow).toHaveBeenCalledWith(+ {+ sub: approvedAccessDomain.id,+ type: JwtTokenTypeEnum.APPROVED_ACCESS_DOMAIN,+ workspaceId: workspace.id,+ approvedAccessDomainId: approvedAccessDomain.id,+ domain: approvedAccessDomain.domain,+ },+ { expiresIn: '7d' },+ );expect(workspaceDomainsService.buildWorkspaceURL).toHaveBeenCalledWith({workspace: workspace,pathname: getSettingsPath(SettingsPath.WorkspaceMembersPage),- searchParams: { validationToken: expect.any(String) },+ searchParams: {+ wtdId: approvedAccessDomain.id,+ validationToken: 'signed.jwt.token',+ },});expect(emailService.send).toHaveBeenCalledWith({@@ -325,28 +355,45 @@ describe('ApprovedAccessDomainService', () => {});describe('validateApprovedAccessDomain', () => {+ const approvedAccessDomainId = 'domain-id';+ const workspaceId = 'workspace-id';+ const domain = 'example.com';+ const encodeSegment = (value: object) =>+ Buffer.from(JSON.stringify(value)).toString('base64url');+ const buildToken = (header: object) =>+ `${encodeSegment(header)}.${encodeSegment({})}.signature`;+ const validationToken = buildToken({ alg: 'ES256', kid: 'test-kid' });+ const buildPayload = (overrides: Record<string, unknown> = {}) => ({+ sub: approvedAccessDomainId,+ type: JwtTokenTypeEnum.APPROVED_ACCESS_DOMAIN,+ workspaceId,+ approvedAccessDomainId,+ domain,+ ...overrides,+ });+it('should validate the approved access domain successfully with a correct token', async () => {- const approvedAccessDomainId = 'domain-id';- const validationToken = 'valid-token';const approvedAccessDomain = {id: approvedAccessDomainId,- domain: 'example.com',+ workspaceId,+ domain,isValidated: false,} as ApprovedAccessDomainEntity;+ jwtWrapperService.verifyJwtToken.mockResolvedValue(buildPayload());jest.spyOn(approvedAccessDomainRepository, 'findOneBy').mockResolvedValue(approvedAccessDomain);- jest- .spyOn(service as any, 'generateUniqueHash')- .mockReturnValue(validationToken);const saveSpy = jest.spyOn(approvedAccessDomainRepository, 'save');await service.validateApprovedAccessDomain({validationToken,- approvedAccessDomainId: approvedAccessDomainId,+ approvedAccessDomainId,});+ expect(jwtWrapperService.verifyJwtToken).toHaveBeenCalledWith(+ validationToken,+ );expect(approvedAccessDomainRepository.findOneBy).toHaveBeenCalledWith({id: approvedAccessDomainId,});@@ -355,47 +402,124 @@ describe('ApprovedAccessDomainService', () => {);});- it('should throw an error if the approved access domain does not exist', async () => {- const approvedAccessDomainId = 'invalid-domain-id';- const validationToken = 'valid-token';+ it('should reject any token whose header is not asymmetric (no kid / wrong alg) before calling verify', async () => {+ const legacyHs256Token = buildToken({ alg: 'HS256' });- jest- .spyOn(approvedAccessDomainRepository, 'findOneBy')- .mockResolvedValue(null);+ await expect(+ service.validateApprovedAccessDomain({+ validationToken: legacyHs256Token,+ approvedAccessDomainId,+ }),+ ).rejects.toThrowError(+ new ApprovedAccessDomainException(+ 'Invalid approved access domain validation token',+ ApprovedAccessDomainExceptionCode.APPROVED_ACCESS_DOMAIN_VALIDATION_TOKEN_INVALID,+ ),+ );+ expect(jwtWrapperService.verifyJwtToken).not.toHaveBeenCalled();+ expect(approvedAccessDomainRepository.findOneBy).not.toHaveBeenCalled();+ });++ it('should reject when the JWT verification fails (bad signature or expired)', async () => {+ jwtWrapperService.verifyJwtToken.mockRejectedValue(+ new Error('jwt expired'),+ );await expect(service.validateApprovedAccessDomain({validationToken,- approvedAccessDomainId: approvedAccessDomainId,+ approvedAccessDomainId,}),).rejects.toThrowError(new ApprovedAccessDomainException(- 'Approved access domain not found',- ApprovedAccessDomainExceptionCode.APPROVED_ACCESS_DOMAIN_NOT_FOUND,+ 'Invalid approved access domain validation token',+ ApprovedAccessDomainExceptionCode.APPROVED_ACCESS_DOMAIN_VALIDATION_TOKEN_INVALID,),);+ expect(approvedAccessDomainRepository.findOneBy).not.toHaveBeenCalled();});- it('should throw an error if the validation token is invalid', async () => {- const approvedAccessDomainId = 'domain-id';- const validationToken = 'invalid-token';- const approvedAccessDomain = {- id: approvedAccessDomainId,- domain: 'example.com',- isValidated: false,- } as ApprovedAccessDomainEntity;+ it('should reject a JWT minted with a different token type', async () => {+ jwtWrapperService.verifyJwtToken.mockResolvedValue(+ buildPayload({ type: JwtTokenTypeEnum.ACCESS }),+ );++ await expect(+ service.validateApprovedAccessDomain({+ validationToken,+ approvedAccessDomainId,+ }),+ ).rejects.toThrowError(+ new ApprovedAccessDomainException(+ 'Invalid approved access domain validation token',+ ApprovedAccessDomainExceptionCode.APPROVED_ACCESS_DOMAIN_VALIDATION_TOKEN_INVALID,+ ),+ );+ expect(approvedAccessDomainRepository.findOneBy).not.toHaveBeenCalled();+ });++ it('should reject when the JWT approvedAccessDomainId does not match the input id', async () => {+ jwtWrapperService.verifyJwtToken.mockResolvedValue(+ buildPayload({ approvedAccessDomainId: 'other-domain-id' }),+ );+ await expect(+ service.validateApprovedAccessDomain({+ validationToken,+ approvedAccessDomainId,+ }),+ ).rejects.toThrowError(+ new ApprovedAccessDomainException(+ 'Invalid approved access domain validation token',+ ApprovedAccessDomainExceptionCode.APPROVED_ACCESS_DOMAIN_VALIDATION_TOKEN_INVALID,+ ),+ );+ expect(approvedAccessDomainRepository.findOneBy).not.toHaveBeenCalled();+ });++ it('should reject when the JWT-claimed domain does not match the stored row', async () => {+ jwtWrapperService.verifyJwtToken.mockResolvedValue(+ buildPayload({ domain: 'attacker.com' }),+ );jest.spyOn(approvedAccessDomainRepository, 'findOneBy')- .mockResolvedValue(approvedAccessDomain);+ .mockResolvedValue({+ id: approvedAccessDomainId,+ workspaceId,+ domain,+ isValidated: false,+ } as ApprovedAccessDomainEntity);++ await expect(+ service.validateApprovedAccessDomain({+ validationToken,+ approvedAccessDomainId,+ }),+ ).rejects.toThrowError(+ new ApprovedAccessDomainException(+ 'Invalid approved access domain validation token',+ ApprovedAccessDomainExceptionCode.APPROVED_ACCESS_DOMAIN_VALIDATION_TOKEN_INVALID,+ ),+ );+ });++ it('should reject when the JWT-claimed workspaceId does not match the stored row', async () => {+ jwtWrapperService.verifyJwtToken.mockResolvedValue(+ buildPayload({ workspaceId: 'other-workspace-id' }),+ );jest- .spyOn(service as any, 'generateUniqueHash')- .mockReturnValue('valid-token');+ .spyOn(approvedAccessDomainRepository, 'findOneBy')+ .mockResolvedValue({+ id: approvedAccessDomainId,+ workspaceId,+ domain,+ isValidated: false,+ } as ApprovedAccessDomainEntity);await expect(service.validateApprovedAccessDomain({validationToken,- approvedAccessDomainId: approvedAccessDomainId,+ approvedAccessDomainId,}),).rejects.toThrowError(new ApprovedAccessDomainException(@@ -405,23 +529,40 @@ describe('ApprovedAccessDomainService', () => {);});- it('should throw an error if the approved access domain is already validated', async () => {- const approvedAccessDomainId = 'domain-id';- const validationToken = 'valid-token';- const approvedAccessDomain = {- id: approvedAccessDomainId,- domain: 'example.com',- isValidated: true,- } as ApprovedAccessDomainEntity;+ it('should throw an error if the approved access domain does not exist', async () => {+ jwtWrapperService.verifyJwtToken.mockResolvedValue(buildPayload());+ jest+ .spyOn(approvedAccessDomainRepository, 'findOneBy')+ .mockResolvedValue(null);++ await expect(+ service.validateApprovedAccessDomain({+ validationToken,+ approvedAccessDomainId,+ }),+ ).rejects.toThrowError(+ new ApprovedAccessDomainException(+ 'Approved access domain not found',+ ApprovedAccessDomainExceptionCode.APPROVED_ACCESS_DOMAIN_NOT_FOUND,+ ),+ );+ });+ it('should throw an error if the approved access domain is already validated', async () => {+ jwtWrapperService.verifyJwtToken.mockResolvedValue(buildPayload());jest.spyOn(approvedAccessDomainRepository, 'findOneBy')- .mockResolvedValue(approvedAccessDomain);+ .mockResolvedValue({+ id: approvedAccessDomainId,+ workspaceId,+ domain,+ isValidated: true,+ } as ApprovedAccessDomainEntity);await expect(service.validateApprovedAccessDomain({validationToken,- approvedAccessDomainId: approvedAccessDomainId,+ approvedAccessDomainId,}),).rejects.toThrowError(new ApprovedAccessDomainException(diff --git a/packages/twenty-server/src/engine/core-modules/auth/types/auth-context.type.ts b/packages/twenty-server/src/engine/core-modules/auth/types/auth-context.type.tsindex ad6f766f49f..89e1f1a5996 100644--- a/packages/twenty-server/src/engine/core-modules/auth/types/auth-context.type.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/types/auth-context.type.ts@@ -48,6 +48,7 @@ export enum JwtTokenTypeEnum {APPLICATION_ACCESS = 'APPLICATION_ACCESS',APPLICATION_REFRESH = 'APPLICATION_REFRESH',APP_OAUTH_STATE = 'APP_OAUTH_STATE',+ APPROVED_ACCESS_DOMAIN = 'APPROVED_ACCESS_DOMAIN',}type CommonPropertiesJwtPayload = {@@ -154,6 +155,13 @@ export type AppOAuthStateJwtPayload = CommonPropertiesJwtPayload & {codeVerifier: string | null;};+export type ApprovedAccessDomainJwtPayload = CommonPropertiesJwtPayload & {+ type: JwtTokenTypeEnum.APPROVED_ACCESS_DOMAIN;+ workspaceId: string;+ approvedAccessDomainId: string;+ domain: string;+};+export type JwtPayload =| AccessTokenJwtPayload| ApiKeyTokenJwtPayload@@ -165,4 +173,5 @@ export type JwtPayload =| RefreshTokenJwtPayload| FileTokenJwtPayload| FileTokenJwtPayloadLegacy- | AppOAuthStateJwtPayload;+ | AppOAuthStateJwtPayload+ | ApprovedAccessDomainJwtPayload;diff --git a/packages/twenty-server/src/engine/core-modules/secret-encryption/constants/secret-encryption.constant.ts b/packages/twenty-server/src/engine/core-modules/secret-encryption/constants/secret-encryption.constant.tsindex 8129236a418..aa02e5245f0 100644--- a/packages/twenty-server/src/engine/core-modules/secret-encryption/constants/secret-encryption.constant.ts+++ b/packages/twenty-server/src/engine/core-modules/secret-encryption/constants/secret-encryption.constant.ts@@ -8,3 +8,6 @@ export const SECRET_ENCRYPTION_GCM_TAG_LENGTH = 16;export const SECRET_ENCRYPTION_DERIVED_KEY_LENGTH = 32;export const SECRET_ENCRYPTION_HKDF_INFO_PREFIX = 'twenty:enc:v2:';export const SECRET_ENCRYPTION_INSTANCE_CONTEXT = 'instance';++export const INSTANCE_HMAC_HKDF_INFO_PREFIX = 'twenty:hmac:v1:';+export const INSTANCE_HMAC_DERIVED_KEY_LENGTH = 32;diff --git a/packages/twenty-server/src/engine/core-modules/secret-encryption/utils/__tests__/resolve-session-cookie-secrets.util.spec.ts b/packages/twenty-server/src/engine/core-modules/secret-encryption/utils/__tests__/resolve-session-cookie-secrets.util.spec.tsnew file mode 100644index 00000000000..baec7de9ec7--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/secret-encryption/utils/__tests__/resolve-session-cookie-secrets.util.spec.ts@@ -0,0 +1,102 @@+import { createHash } from 'crypto';++import { deriveInstanceHmacKey } from 'src/engine/core-modules/secret-encryption/utils/derive-instance-hmac-key.util';+import { resolveSessionCookieSecretsOrThrow } from 'src/engine/core-modules/secret-encryption/utils/resolve-session-cookie-secrets.util';+import { type TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';++type EnvMap = Partial<{+ ENCRYPTION_KEY: string;+ FALLBACK_ENCRYPTION_KEY: string;+ APP_SECRET: string;+}>;++const buildConfig = (env: EnvMap): Pick<TwentyConfigService, 'get'> => ({+ get: jest.fn((key: keyof EnvMap) => env[key]) as never,+});++const hmacFor = (rawKey: string) =>+ deriveInstanceHmacKey({ rawKey, purpose: 'session-cookie' }).toString('hex');++const legacyAppSecretHash = (appSecret: string) =>+ createHash('sha256').update(`${appSecret}SESSION_STORE_SECRET`).digest('hex');++describe('resolveSessionCookieSecretsOrThrow', () => {+ it('throws when neither ENCRYPTION_KEY nor APP_SECRET is configured', () => {+ expect(() =>+ resolveSessionCookieSecretsOrThrow({+ twentyConfigService: buildConfig({}),+ }),+ ).toThrow(/ENCRYPTION_KEY/);+ });++ it('signs with ENCRYPTION_KEY first when set, with legacy APP_SECRET hash kept for verification', () => {+ const secrets = resolveSessionCookieSecretsOrThrow({+ twentyConfigService: buildConfig({+ ENCRYPTION_KEY: 'new-key',+ APP_SECRET: 'app',+ }),+ });++ expect(secrets[0]).toBe(hmacFor('new-key'));+ expect(secrets).toContain(legacyAppSecretHash('app'));+ expect(secrets).toHaveLength(2);+ });++ it('places FALLBACK_ENCRYPTION_KEY between the primary and the legacy slot', () => {+ const secrets = resolveSessionCookieSecretsOrThrow({+ twentyConfigService: buildConfig({+ ENCRYPTION_KEY: 'new-key',+ FALLBACK_ENCRYPTION_KEY: 'previous-key',+ APP_SECRET: 'app',+ }),+ });++ expect(secrets).toEqual([+ hmacFor('new-key'),+ hmacFor('previous-key'),+ legacyAppSecretHash('app'),+ ]);+ });++ it('omits the FALLBACK slot when FALLBACK_ENCRYPTION_KEY is empty', () => {+ const secrets = resolveSessionCookieSecretsOrThrow({+ twentyConfigService: buildConfig({+ ENCRYPTION_KEY: 'new-key',+ FALLBACK_ENCRYPTION_KEY: '',+ APP_SECRET: 'app',+ }),+ });++ expect(secrets).toEqual([hmacFor('new-key'), legacyAppSecretHash('app')]);+ });++ it('omits the legacy slot when APP_SECRET is unset', () => {+ const secrets = resolveSessionCookieSecretsOrThrow({+ twentyConfigService: buildConfig({ ENCRYPTION_KEY: 'new-key' }),+ });++ expect(secrets).toEqual([hmacFor('new-key')]);+ });++ it('falls back to HKDF(APP_SECRET) as primary when ENCRYPTION_KEY is unset, while keeping the legacy SHA slot', () => {+ const secrets = resolveSessionCookieSecretsOrThrow({+ twentyConfigService: buildConfig({ APP_SECRET: 'app' }),+ });++ expect(secrets).toEqual([hmacFor('app'), legacyAppSecretHash('app')]);+ expect(secrets[0]).not.toBe(secrets[1]);+ });++ it('derives different keys for different purposes (domain separation)', () => {+ const sessionCookieKey = deriveInstanceHmacKey({+ rawKey: 'same',+ purpose: 'session-cookie',+ });+ const otherPurposeKey = deriveInstanceHmacKey({+ rawKey: 'same',+ purpose: 'something-else',+ });++ expect(sessionCookieKey.equals(otherPurposeKey)).toBe(false);+ });+});diff --git a/packages/twenty-server/src/engine/core-modules/secret-encryption/utils/derive-instance-hmac-key.util.ts b/packages/twenty-server/src/engine/core-modules/secret-encryption/utils/derive-instance-hmac-key.util.tsnew file mode 100644index 00000000000..d564213d0bd--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/secret-encryption/utils/derive-instance-hmac-key.util.ts@@ -0,0 +1,25 @@+import { hkdfSync } from 'crypto';++import {+ INSTANCE_HMAC_DERIVED_KEY_LENGTH,+ INSTANCE_HMAC_HKDF_INFO_PREFIX,+} from 'src/engine/core-modules/secret-encryption/constants/secret-encryption.constant';++const ZERO_SALT = Buffer.alloc(32);++export const deriveInstanceHmacKey = ({+ rawKey,+ purpose,+}: {+ rawKey: string;+ purpose: string;+}): Buffer =>+ Buffer.from(+ hkdfSync(+ 'sha256',+ Buffer.from(rawKey),+ ZERO_SALT,+ Buffer.from(`${INSTANCE_HMAC_HKDF_INFO_PREFIX}${purpose}`),+ INSTANCE_HMAC_DERIVED_KEY_LENGTH,+ ),+ );diff --git a/packages/twenty-server/src/engine/core-modules/secret-encryption/utils/resolve-session-cookie-secrets.util.ts b/packages/twenty-server/src/engine/core-modules/secret-encryption/utils/resolve-session-cookie-secrets.util.tsnew file mode 100644index 00000000000..e6a14767eab--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/secret-encryption/utils/resolve-session-cookie-secrets.util.ts@@ -0,0 +1,55 @@+import { createHash } from 'crypto';++import { isNonEmptyString } from '@sniptt/guards';++import { deriveInstanceHmacKey } from 'src/engine/core-modules/secret-encryption/utils/derive-instance-hmac-key.util';+import { type TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';++const SESSION_COOKIE_HMAC_PURPOSE = 'session-cookie';++const buildLegacySessionSecret = (appSecret: string) =>+ createHash('sha256').update(`${appSecret}SESSION_STORE_SECRET`).digest('hex');++export const resolveSessionCookieSecretsOrThrow = ({+ twentyConfigService,+}: {+ twentyConfigService: Pick<TwentyConfigService, 'get'>;+}): string[] => {+ const encryptionKey = twentyConfigService.get('ENCRYPTION_KEY');+ const fallbackEncryptionKey = twentyConfigService.get(+ 'FALLBACK_ENCRYPTION_KEY',+ );+ const appSecret = twentyConfigService.get('APP_SECRET');++ const rawPrimary = isNonEmptyString(encryptionKey)+ ? encryptionKey+ : appSecret;++ if (!isNonEmptyString(rawPrimary)) {+ throw new Error(+ 'Cannot derive session cookie secret: set ENCRYPTION_KEY (or APP_SECRET for legacy deployments).',+ );+ }++ const secrets: string[] = [+ deriveInstanceHmacKey({+ rawKey: rawPrimary,+ purpose: SESSION_COOKIE_HMAC_PURPOSE,+ }).toString('hex'),+ ];++ if (isNonEmptyString(fallbackEncryptionKey)) {+ secrets.push(+ deriveInstanceHmacKey({+ rawKey: fallbackEncryptionKey,+ purpose: SESSION_COOKIE_HMAC_PURPOSE,+ }).toString('hex'),+ );+ }++ if (isNonEmptyString(appSecret)) {+ secrets.push(buildLegacySessionSecret(appSecret));+ }++ return secrets;+};diff --git a/packages/twenty-server/src/engine/core-modules/session-storage/session-storage.module-factory.ts b/packages/twenty-server/src/engine/core-modules/session-storage/session-storage.module-factory.tsindex 457f20769cc..69a9f7076a8 100644--- a/packages/twenty-server/src/engine/core-modules/session-storage/session-storage.module-factory.ts+++ b/packages/twenty-server/src/engine/core-modules/session-storage/session-storage.module-factory.ts@@ -1,5 +1,3 @@-import { createHash } from 'crypto';-import { Logger } from '@nestjs/common';import RedisStore from 'connect-redis';@@ -8,6 +6,7 @@ import { createClient } from 'redis';import type session from 'express-session';import { CacheStorageType } from 'src/engine/core-modules/cache-storage/types/cache-storage-type.enum';+import { resolveSessionCookieSecretsOrThrow } from 'src/engine/core-modules/secret-encryption/utils/resolve-session-cookie-secrets.util';import { type TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';const sessionStorageLogger = new Logger('SessionStorage');@@ -21,18 +20,12 @@ export const getSessionStorageOptions = (const SERVER_URL = twentyConfigService.get('SERVER_URL');- const appSecret = twentyConfigService.get('APP_SECRET');-- if (!appSecret) {- throw new Error('APP_SECRET is not set');- }-- const sessionSecret = createHash('sha256')- .update(`${appSecret}SESSION_STORE_SECRET`)- .digest('hex');+ const sessionSecrets = resolveSessionCookieSecretsOrThrow({+ twentyConfigService,+ });const sessionStorage: session.SessionOptions = {- secret: sessionSecret,+ secret: sessionSecrets,resave: false,saveUninitialized: false,proxy: true,diff --git a/packages/twenty-server/src/engine/core-modules/twenty-config/config-variables.ts b/packages/twenty-server/src/engine/core-modules/twenty-config/config-variables.tsindex 1023bad75a7..fcad9496595 100644--- a/packages/twenty-server/src/engine/core-modules/twenty-config/config-variables.ts+++ b/packages/twenty-server/src/engine/core-modules/twenty-config/config-variables.ts@@ -1158,7 +1158,7 @@ export class ConfigVariables {group: ConfigVariablesGroup.SERVER_CONFIG,isSensitive: true,description:- 'Decrypt-only fallback key. During rotation, set this to the previous ENCRYPTION_KEY so rows encrypted with the old key remain readable.',+ 'Verification-only fallback key. During rotation, set this to the previous ENCRYPTION_KEY so rows encrypted with the old key remain decryptable and session cookies signed under it still verify.',isEnvOnly: true,type: ConfigVariableType.STRING,})