mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-02-20 09:24:10 +01:00
* chore: move database model methods to /packages/data-schemas * chore: add TypeScript ESLint rule to warn on unused variables * refactor: model imports to streamline access - Consolidated model imports across various files to improve code organization and reduce redundancy. - Updated imports for models such as Assistant, Message, Conversation, and others to a unified import path. - Adjusted middleware and service files to reflect the new import structure, ensuring functionality remains intact. - Enhanced test files to align with the new import paths, maintaining test coverage and integrity. * chore: migrate database models to packages/data-schemas and refactor all direct Mongoose Model usage outside of data-schemas * test: update agent model mocks in unit tests - Added `getAgent` mock to `client.test.js` to enhance test coverage for agent-related functionality. - Removed redundant `getAgent` and `getAgents` mocks from `openai.spec.js` and `responses.unit.spec.js` to streamline test setup and reduce duplication. - Ensured consistency in agent mock implementations across test files. * fix: update types in data-schemas * refactor: enhance type definitions in transaction and spending methods - Updated type definitions in `checkBalance.ts` to use specific request and response types. - Refined `spendTokens.ts` to utilize a new `SpendTxData` interface for better clarity and type safety. - Improved transaction handling in `transaction.ts` by introducing `TransactionResult` and `TxData` interfaces, ensuring consistent data structures across methods. - Adjusted unit tests in `transaction.spec.ts` to accommodate new type definitions and enhance robustness. * refactor: streamline model imports and enhance code organization - Consolidated model imports across various controllers and services to a unified import path, improving code clarity and reducing redundancy. - Updated multiple files to reflect the new import structure, ensuring all functionalities remain intact. - Enhanced overall code organization by removing duplicate import statements and optimizing the usage of model methods. * feat: implement loadAddedAgent and refactor agent loading logic - Introduced `loadAddedAgent` function to handle loading agents from added conversations, supporting multi-convo parallel execution. - Created a new `load.ts` file to encapsulate agent loading functionalities, including `loadEphemeralAgent` and `loadAgent`. - Updated the `index.ts` file to export the new `load` module instead of the deprecated `loadAgent`. - Enhanced type definitions and improved error handling in the agent loading process. - Adjusted unit tests to reflect changes in the agent loading structure and ensure comprehensive coverage. * refactor: enhance balance handling with new update interface - Introduced `IBalanceUpdate` interface to streamline balance update operations across the codebase. - Updated `upsertBalanceFields` method signatures in `balance.ts`, `transaction.ts`, and related tests to utilize the new interface for improved type safety. - Adjusted type imports in `balance.spec.ts` to include `IBalanceUpdate`, ensuring consistency in balance management functionalities. - Enhanced overall code clarity and maintainability by refining type definitions related to balance operations. * feat: add unit tests for loadAgent functionality and enhance agent loading logic - Introduced comprehensive unit tests for the `loadAgent` function, covering various scenarios including null and empty agent IDs, loading of ephemeral agents, and permission checks. - Enhanced the `initializeClient` function by moving `getConvoFiles` to the correct position in the database method exports, ensuring proper functionality. - Improved test coverage for agent loading, including handling of non-existent agents and user permissions. * chore: reorder memory method exports for consistency - Moved `deleteAllUserMemories` to the correct position in the exported memory methods, ensuring a consistent and logical order of method exports in `memory.ts`.
131 lines
4.3 KiB
JavaScript
131 lines
4.3 KiB
JavaScript
const { logger } = require('@librechat/data-schemas');
|
|
const { PermissionBits, ResourceType } = require('librechat-data-provider');
|
|
const { checkPermission } = require('~/server/services/PermissionService');
|
|
const { getAgent } = require('~/models');
|
|
|
|
/**
|
|
* Checks if a user has access to multiple files through a shared agent (batch operation)
|
|
* @param {Object} params - Parameters object
|
|
* @param {string} params.userId - The user ID to check access for
|
|
* @param {string} [params.role] - Optional user role to avoid DB query
|
|
* @param {string[]} params.fileIds - Array of file IDs to check
|
|
* @param {string} params.agentId - The agent ID that might grant access
|
|
* @param {boolean} [params.isDelete] - Whether the operation is a delete operation
|
|
* @returns {Promise<Map<string, boolean>>} Map of fileId to access status
|
|
*/
|
|
const hasAccessToFilesViaAgent = async ({ userId, role, fileIds, agentId, isDelete }) => {
|
|
const accessMap = new Map();
|
|
|
|
// Initialize all files as no access
|
|
fileIds.forEach((fileId) => accessMap.set(fileId, false));
|
|
|
|
try {
|
|
const agent = await getAgent({ id: agentId });
|
|
|
|
if (!agent) {
|
|
return accessMap;
|
|
}
|
|
|
|
// Check if user is the author - if so, grant access to all files
|
|
if (agent.author.toString() === userId.toString()) {
|
|
fileIds.forEach((fileId) => accessMap.set(fileId, true));
|
|
return accessMap;
|
|
}
|
|
|
|
// Check if user has at least VIEW permission on the agent
|
|
const hasViewPermission = await checkPermission({
|
|
userId,
|
|
role,
|
|
resourceType: ResourceType.AGENT,
|
|
resourceId: agent._id,
|
|
requiredPermission: PermissionBits.VIEW,
|
|
});
|
|
|
|
if (!hasViewPermission) {
|
|
return accessMap;
|
|
}
|
|
|
|
if (isDelete) {
|
|
// Check if user has EDIT permission (which would indicate collaborative access)
|
|
const hasEditPermission = await checkPermission({
|
|
userId,
|
|
role,
|
|
resourceType: ResourceType.AGENT,
|
|
resourceId: agent._id,
|
|
requiredPermission: PermissionBits.EDIT,
|
|
});
|
|
|
|
// If user only has VIEW permission, they can't access files
|
|
// Only users with EDIT permission or higher can access agent files
|
|
if (!hasEditPermission) {
|
|
return accessMap;
|
|
}
|
|
}
|
|
|
|
const attachedFileIds = new Set();
|
|
if (agent.tool_resources) {
|
|
for (const [_resourceType, resource] of Object.entries(agent.tool_resources)) {
|
|
if (resource?.file_ids && Array.isArray(resource.file_ids)) {
|
|
resource.file_ids.forEach((fileId) => attachedFileIds.add(fileId));
|
|
}
|
|
}
|
|
}
|
|
|
|
// Grant access only to files that are attached to this agent
|
|
fileIds.forEach((fileId) => {
|
|
if (attachedFileIds.has(fileId)) {
|
|
accessMap.set(fileId, true);
|
|
}
|
|
});
|
|
|
|
return accessMap;
|
|
} catch (error) {
|
|
logger.error('[hasAccessToFilesViaAgent] Error checking file access:', error);
|
|
return accessMap;
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Filter files based on user access through agents
|
|
* @param {Object} params - Parameters object
|
|
* @param {Array<MongoFile>} params.files - Array of file documents
|
|
* @param {string} params.userId - User ID for access control
|
|
* @param {string} [params.role] - Optional user role to avoid DB query
|
|
* @param {string} params.agentId - Agent ID that might grant access to files
|
|
* @returns {Promise<Array<MongoFile>>} Filtered array of accessible files
|
|
*/
|
|
const filterFilesByAgentAccess = async ({ files, userId, role, agentId }) => {
|
|
if (!userId || !agentId || !files || files.length === 0) {
|
|
return files;
|
|
}
|
|
|
|
// Separate owned files from files that need access check
|
|
const filesToCheck = [];
|
|
const ownedFiles = [];
|
|
|
|
for (const file of files) {
|
|
if (file.user && file.user.toString() === userId.toString()) {
|
|
ownedFiles.push(file);
|
|
} else {
|
|
filesToCheck.push(file);
|
|
}
|
|
}
|
|
|
|
if (filesToCheck.length === 0) {
|
|
return ownedFiles;
|
|
}
|
|
|
|
// Batch check access for all non-owned files
|
|
const fileIds = filesToCheck.map((f) => f.file_id);
|
|
const accessMap = await hasAccessToFilesViaAgent({ userId, role, fileIds, agentId });
|
|
|
|
// Filter files based on access
|
|
const accessibleFiles = filesToCheck.filter((file) => accessMap.get(file.file_id));
|
|
|
|
return [...ownedFiles, ...accessibleFiles];
|
|
};
|
|
|
|
module.exports = {
|
|
hasAccessToFilesViaAgent,
|
|
filterFilesByAgentAccess,
|
|
};
|