The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix(permissions): validate row-level predicate operands against the field type (#29185)
Etienne7cca9ac5afb7
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/build-row-level-permission-record-filter.util.spec.ts b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/build-row-level-permission-record-filter.util.spec.tsindex 6587de7313a..cdf23e06fd6 100644--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/build-row-level-permission-record-filter.util.spec.ts+++ b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/build-row-level-permission-record-filter.util.spec.ts@@ -30,6 +30,8 @@ const OR_GROUP_ROLE_ID = 'or-group-role-1';const AND_GROUP_ROLE_ID = 'and-group-role-1';const NESTED_GROUP_ROLE_ID = 'nested-group-role-1';const OR_GROUP_ONLY_MEMBER_ROLE_ID = 'or-group-only-member-role-1';+const TEXT_IS_ROLE_ID = 'text-is-role-1';+const SELECT_CONTAINS_ROLE_ID = 'select-contains-role-1';const COMPANY_OBJECT_ID = 'company-object';const PERSON_OBJECT_ID = 'person-object';const OWNER_MORPH_ID = 'owner-morph';@@ -228,6 +230,15 @@ const flatRowLevelPermissionPredicateMaps = buildMaps([operand: 'IS',value: { selectedRecordIds: [OWNER_RECORD_ID] },}),+ buildPredicate('predicate-text-is', TEXT_IS_ROLE_ID, {+ operand: 'IS',+ value: 'stale-value',+ }),+ buildPredicate('predicate-select-contains', SELECT_CONTAINS_ROLE_ID, {+ fieldMetadataId: STATUS_FIELD_ID,+ operand: 'CONTAINS',+ value: 'OPEN',+ }),]) as unknown as FlatRowLevelPermissionPredicateMaps;const buildPredicateGroup = (@@ -323,6 +334,20 @@ describe('buildRowLevelPermissionRecordFilter', () => {});});+ describe('predicate whose operand is invalid for the field type', () => {+ it('should throw a meaningful error for an IS operand on a text field', () => {+ expect(() => build([TEXT_IS_ROLE_ID])).toThrow(+ /Operand IS is not supported for field name of type TEXT/,+ );+ });++ it('should throw a meaningful error for a contains operand on a select field', () => {+ expect(() => build([SELECT_CONTAINS_ROLE_ID])).toThrow(+ /Operand CONTAINS is not supported for field status of type SELECT/,+ );+ });+ });+it.each([['a morph relation target', MORPH_TARGET_ROLE_ID],['a morph relation head', MORPH_HEAD_ROLE_ID],diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util.tsindex ebfd10aacc9..1188922a5ef 100644--- a/packages/twenty-server/src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util.ts+++ b/packages/twenty-server/src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util.ts@@ -9,6 +9,8 @@ import {} from 'twenty-shared/types';import {convertViewFilterValueToString,+ getFilterOperandsForFilterableFieldType,+ getFilterTypeFromFieldType,isDefined,type RecordFilter,type RecordFilterGroup,@@ -156,11 +158,25 @@ const buildRecordFilterForRole = ({| CompositeFieldSubFieldName| undefined;+ const operand = predicate.operand as unknown as RecordFilter['operand'];++ const allowedOperands = getFilterOperandsForFilterableFieldType({+ filterType: getFilterTypeFromFieldType(fieldMetadata.type),+ subFieldName: effectiveSubFieldName,+ });++ if (!allowedOperands.includes(operand)) {+ throw new PermissionsException(+ `Operand ${operand} is not supported for field ${fieldMetadata.name} of type ${fieldMetadata.type} in row-level permission predicate ${predicate.id}`,+ PermissionsExceptionCode.INVALID_ARG,+ );+ }+recordFilters.push({id: predicate.id,fieldMetadataId: predicate.fieldMetadataId,value: convertViewFilterValueToString(predicateValue),- operand: predicate.operand as unknown as RecordFilter['operand'],+ operand,recordFilterGroupId: predicate.rowLevelPermissionPredicateGroupId,subFieldName: effectiveSubFieldName,});diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-row-level-permission-predicate-validator.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-row-level-permission-predicate-validator.service.tsindex cc534031714..c82c86e8cb8 100644--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-row-level-permission-predicate-validator.service.ts+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-row-level-permission-predicate-validator.service.ts@@ -12,6 +12,7 @@ import {} from 'twenty-shared/types';import {convertViewFilterValueToString,+ getFilterOperandsForFilterableFieldType,getFilterTypeFromFieldType,getFilterValueValidationIssue,isDefined,@@ -85,6 +86,16 @@ export class FlatRowLevelPermissionPredicateValidatorService {userFriendlyMessage: msg`Field metadata not found`,});} else {+ const unsupportedOperandError = this.getUnsupportedOperandError({+ fieldType: fieldMetadata.type,+ operand: flatPredicateToValidate.operand,+ subFieldName: flatPredicateToValidate.subFieldName,+ });++ if (isDefined(unsupportedOperandError)) {+ validationResult.errors.push(unsupportedOperandError);+ }+const invalidValueError = this.getInvalidValueError({fieldType: fieldMetadata.type,operand: flatPredicateToValidate.operand,@@ -301,6 +312,16 @@ export class FlatRowLevelPermissionPredicateValidatorService {'subFieldName' in flatEntityUpdate ||'workspaceMemberFieldMetadataUniversalIdentifier' in flatEntityUpdate) {+ const unsupportedOperandError = this.getUnsupportedOperandError({+ fieldType: fieldMetadata.type,+ operand: updatedPredicate.operand,+ subFieldName: updatedPredicate.subFieldName,+ });++ if (isDefined(unsupportedOperandError)) {+ validationResult.errors.push(unsupportedOperandError);+ }+const invalidValueError = this.getInvalidValueError({fieldType: fieldMetadata.type,operand: updatedPredicate.operand,@@ -561,6 +582,33 @@ export class FlatRowLevelPermissionPredicateValidatorService {return undefined;}+ private getUnsupportedOperandError({+ fieldType,+ operand,+ subFieldName,+ }: {+ fieldType: FieldMetadataType;+ operand: RowLevelPermissionPredicateOperand;+ subFieldName: string | null | undefined;+ }) {+ const filterType = getFilterTypeFromFieldType(fieldType);++ const allowedOperands = getFilterOperandsForFilterableFieldType({+ filterType,+ subFieldName,+ });++ if (allowedOperands.includes(operand as unknown as ViewFilterOperand)) {+ return undefined;+ }++ return {+ code: RowLevelPermissionPredicateExceptionCode.INVALID_ROW_LEVEL_PERMISSION_PREDICATE_DATA,+ message: t`Operand ${operand} is not supported for field type ${filterType}`,+ userFriendlyMessage: msg`This operand is not supported for this field`,+ };+ }+private getInvalidValueError({fieldType,operand,diff --git a/packages/twenty-server/test/integration/metadata/suites/application/successful-manifest-sync-row-level-permission-predicate.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application/successful-manifest-sync-row-level-permission-predicate.integration-spec.tsindex 9c96f00a786..d9108b227f7 100644--- a/packages/twenty-server/test/integration/metadata/suites/application/successful-manifest-sync-row-level-permission-predicate.integration-spec.ts+++ b/packages/twenty-server/test/integration/metadata/suites/application/successful-manifest-sync-row-level-permission-predicate.integration-spec.ts@@ -143,7 +143,7 @@ describe('Manifest sync - row level permission predicates declared on a role', (it('creates a row-level predicate owned by the app and pointing at the declared role/object/field', async () => {const { errors } = await syncApplication({manifest: buildManifestWithPredicates([- partnerUserStylePredicate(RowLevelPermissionPredicateOperand.IS),+ partnerUserStylePredicate(RowLevelPermissionPredicateOperand.CONTAINS),]),expectToFail: false,});@@ -162,7 +162,7 @@ describe('Manifest sync - row level permission predicates declared on a role', (const predicate = predicateRows[0];- expect(predicate.operand).toBe(RowLevelPermissionPredicateOperand.IS);+ expect(predicate.operand).toBe(RowLevelPermissionPredicateOperand.CONTAINS);expect(predicate.roleId).toBe(roleId);expect(predicate.objectMetadataId).toBe(personObjectId);expect(predicate.fieldMetadataId).toBeTruthy();@@ -173,7 +173,7 @@ describe('Manifest sync - row level permission predicates declared on a role', (it('updates the predicate in place on re-sync and removes it when dropped from the manifest', async () => {await syncApplication({manifest: buildManifestWithPredicates([- partnerUserStylePredicate(RowLevelPermissionPredicateOperand.IS),+ partnerUserStylePredicate(RowLevelPermissionPredicateOperand.CONTAINS),]),expectToFail: false,});@@ -185,7 +185,9 @@ describe('Manifest sync - row level permission predicates declared on a role', (await syncApplication({manifest: buildManifestWithPredicates([- partnerUserStylePredicate(RowLevelPermissionPredicateOperand.IS_NOT),+ partnerUserStylePredicate(+ RowLevelPermissionPredicateOperand.DOES_NOT_CONTAIN,+ ),]),expectToFail: false,});@@ -195,7 +197,7 @@ describe('Manifest sync - row level permission predicates declared on a role', (expect(updatedRows).toHaveLength(1);expect(updatedRows[0].id).toBe(predicateId);expect(updatedRows[0].operand).toBe(- RowLevelPermissionPredicateOperand.IS_NOT,+ RowLevelPermissionPredicateOperand.DOES_NOT_CONTAIN,);await syncApplication({@@ -209,7 +211,7 @@ describe('Manifest sync - row level permission predicates declared on a role', (it('removes the predicate on uninstall', async () => {await syncApplication({manifest: buildManifestWithPredicates([- partnerUserStylePredicate(RowLevelPermissionPredicateOperand.IS),+ partnerUserStylePredicate(RowLevelPermissionPredicateOperand.CONTAINS),]),expectToFail: false,});diff --git a/packages/twenty-server/test/integration/metadata/suites/row-level-permission-predicate/__snapshots__/failing-row-level-permission-predicate-upsert.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/row-level-permission-predicate/__snapshots__/failing-row-level-permission-predicate-upsert.integration-spec.ts.snapindex f5316f2563b..0d70333dd16 100644--- a/packages/twenty-server/test/integration/metadata/suites/row-level-permission-predicate/__snapshots__/failing-row-level-permission-predicate-upsert.integration-spec.ts.snap+++ b/packages/twenty-server/test/integration/metadata/suites/row-level-permission-predicate/__snapshots__/failing-row-level-permission-predicate-upsert.integration-spec.ts.snap@@ -177,3 +177,38 @@ exports[`Row Level Permission Predicate upsert should fail when rowLevelPermissi"name": "UserInputError",}`;++exports[`Row Level Permission Predicate upsert should fail when the operand is not supported for the field type 1`] = `+{+ "extensions": {+ "code": "METADATA_VALIDATION_FAILED",+ "errors": {+ "rowLevelPermissionPredicate": [+ {+ "errors": [+ {+ "code": "INVALID_ROW_LEVEL_PERMISSION_PREDICATE_DATA",+ "message": "Operand IS is not supported for field type TEXT",+ "userFriendlyMessage": "This operand is not supported for this field",+ },+ ],+ "flatEntityMinimalInformation": {+ "universalIdentifier": Any<String>,+ },+ "metadataName": "rowLevelPermissionPredicate",+ "status": "fail",+ "type": "create",+ },+ ],+ },+ "message": "Validation failed for 1 rowLevelPermissionPredicate",+ "summary": {+ "rowLevelPermissionPredicate": 1,+ "totalErrors": 1,+ },+ "userFriendlyMessage": "This operand is not supported for this field",+ },+ "message": "Validation errors occurred while upserting row level permission predicates",+ "name": "GraphQLError",+}+`;diff --git a/packages/twenty-server/test/integration/metadata/suites/row-level-permission-predicate/failing-row-level-permission-predicate-upsert.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/row-level-permission-predicate/failing-row-level-permission-predicate-upsert.integration-spec.tsindex 5f996b8a6c9..ce59c621a69 100644--- a/packages/twenty-server/test/integration/metadata/suites/row-level-permission-predicate/failing-row-level-permission-predicate-upsert.integration-spec.ts+++ b/packages/twenty-server/test/integration/metadata/suites/row-level-permission-predicate/failing-row-level-permission-predicate-upsert.integration-spec.ts@@ -155,6 +155,23 @@ const failingRowLevelPermissionPredicateUpsertTestCases: EachTestingContext<Test}),},},+ {+ title: 'when the operand is not supported for the field type',+ context: {+ input: (testSetup) => ({+ roleId: testSetup.createdRoleId,+ objectMetadataId: testSetup.companyObjectMetadataId,+ predicates: [+ {+ fieldMetadataId: testSetup.companyNameFieldMetadataId,+ operand: RowLevelPermissionPredicateOperand.IS,+ value: 'Apple',+ },+ ],+ predicateGroups: [],+ }),+ },+ },{title: 'when adding a predicate to a non-editable role',context: {diff --git a/packages/twenty-server/test/integration/metadata/suites/row-level-permission-predicate/successful-row-level-permission-predicate-upsert.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/row-level-permission-predicate/successful-row-level-permission-predicate-upsert.integration-spec.tsindex 51d9c68f667..13d6c19c7ca 100644--- a/packages/twenty-server/test/integration/metadata/suites/row-level-permission-predicate/successful-row-level-permission-predicate-upsert.integration-spec.ts+++ b/packages/twenty-server/test/integration/metadata/suites/row-level-permission-predicate/successful-row-level-permission-predicate-upsert.integration-spec.ts@@ -124,7 +124,7 @@ describe('Row Level Permission Predicate upsert should succeed', () => {predicates: [{fieldMetadataId: companyNameFieldMetadataId,- operand: RowLevelPermissionPredicateOperand.IS,+ operand: RowLevelPermissionPredicateOperand.CONTAINS,value: 'Test Company',subFieldName: null,workspaceMemberFieldMetadataId: null,@@ -147,7 +147,7 @@ describe('Row Level Permission Predicate upsert should succeed', () => {id: expect.any(String),fieldMetadataId: companyNameFieldMetadataId,objectMetadataId: companyObjectMetadataId,- operand: RowLevelPermissionPredicateOperand.IS,+ operand: RowLevelPermissionPredicateOperand.CONTAINS,value: 'Test Company',roleId: createdRoleId,},@@ -290,7 +290,7 @@ describe('Row Level Permission Predicate upsert should succeed', () => {{id: createdPredicateId,fieldMetadataId: companyNameFieldMetadataId,- operand: RowLevelPermissionPredicateOperand.IS,+ operand: RowLevelPermissionPredicateOperand.DOES_NOT_CONTAIN,value: 'Updated Value',},],@@ -315,7 +315,7 @@ describe('Row Level Permission Predicate upsert should succeed', () => {updateData.upsertRowLevelPermissionPredicates.predicates[0],).toMatchObject({id: createdPredicateId,- operand: RowLevelPermissionPredicateOperand.IS,+ operand: RowLevelPermissionPredicateOperand.DOES_NOT_CONTAIN,value: 'Updated Value',});