mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-03-26 09:36:33 +01:00
🪦 fix: ACL-Safe User Account Deletion for Agents, Prompts, and MCP Servers (#12314)
* fix: use ACL ownership for prompt group cleanup on user deletion deleteUserPrompts previously called getAllPromptGroups with only an author filter, which defaults to searchShared=true and drops the author filter for shared/global project entries. This caused any user deleting their account to strip shared prompt group associations and ACL entries for other users. Replace the author-based query with ACL-based ownership lookup: - Find prompt groups where the user has OWNER permission (DELETE bit) - Only delete groups where the user is the sole owner - Preserve multi-owned groups and their ACL entries for other owners * fix: use ACL ownership for agent cleanup on user deletion deleteUserAgents used the deprecated author field to find and delete agents, then unconditionally removed all ACL entries for those agents. This could destroy ACL entries for agents shared with or co-owned by other users. Replace the author-based query with ACL-based ownership lookup: - Find agents where the user has OWNER permission (DELETE bit) - Only delete agents where the user is the sole owner - Preserve multi-owned agents and their ACL entries for other owners - Also clean up handoff edges referencing deleted agents * fix: add MCP server cleanup on user deletion User deletion had no cleanup for MCP servers, leaving solely-owned servers orphaned in the database with dangling ACL entries for other users. Add deleteUserMcpServers that follows the same ACL ownership pattern as prompt groups and agents: find servers with OWNER permission, check for sole ownership, and only delete those with no other owners. * style: fix prettier formatting in Prompt.spec.js * refactor: extract getSoleOwnedResourceIds to PermissionService The ACL sole-ownership detection algorithm was duplicated across deleteUserPrompts, deleteUserAgents, and deleteUserMcpServers. Centralizes the three-step pattern (find owned entries, find other owners, compute sole-owned set) into a single reusable utility. * refactor: use getSoleOwnedResourceIds in all deletion functions - Replace inline ACL queries with the centralized utility - Remove vestigial _req parameter from deleteUserPrompts - Use Promise.all for parallel project removal instead of sequential awaits - Disconnect live MCP sessions and invalidate tool cache before deleting sole-owned MCP server documents - Export deleteUserMcpServers for testability * test: improve deletion test coverage and quality - Move deleteUserPrompts call to beforeAll to eliminate execution-order dependency between tests - Standardize on test() instead of it() for consistency in Prompt.spec.js - Add assertion for deleting user's own ACL entry preservation on multi-owned agents - Add deleteUserMcpServers integration test suite with 6 tests covering sole-owner deletion, multi-owner preservation, session disconnect, cache invalidation, model-not-registered guard, and missing MCPManager - Add PermissionService mock to existing deleteUser.spec.js to fix import chain * fix: add legacy author-based fallback for unmigrated resources Resources created before the ACL system have author set but no AclEntry records. The sole-ownership detection returns empty for these, causing deleteUserPrompts, deleteUserAgents, and deleteUserMcpServers to silently skip them — permanently orphaning data on user deletion. Add a fallback that identifies author-owned resources with zero ACL entries (truly unmigrated) and includes them in the deletion set. This preserves the multi-owner safety of the ACL path while ensuring pre-ACL resources are still cleaned up regardless of migration status. * style: fix prettier formatting across all changed files * test: add resource type coverage guard for user deletion Ensures every ResourceType in the ACL system has a corresponding cleanup handler wired into deleteUserController. When a new ResourceType is added (e.g. WORKFLOW), this test fails immediately, preventing silent data orphaning on user account deletion. * style: fix import order in PermissionService destructure * test: add opt-out set and fix test lifecycle in coverage guard Add NO_USER_CLEANUP_NEEDED set for resource types that legitimately require no per-user deletion. Move fs.readFileSync into beforeAll so path errors surface as clean test failures instead of unhandled crashes.
This commit is contained in:
Danny Avila
GitHub
parent
f380390408
commit
1ecff83b20
9 changed files with 993 additions and 60 deletions
|
|
@ -561,4 +561,231 @@ describe('Prompt ACL Permissions', () => {
|
|||
expect(prompt._id.toString()).toBe(legacyPrompt._id.toString());
|
||||
});
|
||||
});
|
||||
|
||||
describe('deleteUserPrompts', () => {
|
||||
let deletingUser;
|
||||
let otherUser;
|
||||
let soleOwnedGroup;
|
||||
let multiOwnedGroup;
|
||||
let sharedGroup;
|
||||
let soleOwnedPrompt;
|
||||
let multiOwnedPrompt;
|
||||
let sharedPrompt;
|
||||
|
||||
beforeAll(async () => {
|
||||
deletingUser = await User.create({
|
||||
name: 'Deleting User',
|
||||
email: 'deleting@example.com',
|
||||
role: SystemRoles.USER,
|
||||
});
|
||||
otherUser = await User.create({
|
||||
name: 'Other User',
|
||||
email: 'other@example.com',
|
||||
role: SystemRoles.USER,
|
||||
});
|
||||
|
||||
const soleProductionId = new ObjectId();
|
||||
soleOwnedGroup = await PromptGroup.create({
|
||||
name: 'Sole Owned Group',
|
||||
author: deletingUser._id,
|
||||
authorName: deletingUser.name,
|
||||
productionId: soleProductionId,
|
||||
});
|
||||
soleOwnedPrompt = await Prompt.create({
|
||||
prompt: 'Sole owned prompt',
|
||||
author: deletingUser._id,
|
||||
groupId: soleOwnedGroup._id,
|
||||
type: 'text',
|
||||
});
|
||||
await PromptGroup.updateOne(
|
||||
{ _id: soleOwnedGroup._id },
|
||||
{ productionId: soleOwnedPrompt._id },
|
||||
);
|
||||
|
||||
const multiProductionId = new ObjectId();
|
||||
multiOwnedGroup = await PromptGroup.create({
|
||||
name: 'Multi Owned Group',
|
||||
author: deletingUser._id,
|
||||
authorName: deletingUser.name,
|
||||
productionId: multiProductionId,
|
||||
});
|
||||
multiOwnedPrompt = await Prompt.create({
|
||||
prompt: 'Multi owned prompt',
|
||||
author: deletingUser._id,
|
||||
groupId: multiOwnedGroup._id,
|
||||
type: 'text',
|
||||
});
|
||||
await PromptGroup.updateOne(
|
||||
{ _id: multiOwnedGroup._id },
|
||||
{ productionId: multiOwnedPrompt._id },
|
||||
);
|
||||
|
||||
const sharedProductionId = new ObjectId();
|
||||
sharedGroup = await PromptGroup.create({
|
||||
name: 'Shared Group (other user owns)',
|
||||
author: otherUser._id,
|
||||
authorName: otherUser.name,
|
||||
productionId: sharedProductionId,
|
||||
});
|
||||
sharedPrompt = await Prompt.create({
|
||||
prompt: 'Shared prompt',
|
||||
author: otherUser._id,
|
||||
groupId: sharedGroup._id,
|
||||
type: 'text',
|
||||
});
|
||||
await PromptGroup.updateOne({ _id: sharedGroup._id }, { productionId: sharedPrompt._id });
|
||||
|
||||
await permissionService.grantPermission({
|
||||
principalType: PrincipalType.USER,
|
||||
principalId: deletingUser._id,
|
||||
resourceType: ResourceType.PROMPTGROUP,
|
||||
resourceId: soleOwnedGroup._id,
|
||||
accessRoleId: AccessRoleIds.PROMPTGROUP_OWNER,
|
||||
grantedBy: deletingUser._id,
|
||||
});
|
||||
|
||||
await permissionService.grantPermission({
|
||||
principalType: PrincipalType.USER,
|
||||
principalId: deletingUser._id,
|
||||
resourceType: ResourceType.PROMPTGROUP,
|
||||
resourceId: multiOwnedGroup._id,
|
||||
accessRoleId: AccessRoleIds.PROMPTGROUP_OWNER,
|
||||
grantedBy: deletingUser._id,
|
||||
});
|
||||
await permissionService.grantPermission({
|
||||
principalType: PrincipalType.USER,
|
||||
principalId: otherUser._id,
|
||||
resourceType: ResourceType.PROMPTGROUP,
|
||||
resourceId: multiOwnedGroup._id,
|
||||
accessRoleId: AccessRoleIds.PROMPTGROUP_OWNER,
|
||||
grantedBy: otherUser._id,
|
||||
});
|
||||
|
||||
await permissionService.grantPermission({
|
||||
principalType: PrincipalType.USER,
|
||||
principalId: otherUser._id,
|
||||
resourceType: ResourceType.PROMPTGROUP,
|
||||
resourceId: sharedGroup._id,
|
||||
accessRoleId: AccessRoleIds.PROMPTGROUP_OWNER,
|
||||
grantedBy: otherUser._id,
|
||||
});
|
||||
await permissionService.grantPermission({
|
||||
principalType: PrincipalType.USER,
|
||||
principalId: deletingUser._id,
|
||||
resourceType: ResourceType.PROMPTGROUP,
|
||||
resourceId: sharedGroup._id,
|
||||
accessRoleId: AccessRoleIds.PROMPTGROUP_VIEWER,
|
||||
grantedBy: otherUser._id,
|
||||
});
|
||||
|
||||
const globalProject = await Project.findOne({ name: 'Global' });
|
||||
await Project.updateOne(
|
||||
{ _id: globalProject._id },
|
||||
{
|
||||
$addToSet: {
|
||||
promptGroupIds: {
|
||||
$each: [soleOwnedGroup._id, multiOwnedGroup._id, sharedGroup._id],
|
||||
},
|
||||
},
|
||||
},
|
||||
);
|
||||
|
||||
await promptFns.deleteUserPrompts(deletingUser._id.toString());
|
||||
});
|
||||
|
||||
test('should delete solely-owned prompt groups and their prompts', async () => {
|
||||
expect(await PromptGroup.findById(soleOwnedGroup._id)).toBeNull();
|
||||
expect(await Prompt.findById(soleOwnedPrompt._id)).toBeNull();
|
||||
});
|
||||
|
||||
test('should remove solely-owned groups from projects', async () => {
|
||||
const globalProject = await Project.findOne({ name: 'Global' });
|
||||
const projectGroupIds = globalProject.promptGroupIds.map((id) => id.toString());
|
||||
expect(projectGroupIds).not.toContain(soleOwnedGroup._id.toString());
|
||||
});
|
||||
|
||||
test('should remove all ACL entries for solely-owned groups', async () => {
|
||||
const aclEntries = await AclEntry.find({
|
||||
resourceType: ResourceType.PROMPTGROUP,
|
||||
resourceId: soleOwnedGroup._id,
|
||||
});
|
||||
expect(aclEntries).toHaveLength(0);
|
||||
});
|
||||
|
||||
test('should preserve multi-owned prompt groups', async () => {
|
||||
expect(await PromptGroup.findById(multiOwnedGroup._id)).not.toBeNull();
|
||||
expect(await Prompt.findById(multiOwnedPrompt._id)).not.toBeNull();
|
||||
});
|
||||
|
||||
test('should preserve ACL entries of other owners on multi-owned groups', async () => {
|
||||
const otherOwnerAcl = await AclEntry.findOne({
|
||||
resourceType: ResourceType.PROMPTGROUP,
|
||||
resourceId: multiOwnedGroup._id,
|
||||
principalId: otherUser._id,
|
||||
});
|
||||
expect(otherOwnerAcl).not.toBeNull();
|
||||
expect(otherOwnerAcl.permBits & PermissionBits.DELETE).toBeTruthy();
|
||||
});
|
||||
|
||||
test('should preserve groups owned by other users', async () => {
|
||||
expect(await PromptGroup.findById(sharedGroup._id)).not.toBeNull();
|
||||
expect(await Prompt.findById(sharedPrompt._id)).not.toBeNull();
|
||||
});
|
||||
|
||||
test('should preserve project membership of non-deleted groups', async () => {
|
||||
const globalProject = await Project.findOne({ name: 'Global' });
|
||||
const projectGroupIds = globalProject.promptGroupIds.map((id) => id.toString());
|
||||
expect(projectGroupIds).toContain(multiOwnedGroup._id.toString());
|
||||
expect(projectGroupIds).toContain(sharedGroup._id.toString());
|
||||
});
|
||||
|
||||
test('should preserve ACL entries for shared group owned by other user', async () => {
|
||||
const ownerAcl = await AclEntry.findOne({
|
||||
resourceType: ResourceType.PROMPTGROUP,
|
||||
resourceId: sharedGroup._id,
|
||||
principalId: otherUser._id,
|
||||
});
|
||||
expect(ownerAcl).not.toBeNull();
|
||||
});
|
||||
|
||||
test('should be a no-op when user has no owned prompt groups', async () => {
|
||||
const unrelatedUser = await User.create({
|
||||
name: 'Unrelated User',
|
||||
email: 'unrelated@example.com',
|
||||
role: SystemRoles.USER,
|
||||
});
|
||||
|
||||
const beforeCount = await PromptGroup.countDocuments();
|
||||
await promptFns.deleteUserPrompts(unrelatedUser._id.toString());
|
||||
const afterCount = await PromptGroup.countDocuments();
|
||||
|
||||
expect(afterCount).toBe(beforeCount);
|
||||
});
|
||||
|
||||
test('should delete legacy prompt groups that have author but no ACL entries', async () => {
|
||||
const legacyUser = await User.create({
|
||||
name: 'Legacy User',
|
||||
email: 'legacy-prompt@example.com',
|
||||
role: SystemRoles.USER,
|
||||
});
|
||||
|
||||
const legacyGroup = await PromptGroup.create({
|
||||
name: 'Legacy Group (no ACL)',
|
||||
author: legacyUser._id,
|
||||
authorName: legacyUser.name,
|
||||
productionId: new ObjectId(),
|
||||
});
|
||||
const legacyPrompt = await Prompt.create({
|
||||
prompt: 'Legacy prompt text',
|
||||
author: legacyUser._id,
|
||||
groupId: legacyGroup._id,
|
||||
type: 'text',
|
||||
});
|
||||
|
||||
await promptFns.deleteUserPrompts(legacyUser._id.toString());
|
||||
|
||||
expect(await PromptGroup.findById(legacyGroup._id)).toBeNull();
|
||||
expect(await Prompt.findById(legacyPrompt._id)).toBeNull();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue