mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-01-20 17:26:12 +01:00
* 🔒 feat: Add MCP server domain restrictions for remote transports * 🔒 feat: Implement comprehensive MCP error handling and domain validation - Added `handleMCPError` function to centralize error responses for domain restrictions and inspection failures. - Introduced custom error classes: `MCPDomainNotAllowedError` and `MCPInspectionFailedError` for better error management. - Updated MCP server controllers to utilize the new error handling mechanism. - Enhanced domain validation logic in `createMCPTools` and `createMCPTool` functions to prevent operations on disallowed domains. - Added tests for runtime domain validation scenarios to ensure correct behavior. * chore: import order * 🔒 feat: Enhance domain validation in MCP tools with user role-based restrictions - Integrated `getAppConfig` to fetch allowed domains based on user roles in `createMCPTools` and `createMCPTool` functions. - Removed the deprecated `getAllowedDomains` method from `MCPServersRegistry`. - Updated tests to verify domain restrictions are applied correctly based on user roles. - Ensured that domain validation logic is consistent and efficient across tool creation processes. * 🔒 test: Refactor MCP tests to utilize configurable app settings - Introduced a mock for `getAppConfig` to enhance test flexibility. - Removed redundant mock definition to streamline test setup. - Ensured tests are aligned with the latest domain validation logic. --------- Co-authored-by: Atef Bellaaj <slalom.bellaaj@external.daimlertruck.com> Co-authored-by: Danny Avila <danny@librechat.ai>
115 lines
3.4 KiB
TypeScript
115 lines
3.4 KiB
TypeScript
import { EModelEndpoint, getConfigDefaults } from 'librechat-data-provider';
|
|
import type { TCustomConfig, FileSources, DeepPartial } from 'librechat-data-provider';
|
|
import type { AppConfig, FunctionTool } from '~/types/app';
|
|
import { loadDefaultInterface } from './interface';
|
|
import { loadTurnstileConfig } from './turnstile';
|
|
import { agentsConfigSetup } from './agents';
|
|
import { loadWebSearchConfig } from './web';
|
|
import { processModelSpecs } from './specs';
|
|
import { loadMemoryConfig } from './memory';
|
|
import { loadEndpoints } from './endpoints';
|
|
import { loadOCRConfig } from './ocr';
|
|
|
|
export type Paths = {
|
|
root: string;
|
|
uploads: string;
|
|
clientPath: string;
|
|
dist: string;
|
|
publicPath: string;
|
|
fonts: string;
|
|
assets: string;
|
|
imageOutput: string;
|
|
structuredTools: string;
|
|
pluginManifest: string;
|
|
};
|
|
|
|
/**
|
|
* Loads custom config and initializes app-wide variables.
|
|
* @function AppService
|
|
*/
|
|
export const AppService = async (params?: {
|
|
config: DeepPartial<TCustomConfig>;
|
|
paths?: Paths;
|
|
systemTools?: Record<string, FunctionTool>;
|
|
}): Promise<AppConfig> => {
|
|
const { config, paths, systemTools } = params || {};
|
|
if (!config) {
|
|
throw new Error('Config is required');
|
|
}
|
|
const configDefaults = getConfigDefaults();
|
|
|
|
const ocr = loadOCRConfig(config.ocr);
|
|
const webSearch = loadWebSearchConfig(config.webSearch);
|
|
const memory = loadMemoryConfig(config.memory);
|
|
const filteredTools = config.filteredTools;
|
|
const includedTools = config.includedTools;
|
|
const fileStrategy = (config.fileStrategy ?? configDefaults.fileStrategy) as
|
|
| FileSources.local
|
|
| FileSources.s3
|
|
| FileSources.firebase
|
|
| FileSources.azure_blob;
|
|
const startBalance = process.env.START_BALANCE;
|
|
const balance = config.balance ?? {
|
|
enabled: process.env.CHECK_BALANCE?.toLowerCase().trim() === 'true',
|
|
startBalance: startBalance ? parseInt(startBalance, 10) : undefined,
|
|
};
|
|
const transactions = config.transactions ?? configDefaults.transactions;
|
|
const imageOutputType = config?.imageOutputType ?? configDefaults.imageOutputType;
|
|
|
|
process.env.CDN_PROVIDER = fileStrategy;
|
|
|
|
const availableTools = systemTools;
|
|
|
|
const mcpServersConfig = config.mcpServers || null;
|
|
const mcpSettings = config.mcpSettings || null;
|
|
const registration = config.registration ?? configDefaults.registration;
|
|
const interfaceConfig = await loadDefaultInterface({ config, configDefaults });
|
|
const turnstileConfig = loadTurnstileConfig(config, configDefaults);
|
|
const speech = config.speech;
|
|
|
|
const defaultConfig = {
|
|
ocr,
|
|
paths,
|
|
config,
|
|
memory,
|
|
speech,
|
|
balance,
|
|
transactions,
|
|
mcpConfig: mcpServersConfig,
|
|
mcpSettings,
|
|
webSearch,
|
|
fileStrategy,
|
|
registration,
|
|
filteredTools,
|
|
includedTools,
|
|
availableTools,
|
|
imageOutputType,
|
|
interfaceConfig,
|
|
turnstileConfig,
|
|
fileStrategies: config.fileStrategies,
|
|
};
|
|
|
|
const agentsDefaults = agentsConfigSetup(config);
|
|
|
|
if (!Object.keys(config).length) {
|
|
const appConfig = {
|
|
...defaultConfig,
|
|
endpoints: {
|
|
[EModelEndpoint.agents]: agentsDefaults,
|
|
},
|
|
};
|
|
return appConfig;
|
|
}
|
|
|
|
const loadedEndpoints = loadEndpoints(config, agentsDefaults);
|
|
|
|
const appConfig = {
|
|
...defaultConfig,
|
|
fileConfig: config?.fileConfig,
|
|
secureImageLinks: config?.secureImageLinks,
|
|
modelSpecs: processModelSpecs(config?.endpoints, config.modelSpecs, interfaceConfig),
|
|
endpoints: loadedEndpoints,
|
|
};
|
|
|
|
return appConfig;
|
|
};
|