@samanhappy/mcphub 1.0.32 → 1.0.33

package/dist/services/cimdClientService.js

@@ -0,0 +1,195 @@
+/**
+ * Client ID Metadata Documents (CIMD) support for MCPHub's authorization server.
+ *
+ * Implements the client side of draft-ietf-oauth-client-id-metadata-document:
+ * a client may present an HTTPS URL as its client_id; the authorization server
+ * fetches a metadata document from that URL and uses it in place of a
+ * registration. CIMD clients are always treated as PUBLIC clients (no shared
+ * secret can be established out-of-band), so PKCE with S256 is enforced by the
+ * existing public-client policy.
+ *
+ * Documents are fetched with SSRF protection (private-IP blocklist +
+ * redirect validation, shared with upstream MCP connections) and cached with
+ * a TTL. Resolution is opt-in via systemConfig.oauthServer.clientIdMetadata.enabled.
+ */
+import { getSystemConfigDao } from '../dao/index.js';
+import { cloneDefaultOAuthServerConfig } from '../constants/oauthServerDefaults.js';
+import { findOAuthClientById } from '../models/OAuth.js';
+import { assertSafeUrl, createRedirectValidatingFetch } from '../utils/ssrf.js';
+import { logger } from '../utils/logger.js';
+const METADATA_FETCH_TIMEOUT_MS = 5000;
+const DEFAULT_CACHE_TTL_MS = 3600000;
+const MAX_DOCUMENT_BYTES = 256 * 1024;
+export const isCimdClientId = (clientId) => {
+    return typeof clientId === 'string' && clientId.startsWith('https://');
+};
+const cache = new Map();
+const inflight = new Map();
+let fetchImpl = (...args) => fetch(...args);
+// Test seam: DNS resolution used by the SSRF guard, so tests never hit real DNS.
+let ssrfLookupOverride;
+/** Test seam: replace the fetch implementation used for metadata retrieval. */
+export const setCimdFetchImplForTesting = (impl) => {
+    fetchImpl = impl;
+};
+/** Test seam: replace DNS resolution used by the SSRF guard. */
+export const setCimdDnsLookupForTesting = (lookup) => {
+    ssrfLookupOverride = lookup;
+};
+export const clearCimdCacheForTesting = () => {
+    cache.clear();
+    inflight.clear();
+};
+export const getCimdSettings = async () => {
+    try {
+        const systemConfig = await getSystemConfigDao().get();
+        const merged = { ...cloneDefaultOAuthServerConfig(), ...systemConfig?.oauthServer };
+        const ttl = typeof merged.clientIdMetadata?.cacheTtlMs === 'number' &&
+            merged.clientIdMetadata.cacheTtlMs > 0
+            ? merged.clientIdMetadata.cacheTtlMs
+            : DEFAULT_CACHE_TTL_MS;
+        return { enabled: merged.clientIdMetadata?.enabled === true, cacheTtlMs: ttl };
+    }
+    catch {
+        return { enabled: false, cacheTtlMs: DEFAULT_CACHE_TTL_MS };
+    }
+};
+const asStringArray = (value) => Array.isArray(value) && value.every((v) => typeof v === 'string') ? value : undefined;
+/**
+ * Validate a fetched metadata document and map it onto an IOAuthClient.
+ * Returns undefined when the document is not a usable CIMD client.
+ */
+export const mapCimdDocument = (clientIdUrl, document) => {
+    if (!document || typeof document !== 'object' || Array.isArray(document)) {
+        return undefined;
+    }
+    // The document's client_id MUST be present and identical to the URL it was
+    // retrieved from (draft-ietf-oauth-client-id-metadata-document, section 4).
+    if (document.client_id !== clientIdUrl) {
+        return undefined;
+    }
+    const redirectUris = asStringArray(document.redirect_uris);
+    if (!redirectUris || redirectUris.length === 0 || !redirectUris.every((uri) => uri)) {
+        return undefined;
+    }
+    // Only public clients can be expressed via CIMD on this server; a document
+    // claiming a secret-based auth method cannot be honored safely.
+    const authMethod = typeof document.token_endpoint_auth_method === 'string'
+        ? document.token_endpoint_auth_method
+        : 'none';
+    if (authMethod !== 'none') {
+        return undefined;
+    }
+    const applicationType = document.application_type === 'native' ? 'native' : 'web';
+    const contacts = asStringArray(document.contacts);
+    const optionalUriField = (value) => typeof value === 'string' && value.length > 0 ? value : undefined;
+    return {
+        clientId: clientIdUrl,
+        name: typeof document.client_name === 'string' && document.client_name.length > 0
+            ? document.client_name
+            : clientIdUrl,
+        redirectUris,
+        grants: ['authorization_code', 'refresh_token'],
+        metadata: {
+            application_type: applicationType,
+            ...(contacts ? { contacts } : {}),
+            ...(optionalUriField(document.logo_uri) ? { logo_uri: optionalUriField(document.logo_uri) } : {}),
+            ...(optionalUriField(document.client_uri) ? { client_uri: optionalUriField(document.client_uri) } : {}),
+            ...(optionalUriField(document.policy_uri) ? { policy_uri: optionalUriField(document.policy_uri) } : {}),
+            ...(optionalUriField(document.tos_uri) ? { tos_uri: optionalUriField(document.tos_uri) } : {}),
+            ...(optionalUriField(document.jwks_uri) ? { jwks_uri: optionalUriField(document.jwks_uri) } : {}),
+        },
+    };
+};
+const fetchCimdDocument = async (clientIdUrl) => {
+    await assertSafeUrl(clientIdUrl, {
+        allowInternal: false,
+        ...(ssrfLookupOverride ? { lookup: ssrfLookupOverride } : {}),
+    });
+    const validatingFetch = createRedirectValidatingFetch((url, init) => fetchImpl(url, init), false);
+    const response = await validatingFetch(clientIdUrl, {
+        method: 'GET',
+        headers: { Accept: 'application/json' },
+        signal: AbortSignal.timeout(METADATA_FETCH_TIMEOUT_MS),
+        redirect: 'manual',
+    });
+    if (!response.ok) {
+        logger.warn('CIMD metadata document fetch failed', {
+            clientIdUrl,
+            status: response.status,
+        });
+        return undefined;
+    }
+    const contentLength = Number(response.headers.get('content-length') || '0');
+    if (contentLength > MAX_DOCUMENT_BYTES) {
+        logger.warn('CIMD metadata document exceeds size limit', { clientIdUrl });
+        return undefined;
+    }
+    let document;
+    try {
+        const text = await response.text();
+        if (text.length > MAX_DOCUMENT_BYTES) {
+            logger.warn('CIMD metadata document exceeds size limit', { clientIdUrl });
+            return undefined;
+        }
+        document = JSON.parse(text);
+    }
+    catch (error) {
+        logger.warn('CIMD metadata document is not valid JSON', { clientIdUrl, error });
+        return undefined;
+    }
+    const mapped = mapCimdDocument(clientIdUrl, document);
+    if (!mapped) {
+        logger.warn('CIMD metadata document failed validation', { clientIdUrl });
+    }
+    return mapped;
+};
+/**
+ * Resolve a URL-shaped client_id to a client by fetching (or caching) its
+ * metadata document. Returns undefined for anything that is not a valid,
+ * enabled CIMD identifier.
+ */
+export const resolveCimdClient = async (clientId, settings) => {
+    const resolvedSettings = settings ?? (await getCimdSettings());
+    if (!resolvedSettings.enabled || !isCimdClientId(clientId)) {
+        return undefined;
+    }
+    const now = Date.now();
+    const cached = cache.get(clientId);
+    if (cached && cached.expiresAt > now) {
+        return cached.client;
+    }
+    const existingFetch = inflight.get(clientId);
+    if (existingFetch) {
+        return existingFetch;
+    }
+    const fetchPromise = fetchCimdDocument(clientId)
+        .then((client) => {
+        if (client) {
+            cache.set(clientId, { client, expiresAt: Date.now() + resolvedSettings.cacheTtlMs });
+        }
+        return client;
+    })
+        .catch((error) => {
+        logger.warn('Failed to resolve CIMD client', { clientId, error });
+        return undefined;
+    })
+        .finally(() => {
+        inflight.delete(clientId);
+    });
+    inflight.set(clientId, fetchPromise);
+    return fetchPromise;
+};
+/**
+ * Client lookup used across the authorization server surface: registered
+ * clients first, then CIMD resolution when enabled. Drop-in replacement for
+ * findOAuthClientById at every call site that must understand CIMD clients.
+ */
+export const findOAuthClientIncludingCimd = async (clientId) => {
+    const persisted = await findOAuthClientById(clientId);
+    if (persisted) {
+        return persisted;
+    }
+    return resolveCimdClient(clientId);
+};
+//# sourceMappingURL=cimdClientService.js.map

package/dist/services/cimdClientService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cimdClientService.js","sourceRoot":"","sources":["../../src/services/cimdClientService.ts"],"names":[],"mappings":"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"}

package/dist/services/mcpService.js

@@ -2,6 +2,7 @@ import os from 'os';
 import path from 'path';
 import fs from 'fs';
 import treeKill from 'tree-kill';
+import { isProcessTreeKillAvailable } from '../utils/processTree.js';
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import { CallToolRequestSchema, ListToolsRequestSchema, ListPromptsRequestSchema, GetPromptRequestSchema, ListResourcesRequestSchema, ListResourceTemplatesRequestSchema, ReadResourceRequestSchema, } from '@modelcontextprotocol/sdk/types.js';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
@@ -16,6 +17,7 @@ import { ResilientJsonSchemaValidator } from '../utils/jsonSchemaValidator.js';
 import { getUserDao } from '../dao/index.js';
 import { expandEnvVars, replaceEnvVars, getNameSeparator } from '../config/index.js';
 import config from '../config/index.js';
+import { validateServerName } from '../utils/serverNameValidation.js';
 import { getGroup } from './sseService.js';
 import { getServerConfigInGroup, normalizeGroupServers } from './groupService.js';
 import { removeServerToolEmbeddings, saveToolsAsVectorEmbeddings } from './vectorSearchService.js';
@@ -1184,6 +1186,15 @@ export const initializeClientsFromSettings = async (isInit, serverName, options)
     try {
         for (const conf of allServers) {
             const { name } = conf;
+            // Names loaded from disk are not rejected (that would break existing
+            // configs on upgrade), but a strict client may drop the whole tools/list
+            // if the server name produces a non-conforming downstream tool name.
+            if (isInit) {
+                const nameValidation = validateServerName(name);
+                if (!nameValidation.valid) {
+                    logger.warn(`Server name '${name}' does not match the MCP tool-name charset (${nameValidation.message}); downstream tool names may be rejected by strict clients`);
+                }
+            }
             // Expand environment variables in all configuration values
             const expandedConf = replaceEnvVars(conf);
             // Skip disabled servers
@@ -1755,6 +1766,42 @@ const filterToolsByConfig = async (serverName, tools) => {
 const getServerByTool = (toolName) => {
     return getVisibleServerInfos().find((serverInfo) => serverInfo.enabled !== false && serverInfo.tools.some((tool) => tool.name === toolName));
 };
+/**
+ * Error thrown when the requested server/tool (or server/prompt) cannot be
+ * used by the current caller. `message` is the single safe text returned to
+ * the caller — intentionally identical whether the target is hidden from them
+ * or does not exist at all, so server/tool existence is never leaked through
+ * distinguishable authorization errors (see #1103). `reason` is an internal
+ * diagnostic recorded only in logs/activity, never surfaced to the caller.
+ */
+export class ToolUnavailableError extends Error {
+    constructor(message, reason) {
+        super(message);
+        this.reason = reason;
+        this.name = 'ToolUnavailableError';
+    }
+}
+/**
+ * Best-effort internal classification of why a qualified tool/prompt name was
+ * unavailable, for logs/activity only. The externally visible message must not
+ * vary with this result.
+ */
+const classifyUnavailableReason = (qualifiedName) => {
+    // Qualified names are `<server><separator><name>`; a bare name has no prefix.
+    const serverName = qualifiedName.split(getNameSeparator())[0];
+    const server = getServerByName(serverName);
+    if (!server) {
+        return 'server-or-name-not-found';
+    }
+    if (server.enabled === false) {
+        return 'server-disabled';
+    }
+    // Server exists and is enabled: distinguish a caller-hidden server from a
+    // tool/prompt that is missing (or group-filtered) on a visible server.
+    return getVisibleServerByName(serverName)
+        ? 'tool-or-prompt-not-found'
+        : 'server-hidden-from-caller';
+};
 // Add new server
 export const addServer = async (name, config) => {
     const server = { name, ...config };
@@ -2090,7 +2137,28 @@ export const resetServerOAuthConnection = (name) => {
 // launched through a wrapper like `npx` / `npm exec`, the wrapper does not
 // forward signals to its descendants, so the real server process is left
 // running as an orphan. Walk the whole tree and force-kill it.
+//
+// When the process-lister tool tree-kill needs (`ps` on Linux) is missing —
+// e.g. slim Docker images without procps — tree-kill's internal spawn fails
+// with an unhandled 'error' event that would crash MCPHub. Fall back to
+// signaling just the direct child instead (issue #1072).
 function killStdioProcessTree(name, pid) {
+    const safeDirectKill = (signal) => {
+        try {
+            process.kill(pid, signal);
+        }
+        catch (err) {
+            const code = err.code;
+            if (code !== 'ESRCH') {
+                logger.warn('Failed to send signal to process', {
+                    serverName: name,
+                    pid,
+                    signal,
+                    err,
+                });
+            }
+        }
+    };
     const safeTreeKill = (signal) => {
         try {
             treeKill(pid, signal, (err) => {
@@ -2121,12 +2189,22 @@ function killStdioProcessTree(name, pid) {
             });
         }
     };
-    safeTreeKill('SIGTERM');
+    const safeKill = isProcessTreeKillAvailable()
+        ? safeTreeKill
+        : (signal) => {
+            logger.warn('Process lister unavailable, killing only the direct child process', {
+                serverName: name,
+                pid,
+                signal,
+            });
+            safeDirectKill(signal);
+        };
+    safeKill('SIGTERM');
     setTimeout(() => {
         if (!isProcessAlive(pid)) {
             return;
         }
-        safeTreeKill('SIGKILL');
+        safeKill('SIGKILL');
     }, STDIO_KILL_GRACE_PERIOD_MS);
 }
 function isProcessAlive(pid) {
@@ -2465,7 +2543,7 @@ export const handleCallToolRequest = async (request, extra) => {
                     serverInfo.tools.some((tool) => tool.name === toolName));
             }
             if (!targetServerInfo) {
-                throw new Error(`No available servers found with tool: ${toolName}`);
+                throw new ToolUnavailableError(`Tool not available: ${toolName}`, classifyUnavailableReason(toolName));
             }
             // If the target is an on-demand server that is not yet running, wake it up now.
             // Concurrent callers are serialised via ensureServerReady's singleton promise.
@@ -2482,7 +2560,7 @@ export const handleCallToolRequest = async (request, extra) => {
             // Check if the tool exists on the server
             const tool = targetTool ?? findToolOnServer(targetServerInfo, targetToolName, singleServerAppsRoute);
             if (!tool) {
-                throw new Error(`Tool '${toolName}' not found on server '${targetServerInfo.name}'`);
+                throw new ToolUnavailableError(`Tool not available: ${toolName}`, 'tool-not-found');
             }
             assertToolAvailableForRoute(tool, appsRouteContext);
             // Handle OpenAPI servers differently
@@ -2639,7 +2717,7 @@ export const handleCallToolRequest = async (request, extra) => {
         const tool = groupTool?.tool ??
             (serverInfo ? findToolOnServer(serverInfo, routeToolName, singleServerAppsRoute) : undefined);
         if (!serverInfo || !tool) {
-            throw new Error(`Server not found: ${request.params.name}`);
+            throw new ToolUnavailableError(`Tool not available: ${request.params.name}`, classifyUnavailableReason(request.params.name));
         }
         assertToolAvailableForRoute(tool, appsRouteContext);
         // Wake the on-demand server before invoking the tool. It may be asleep with
@@ -2773,7 +2851,13 @@ export const handleCallToolRequest = async (request, extra) => {
         });
     }
     catch (error) {
-        logger.error('Error handling CallToolRequest', summarizeErrorForLogging(error));
+        const unavailable = error instanceof ToolUnavailableError
+            ? { message: error.message, reason: error.reason }
+            : undefined;
+        logger.error('Error handling CallToolRequest', {
+            ...summarizeErrorForLogging(error),
+            ...(unavailable ? { reason: unavailable.reason } : {}),
+        });
         // Log error activity
         const duration = Date.now() - startTime;
         await settleHostedIfNeeded({
@@ -2796,9 +2880,15 @@ export const handleCallToolRequest = async (request, extra) => {
             keyId,
             keyName,
             sourceIp,
-            errorMessage: formatErrorForLogging(error),
+            // The reason is an internal diagnostic; the caller-facing message stays
+            // identical for hidden and nonexistent targets.
+            errorMessage: unavailable
+                ? `${unavailable.message} (reason: ${unavailable.reason})`
+                : formatErrorForLogging(error),
         });
-        const safeErrorText = formatErrorForLogging(error);
+        // For unavailable-target errors, surface exactly the unified message (no
+        // error-class name, no reason) so hidden vs nonexistent is indistinguishable.
+        const safeErrorText = unavailable ? unavailable.message : formatErrorForLogging(error);
         return {
             content: [
                 {
@@ -2854,7 +2944,7 @@ export const handleGetPromptRequest = async (request, extra) => {
                 serverInfo.prompts.find((prompt) => prompt.name === name));
         }
         if (!server) {
-            throw new Error(`Server not found: ${name}`);
+            throw new ToolUnavailableError(`Prompt not available: ${name}`, classifyUnavailableReason(name));
         }
         // Remove server prefix from prompt name if present
         const separator = getNameSeparator();
@@ -2879,8 +2969,15 @@ export const handleGetPromptRequest = async (request, extra) => {
         return prompt;
     }
     catch (error) {
-        logger.error('Error handling GetPromptRequest', summarizeErrorForLogging(error));
-        const safeErrorText = formatErrorForLogging(error);
+        const unavailable = error instanceof ToolUnavailableError
+            ? { message: error.message, reason: error.reason }
+            : undefined;
+        logger.error('Error handling GetPromptRequest', {
+            ...summarizeErrorForLogging(error),
+            ...(unavailable ? { reason: unavailable.reason } : {}),
+        });
+        // Surface exactly the unified message for unavailable targets (see #1103).
+        const safeErrorText = unavailable ? unavailable.message : formatErrorForLogging(error);
         return {
             content: [
                 {