The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix(server): apply row-level security predicates to API key and application principals (#22456)
Félix Malfait1cba0cdf495b
diff --git a/packages/twenty-server/src/engine/twenty-orm/entity-manager/workspace-entity-manager.spec.ts b/packages/twenty-server/src/engine/twenty-orm/entity-manager/workspace-entity-manager.spec.tsindex 74b74a04368..05c53838d37 100644--- a/packages/twenty-server/src/engine/twenty-orm/entity-manager/workspace-entity-manager.spec.ts+++ b/packages/twenty-server/src/engine/twenty-orm/entity-manager/workspace-entity-manager.spec.ts@@ -245,6 +245,7 @@ describe('WorkspaceEntityManager', () => {IS_MESSAGING_CALENDAR_WEBHOOK_ENABLED: false,},userWorkspaceRoleMap: {},+ apiKeyRoleMap: {},eventEmitterService: {emitMutationEvent: jest.fn(),emitDatabaseBatchEvent: jest.fn(),diff --git a/packages/twenty-server/src/engine/twenty-orm/entity-manager/workspace-entity-manager.ts b/packages/twenty-server/src/engine/twenty-orm/entity-manager/workspace-entity-manager.tsindex a815b8f6654..26116fbd781 100644--- a/packages/twenty-server/src/engine/twenty-orm/entity-manager/workspace-entity-manager.ts+++ b/packages/twenty-server/src/engine/twenty-orm/entity-manager/workspace-entity-manager.ts@@ -112,6 +112,7 @@ export class WorkspaceEntityManager extends EntityManager {objectIdByNameSingular: context.objectIdByNameSingular,featureFlagsMap: context.featureFlagsMap,userWorkspaceRoleMap: context.userWorkspaceRoleMap,+ apiKeyRoleMap: context.apiKeyRoleMap,eventEmitterService: this.eventEmitterService,coreDataSource: this.connection.coreDataSource,};diff --git a/packages/twenty-server/src/engine/twenty-orm/interfaces/workspace-internal-context.interface.ts b/packages/twenty-server/src/engine/twenty-orm/interfaces/workspace-internal-context.interface.tsindex 7b4eefafe1d..a7179940a90 100644--- a/packages/twenty-server/src/engine/twenty-orm/interfaces/workspace-internal-context.interface.ts+++ b/packages/twenty-server/src/engine/twenty-orm/interfaces/workspace-internal-context.interface.ts@@ -20,6 +20,7 @@ export interface WorkspaceInternalContext {objectIdByNameSingular: Record<string, string>;featureFlagsMap: Record<FeatureFlagKey, boolean>;userWorkspaceRoleMap: UserWorkspaceRoleMap;+ apiKeyRoleMap: Record<string, string>;eventEmitterService: WorkspaceEventEmitter;coreDataSource: DataSource;}diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/apply-row-level-permission-predicates.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/apply-row-level-permission-predicates.util.tsindex f0ede4a17e9..3588ad25e59 100644--- a/packages/twenty-server/src/engine/twenty-orm/utils/apply-row-level-permission-predicates.util.ts+++ b/packages/twenty-server/src/engine/twenty-orm/utils/apply-row-level-permission-predicates.util.ts@@ -16,6 +16,7 @@ import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/woimport { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';import { type WorkspaceSelectQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-select-query-builder';import { buildRowLevelPermissionRecordFilter } from 'src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util';+import { resolveRoleIdFromAuthContext } from 'src/engine/twenty-orm/utils/resolve-role-id-from-auth-context.util';type ApplyRowLevelPermissionPredicatesArgs<T extends ObjectLiteral> = {queryBuilder: WorkspaceSelectQueryBuilder<T>;@@ -32,12 +33,11 @@ export const applyRowLevelPermissionPredicates = <T extends ObjectLiteral>({authContext,featureFlagMap: _featureFlagMap,}: ApplyRowLevelPermissionPredicatesArgs<T>): void => {- const userWorkspaceId = isUserAuthContext(authContext)- ? authContext.userWorkspaceId- : undefined;- const roleId = userWorkspaceId- ? internalContext.userWorkspaceRoleMap[userWorkspaceId]- : undefined;+ const roleId = resolveRoleIdFromAuthContext({+ authContext,+ userWorkspaceRoleMap: internalContext.userWorkspaceRoleMap,+ apiKeyRoleMap: internalContext.apiKeyRoleMap,+ });const recordFilter = buildRowLevelPermissionRecordFilter({flatRowLevelPermissionPredicateMaps:diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-role-id-from-auth-context.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/resolve-role-id-from-auth-context.util.tsnew file mode 100644index 00000000000..e95f4bf10ae--- /dev/null+++ b/packages/twenty-server/src/engine/twenty-orm/utils/resolve-role-id-from-auth-context.util.ts@@ -0,0 +1,34 @@+import { isDefined } from 'twenty-shared/utils';++import { isApiKeyAuthContext } from 'src/engine/core-modules/auth/guards/is-api-key-auth-context.guard';+import { isApplicationAuthContext } from 'src/engine/core-modules/auth/guards/is-application-auth-context.guard';+import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-auth-context.guard';+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';+import { type UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-target/types/user-workspace-role-map';++export const resolveRoleIdFromAuthContext = ({+ authContext,+ userWorkspaceRoleMap,+ apiKeyRoleMap,+}: {+ authContext: WorkspaceAuthContext;+ userWorkspaceRoleMap: UserWorkspaceRoleMap;+ apiKeyRoleMap: Record<string, string>;+}): string | undefined => {+ if (isUserAuthContext(authContext)) {+ return userWorkspaceRoleMap[authContext.userWorkspaceId];+ }++ if (isApiKeyAuthContext(authContext)) {+ return apiKeyRoleMap[authContext.apiKey.id];+ }++ if (+ isApplicationAuthContext(authContext) &&+ isDefined(authContext.application.defaultRoleId)+ ) {+ return authContext.application.defaultRoleId;+ }++ return undefined;+};diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-role-permission-config.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/resolve-role-permission-config.util.tsindex ee07411aa8f..5e1139ee83a 100644--- a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-role-permission-config.util.ts+++ b/packages/twenty-server/src/engine/twenty-orm/utils/resolve-role-permission-config.util.ts@@ -1,12 +1,10 @@import { isDefined } from 'twenty-shared/utils';-import { isApiKeyAuthContext } from 'src/engine/core-modules/auth/guards/is-api-key-auth-context.guard';-import { isApplicationAuthContext } from 'src/engine/core-modules/auth/guards/is-application-auth-context.guard';import { isSystemAuthContext } from 'src/engine/core-modules/auth/guards/is-system-auth-context.guard';-import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-auth-context.guard';import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';import { type UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-target/types/user-workspace-role-map';import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';+import { resolveRoleIdFromAuthContext } from 'src/engine/twenty-orm/utils/resolve-role-id-from-auth-context.util';export const resolveRolePermissionConfig = ({authContext,@@ -21,32 +19,15 @@ export const resolveRolePermissionConfig = ({return { shouldBypassPermissionChecks: true };}- if (isApiKeyAuthContext(authContext)) {- const roleId = apiKeyRoleMap[authContext.apiKey.id];+ const roleId = resolveRoleIdFromAuthContext({+ authContext,+ userWorkspaceRoleMap,+ apiKeyRoleMap,+ });- if (!isDefined(roleId)) {- return null;- }-- return { intersectionOf: [roleId] };- }-- if (- isApplicationAuthContext(authContext) &&- isDefined(authContext.application.defaultRoleId)- ) {- return { intersectionOf: [authContext.application.defaultRoleId] };- }-- if (isUserAuthContext(authContext)) {- const roleId = userWorkspaceRoleMap[authContext.userWorkspaceId];-- if (!isDefined(roleId)) {- return null;- }-- return { intersectionOf: [roleId] };+ if (!isDefined(roleId)) {+ return null;}- return null;+ return { intersectionOf: [roleId] };};diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/validate-rls-predicates-for-records.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/validate-rls-predicates-for-records.util.tsindex 54b19dfbb64..57b86997280 100644--- a/packages/twenty-server/src/engine/twenty-orm/utils/validate-rls-predicates-for-records.util.ts+++ b/packages/twenty-server/src/engine/twenty-orm/utils/validate-rls-predicates-for-records.util.ts@@ -14,6 +14,7 @@ import {} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';import { buildRowLevelPermissionRecordFilter } from 'src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util';import { isRecordMatchingRLSRowLevelPermissionPredicate } from 'src/engine/twenty-orm/utils/is-record-matching-rls-row-level-permission-predicate.util';+import { resolveRoleIdFromAuthContext } from 'src/engine/twenty-orm/utils/resolve-role-id-from-auth-context.util';type ValidateRLSPredicatesForRecordsArgs<T extends ObjectLiteral> = {records: T[];@@ -36,12 +37,11 @@ export const validateRLSPredicatesForRecords = <T extends ObjectLiteral>({return;}- const userWorkspaceId = isUserAuthContext(authContext)- ? authContext.userWorkspaceId- : undefined;- const roleId = userWorkspaceId- ? internalContext.userWorkspaceRoleMap[userWorkspaceId]- : undefined;+ const roleId = resolveRoleIdFromAuthContext({+ authContext,+ userWorkspaceRoleMap: internalContext.userWorkspaceRoleMap,+ apiKeyRoleMap: internalContext.apiKeyRoleMap,+ });if (!roleId) {return;