mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-03-24 08:36:33 +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`.
193 lines
6.1 KiB
JavaScript
193 lines
6.1 KiB
JavaScript
const { logger } = require('@librechat/data-schemas');
|
|
const {
|
|
Constants,
|
|
Permissions,
|
|
ResourceType,
|
|
SystemRoles,
|
|
PermissionTypes,
|
|
isAgentsEndpoint,
|
|
isEphemeralAgentId,
|
|
} = require('librechat-data-provider');
|
|
const { checkPermission } = require('~/server/services/PermissionService');
|
|
const { canAccessResource } = require('./canAccessResource');
|
|
const db = require('~/models');
|
|
|
|
const { getRoleByName, getAgent } = db;
|
|
|
|
/**
|
|
* Resolves custom agent ID (e.g., "agent_abc123") to a MongoDB document.
|
|
* @param {string} agentCustomId - Custom agent ID from request body
|
|
* @returns {Promise<Object|null>} Agent document with _id field, or null if ephemeral/not found
|
|
*/
|
|
const resolveAgentIdFromBody = async (agentCustomId) => {
|
|
if (isEphemeralAgentId(agentCustomId)) {
|
|
return null;
|
|
}
|
|
return getAgent({ id: agentCustomId });
|
|
};
|
|
|
|
/**
|
|
* Creates a `canAccessResource` middleware for the given agent ID
|
|
* and chains to the provided continuation on success.
|
|
*
|
|
* @param {string} agentId - The agent's custom string ID (e.g., "agent_abc123")
|
|
* @param {number} requiredPermission - Permission bit(s) required
|
|
* @param {import('express').Request} req
|
|
* @param {import('express').Response} res - Written on deny; continuation called on allow
|
|
* @param {Function} continuation - Called when the permission check passes
|
|
* @returns {Promise<void>}
|
|
*/
|
|
const checkAgentResourceAccess = (agentId, requiredPermission, req, res, continuation) => {
|
|
const middleware = canAccessResource({
|
|
resourceType: ResourceType.AGENT,
|
|
requiredPermission,
|
|
resourceIdParam: 'agent_id',
|
|
idResolver: () => resolveAgentIdFromBody(agentId),
|
|
});
|
|
|
|
const tempReq = {
|
|
...req,
|
|
params: { ...req.params, agent_id: agentId },
|
|
};
|
|
|
|
return middleware(tempReq, res, continuation);
|
|
};
|
|
|
|
/**
|
|
* Middleware factory that validates MULTI_CONVO:USE role permission and, when
|
|
* addedConvo.agent_id is a non-ephemeral agent, the same resource-level permission
|
|
* required for the primary agent (`requiredPermission`). Caches the resolved agent
|
|
* document on `req.resolvedAddedAgent` to avoid a duplicate DB fetch in `loadAddedAgent`.
|
|
*
|
|
* @param {number} requiredPermission - Permission bit(s) to check on the added agent resource
|
|
* @returns {(req: import('express').Request, res: import('express').Response, next: Function) => Promise<void>}
|
|
*/
|
|
const checkAddedConvoAccess = (requiredPermission) => async (req, res, next) => {
|
|
const addedConvo = req.body?.addedConvo;
|
|
if (!addedConvo || typeof addedConvo !== 'object' || Array.isArray(addedConvo)) {
|
|
return next();
|
|
}
|
|
|
|
try {
|
|
if (!req.user?.role) {
|
|
return res.status(403).json({
|
|
error: 'Forbidden',
|
|
message: 'Insufficient permissions for multi-conversation',
|
|
});
|
|
}
|
|
|
|
if (req.user.role !== SystemRoles.ADMIN) {
|
|
const role = await getRoleByName(req.user.role);
|
|
const hasMultiConvo = role?.permissions?.[PermissionTypes.MULTI_CONVO]?.[Permissions.USE];
|
|
if (!hasMultiConvo) {
|
|
return res.status(403).json({
|
|
error: 'Forbidden',
|
|
message: 'Multi-conversation feature is not enabled',
|
|
});
|
|
}
|
|
}
|
|
|
|
const addedAgentId = addedConvo.agent_id;
|
|
if (!addedAgentId || typeof addedAgentId !== 'string' || isEphemeralAgentId(addedAgentId)) {
|
|
return next();
|
|
}
|
|
|
|
if (req.user.role === SystemRoles.ADMIN) {
|
|
return next();
|
|
}
|
|
|
|
const agent = await resolveAgentIdFromBody(addedAgentId);
|
|
if (!agent) {
|
|
return res.status(404).json({
|
|
error: 'Not Found',
|
|
message: `${ResourceType.AGENT} not found`,
|
|
});
|
|
}
|
|
|
|
const hasPermission = await checkPermission({
|
|
userId: req.user.id,
|
|
role: req.user.role,
|
|
resourceType: ResourceType.AGENT,
|
|
resourceId: agent._id,
|
|
requiredPermission,
|
|
});
|
|
|
|
if (!hasPermission) {
|
|
return res.status(403).json({
|
|
error: 'Forbidden',
|
|
message: `Insufficient permissions to access this ${ResourceType.AGENT}`,
|
|
});
|
|
}
|
|
|
|
req.resolvedAddedAgent = agent;
|
|
return next();
|
|
} catch (error) {
|
|
logger.error('Failed to validate addedConvo access permissions', error);
|
|
return res.status(500).json({
|
|
error: 'Internal Server Error',
|
|
message: 'Failed to validate addedConvo access permissions',
|
|
});
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Middleware factory that checks agent access permissions from request body.
|
|
* Validates both the primary agent_id and, when present, addedConvo.agent_id
|
|
* (which also requires MULTI_CONVO:USE role permission).
|
|
*
|
|
* @param {Object} options - Configuration options
|
|
* @param {number} options.requiredPermission - The permission bit required (1=view, 2=edit, 4=delete, 8=share)
|
|
* @returns {Function} Express middleware function
|
|
*
|
|
* @example
|
|
* router.post('/chat',
|
|
* canAccessAgentFromBody({ requiredPermission: PermissionBits.VIEW }),
|
|
* buildEndpointOption,
|
|
* chatController
|
|
* );
|
|
*/
|
|
const canAccessAgentFromBody = (options) => {
|
|
const { requiredPermission } = options;
|
|
|
|
if (!requiredPermission || typeof requiredPermission !== 'number') {
|
|
throw new Error('canAccessAgentFromBody: requiredPermission is required and must be a number');
|
|
}
|
|
|
|
const addedConvoMiddleware = checkAddedConvoAccess(requiredPermission);
|
|
|
|
return async (req, res, next) => {
|
|
try {
|
|
const { endpoint, agent_id } = req.body;
|
|
let agentId = agent_id;
|
|
|
|
if (!isAgentsEndpoint(endpoint)) {
|
|
agentId = Constants.EPHEMERAL_AGENT_ID;
|
|
}
|
|
|
|
if (!agentId) {
|
|
return res.status(400).json({
|
|
error: 'Bad Request',
|
|
message: 'agent_id is required in request body',
|
|
});
|
|
}
|
|
|
|
const afterPrimaryCheck = () => addedConvoMiddleware(req, res, next);
|
|
|
|
if (isEphemeralAgentId(agentId)) {
|
|
return afterPrimaryCheck();
|
|
}
|
|
|
|
return checkAgentResourceAccess(agentId, requiredPermission, req, res, afterPrimaryCheck);
|
|
} catch (error) {
|
|
logger.error('Failed to validate agent access permissions', error);
|
|
return res.status(500).json({
|
|
error: 'Internal Server Error',
|
|
message: 'Failed to validate agent access permissions',
|
|
});
|
|
}
|
|
};
|
|
};
|
|
|
|
module.exports = {
|
|
canAccessAgentFromBody,
|
|
};
|