CERBERUS/LibreChat
1
0
Fork 0
mirror of https://github.com/danny-avila/LibreChat.git synced 2026-10-21 17:44:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

♻️ refactor: extract filterByBitsAndDedup helper for ACL reads

Browse source 
`findAccessibleResources` and `findPublicResourceIds` each inlined the
same bitmask-filter + `Map`-based dedup loop. Lift it into a private
`filterByBitsAndDedup(entries, requiredBits)` helper so the Cosmos-DB
compatible pattern lives in one place. Pure rename/extract — no
behavior change.

Refs #12729.
This commit is contained in:
Danny Avila 2026-04-18 11:25:20 -04:00
parent 6fe4a1cda0
commit 75cd652b69
1 changed files with 25 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

47
packages/data-schemas/src/methods/aclEntry.ts
View file

@ -10,6 +10,29 @@ import type {
import type { AclEntry, IAclEntry } from '~/types';
import { tenantSafeBulkWrite } from '~/utils/tenantBulkWrite';
/**
* Filter entries by a required permission bitmask and deduplicate by resourceId,
* preserving the first-seen `Types.ObjectId` instance. Used in place of
* `$bitsAllSet` for compatibility with MongoDB forks (e.g. Azure Cosmos DB for
* MongoDB) that do not implement the `$bitsAllSet` query operator.
*/
function filterByBitsAndDedup(
entries: Array<{ resourceId: Types.ObjectId; permBits: number }>,
requiredBits: number,
): Types.ObjectId[] {
const uniqueIds = new Map<string, Types.ObjectId>();
for (const entry of entries) {
if ((entry.permBits & requiredBits) !== requiredBits) {
continue;
}
const key = entry.resourceId.toString();
if (!uniqueIds.has(key)) {
uniqueIds.set(key, entry.resourceId);
}
}
return Array.from(uniqueIds.values());
}
export function createAclEntryMethods(mongoose: typeof import('mongoose')) {
/**
* Find ACL entries for a specific principal (user or group)
@ -359,17 +382,7 @@ export function createAclEntryMethods(mongoose: typeof import('mongoose')) {
.select('resourceId permBits')
.lean();
const uniqueIds = new Map<string, Types.ObjectId>();
for (const entry of entries) {
if ((entry.permBits & requiredPermBit) !== requiredPermBit) {
continue;
}
const key = entry.resourceId.toString();
if (!uniqueIds.has(key)) {
uniqueIds.set(key, entry.resourceId);
}
}
return Array.from(uniqueIds.values());
return filterByBitsAndDedup(entries, requiredPermBit);
}
/**
@ -417,17 +430,7 @@ export function createAclEntryMethods(mongoose: typeof import('mongoose')) {
.select('resourceId permBits')
.lean();
const uniqueIds = new Map<string, Types.ObjectId>();
for (const entry of entries) {
if ((entry.permBits & requiredPermissions) !== requiredPermissions) {
continue;
}
const key = entry.resourceId.toString();
if (!uniqueIds.has(key)) {
uniqueIds.set(key, entry.resourceId);
}
}
return Array.from(uniqueIds.values());
return filterByBitsAndDedup(entries, requiredPermissions);
}
/**