Skip to content

Feat/rbac v1#2092

Open
Marfuen wants to merge 67 commits intomainfrom
feat/rbac-v1
Open

Feat/rbac v1#2092
Marfuen wants to merge 67 commits intomainfrom
feat/rbac-v1

Conversation

@Marfuen
Copy link
Contributor

@Marfuen Marfuen commented Feb 2, 2026

What does this PR do?

  • Fixes #XXXX (GitHub issue number)
  • Fixes COMP-XXXX (Linear issue number - should be visible at the bottom of the GitHub issue description)

Visual Demo (For contributors especially)

A visual demonstration is strongly recommended, for both the original and new change (video / image - any one).

Video Demo (if applicable):

  • Show screen recordings of the issue or feature.
  • Demonstrate how to reproduce the issue, the behavior before and after the change.

Image Demo (if applicable):

  • Add side-by-side screenshots of the original and updated change.
  • Highlight any significant change(s).

Mandatory Tasks (DO NOT REMOVE)

  • I have self-reviewed the code (A decent size PR without self-review might be rejected).
  • I have updated the developer docs in /docs if this PR makes changes that would require a documentation change. If N/A, write N/A here and check the checkbox.
  • I confirm automated tests are in place that prove my fix is effective or that my feature works.

How should this be tested?

  • Are there environment variables that should be set?
  • What are the minimal test data to have?
  • What is expected (happy path) to have (input and output)?
  • Any other important info that could help to test that PR

Checklist

  • I haven't read the contributing guide
  • My code doesn't follow the style guidelines of this project
  • I haven't commented my code, particularly in hard-to-understand areas
  • I haven't checked if my changes generate no new warnings
Cursor Bugbot reviewed your changes and found no issues for commit c74407b

Marfuen and others added 19 commits February 2, 2026 12:19
- Update permissions.ts to extend defaultStatements from better-auth
- Add GRC resources: control, evidence, policy, risk, vendor, task,
  framework, audit, finding, questionnaire, integration
- Add program_manager role with full GRC access but no member management
- Update owner/admin roles to extend ownerAc/adminAc from better-auth
- Update auditor role with read + export permissions
- Keep employee/contractor roles minimal with assignment-based access
- Add ROLE_HIERARCHY, RESTRICTED_ROLES, PRIVILEGED_ROLES exports
- Add placeholder for dynamicAccessControl in auth.ts (Sprint 2)

Part of ENG-138: Complete Permission System

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
- Create PermissionGuard that calls better-auth's hasPermission API
- Add fallback role-based check when better-auth is unavailable
- Create @RequirePermission decorator for route-level permission checks
- Create @RequirePermissions decorator for multi-resource permissions
- Export GRCResource and GRCAction types for type safety
- Add program_manager to Role enum in database schema
- Update AuthModule to export PermissionGuard

The guard:
- Validates permissions via better-auth's hasPermission endpoint
- Falls back to role-based check if API unavailable
- Logs warnings for API key bypass (TODO: add API key scopes)
- Provides static isRestrictedRole() helper for assignment filtering

Part of ENG-138: Complete Permission System

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
- Update portal permissions.ts to match app version
- Fix security issue where employee/contractor had excessive permissions
- Add program_manager role to portal
- Extend defaultStatements from better-auth
- Add RESTRICTED_ROLES and PRIVILEGED_ROLES exports

BREAKING CHANGE: Employee and contractor roles in portal now have
restricted permissions matching the app. Previously they had member
management and organization update permissions.

Part of ENG-138: Complete Permission System

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Add comprehensive tests for PermissionGuard covering:
- Permission bypass when no permissions required
- API key bypass behavior
- Role-based access for privileged vs restricted roles
- Fallback behavior when better-auth API unavailable
- isRestrictedRole static method for all role types

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Migrate all API controllers to use the new better-auth permission system:
- findings.controller.ts: finding create/update/delete permissions
- task-management.controller.ts: task CRUD + assign permissions
- people.controller.ts: member delete permission for removeHost
- evidence-export.controller.ts: evidence export permission

Also fix TypeScript errors in permission.guard.spec.ts for fetch mocking.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Implement assignment filtering to restrict employees/contractors to only
see resources they are assigned to:

- Add memberId to AuthContext for assignment checking
- Create assignment-filter utility with filter builders and access checkers
- Update tasks controller/service with assignment filtering on GET endpoints
- Update risks controller/service with assignment filtering on GET endpoints
- Add PermissionGuard and @RequirePermission to tasks and risks endpoints

Employees/contractors now only see:
- Tasks where they are the assignee
- Risks where they are the assignee

Privileged roles (owner, admin, program_manager, auditor) see all resources.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Allow admins to control which departments can see specific policies:

Schema changes:
- Add PolicyVisibility enum (ALL, DEPARTMENT)
- Add visibility and visibleToDepartments fields to Policy model

API changes:
- Add memberDepartment to AuthContext for visibility filtering
- Create department-visibility utility with filter builders
- Update policies controller to filter by visibility for restricted roles
- Update policies service to accept visibility filter

Policies can now be:
- Visible to ALL (default) - everyone in the organization sees them
- Visible to specific DEPARTMENTS only - only members in those departments see them

Privileged roles (owner, admin, program_manager, auditor) see all policies
regardless of visibility settings.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
- Move auth server to API, app now uses proxy to forward auth requests
- Remove localStorage token storage (XSS prevention)
- Add rate limiting to auth proxy (60/min general, 10/min sensitive)
- Add redirect URL validation to prevent open redirects
- Add AUTH_SECRET validation at startup
- Make all debug logging conditional on NODE_ENV
- Simplify root page routing (no activeOrganizationId dependency)
- Use URL-based RBAC with direct DB member lookup

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
- Add @comp/auth package with centralized permissions and role definitions
- Update API auth module to integrate with better-auth server
- Add 403 responses to policy and risk endpoints for Swagger
- Add assignment filter and department visibility utilities with tests
- Sync permissions across app and portal
- Update tsconfig and nest-cli for proper module resolution

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
- Add dynamicAccessControl config to organization plugin
- Add OrganizationRole table for storing custom roles
- Configure maximum 20 roles per organization
- Add schema mapping for better-auth role table

Resolves: ENG-145

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
- Add roles module with CRUD endpoints for custom roles
- Implement privilege escalation prevention
- Add permission validation against valid resources/actions
- Protect built-in roles (owner, admin, auditor, employee, contractor)
- Add OrganizationRole table migration
- Limit to 20 custom roles per organization
- Require ac:create/read/update/delete permissions for role management

Implements: ENG-146

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
- Update roles service to accept array of roles instead of single role
- Add getCombinedPermissions to merge permissions from all user roles
- Update controller to pass full userRoles array
- Users with multiple roles now get combined permissions for validation

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Add explicit jwks configuration with rotationInterval to prevent
better-auth from creating new JWKS keys on each request. Without this,
all existing JWTs become invalid when the API restarts because new
signing keys are generated.

- Set rotationInterval to 30 days for monthly key rotation
- Set gracePeriod to 7 days so old keys remain valid after rotation

Fixes: Session persistence across API restarts

References:
- better-auth/better-auth#6215

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
- Add 18 tests for RolesService covering CRUD operations
- Add 9 tests for RolesController
- Test permission validation and privilege escalation prevention
- Test multiple roles support for privilege checking
- Test edge cases (duplicate names, max roles limit, reserved names)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
- Update .cursorrules with testing requirements and conventions
- Add apps/api/CLAUDE.md with API-specific development guidelines
- Document when to write tests, how to run them, and test patterns
- Include RBAC system documentation

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
- Remove API-specific testing rules from root .cursorrules
- Create apps/api/.cursorrules with API testing requirements
- Keep root .cursorrules focused on commit message conventions

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Ensures that users cannot escalate privileges when updating
role permissions, not just when creating roles.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
- Add roles settings pages (list, create, edit) with permission matrix
- Add "Select all" feature to quickly set all permissions
- Integrate custom roles into member management UI:
  - Role filter dropdown shows all roles dynamically
  - Invite modal supports custom role selection
  - Edit member role supports custom roles
- Allow normal spelling for role names (spaces, capitalization)
- Add loading skeletons with proper PageLayout wrappers
- Add comprehensive tests for RolesTable, RoleForm, PermissionMatrix

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
@cursor
Copy link

cursor bot commented Feb 2, 2026

PR Summary

High Risk
High risk because it rewires core authentication (moving from JWT verification to Better Auth session resolution), introduces new RBAC enforcement via PermissionGuard across multiple controllers, and adds a global audit logging interceptor that writes to the database on many requests.

Overview
Adds a new API-wide RBAC layer by introducing PermissionGuard + @RequirePermission/@RequirePermissions decorators, and updates multiple controllers (e.g., attachments, comments, browserbase, assistant-chat) to enforce permissions per endpoint.

Reworks authentication to use Better Auth directly inside the API: HybridAuthGuard now resolves sessions via auth.api.getSession (cookies/bearer), adds service-token auth (x-service-token) with scoped permissions, and expands API key support to include salted hashing, creation/revocation, and optional permission scopes (legacy keys remain full-access).

Introduces automatic audit logging via a new AuditLogInterceptor (with @SkipAuditLog/@AuditRead opt-outs), including sensitive-field redaction and richer descriptions/diffs for select operations; adds extensive unit tests for the interceptor and permission guard. Also includes supporting infra tweaks (new AuthController endpoints, cloud-security legacy/query services, Browserbase Stagehand lazy import, and updated env/examples/ignores).

Written by Cursor Bugbot for commit 7c26342. This will update automatically on new commits. Configure here.

@vercel
Copy link

vercel bot commented Feb 2, 2026

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
app Ready Ready Preview, Comment Feb 27, 2026 0:31am
portal Error Error Feb 27, 2026 0:31am

Request Review

TrainingModule,
OrgChartModule,
EvidenceFormsModule,
RolesModule,
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AuditModule not imported, interceptor never activates

High Severity

The newly created AuditModule registers AuditLogInterceptor as an APP_INTERCEPTOR, but it is never imported into AppModule. Without the import, the interceptor is never instantiated by NestJS, so no audit logs will be written for any API mutations. All the audit logging infrastructure (interceptor, utils, resolvers, constants, tests) is dead code until the module is added to AppModule.imports.

Additional Locations (1)

Fix in Cursor Fix in Web

// ============================================================

@Get('providers')
@RequirePermission('cloud-security', 'read')
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing resources block session auth on endpoints

High Severity

The cloud-security and training resources are used in @RequirePermission decorators but are not defined in the statement in @comp/auth. Since no role (including owner and admin) includes these resources, auth.api.hasPermission will deny access for all session-authenticated users. Only service tokens and legacy API keys (which bypass the SDK check) can reach these endpoints. Interactive users will get 403 on all cloud security and training routes.

Additional Locations (1)

Fix in Cursor Fix in Web

const mentionedUsers = await db.user.findMany({
where: {
id: { in: mentionedUserIds },
isPlatformAdmin: false,
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Platform admins silently excluded from mention notifications

Medium Severity

The newly added isPlatformAdmin: false filter in the mentionedUsers query silently excludes platform admins from receiving comment mention notifications. A platform admin can also be a regular member of an organization and can be explicitly @mentioned in a comment. With this filter, the mention is silently dropped — the mentioning user gets no indication the notification wasn't sent, and the admin never sees it.

Fix in Cursor Fix in Web

},
}),
db.member.findMany({
where: { userId, isActive: true },
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Inconsistent member activity filter in getMe endpoint

Low Severity

The new getMe endpoint filters members with isActive: true, while HybridAuthGuard uses deactivated: false. The Member model has both fields, and the rest of the codebase consistently uses deactivated: false for active-member checks. Although deactivation currently sets both fields in sync, using a different filter than the guard could produce inconsistent results if they diverge — a user could see orgs in getMe that the guard won't authenticate them for, or vice versa.

Fix in Cursor Fix in Web

TrainingModule,
OrgChartModule,
EvidenceFormsModule,
RolesModule,
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AuditModule never imported, interceptor is inactive

High Severity

AuditModule is defined and registers AuditLogInterceptor as an APP_INTERCEPTOR, but it's never imported in app.module.ts. This means the audit logging interceptor won't be instantiated, and all audit logging for mutations (the entire audit system built in this PR) will be silently inactive.

Additional Locations (1)

Fix in Cursor Fix in Web

// PATCH /v1/policies/:id with isArchived field
if (method === 'PATCH' && requestBody && 'isArchived' in requestBody) {
return requestBody.isArchived ? 'Archived policy' : 'Restored policy';
}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Archive check matches all resources, not just policies

Medium Severity

extractPolicyActionDescription checks for isArchived in the request body without verifying the URL path contains /policies/. Any PATCH request from any resource (vendor, risk, etc.) that includes isArchived would incorrectly produce "Archived policy" or "Restored policy" in the audit log and suppress actual field change logging (since policyActionDesc being truthy causes changes = null).

Fix in Cursor Fix in Web

app: AuditLogEntityType.organization,
questionnaire: AuditLogEntityType.organization,
audit: null,
};
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing trust key in entity type mapping

Low Severity

RESOURCE_TO_ENTITY_TYPE maps portal to AuditLogEntityType.trust, but the permission system uses trust as the resource name (e.g., @RequirePermission('trust', 'read')). Since there's no trust key in the map, audit logs for trust portal endpoints will have null entity type. The same mismatch exists in RESOURCE_TO_PRISMA_MODEL.

Fix in Cursor Fix in Web

TrainingModule,
OrgChartModule,
EvidenceFormsModule,
RolesModule,
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AuditModule not imported in AppModule

High Severity

AuditModule registers AuditLogInterceptor as APP_INTERCEPTOR but is never imported in AppModule.imports, so the interceptor never runs and no audit logs are created for any API mutations. The entire audit logging feature for RBAC v1 is non-functional.

Additional Locations (1)

Fix in Cursor Fix in Web

// App access resources
app: ['read'], // Main app access
trust: ['read', 'update'], // Trust center access
} as const;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing cloud-security resource in permission statement

High Severity

The cloud-security resource is used in @RequirePermission decorators and service token permissions but not defined in the permission statement. This causes PermissionGuard to fail permission checks for all cloud security endpoints because better-auth's hasPermission API doesn't recognize cloud-security as a valid resource.

Additional Locations (1)

Fix in Cursor Fix in Web

// App access resources
app: ['read'], // Main app access
trust: ['read', 'update'], // Trust center access
} as const;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing training resource in permission statement

High Severity

The training resource is used in @RequirePermission decorators and the Portal service token permissions but not defined in the permission statement. Permission checks for training endpoints will fail when better-auth's hasPermission API rejects the undefined resource.

Additional Locations (1)

Fix in Cursor Fix in Web

}

return null;
}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment updates create incorrect audit logs

Medium Severity

The extractCommentContext function handles POST and DELETE for comments but not PUT. When comments are updated via PUT /comments/:commentId, the audit log incorrectly records "Updated task" with entityId set to the comment ID instead of the parent entity (policy/vendor/risk/task) that the comment belongs to, creating misleading audit trails.

Additional Locations (1)

Fix in Cursor Fix in Web

encryptedCredentials[key] = value
.filter(Boolean)
.map((item) => this.encrypt(item));
}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Array credentials not validated before encryption

Medium Severity

The connectLegacy method encrypts array credential values without validating that items are strings. The encrypt method expects a string parameter, but array items are only filtered for truthiness. If non-string values like numbers or objects are passed in credential arrays (e.g., regions: [123, 456]), cipher.update() throws a TypeError when attempting to encrypt them.

Additional Locations (1)

Fix in Cursor Fix in Web

app: AuditLogEntityType.organization,
questionnaire: AuditLogEntityType.organization,
audit: null,
};
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing entity types for audited resources

Low Severity

The RESOURCE_TO_ENTITY_TYPE map is missing entries for cloud-security and training resources that are used in @RequirePermission decorators. Audit logs for these endpoints will have entityType: null, making it difficult to filter and query audit history for cloud security and training operations.

Additional Locations (1)

Fix in Cursor Fix in Web

Copy link

@cursor cursor bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes and found 2 potential issues.

Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

TrainingModule,
OrgChartModule,
EvidenceFormsModule,
RolesModule,
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AuditModule not imported, interceptor never activates

High Severity

The AuditModule is defined and registers AuditLogInterceptor as a global APP_INTERCEPTOR, but it is never imported in AppModule. The RolesModule was added to the imports array, but AuditModule was not. This means the entire audit logging infrastructure (interceptor, change tracking, comment logging, version descriptions) will silently do nothing at runtime.

Additional Locations (1)

Fix in Cursor Fix in Web

}

return null;
}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Audit description wrongly applies to non-policy resources

Medium Severity

extractPolicyActionDescription checks for isArchived in the request body and \/regenerate in the path without verifying the resource is actually a policy. Any PATCH request with an isArchived field (e.g., on a vendor or framework) would produce an incorrect "Archived policy" or "Restored policy" description, and its real field changes would be suppressed.

Fix in Cursor Fix in Web

Copy link

@cursor cursor bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes and found 5 potential issues.

Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

OrgChartModule,
EvidenceFormsModule,
FrameworksModule,
RolesModule,
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AuditModule never imported, audit logging interceptor inactive

High Severity

The AuditModule is defined with APP_INTERCEPTOR to register AuditLogInterceptor globally, but it's never imported by AppModule or any other module. This means the entire audit logging interceptor — including all the change tracking, comment logging, and policy version descriptions — is completely inert. No mutations will be audit-logged.

Additional Locations (1)

Fix in Cursor Fix in Web

request.userRoles = userRoles;
request.organizationId = explicitOrgId;
request.authType = 'jwt';
request.organizationId = organizationId ?? '';
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Empty organizationId breaks AuthContext decorator for SkipOrgCheck routes

High Severity

When skipOrgCheck is true and the user has no active organization, organizationId is set to '' (empty string). The AuthContext decorator then checks if (!organizationId), which evaluates to true for an empty string, causing it to throw. This breaks the /auth/me endpoint for users during onboarding who haven't selected an organization yet.

Additional Locations (2)

Fix in Cursor Fix in Web

request.organizationId = explicitOrgId;
request.authType = 'jwt';
request.organizationId = organizationId ?? '';
request.authType = 'session';
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isPlatformAdmin unset for session auth without active org

Low Severity

When skipOrgCheck is true and there's no active organizationId, the if (organizationId) block is skipped and request.isPlatformAdmin is never set. The TypeScript interface declares it as boolean, but at runtime it will be undefined. Both isApiKey and isServiceToken paths properly set it to false, but the session-without-org path doesn't.

Fix in Cursor Fix in Web

app: AuditLogEntityType.organization,
questionnaire: AuditLogEntityType.organization,
audit: null,
};
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RESOURCE_TO_ENTITY_TYPE missing trust key for audit logging

Medium Severity

The RESOURCE_TO_ENTITY_TYPE map uses portal as the key for AuditLogEntityType.trust, but controllers use @RequirePermission('trust', ...) as the resource name. Since there's no trust key in the map, audit logs for trust-portal mutations will have entityType: null instead of the expected trust entity type.

Fix in Cursor Fix in Web

// PATCH /v1/policies/:id with isArchived field
if (method === 'PATCH' && requestBody && 'isArchived' in requestBody) {
return requestBody.isArchived ? 'Archived policy' : 'Restored policy';
}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

extractPolicyActionDescription matches isArchived on any resource

Medium Severity

extractPolicyActionDescription checks for isArchived in the request body without verifying the URL path contains policies. Any PATCH request to any resource that includes isArchived in the body will produce an "Archived policy" or "Restored policy" audit description, even for non-policy resources. The path parameter is available but not used for this check.

Fix in Cursor Fix in Web

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant