mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-17 17:00:15 +01:00
🏗️ feat: Dynamic MCP Server Infrastructure with Access Control (#10787)
* 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>
This commit is contained in:
parent
41c0a96d39
commit
99f8bd2ce6
103 changed files with 7978 additions and 1003 deletions
|
|
@ -1,11 +1,18 @@
|
|||
const { Router } = require('express');
|
||||
const { logger } = require('@librechat/data-schemas');
|
||||
const { CacheKeys, Constants } = require('librechat-data-provider');
|
||||
const {
|
||||
CacheKeys,
|
||||
Constants,
|
||||
PermissionBits,
|
||||
PermissionTypes,
|
||||
Permissions,
|
||||
} = require('librechat-data-provider');
|
||||
const {
|
||||
createSafeUser,
|
||||
MCPOAuthHandler,
|
||||
MCPTokenStorage,
|
||||
getUserMCPAuthMap,
|
||||
generateCheckAccess,
|
||||
} = require('@librechat/api');
|
||||
const {
|
||||
getMCPManager,
|
||||
|
|
@ -14,15 +21,22 @@ const {
|
|||
getMCPServersRegistry,
|
||||
} = require('~/config');
|
||||
const { getMCPSetupData, getServerConnectionStatus } = require('~/server/services/MCP');
|
||||
const { requireJwtAuth, canAccessMCPServerResource } = require('~/server/middleware');
|
||||
const { findToken, updateToken, createToken, deleteTokens } = require('~/models');
|
||||
const { getUserPluginAuthValue } = require('~/server/services/PluginService');
|
||||
const { updateMCPServerTools } = require('~/server/services/Config/mcp');
|
||||
const { reinitMCPServer } = require('~/server/services/Tools/mcp');
|
||||
const { getMCPServersList } = require('~/server/controllers/mcp');
|
||||
const { getMCPTools } = require('~/server/controllers/mcp');
|
||||
const { requireJwtAuth } = require('~/server/middleware');
|
||||
const { findPluginAuthsByKeys } = require('~/models');
|
||||
const { getRoleByName } = require('~/models/Role');
|
||||
const { getLogStores } = require('~/cache');
|
||||
const {
|
||||
createMCPServerController,
|
||||
getMCPServerById,
|
||||
getMCPServersList,
|
||||
updateMCPServerController,
|
||||
deleteMCPServerController,
|
||||
} = require('~/server/controllers/mcp');
|
||||
|
||||
const router = Router();
|
||||
|
||||
|
|
@ -573,11 +587,93 @@ async function getOAuthHeaders(serverName, userId) {
|
|||
const serverConfig = await getMCPServersRegistry().getServerConfig(serverName, userId);
|
||||
return serverConfig?.oauth_headers ?? {};
|
||||
}
|
||||
|
||||
/**
|
||||
MCP Server CRUD Routes (User-Managed MCP Servers)
|
||||
*/
|
||||
|
||||
// Permission checkers for MCP server management
|
||||
const checkMCPUsePermissions = generateCheckAccess({
|
||||
permissionType: PermissionTypes.MCP_SERVERS,
|
||||
permissions: [Permissions.USE],
|
||||
getRoleByName,
|
||||
});
|
||||
|
||||
const checkMCPCreate = generateCheckAccess({
|
||||
permissionType: PermissionTypes.MCP_SERVERS,
|
||||
permissions: [Permissions.USE, Permissions.CREATE],
|
||||
getRoleByName,
|
||||
});
|
||||
|
||||
/**
|
||||
* Get list of accessible MCP servers
|
||||
* @route GET /api/mcp/servers
|
||||
* @returns {MCPServersListResponse} 200 - Success response - application/json
|
||||
* @param {Object} req.query - Query parameters for pagination and search
|
||||
* @param {number} [req.query.limit] - Number of results per page
|
||||
* @param {string} [req.query.after] - Pagination cursor
|
||||
* @param {string} [req.query.search] - Search query for title/description
|
||||
* @returns {MCPServerListResponse} 200 - Success response - application/json
|
||||
*/
|
||||
router.get('/servers', requireJwtAuth, getMCPServersList);
|
||||
router.get('/servers', requireJwtAuth, checkMCPUsePermissions, getMCPServersList);
|
||||
|
||||
/**
|
||||
* Create a new MCP server
|
||||
* @route POST /api/mcp/servers
|
||||
* @param {MCPServerCreateParams} req.body - The MCP server creation parameters.
|
||||
* @returns {MCPServer} 201 - Success response - application/json
|
||||
*/
|
||||
router.post('/servers', requireJwtAuth, checkMCPCreate, createMCPServerController);
|
||||
|
||||
/**
|
||||
* Get single MCP server by ID
|
||||
* @route GET /api/mcp/servers/:serverName
|
||||
* @param {string} req.params.serverName - MCP server identifier.
|
||||
* @returns {MCPServer} 200 - Success response - application/json
|
||||
*/
|
||||
router.get(
|
||||
'/servers/:serverName',
|
||||
requireJwtAuth,
|
||||
checkMCPUsePermissions,
|
||||
canAccessMCPServerResource({
|
||||
requiredPermission: PermissionBits.VIEW,
|
||||
resourceIdParam: 'serverName',
|
||||
}),
|
||||
getMCPServerById,
|
||||
);
|
||||
|
||||
/**
|
||||
* Update MCP server
|
||||
* @route PATCH /api/mcp/servers/:serverName
|
||||
* @param {string} req.params.serverName - MCP server identifier.
|
||||
* @param {MCPServerUpdateParams} req.body - The MCP server update parameters.
|
||||
* @returns {MCPServer} 200 - Success response - application/json
|
||||
*/
|
||||
router.patch(
|
||||
'/servers/:serverName',
|
||||
requireJwtAuth,
|
||||
checkMCPCreate,
|
||||
canAccessMCPServerResource({
|
||||
requiredPermission: PermissionBits.EDIT,
|
||||
resourceIdParam: 'serverName',
|
||||
}),
|
||||
updateMCPServerController,
|
||||
);
|
||||
|
||||
/**
|
||||
* Delete MCP server
|
||||
* @route DELETE /api/mcp/servers/:serverName
|
||||
* @param {string} req.params.serverName - MCP server identifier.
|
||||
* @returns {Object} 200 - Success response - application/json
|
||||
*/
|
||||
router.delete(
|
||||
'/servers/:serverName',
|
||||
requireJwtAuth,
|
||||
checkMCPCreate,
|
||||
canAccessMCPServerResource({
|
||||
requiredPermission: PermissionBits.DELETE,
|
||||
resourceIdParam: 'serverName',
|
||||
}),
|
||||
deleteMCPServerController,
|
||||
);
|
||||
|
||||
module.exports = router;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue