Enhance role-check system with stricter checks (#15392)
## Overview This PR strengthens our permission system by introducing more granular role-based access control across the platform. ## Changes ### New Permissions Added - **Applications** - Control who can install and manage applications - **Layouts** - Control who can customize page layouts and UI structure - **AI** - Control access to AI features and agents - **Upload File** - Separate permission for file uploads - **Download File** - Separate permission for file downloads (frontend visibility) ### Security Enhancements - Implemented whitelist-based validation for workspace field updates - Added explicit permission guards to core entity resolvers - Enhanced ESLint rule to enforce permission checks on all mutations - Created `CustomPermissionGuard` and `NoPermissionGuard` for better code documentation ### Affected Components - Core entity resolvers: webhooks, files, domains, applications, layouts, postgres credentials - Workspace update mutations now use whitelist validation - Settings UI updated with new permission controls ### Developer Experience - ESLint now catches missing permission guards during development - Explicit guard markers make permission requirements clear in code review - Comprehensive test coverage for new permission logic ## Testing - ✅ All TypeScript type checks pass - ✅ ESLint validation passes - ✅ New permission guards properly enforced - ✅ Frontend UI displays new permissions correctly ## Migration Notes Existing workspaces will need to assign the new permissions to roles as needed. By default, all new permissions are set to `false` for non-admin roles.
This commit is contained in:
@@ -0,0 +1,32 @@
|
||||
import { type ExecutionContext } from '@nestjs/common';
|
||||
|
||||
import { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard';
|
||||
|
||||
describe('CustomPermissionGuard', () => {
|
||||
let guard: CustomPermissionGuard;
|
||||
let mockExecutionContext: ExecutionContext;
|
||||
|
||||
beforeEach(() => {
|
||||
guard = new CustomPermissionGuard();
|
||||
mockExecutionContext = {} as ExecutionContext;
|
||||
});
|
||||
|
||||
describe('canActivate', () => {
|
||||
it('should always return true', () => {
|
||||
const result = guard.canActivate(mockExecutionContext);
|
||||
|
||||
expect(result).toBe(true);
|
||||
});
|
||||
|
||||
it('should return true even with different contexts', () => {
|
||||
const differentContext = {
|
||||
switchToHttp: jest.fn(),
|
||||
getHandler: jest.fn(),
|
||||
} as unknown as ExecutionContext;
|
||||
|
||||
const result = guard.canActivate(differentContext);
|
||||
|
||||
expect(result).toBe(true);
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,32 @@
|
||||
import { type ExecutionContext } from '@nestjs/common';
|
||||
|
||||
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
|
||||
|
||||
describe('NoPermissionGuard', () => {
|
||||
let guard: NoPermissionGuard;
|
||||
let mockExecutionContext: ExecutionContext;
|
||||
|
||||
beforeEach(() => {
|
||||
guard = new NoPermissionGuard();
|
||||
mockExecutionContext = {} as ExecutionContext;
|
||||
});
|
||||
|
||||
describe('canActivate', () => {
|
||||
it('should always return true', () => {
|
||||
const result = guard.canActivate(mockExecutionContext);
|
||||
|
||||
expect(result).toBe(true);
|
||||
});
|
||||
|
||||
it('should return true even with different contexts', () => {
|
||||
const differentContext = {
|
||||
switchToHttp: jest.fn(),
|
||||
getHandler: jest.fn(),
|
||||
} as unknown as ExecutionContext;
|
||||
|
||||
const result = guard.canActivate(differentContext);
|
||||
|
||||
expect(result).toBe(true);
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,89 @@
|
||||
import { type ExecutionContext } from '@nestjs/common';
|
||||
import { GqlExecutionContext } from '@nestjs/graphql';
|
||||
|
||||
import { WorkspaceActivationStatus } from 'twenty-shared/workspace';
|
||||
|
||||
import { SettingsPermissionsGuard } from 'src/engine/guards/settings-permissions.guard';
|
||||
import { PermissionFlagType } from 'src/engine/metadata-modules/permissions/constants/permission-flag-type.constants';
|
||||
import { PermissionsException } from 'src/engine/metadata-modules/permissions/permissions.exception';
|
||||
import { type PermissionsService } from 'src/engine/metadata-modules/permissions/permissions.service';
|
||||
|
||||
describe('SettingsPermissionsGuard', () => {
|
||||
let guard: any;
|
||||
let mockPermissionsService: jest.Mocked<PermissionsService>;
|
||||
let mockExecutionContext: ExecutionContext;
|
||||
let mockGqlContext: any;
|
||||
|
||||
beforeEach(() => {
|
||||
mockPermissionsService = {
|
||||
userHasWorkspaceSettingPermission: jest.fn(),
|
||||
} as any;
|
||||
|
||||
mockGqlContext = {
|
||||
req: {
|
||||
workspace: {
|
||||
id: 'workspace-id',
|
||||
activationStatus: WorkspaceActivationStatus.ACTIVE,
|
||||
},
|
||||
userWorkspaceId: 'user-workspace-id',
|
||||
apiKey: null,
|
||||
},
|
||||
};
|
||||
|
||||
mockExecutionContext = {} as ExecutionContext;
|
||||
|
||||
jest
|
||||
.spyOn(GqlExecutionContext, 'create')
|
||||
.mockReturnValue({ getContext: () => mockGqlContext } as any);
|
||||
|
||||
const GuardClass = SettingsPermissionsGuard(PermissionFlagType.WORKSPACE);
|
||||
|
||||
guard = new GuardClass(mockPermissionsService);
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
jest.restoreAllMocks();
|
||||
});
|
||||
|
||||
describe('canActivate', () => {
|
||||
it('should bypass permission check when workspace is being created', async () => {
|
||||
mockGqlContext.req.workspace.activationStatus =
|
||||
WorkspaceActivationStatus.PENDING_CREATION;
|
||||
|
||||
const result = await guard.canActivate(mockExecutionContext);
|
||||
|
||||
expect(result).toBe(true);
|
||||
expect(
|
||||
mockPermissionsService.userHasWorkspaceSettingPermission,
|
||||
).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('should return true when user has required permission', async () => {
|
||||
mockPermissionsService.userHasWorkspaceSettingPermission.mockResolvedValue(
|
||||
true,
|
||||
);
|
||||
|
||||
const result = await guard.canActivate(mockExecutionContext);
|
||||
|
||||
expect(result).toBe(true);
|
||||
expect(
|
||||
mockPermissionsService.userHasWorkspaceSettingPermission,
|
||||
).toHaveBeenCalledWith({
|
||||
userWorkspaceId: 'user-workspace-id',
|
||||
setting: PermissionFlagType.WORKSPACE,
|
||||
workspaceId: 'workspace-id',
|
||||
apiKeyId: undefined,
|
||||
});
|
||||
});
|
||||
|
||||
it('should throw PermissionsException when user lacks permission', async () => {
|
||||
mockPermissionsService.userHasWorkspaceSettingPermission.mockResolvedValue(
|
||||
false,
|
||||
);
|
||||
|
||||
await expect(guard.canActivate(mockExecutionContext)).rejects.toThrow(
|
||||
PermissionsException,
|
||||
);
|
||||
});
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user