mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-16 16:30:15 +01:00
* Feature: Dynamic MCP Server with Full UI Management * 🚦 feat: Add MCP Connection Status icons to MCPBuilder panel (#10805) * feature: Add MCP server connection status icons to MCPBuilder panel * refactor: Simplify MCPConfigDialog rendering in MCPBuilderPanel --------- Co-authored-by: Atef Bellaaj <slalom.bellaaj@external.daimlertruck.com> Co-authored-by: Danny Avila <danny@librechat.ai> * fix: address code review feedback for MCP server management - Fix OAuth secret preservation to avoid mutating input parameter by creating a merged config copy in ServerConfigsDB.update() - Improve error handling in getResourcePermissionsMap to propagate critical errors instead of silently returning empty Map - Extract duplicated MCP server filter logic by exposing selectableServers from useMCPServerManager hook and using it in MCPSelect component * test: Update PermissionService tests to throw errors on invalid resource types - Changed the test for handling invalid resource types to ensure it throws an error instead of returning an empty permissions map. - Updated the expectation to check for the specific error message when an invalid resource type is provided. * feat: Implement retry logic for MCP server creation to handle race conditions - Enhanced the createMCPServer method to include retry logic with exponential backoff for handling duplicate key errors during concurrent server creation. - Updated tests to verify that all concurrent requests succeed and that unique server names are generated. - Added a helper function to identify MongoDB duplicate key errors, improving error handling during server creation. * refactor: StatusIcon to use CircleCheck for connected status - Replaced the PlugZap icon with CircleCheck in the ConnectedStatusIcon component to better represent the connected state. - Ensured consistent icon usage across the component for improved visual clarity. * test: Update AccessControlService tests to throw errors on invalid resource types - Modified the test for invalid resource types to ensure it throws an error with a specific message instead of returning an empty permissions map. - This change enhances error handling and improves test coverage for the AccessControlService. * fix: Update error message for missing server name in MCP server retrieval - Changed the error message returned when the server name is not provided from 'MCP ID is required' to 'Server name is required' for better clarity and accuracy in the API response. --------- Co-authored-by: Atef Bellaaj <slalom.bellaaj@external.daimlertruck.com> Co-authored-by: Danny Avila <danny@librechat.ai>
163 lines
4.7 KiB
JavaScript
163 lines
4.7 KiB
JavaScript
const express = require('express');
|
|
const {
|
|
SystemRoles,
|
|
roleDefaults,
|
|
PermissionTypes,
|
|
agentPermissionsSchema,
|
|
promptPermissionsSchema,
|
|
memoryPermissionsSchema,
|
|
marketplacePermissionsSchema,
|
|
peoplePickerPermissionsSchema,
|
|
mcpServersPermissionsSchema,
|
|
} = require('librechat-data-provider');
|
|
const { checkAdmin, requireJwtAuth } = require('~/server/middleware');
|
|
const { updateRoleByName, getRoleByName } = require('~/models/Role');
|
|
|
|
const router = express.Router();
|
|
router.use(requireJwtAuth);
|
|
|
|
/**
|
|
* Permission configuration mapping
|
|
* Maps route paths to their corresponding schemas and permission types
|
|
*/
|
|
const permissionConfigs = {
|
|
prompts: {
|
|
schema: promptPermissionsSchema,
|
|
permissionType: PermissionTypes.PROMPTS,
|
|
errorMessage: 'Invalid prompt permissions.',
|
|
},
|
|
agents: {
|
|
schema: agentPermissionsSchema,
|
|
permissionType: PermissionTypes.AGENTS,
|
|
errorMessage: 'Invalid agent permissions.',
|
|
},
|
|
memories: {
|
|
schema: memoryPermissionsSchema,
|
|
permissionType: PermissionTypes.MEMORIES,
|
|
errorMessage: 'Invalid memory permissions.',
|
|
},
|
|
'people-picker': {
|
|
schema: peoplePickerPermissionsSchema,
|
|
permissionType: PermissionTypes.PEOPLE_PICKER,
|
|
errorMessage: 'Invalid people picker permissions.',
|
|
},
|
|
'mcp-servers': {
|
|
schema: mcpServersPermissionsSchema,
|
|
permissionType: PermissionTypes.MCP_SERVERS,
|
|
errorMessage: 'Invalid MCP servers permissions.',
|
|
},
|
|
marketplace: {
|
|
schema: marketplacePermissionsSchema,
|
|
permissionType: PermissionTypes.MARKETPLACE,
|
|
errorMessage: 'Invalid marketplace permissions.',
|
|
},
|
|
};
|
|
|
|
/**
|
|
* Generic handler for updating permissions
|
|
* @param {string} permissionKey - The key from permissionConfigs
|
|
* @returns {Function} Express route handler
|
|
*/
|
|
const createPermissionUpdateHandler = (permissionKey) => {
|
|
const config = permissionConfigs[permissionKey];
|
|
|
|
return async (req, res) => {
|
|
const { roleName: _r } = req.params;
|
|
// TODO: TEMP, use a better parsing for roleName
|
|
const roleName = _r.toUpperCase();
|
|
const updates = req.body;
|
|
|
|
try {
|
|
const parsedUpdates = config.schema.partial().parse(updates);
|
|
|
|
const role = await getRoleByName(roleName);
|
|
if (!role) {
|
|
return res.status(404).send({ message: 'Role not found' });
|
|
}
|
|
|
|
const currentPermissions =
|
|
role.permissions?.[config.permissionType] || role[config.permissionType] || {};
|
|
|
|
const mergedUpdates = {
|
|
permissions: {
|
|
...role.permissions,
|
|
[config.permissionType]: {
|
|
...currentPermissions,
|
|
...parsedUpdates,
|
|
},
|
|
},
|
|
};
|
|
|
|
const updatedRole = await updateRoleByName(roleName, mergedUpdates);
|
|
res.status(200).send(updatedRole);
|
|
} catch (error) {
|
|
return res.status(400).send({ message: config.errorMessage, error: error.errors });
|
|
}
|
|
};
|
|
};
|
|
|
|
/**
|
|
* GET /api/roles/:roleName
|
|
* Get a specific role by name
|
|
*/
|
|
router.get('/:roleName', async (req, res) => {
|
|
const { roleName: _r } = req.params;
|
|
// TODO: TEMP, use a better parsing for roleName
|
|
const roleName = _r.toUpperCase();
|
|
|
|
if (
|
|
(req.user.role !== SystemRoles.ADMIN && roleName === SystemRoles.ADMIN) ||
|
|
(req.user.role !== SystemRoles.ADMIN && !roleDefaults[roleName])
|
|
) {
|
|
return res.status(403).send({ message: 'Unauthorized' });
|
|
}
|
|
|
|
try {
|
|
const role = await getRoleByName(roleName, '-_id -__v');
|
|
if (!role) {
|
|
return res.status(404).send({ message: 'Role not found' });
|
|
}
|
|
|
|
res.status(200).send(role);
|
|
} catch (error) {
|
|
return res.status(500).send({ message: 'Failed to retrieve role', error: error.message });
|
|
}
|
|
});
|
|
|
|
/**
|
|
* PUT /api/roles/:roleName/prompts
|
|
* Update prompt permissions for a specific role
|
|
*/
|
|
router.put('/:roleName/prompts', checkAdmin, createPermissionUpdateHandler('prompts'));
|
|
|
|
/**
|
|
* PUT /api/roles/:roleName/agents
|
|
* Update agent permissions for a specific role
|
|
*/
|
|
router.put('/:roleName/agents', checkAdmin, createPermissionUpdateHandler('agents'));
|
|
|
|
/**
|
|
* PUT /api/roles/:roleName/memories
|
|
* Update memory permissions for a specific role
|
|
*/
|
|
router.put('/:roleName/memories', checkAdmin, createPermissionUpdateHandler('memories'));
|
|
|
|
/**
|
|
* PUT /api/roles/:roleName/people-picker
|
|
* Update people picker permissions for a specific role
|
|
*/
|
|
router.put('/:roleName/people-picker', checkAdmin, createPermissionUpdateHandler('people-picker'));
|
|
|
|
/**
|
|
* PUT /api/roles/:roleName/mcp-servers
|
|
* Update MCP servers permissions for a specific role
|
|
*/
|
|
router.put('/:roleName/mcp-servers', checkAdmin, createPermissionUpdateHandler('mcp-servers'));
|
|
|
|
/**
|
|
* PUT /api/roles/:roleName/marketplace
|
|
* Update marketplace permissions for a specific role
|
|
*/
|
|
router.put('/:roleName/marketplace', checkAdmin, createPermissionUpdateHandler('marketplace'));
|
|
|
|
module.exports = router;
|