Skip to content

The open alternative to Salesforce, designed for AI.

Refuse row-level permission rule changes on non-editable roles (#28645)

Paul Rastoincf180c72a399
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-role-validator.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-role-validator.service.ts
index f1c6de81f31..fb78104a2cc 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-role-validator.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-role-validator.service.ts
@@ -14,7 +14,7 @@ import { type FailedFlatEntityValidation } from 'src/engine/workspace-manager/wo
import { getEmptyFlatEntityValidationError } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/utils/get-flat-entity-validation-error.util';
import { type FlatEntityUpdateValidationArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-update-validation-args.type';
import { type UniversalFlatEntityValidationArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-validation-args.type';
-import { validateRoleIsEditable } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-role-is-editable.util';
+import { getRoleNotEditableErrors } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/get-role-not-editable-errors.util';
import { validateRoleLabelUniqueness } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-role-label-uniqueness.util';
import { validateRoleReadWritePermissionsConsistency } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-role-read-write-permissions-consistency.util';
import { validateRoleRequiredPropertiesAreDefined } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-role-required-properties-are-defined.util';
@@ -98,7 +98,7 @@ export class FlatRoleValidatorService {
}
validationResult.errors.push(
- ...validateRoleIsEditable({
+ ...getRoleNotEditableErrors({
flatRole: existingRole,
buildOptions,
}),
@@ -152,7 +152,7 @@ export class FlatRoleValidatorService {
}
validationResult.errors.push(
- ...validateRoleIsEditable({
+ ...getRoleNotEditableErrors({
flatRole: fromFlatRole,
buildOptions,
}),
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-row-level-permission-predicate-group-validator.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-row-level-permission-predicate-group-validator.service.ts
index e92736bd3ba..eb0f4e09e40 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-row-level-permission-predicate-group-validator.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-row-level-permission-predicate-group-validator.service.ts
@@ -12,12 +12,14 @@ import { FailedFlatEntityValidation } from 'src/engine/workspace-manager/workspa
import { getEmptyFlatEntityValidationError } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/utils/get-flat-entity-validation-error.util';
import { FlatEntityUpdateValidationArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-update-validation-args.type';
import { UniversalFlatEntityValidationArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-validation-args.type';
+import { getRoleNotEditableErrors } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/get-role-not-editable-errors.util';
@Injectable()
export class FlatRowLevelPermissionPredicateGroupValidatorService {
validateFlatRowLevelPermissionPredicateGroupCreation({
flatEntityToValidate: flatPredicateGroupToValidate,
optimisticFlatEntityMapsAndRelatedFlatEntityMaps,
+ buildOptions,
}: UniversalFlatEntityValidationArgs<
typeof ALL_METADATA_NAME.rowLevelPermissionPredicateGroup
>): FailedFlatEntityValidation<'rowLevelPermissionPredicateGroup', 'create'> {
@@ -82,6 +84,10 @@ export class FlatRowLevelPermissionPredicateGroupValidatorService {
message: t`Role not found`,
userFriendlyMessage: msg`Role not found`,
});
+ } else {
+ validationResult.errors.push(
+ ...getRoleNotEditableErrors({ flatRole: role, buildOptions }),
+ );
}
const objectMetadata = flatObjectMetadataMaps
@@ -142,6 +148,7 @@ export class FlatRowLevelPermissionPredicateGroupValidatorService {
universalIdentifier,
flatEntityUpdate,
optimisticFlatEntityMapsAndRelatedFlatEntityMaps,
+ buildOptions,
}: FlatEntityUpdateValidationArgs<
typeof ALL_METADATA_NAME.rowLevelPermissionPredicateGroup
>): FailedFlatEntityValidation<'rowLevelPermissionPredicateGroup', 'update'> {
@@ -245,6 +252,10 @@ export class FlatRowLevelPermissionPredicateGroupValidatorService {
message: t`Role not found`,
userFriendlyMessage: msg`Role not found`,
});
+ } else {
+ validationResult.errors.push(
+ ...getRoleNotEditableErrors({ flatRole: role, buildOptions }),
+ );
}
const objectMetadata = flatObjectMetadataMaps
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.ts
index 5d8ba4f8690..cc534031714 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
@@ -30,12 +30,14 @@ import { FailedFlatEntityValidation } from 'src/engine/workspace-manager/workspa
import { getEmptyFlatEntityValidationError } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/utils/get-flat-entity-validation-error.util';
import { FlatEntityUpdateValidationArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-update-validation-args.type';
import { UniversalFlatEntityValidationArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-validation-args.type';
+import { getRoleNotEditableErrors } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/get-role-not-editable-errors.util';
@Injectable()
export class FlatRowLevelPermissionPredicateValidatorService {
validateFlatRowLevelPermissionPredicateCreation({
flatEntityToValidate: flatPredicateToValidate,
optimisticFlatEntityMapsAndRelatedFlatEntityMaps,
+ buildOptions,
}: UniversalFlatEntityValidationArgs<
typeof ALL_METADATA_NAME.rowLevelPermissionPredicate
>): FailedFlatEntityValidation<'rowLevelPermissionPredicate', 'create'> {
@@ -163,6 +165,10 @@ export class FlatRowLevelPermissionPredicateValidatorService {
message: t`Role not found`,
userFriendlyMessage: msg`Role not found`,
});
+ } else {
+ validationResult.errors.push(
+ ...getRoleNotEditableErrors({ flatRole: role, buildOptions }),
+ );
}
return validationResult;
@@ -204,6 +210,7 @@ export class FlatRowLevelPermissionPredicateValidatorService {
universalIdentifier,
flatEntityUpdate,
optimisticFlatEntityMapsAndRelatedFlatEntityMaps,
+ buildOptions,
}: FlatEntityUpdateValidationArgs<
typeof ALL_METADATA_NAME.rowLevelPermissionPredicate
>): FailedFlatEntityValidation<'rowLevelPermissionPredicate', 'update'> {
@@ -374,6 +381,10 @@ export class FlatRowLevelPermissionPredicateValidatorService {
message: t`Role not found`,
userFriendlyMessage: msg`Role not found`,
});
+ } else {
+ validationResult.errors.push(
+ ...getRoleNotEditableErrors({ flatRole: role, buildOptions }),
+ );
}
return validationResult;
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-role-is-editable.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/get-role-not-editable-errors.util.ts
similarity index 96%
rename from packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-role-is-editable.util.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/get-role-not-editable-errors.util.ts
index 09df4d4b186..0d7138b94ee 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-role-is-editable.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/get-role-not-editable-errors.util.ts
@@ -8,7 +8,7 @@ import { type UniversalFlatRole } from 'src/engine/workspace-manager/workspace-m
import { type FlatEntityValidationError } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/types/failed-flat-entity-validation.type';
import { type WorkspaceMigrationBuilderOptions } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-builder-options.type';
-export const validateRoleIsEditable = ({
+export const getRoleNotEditableErrors = ({
flatRole,
buildOptions,
}: {
diff --git a/packages/twenty-server/test/integration/ai/suites/mcp-role-tools.integration-spec.ts b/packages/twenty-server/test/integration/ai/suites/mcp-role-tools.integration-spec.ts
index a11698d3efd..8a6f302a0bb 100644
--- a/packages/twenty-server/test/integration/ai/suites/mcp-role-tools.integration-spec.ts
+++ b/packages/twenty-server/test/integration/ai/suites/mcp-role-tools.integration-spec.ts
@@ -123,6 +123,43 @@ describe('MCP role tools (integration)', () => {
);
});
+ it('should refuse row-level rules on a non-editable role', async () => {
+ const adminRole = (await listRolesThroughMcp()).find(
+ ({ label }) => label === 'Admin',
+ );
+
+ jestExpectToBeDefined(adminRole);
+
+ const refused = await executeToolThroughMcp({
+ toolName: 'upsert_row_level_permission_rules',
+ toolArguments: {
+ roleId: adminRole.id,
+ objectMetadataId: await findObjectMetadataIdByName('company'),
+ predicates: [],
+ predicateGroups: [{ logicalOperator: 'AND' }],
+ },
+ });
+
+ expect(refused).toMatchObject({
+ success: false,
+ error: expect.stringContaining('Role is not editable'),
+ });
+
+ const rolesWithRules = await executeToolThroughMcp<{
+ roles: (RoleSummary & {
+ rowLevelPermissionPredicateGroups: unknown[];
+ })[];
+ }>({
+ toolName: 'list_roles',
+ toolArguments: { includeRowLevelPermissionRules: true },
+ });
+
+ expect(
+ rolesWithRules.result?.roles.find(({ id }) => id === adminRole.id)
+ ?.rowLevelPermissionPredicateGroups,
+ ).toEqual([]);
+ });
+
// The seeded member role holds no settings flag, so it lacks ROLES
describe('for a member without ROLES', () => {
it('should hide the role category from the catalog', async () => {
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.snap
index e4859d999a6..f5316f2563b 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
@@ -1,5 +1,75 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
+exports[`Row Level Permission Predicate upsert should fail when adding a predicate group to a non-editable role 1`] = `
+{
+ "extensions": {
+ "code": "METADATA_VALIDATION_FAILED",
+ "errors": {
+ "rowLevelPermissionPredicateGroup": [
+ {
+ "errors": [
+ {
+ "code": "ROLE_NOT_EDITABLE",
+ "message": "Role is not editable",
+ "userFriendlyMessage": "This role cannot be modified because it is a system role. Only custom roles can be edited.",
+ },
+ ],
+ "flatEntityMinimalInformation": {
+ "universalIdentifier": Any<String>,
+ },
+ "metadataName": "rowLevelPermissionPredicateGroup",
+ "status": "fail",
+ "type": "create",
+ },
+ ],
+ },
+ "message": "Validation failed for 1 rowLevelPermissionPredicateGroup",
+ "summary": {
+ "rowLevelPermissionPredicateGroup": 1,
+ "totalErrors": 1,
+ },
+ "userFriendlyMessage": "This role cannot be modified because it is a system role. Only custom roles can be edited.",
+ },
+ "message": "Validation errors occurred while upserting row level permission predicates",
+ "name": "GraphQLError",
+}
+`;
+
+exports[`Row Level Permission Predicate upsert should fail when adding a predicate to a non-editable role 1`] = `
+{
+ "extensions": {
+ "code": "METADATA_VALIDATION_FAILED",
+ "errors": {
+ "rowLevelPermissionPredicate": [
+ {
+ "errors": [
+ {
+ "code": "ROLE_NOT_EDITABLE",
+ "message": "Role is not editable",
+ "userFriendlyMessage": "This role cannot be modified because it is a system role. Only custom roles can be edited.",
+ },
+ ],
+ "flatEntityMinimalInformation": {
+ "universalIdentifier": Any<String>,
+ },
+ "metadataName": "rowLevelPermissionPredicate",
+ "status": "fail",
+ "type": "create",
+ },
+ ],
+ },
+ "message": "Validation failed for 1 rowLevelPermissionPredicate",
+ "summary": {
+ "rowLevelPermissionPredicate": 1,
+ "totalErrors": 1,
+ },
+ "userFriendlyMessage": "This role cannot be modified because it is a system role. Only custom roles can be edited.",
+ },
+ "message": "Validation errors occurred while upserting row level permission predicates",
+ "name": "GraphQLError",
+}
+`;
+
exports[`Row Level Permission Predicate upsert should fail when fieldMetadataId in predicate does not exist 1`] = `
{
"extensions": {
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.ts
index 20b2e704853..5f996b8a6c9 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
@@ -2,6 +2,7 @@ import { expectOneNotInternalServerErrorSnapshot } from 'test/integration/graphq
import { findManyObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/find-many-object-metadata.util';
import { createOneRole } from 'test/integration/metadata/suites/role/utils/create-one-role.util';
import { deleteOneRole } from 'test/integration/metadata/suites/role/utils/delete-one-role.util';
+import { findOneRoleByLabel } from 'test/integration/metadata/suites/role/utils/find-one-role-by-label.util';
import { upsertRowLevelPermissionPredicates } from 'test/integration/metadata/suites/row-level-permission-predicate/utils/upsert-row-level-permission-predicates.util';
import { jestExpectToBeDefined } from 'test/utils/jest-expect-to-be-defined.util.test';
import {
@@ -18,6 +19,7 @@ import { type UpsertRowLevelPermissionPredicatesInput } from 'src/engine/metadat
type TestSetup = {
createdRoleId: string;
+ adminRoleId: string;
companyObjectMetadataId: string;
companyNameFieldMetadataId: string;
};
@@ -153,10 +155,45 @@ const failingRowLevelPermissionPredicateUpsertTestCases: EachTestingContext<Test
}),
},
},
+ {
+ title: 'when adding a predicate to a non-editable role',
+ context: {
+ input: (testSetup) => ({
+ roleId: testSetup.adminRoleId,
+ objectMetadataId: testSetup.companyObjectMetadataId,
+ predicates: [
+ {
+ fieldMetadataId: testSetup.companyNameFieldMetadataId,
+ operand: RowLevelPermissionPredicateOperand.CONTAINS,
+ value: 'Apple',
+ },
+ ],
+ predicateGroups: [],
+ }),
+ },
+ },
+ {
+ title: 'when adding a predicate group to a non-editable role',
+ context: {
+ input: (testSetup) => ({
+ roleId: testSetup.adminRoleId,
+ objectMetadataId: testSetup.companyObjectMetadataId,
+ predicates: [],
+ predicateGroups: [
+ {
+ objectMetadataId: testSetup.companyObjectMetadataId,
+ logicalOperator:
+ RowLevelPermissionPredicateGroupLogicalOperator.AND,
+ },
+ ],
+ }),
+ },
+ },
];
describe('Row Level Permission Predicate upsert should fail', () => {
let createdRoleId: string;
+ let adminRoleId: string;
let companyObjectMetadataId: string;
let companyNameFieldMetadataId: string;
@@ -214,6 +251,8 @@ describe('Row Level Permission Predicate upsert should fail', () => {
createdRoleId = roleData?.createOneRole?.id;
jestExpectToBeDefined(createdRoleId);
+
+ adminRoleId = (await findOneRoleByLabel({ label: 'Admin' })).id;
});
afterAll(async () => {
@@ -223,6 +262,23 @@ describe('Row Level Permission Predicate upsert should fail', () => {
input: { idToDelete: createdRoleId },
});
}
+
+ const adminRole = await findOneRoleByLabel({
+ label: 'Admin',
+ gqlFields: `
+ id
+ label
+ rowLevelPermissionPredicates {
+ id
+ }
+ rowLevelPermissionPredicateGroups {
+ id
+ }
+ `,
+ });
+
+ expect(adminRole.rowLevelPermissionPredicates).toEqual([]);
+ expect(adminRole.rowLevelPermissionPredicateGroups).toEqual([]);
});
it.each(
@@ -232,6 +288,7 @@ describe('Row Level Permission Predicate upsert should fail', () => {
expectToFail: true,
input: context.input({
createdRoleId,
+ adminRoleId,
companyObjectMetadataId,
companyNameFieldMetadataId,
}),