Andreas/LibreChat
1
0
Fork 0
mirror of https://github.com/danny-avila/LibreChat.git synced 2026-01-14 14:38:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

🪪 fix: Misleading MCP Server Lookup Method Name (#11315)

Browse source 
* 🔧 fix: MCP server ID resolver in access permissions (#11315)

- Replaced `findMCPServerById` with `findMCPServerByObjectId` in access permissions route and corresponding tests for improved clarity and consistency in resource identification.

* 🔧 refactor: Update MCP server resource access methods to use server name

- Replaced instances of `findMCPServerById` with `findMCPServerByServerName` across middleware, database, and test files for improved clarity and consistency in resource identification.
- Updated related comments and test cases to reflect the change in method usage.

* chore: Increase timeout for Redis update in GenerationJobManager integration tests

- Updated the timeout duration from 50ms to 200ms in the GenerationJobManager integration tests to ensure reliable verification of final event data in Redis after emitting the done event.
This commit is contained in:
Danny Avila 2026-01-12 21:04:25 -05:00 • committed by GitHub
parent a8fa85b8e2
commit f8774983a0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 26 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

14
api/server/middleware/accessResources/canAccessMCPServerResource.js
View file

@ -1,16 +1,16 @@
const { ResourceType } = require('librechat-data-provider');
const { canAccessResource } = require('./canAccessResource');
const { findMCPServerById } = require('~/models');
const { findMCPServerByServerName } = require('~/models');
/**
* MCP Server ID resolver function
* Resolves custom MCP server ID (e.g., "mcp_abc123") to MongoDB ObjectId
* MCP Server name resolver function
* Resolves MCP server name (e.g., "my-mcp-server") to MongoDB ObjectId
*
* @param {string} mcpServerCustomId - Custom MCP server ID from route parameter
* @param {string} serverName - Server name from route parameter
* @returns {Promise<Object|null>} MCP server document with _id field, or null if not found
*/
const resolveMCPServerId = async (mcpServerCustomId) => {
return await findMCPServerById(mcpServerCustomId);
const resolveMCPServerName = async (serverName) => {
return await findMCPServerByServerName(serverName);
};
/**
@ -52,7 +52,7 @@ const canAccessMCPServerResource = (options) => {
resourceType: ResourceType.MCPSERVER,
requiredPermission,
resourceIdParam,
idResolver: resolveMCPServerId,
idResolver: resolveMCPServerName,
});
};

2
api/server/middleware/accessResources/canAccessMCPServerResource.spec.js
View file

@ -545,7 +545,7 @@ describe('canAccessMCPServerResource middleware', () => {
describe('error handling', () => {
test('should handle server returning null gracefully (treated as not found)', async () => {
// When an MCP server is not found, findMCPServerById returns null
// When an MCP server is not found, findMCPServerByServerName returns null
// which the middleware correctly handles as a 404
req.params.serverName = 'definitely-non-existent-server';