@open-mercato/ai-assistant 0.6.6-develop.5675.1.d585628349 → 0.6.6-develop.5706.1.dbef29f570

package/AGENTS.md

@@ -1464,6 +1464,19 @@ Agents that need multi-step tool loops configure the `loop` block on `AiAgentDef
 
 ## Changelog
 
+### 2026-06-11 - Harden latent MCP server-config module (#2672)
+
+**What changed** (`lib/mcp-server-config.ts`, currently dead code — no callers):
+- Added `validateMcpServerUrl()` (exported): restricts external MCP server URLs to `http:`/`https:` (blocks `file:`/`gopher:`/`data:` local-file disclosure) and rejects literal loopback, link-local (`169.254.0.0/16`, `fe80::/10`), and RFC1918 private hosts plus `localhost`/`0.0.0.0`/IPv4-mapped IPv6 — reducing SSRF exposure if a management route is ever wired up. `validateMcpServerConfig` now uses it for HTTP configs.
+- `saveMcpServerConfig` / `updateMcpServerConfig` now call `validateMcpServerConfig` and throw on invalid input, so persistence is **fail-closed**.
+- `generateId()` now uses `randomUUID()` (CSPRNG) instead of `Date.now()` + `Math.random()`.
+
+Note: the guard is intentionally NOT added to `mcp-client.ts` `connectHttp`, which legitimately connects to the app's own loopback MCP server (`localhost:3001`). DNS-rebinding (resolution-time checks) is out of scope for this dead-code hardening.
+
+**Files**: `lib/mcp-server-config.ts`. Regression test: `lib/__tests__/mcp-server-config-hardening.test.ts`.
+
+**Backward compatibility**: `validateMcpServerUrl` is additive. The module has no callers, so the tightened HTTP validation + fail-closed persistence change no live behavior.
+
 ### 2026-06-11 - MCP stdio server fails closed without auth (#2673)
 
 **What changed**:

package/dist/modules/ai_assistant/lib/mcp-server-config.js

@@ -1,3 +1,4 @@
+import { randomUUID } from "node:crypto";
 const MCP_SERVERS_CONFIG_KEY = "mcp_servers";
 async function getMcpServerConfigs(resolver) {
   let service;
@@ -61,6 +62,10 @@ async function saveMcpServerConfig(resolver, config) {
     };
     updatedConfigs = [...configs, savedConfig];
   }
+  const validation = validateMcpServerConfig(savedConfig);
+  if (!validation.valid) {
+    throw new Error(`[internal] Invalid MCP server config: ${validation.error}`);
+  }
   await service.setValue("ai_assistant", MCP_SERVERS_CONFIG_KEY, updatedConfigs);
   return savedConfig;
 }
@@ -83,6 +88,10 @@ async function updateMcpServerConfig(resolver, serverId, updates) {
     // Ensure ID is preserved
     updatedAt: (/* @__PURE__ */ new Date()).toISOString()
   };
+  const validation = validateMcpServerConfig(updatedConfig);
+  if (!validation.valid) {
+    throw new Error(`[internal] Invalid MCP server config: ${validation.error}`);
+  }
   const updatedConfigs = [
     ...configs.slice(0, existingIndex),
     updatedConfig,
@@ -120,7 +129,74 @@ async function toggleMcpServerEnabled(resolver, serverId) {
   });
 }
 function generateId() {
-  return `mcp_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 9)}`;
+  return `mcp_${randomUUID()}`;
+}
+const ALLOWED_MCP_URL_PROTOCOLS = /* @__PURE__ */ new Set(["http:", "https:"]);
+const BLOCKED_MCP_HOSTNAMES = /* @__PURE__ */ new Set(["localhost", "0.0.0.0", "::", "::1"]);
+function parseIpv4Octets(hostname) {
+  const parts = hostname.split(".");
+  if (parts.length !== 4) return null;
+  const octets = parts.map((part) => /^\d{1,3}$/.test(part) ? Number(part) : NaN);
+  if (octets.some((value) => !Number.isInteger(value) || value < 0 || value > 255)) {
+    return null;
+  }
+  return octets;
+}
+function isPrivateOrLocalIpv4(octets) {
+  const [first, second] = octets;
+  if (first === 0) return true;
+  if (first === 127) return true;
+  if (first === 10) return true;
+  if (first === 172 && second >= 16 && second <= 31) return true;
+  if (first === 192 && second === 168) return true;
+  if (first === 169 && second === 254) return true;
+  return false;
+}
+function isPrivateOrLocalIpv6(hostname) {
+  const host = hostname.toLowerCase();
+  if (host === "::1" || host === "::") return true;
+  if (host.startsWith("fe80")) return true;
+  if (host.startsWith("fc") || host.startsWith("fd")) return true;
+  const ipv4MappedDotted = host.match(/^::ffff:(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/);
+  if (ipv4MappedDotted) {
+    const octets = parseIpv4Octets(ipv4MappedDotted[1]);
+    if (octets && isPrivateOrLocalIpv4(octets)) return true;
+  }
+  const ipv4MappedHex = host.match(/^::ffff:([0-9a-f]{1,4}):([0-9a-f]{1,4})$/);
+  if (ipv4MappedHex) {
+    const high = parseInt(ipv4MappedHex[1], 16);
+    const low = parseInt(ipv4MappedHex[2], 16);
+    const octets = [high >> 8 & 255, high & 255, low >> 8 & 255, low & 255];
+    if (isPrivateOrLocalIpv4(octets)) return true;
+  }
+  return false;
+}
+function validateMcpServerUrl(rawUrl) {
+  let parsed;
+  try {
+    parsed = new URL(rawUrl);
+  } catch {
+    return { valid: false, error: "Invalid URL format" };
+  }
+  if (!ALLOWED_MCP_URL_PROTOCOLS.has(parsed.protocol)) {
+    return { valid: false, error: "URL must use the http or https protocol" };
+  }
+  const hostname = parsed.hostname.toLowerCase().replace(/^\[/, "").replace(/\]$/, "");
+  if (!hostname) {
+    return { valid: false, error: "URL host is required" };
+  }
+  if (BLOCKED_MCP_HOSTNAMES.has(hostname) || hostname === "localhost" || hostname.endsWith(".localhost")) {
+    return { valid: false, error: "URL host is not allowed" };
+  }
+  const ipv4 = parseIpv4Octets(hostname);
+  if (ipv4) {
+    if (isPrivateOrLocalIpv4(ipv4)) {
+      return { valid: false, error: "URL host resolves to a private or loopback address" };
+    }
+  } else if (hostname.includes(":") && isPrivateOrLocalIpv6(hostname)) {
+    return { valid: false, error: "URL host resolves to a private or loopback address" };
+  }
+  return { valid: true };
 }
 function validateMcpServerConfig(config) {
   if (!config.name?.trim()) {
@@ -133,10 +209,9 @@ function validateMcpServerConfig(config) {
     if (!config.url?.trim()) {
       return { valid: false, error: "URL is required for HTTP servers" };
     }
-    try {
-      new URL(config.url);
-    } catch {
-      return { valid: false, error: "Invalid URL format" };
+    const urlCheck = validateMcpServerUrl(config.url);
+    if (!urlCheck.valid) {
+      return urlCheck;
     }
   }
   if (config.type === "stdio") {
@@ -155,6 +230,7 @@ export {
   saveMcpServerConfig,
   toggleMcpServerEnabled,
   updateMcpServerConfig,
-  validateMcpServerConfig
+  validateMcpServerConfig,
+  validateMcpServerUrl
 };
 //# sourceMappingURL=mcp-server-config.js.map

package/dist/modules/ai_assistant/lib/mcp-server-config.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/ai_assistant/lib/mcp-server-config.ts"],
-  "sourcesContent": ["import type { ModuleConfigService } from '@open-mercato/core/modules/configs/lib/module-config-service'\n\n// Types\n\n/**\n * MCP server connection type.\n */\nexport type McpServerType = 'http' | 'stdio'\n\n/**\n * Configuration for an external MCP server.\n */\nexport interface McpServerConfig {\n  /** Unique identifier */\n  id: string\n  /** User-defined name */\n  name: string\n  /** Connection type */\n  type: McpServerType\n  /** Server URL (for HTTP type) */\n  url?: string\n  /** Command to run (for stdio type) */\n  command?: string\n  /** Command arguments (for stdio type) */\n  args?: string[]\n  /** API key for authentication (stored as reference, not the actual secret) */\n  apiKeyId?: string\n  /** Whether the server is enabled */\n  enabled: boolean\n  /** When the config was created */\n  createdAt: string\n  /** When the config was last updated */\n  updatedAt: string\n}\n\n/**\n * Input for creating a new MCP server config.\n */\nexport type McpServerConfigInput = Omit<McpServerConfig, 'id' | 'createdAt' | 'updatedAt'>\n\n/**\n * Input for updating an MCP server config.\n */\nexport type McpServerConfigUpdate = Partial<Omit<McpServerConfig, 'id' | 'createdAt' | 'updatedAt'>>\n\n// Constants\n\nexport const MCP_SERVERS_CONFIG_KEY = 'mcp_servers'\n\n// Resolver type\n\ntype Resolver = {\n  resolve: <T = unknown>(name: string) => T\n}\n\n// Config functions\n\n/**\n * Get all MCP server configurations.\n */\nexport async function getMcpServerConfigs(\n  resolver: Resolver\n): Promise<McpServerConfig[]> {\n  let service: ModuleConfigService\n  try {\n    service = resolver.resolve<ModuleConfigService>('moduleConfigService')\n  } catch {\n    return []\n  }\n\n  try {\n    const value = await service.getValue<McpServerConfig[]>(\n      'ai_assistant',\n      MCP_SERVERS_CONFIG_KEY,\n      { defaultValue: [] }\n    )\n    return value ?? []\n  } catch {\n    return []\n  }\n}\n\n/**\n * Get a single MCP server configuration by ID.\n */\nexport async function getMcpServerConfig(\n  resolver: Resolver,\n  serverId: string\n): Promise<McpServerConfig | null> {\n  const configs = await getMcpServerConfigs(resolver)\n  return configs.find((c) => c.id === serverId) ?? null\n}\n\n/**\n * Get only enabled MCP server configurations.\n */\nexport async function getEnabledMcpServerConfigs(\n  resolver: Resolver\n): Promise<McpServerConfig[]> {\n  const configs = await getMcpServerConfigs(resolver)\n  return configs.filter((c) => c.enabled)\n}\n\n/**\n * Save an MCP server configuration (create or update).\n */\nexport async function saveMcpServerConfig(\n  resolver: Resolver,\n  config: McpServerConfigInput & { id?: string }\n): Promise<McpServerConfig> {\n  let service: ModuleConfigService\n  try {\n    service = resolver.resolve<ModuleConfigService>('moduleConfigService')\n  } catch {\n    throw new Error('Configuration service unavailable')\n  }\n\n  const configs = await getMcpServerConfigs(resolver)\n  const now = new Date().toISOString()\n\n  let updatedConfigs: McpServerConfig[]\n  let savedConfig: McpServerConfig\n\n  if (config.id) {\n    // Update existing\n    const existingIndex = configs.findIndex((c) => c.id === config.id)\n    if (existingIndex === -1) {\n      throw new Error(`MCP server config not found: ${config.id}`)\n    }\n\n    savedConfig = {\n      ...configs[existingIndex],\n      ...config,\n      id: config.id,\n      updatedAt: now,\n    }\n\n    updatedConfigs = [\n      ...configs.slice(0, existingIndex),\n      savedConfig,\n      ...configs.slice(existingIndex + 1),\n    ]\n  } else {\n    // Create new\n    savedConfig = {\n      ...config,\n      id: generateId(),\n      createdAt: now,\n      updatedAt: now,\n    }\n\n    updatedConfigs = [...configs, savedConfig]\n  }\n\n  await service.setValue('ai_assistant', MCP_SERVERS_CONFIG_KEY, updatedConfigs)\n  return savedConfig\n}\n\n/**\n * Update an existing MCP server configuration.\n */\nexport async function updateMcpServerConfig(\n  resolver: Resolver,\n  serverId: string,\n  updates: McpServerConfigUpdate\n): Promise<McpServerConfig> {\n  let service: ModuleConfigService\n  try {\n    service = resolver.resolve<ModuleConfigService>('moduleConfigService')\n  } catch {\n    throw new Error('Configuration service unavailable')\n  }\n\n  const configs = await getMcpServerConfigs(resolver)\n  const existingIndex = configs.findIndex((c) => c.id === serverId)\n\n  if (existingIndex === -1) {\n    throw new Error(`MCP server config not found: ${serverId}`)\n  }\n\n  const updatedConfig: McpServerConfig = {\n    ...configs[existingIndex],\n    ...updates,\n    id: serverId, // Ensure ID is preserved\n    updatedAt: new Date().toISOString(),\n  }\n\n  const updatedConfigs = [\n    ...configs.slice(0, existingIndex),\n    updatedConfig,\n    ...configs.slice(existingIndex + 1),\n  ]\n\n  await service.setValue('ai_assistant', MCP_SERVERS_CONFIG_KEY, updatedConfigs)\n  return updatedConfig\n}\n\n/**\n * Delete an MCP server configuration.\n */\nexport async function deleteMcpServerConfig(\n  resolver: Resolver,\n  serverId: string\n): Promise<boolean> {\n  let service: ModuleConfigService\n  try {\n    service = resolver.resolve<ModuleConfigService>('moduleConfigService')\n  } catch {\n    throw new Error('Configuration service unavailable')\n  }\n\n  const configs = await getMcpServerConfigs(resolver)\n  const existingIndex = configs.findIndex((c) => c.id === serverId)\n\n  if (existingIndex === -1) {\n    return false\n  }\n\n  const updatedConfigs = [\n    ...configs.slice(0, existingIndex),\n    ...configs.slice(existingIndex + 1),\n  ]\n\n  await service.setValue('ai_assistant', MCP_SERVERS_CONFIG_KEY, updatedConfigs)\n  return true\n}\n\n/**\n * Toggle the enabled state of an MCP server configuration.\n */\nexport async function toggleMcpServerEnabled(\n  resolver: Resolver,\n  serverId: string\n): Promise<McpServerConfig> {\n  const config = await getMcpServerConfig(resolver, serverId)\n  if (!config) {\n    throw new Error(`MCP server config not found: ${serverId}`)\n  }\n\n  return updateMcpServerConfig(resolver, serverId, {\n    enabled: !config.enabled,\n  })\n}\n\n// Helpers\n\n/**\n * Generate a unique ID for a new MCP server config.\n */\nfunction generateId(): string {\n  return `mcp_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 9)}`\n}\n\n/**\n * Validate an MCP server configuration.\n */\nexport function validateMcpServerConfig(\n  config: McpServerConfigInput\n): { valid: boolean; error?: string } {\n  if (!config.name?.trim()) {\n    return { valid: false, error: 'Name is required' }\n  }\n\n  if (!['http', 'stdio'].includes(config.type)) {\n    return { valid: false, error: 'Type must be \"http\" or \"stdio\"' }\n  }\n\n  if (config.type === 'http') {\n    if (!config.url?.trim()) {\n      return { valid: false, error: 'URL is required for HTTP servers' }\n    }\n\n    try {\n      new URL(config.url)\n    } catch {\n      return { valid: false, error: 'Invalid URL format' }\n    }\n  }\n\n  if (config.type === 'stdio') {\n    if (!config.command?.trim()) {\n      return { valid: false, error: 'Command is required for stdio servers' }\n    }\n  }\n\n  return { valid: true }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { randomUUID } from 'node:crypto'\nimport type { ModuleConfigService } from '@open-mercato/core/modules/configs/lib/module-config-service'\n\n// Types\n\n/**\n * MCP server connection type.\n */\nexport type McpServerType = 'http' | 'stdio'\n\n/**\n * Configuration for an external MCP server.\n */\nexport interface McpServerConfig {\n  /** Unique identifier */\n  id: string\n  /** User-defined name */\n  name: string\n  /** Connection type */\n  type: McpServerType\n  /** Server URL (for HTTP type) */\n  url?: string\n  /** Command to run (for stdio type) */\n  command?: string\n  /** Command arguments (for stdio type) */\n  args?: string[]\n  /** API key for authentication (stored as reference, not the actual secret) */\n  apiKeyId?: string\n  /** Whether the server is enabled */\n  enabled: boolean\n  /** When the config was created */\n  createdAt: string\n  /** When the config was last updated */\n  updatedAt: string\n}\n\n/**\n * Input for creating a new MCP server config.\n */\nexport type McpServerConfigInput = Omit<McpServerConfig, 'id' | 'createdAt' | 'updatedAt'>\n\n/**\n * Input for updating an MCP server config.\n */\nexport type McpServerConfigUpdate = Partial<Omit<McpServerConfig, 'id' | 'createdAt' | 'updatedAt'>>\n\n// Constants\n\nexport const MCP_SERVERS_CONFIG_KEY = 'mcp_servers'\n\n// Resolver type\n\ntype Resolver = {\n  resolve: <T = unknown>(name: string) => T\n}\n\n// Config functions\n\n/**\n * Get all MCP server configurations.\n */\nexport async function getMcpServerConfigs(\n  resolver: Resolver\n): Promise<McpServerConfig[]> {\n  let service: ModuleConfigService\n  try {\n    service = resolver.resolve<ModuleConfigService>('moduleConfigService')\n  } catch {\n    return []\n  }\n\n  try {\n    const value = await service.getValue<McpServerConfig[]>(\n      'ai_assistant',\n      MCP_SERVERS_CONFIG_KEY,\n      { defaultValue: [] }\n    )\n    return value ?? []\n  } catch {\n    return []\n  }\n}\n\n/**\n * Get a single MCP server configuration by ID.\n */\nexport async function getMcpServerConfig(\n  resolver: Resolver,\n  serverId: string\n): Promise<McpServerConfig | null> {\n  const configs = await getMcpServerConfigs(resolver)\n  return configs.find((c) => c.id === serverId) ?? null\n}\n\n/**\n * Get only enabled MCP server configurations.\n */\nexport async function getEnabledMcpServerConfigs(\n  resolver: Resolver\n): Promise<McpServerConfig[]> {\n  const configs = await getMcpServerConfigs(resolver)\n  return configs.filter((c) => c.enabled)\n}\n\n/**\n * Save an MCP server configuration (create or update).\n */\nexport async function saveMcpServerConfig(\n  resolver: Resolver,\n  config: McpServerConfigInput & { id?: string }\n): Promise<McpServerConfig> {\n  let service: ModuleConfigService\n  try {\n    service = resolver.resolve<ModuleConfigService>('moduleConfigService')\n  } catch {\n    throw new Error('Configuration service unavailable')\n  }\n\n  const configs = await getMcpServerConfigs(resolver)\n  const now = new Date().toISOString()\n\n  let updatedConfigs: McpServerConfig[]\n  let savedConfig: McpServerConfig\n\n  if (config.id) {\n    // Update existing\n    const existingIndex = configs.findIndex((c) => c.id === config.id)\n    if (existingIndex === -1) {\n      throw new Error(`MCP server config not found: ${config.id}`)\n    }\n\n    savedConfig = {\n      ...configs[existingIndex],\n      ...config,\n      id: config.id,\n      updatedAt: now,\n    }\n\n    updatedConfigs = [\n      ...configs.slice(0, existingIndex),\n      savedConfig,\n      ...configs.slice(existingIndex + 1),\n    ]\n  } else {\n    // Create new\n    savedConfig = {\n      ...config,\n      id: generateId(),\n      createdAt: now,\n      updatedAt: now,\n    }\n\n    updatedConfigs = [...configs, savedConfig]\n  }\n\n  const validation = validateMcpServerConfig(savedConfig)\n  if (!validation.valid) {\n    throw new Error(`[internal] Invalid MCP server config: ${validation.error}`)\n  }\n\n  await service.setValue('ai_assistant', MCP_SERVERS_CONFIG_KEY, updatedConfigs)\n  return savedConfig\n}\n\n/**\n * Update an existing MCP server configuration.\n */\nexport async function updateMcpServerConfig(\n  resolver: Resolver,\n  serverId: string,\n  updates: McpServerConfigUpdate\n): Promise<McpServerConfig> {\n  let service: ModuleConfigService\n  try {\n    service = resolver.resolve<ModuleConfigService>('moduleConfigService')\n  } catch {\n    throw new Error('Configuration service unavailable')\n  }\n\n  const configs = await getMcpServerConfigs(resolver)\n  const existingIndex = configs.findIndex((c) => c.id === serverId)\n\n  if (existingIndex === -1) {\n    throw new Error(`MCP server config not found: ${serverId}`)\n  }\n\n  const updatedConfig: McpServerConfig = {\n    ...configs[existingIndex],\n    ...updates,\n    id: serverId, // Ensure ID is preserved\n    updatedAt: new Date().toISOString(),\n  }\n\n  const validation = validateMcpServerConfig(updatedConfig)\n  if (!validation.valid) {\n    throw new Error(`[internal] Invalid MCP server config: ${validation.error}`)\n  }\n\n  const updatedConfigs = [\n    ...configs.slice(0, existingIndex),\n    updatedConfig,\n    ...configs.slice(existingIndex + 1),\n  ]\n\n  await service.setValue('ai_assistant', MCP_SERVERS_CONFIG_KEY, updatedConfigs)\n  return updatedConfig\n}\n\n/**\n * Delete an MCP server configuration.\n */\nexport async function deleteMcpServerConfig(\n  resolver: Resolver,\n  serverId: string\n): Promise<boolean> {\n  let service: ModuleConfigService\n  try {\n    service = resolver.resolve<ModuleConfigService>('moduleConfigService')\n  } catch {\n    throw new Error('Configuration service unavailable')\n  }\n\n  const configs = await getMcpServerConfigs(resolver)\n  const existingIndex = configs.findIndex((c) => c.id === serverId)\n\n  if (existingIndex === -1) {\n    return false\n  }\n\n  const updatedConfigs = [\n    ...configs.slice(0, existingIndex),\n    ...configs.slice(existingIndex + 1),\n  ]\n\n  await service.setValue('ai_assistant', MCP_SERVERS_CONFIG_KEY, updatedConfigs)\n  return true\n}\n\n/**\n * Toggle the enabled state of an MCP server configuration.\n */\nexport async function toggleMcpServerEnabled(\n  resolver: Resolver,\n  serverId: string\n): Promise<McpServerConfig> {\n  const config = await getMcpServerConfig(resolver, serverId)\n  if (!config) {\n    throw new Error(`MCP server config not found: ${serverId}`)\n  }\n\n  return updateMcpServerConfig(resolver, serverId, {\n    enabled: !config.enabled,\n  })\n}\n\n// Helpers\n\n/**\n * Generate a unique ID for a new MCP server config.\n *\n * Uses a CSPRNG (`randomUUID`) instead of `Math.random()` so the suffix is not\n * predictable if the id ever surfaces in URLs, logs, or cache keys.\n */\nfunction generateId(): string {\n  return `mcp_${randomUUID()}`\n}\n\nconst ALLOWED_MCP_URL_PROTOCOLS = new Set(['http:', 'https:'])\nconst BLOCKED_MCP_HOSTNAMES = new Set(['localhost', '0.0.0.0', '::', '::1'])\n\nfunction parseIpv4Octets(hostname: string): number[] | null {\n  const parts = hostname.split('.')\n  if (parts.length !== 4) return null\n  const octets = parts.map((part) => (/^\\d{1,3}$/.test(part) ? Number(part) : NaN))\n  if (octets.some((value) => !Number.isInteger(value) || value < 0 || value > 255)) {\n    return null\n  }\n  return octets\n}\n\nfunction isPrivateOrLocalIpv4(octets: number[]): boolean {\n  const [first, second] = octets\n  if (first === 0) return true // \"this\" network / 0.0.0.0\n  if (first === 127) return true // loopback 127.0.0.0/8\n  if (first === 10) return true // RFC1918 10.0.0.0/8\n  if (first === 172 && second >= 16 && second <= 31) return true // RFC1918 172.16.0.0/12\n  if (first === 192 && second === 168) return true // RFC1918 192.168.0.0/16\n  if (first === 169 && second === 254) return true // link-local 169.254.0.0/16\n  return false\n}\n\nfunction isPrivateOrLocalIpv6(hostname: string): boolean {\n  const host = hostname.toLowerCase()\n  if (host === '::1' || host === '::') return true // loopback / unspecified\n  if (host.startsWith('fe80')) return true // link-local fe80::/10\n  if (host.startsWith('fc') || host.startsWith('fd')) return true // unique-local fc00::/7\n  const ipv4MappedDotted = host.match(/^::ffff:(\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3})$/)\n  if (ipv4MappedDotted) {\n    const octets = parseIpv4Octets(ipv4MappedDotted[1]!)\n    if (octets && isPrivateOrLocalIpv4(octets)) return true\n  }\n  // Node normalizes ::ffff:127.0.0.1 to its hex form (::ffff:7f00:1).\n  const ipv4MappedHex = host.match(/^::ffff:([0-9a-f]{1,4}):([0-9a-f]{1,4})$/)\n  if (ipv4MappedHex) {\n    const high = parseInt(ipv4MappedHex[1]!, 16)\n    const low = parseInt(ipv4MappedHex[2]!, 16)\n    const octets = [(high >> 8) & 0xff, high & 0xff, (low >> 8) & 0xff, low & 0xff]\n    if (isPrivateOrLocalIpv4(octets)) return true\n  }\n  return false\n}\n\n/**\n * Validate that an external MCP server URL is safe to connect to.\n *\n * Rejects non-http(s) protocols (blocking `file:`/`gopher:`/`data:` local-file\n * disclosure) and literal loopback, link-local, and RFC1918 private hosts to\n * reduce SSRF exposure. Hostnames that are not IP literals are allowed here\n * (DNS-rebinding to a private address would still need a resolution-time guard,\n * which is out of scope for this dead-code hardening).\n */\nexport function validateMcpServerUrl(\n  rawUrl: string\n): { valid: boolean; error?: string } {\n  let parsed: URL\n  try {\n    parsed = new URL(rawUrl)\n  } catch {\n    return { valid: false, error: 'Invalid URL format' }\n  }\n\n  if (!ALLOWED_MCP_URL_PROTOCOLS.has(parsed.protocol)) {\n    return { valid: false, error: 'URL must use the http or https protocol' }\n  }\n\n  const hostname = parsed.hostname.toLowerCase().replace(/^\\[/, '').replace(/\\]$/, '')\n  if (!hostname) {\n    return { valid: false, error: 'URL host is required' }\n  }\n\n  if (BLOCKED_MCP_HOSTNAMES.has(hostname) || hostname === 'localhost' || hostname.endsWith('.localhost')) {\n    return { valid: false, error: 'URL host is not allowed' }\n  }\n\n  const ipv4 = parseIpv4Octets(hostname)\n  if (ipv4) {\n    if (isPrivateOrLocalIpv4(ipv4)) {\n      return { valid: false, error: 'URL host resolves to a private or loopback address' }\n    }\n  } else if (hostname.includes(':') && isPrivateOrLocalIpv6(hostname)) {\n    return { valid: false, error: 'URL host resolves to a private or loopback address' }\n  }\n\n  return { valid: true }\n}\n\n/**\n * Validate an MCP server configuration.\n */\nexport function validateMcpServerConfig(\n  config: McpServerConfigInput\n): { valid: boolean; error?: string } {\n  if (!config.name?.trim()) {\n    return { valid: false, error: 'Name is required' }\n  }\n\n  if (!['http', 'stdio'].includes(config.type)) {\n    return { valid: false, error: 'Type must be \"http\" or \"stdio\"' }\n  }\n\n  if (config.type === 'http') {\n    if (!config.url?.trim()) {\n      return { valid: false, error: 'URL is required for HTTP servers' }\n    }\n\n    const urlCheck = validateMcpServerUrl(config.url)\n    if (!urlCheck.valid) {\n      return urlCheck\n    }\n  }\n\n  if (config.type === 'stdio') {\n    if (!config.command?.trim()) {\n      return { valid: false, error: 'Command is required for stdio servers' }\n    }\n  }\n\n  return { valid: true }\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/ai-assistant",
-  "version": "0.6.6-develop.5675.1.d585628349",
+  "version": "0.6.6-develop.5706.1.dbef29f570",
   "type": "module",
   "engines": {
     "node": ">=22.0.0"
@@ -98,16 +98,16 @@
     "zod-to-json-schema": "^3.25.2"
   },
   "peerDependencies": {
-    "@open-mercato/shared": "0.6.6-develop.5675.1.d585628349",
-    "@open-mercato/ui": "0.6.6-develop.5675.1.d585628349",
+    "@open-mercato/shared": "0.6.6-develop.5706.1.dbef29f570",
+    "@open-mercato/ui": "0.6.6-develop.5706.1.dbef29f570",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "zod": ">=3.23.0"
   },
   "devDependencies": {
-    "@open-mercato/cli": "0.6.6-develop.5675.1.d585628349",
-    "@open-mercato/shared": "0.6.6-develop.5675.1.d585628349",
-    "@open-mercato/ui": "0.6.6-develop.5675.1.d585628349",
+    "@open-mercato/cli": "0.6.6-develop.5706.1.dbef29f570",
+    "@open-mercato/shared": "0.6.6-develop.5706.1.dbef29f570",
+    "@open-mercato/ui": "0.6.6-develop.5706.1.dbef29f570",
     "@types/react": "^19.2.17",
     "@types/react-dom": "^19.2.3",
     "react": "19.2.7",

package/src/modules/ai_assistant/lib/__tests__/mcp-server-config-hardening.test.ts

@@ -0,0 +1,148 @@
+import {
+  validateMcpServerUrl,
+  validateMcpServerConfig,
+  saveMcpServerConfig,
+  updateMcpServerConfig,
+  type McpServerConfig,
+} from '../mcp-server-config'
+
+function makeResolver(initial: McpServerConfig[] = []) {
+  const store: { value: McpServerConfig[] } = { value: initial }
+  const service = {
+    async getValue<T>(_module: string, _key: string, opts?: { defaultValue?: T }) {
+      return (store.value as unknown as T) ?? (opts?.defaultValue as T)
+    },
+    async setValue(_module: string, _key: string, value: McpServerConfig[]) {
+      store.value = value
+    },
+  }
+  const resolver = {
+    resolve: <T = unknown>(name: string): T => {
+      if (name === 'moduleConfigService') return service as unknown as T
+      throw new Error(`unexpected resolve: ${name}`)
+    },
+  }
+  return { resolver, store }
+}
+
+describe('issue #2672 — MCP server-config hardening', () => {
+  describe('validateMcpServerUrl — protocol allowlist', () => {
+    it.each(['file:///etc/passwd', 'gopher://example.com', 'data:text/plain,hi', 'ftp://example.com'])(
+      'rejects non-http(s) protocol: %s',
+      (url) => {
+        expect(validateMcpServerUrl(url).valid).toBe(false)
+      },
+    )
+
+    it('accepts a public https URL', () => {
+      expect(validateMcpServerUrl('https://mcp.example.com/sse')).toEqual({ valid: true })
+    })
+
+    it('accepts a public http URL', () => {
+      expect(validateMcpServerUrl('http://203.0.113.5:3001/mcp')).toEqual({ valid: true })
+    })
+
+    it('rejects a malformed URL', () => {
+      expect(validateMcpServerUrl('not a url').valid).toBe(false)
+    })
+  })
+
+  describe('validateMcpServerUrl — private / loopback / link-local hosts', () => {
+    it.each([
+      'http://localhost:3001/mcp',
+      'http://sub.localhost/mcp',
+      'http://127.0.0.1/mcp',
+      'http://127.5.6.7/mcp',
+      'http://0.0.0.0/mcp',
+      'http://10.0.0.5/mcp',
+      'http://172.16.0.9/mcp',
+      'http://172.31.255.1/mcp',
+      'http://192.168.1.1/mcp',
+      'http://169.254.169.254/latest/meta-data',
+      'http://[::1]/mcp',
+      'http://[fe80::1]/mcp',
+      'http://[fc00::1]/mcp',
+      'http://[::ffff:127.0.0.1]/mcp',
+    ])('rejects blocked host: %s', (url) => {
+      expect(validateMcpServerUrl(url).valid).toBe(false)
+    })
+
+    it('does not block a public host in the 172.x range outside RFC1918', () => {
+      expect(validateMcpServerUrl('http://172.32.0.1/mcp')).toEqual({ valid: true })
+    })
+  })
+
+  describe('validateMcpServerConfig', () => {
+    it('rejects an http config whose URL is a loopback address', () => {
+      const result = validateMcpServerConfig({
+        name: 'evil',
+        type: 'http',
+        url: 'http://127.0.0.1/mcp',
+        enabled: true,
+      })
+      expect(result.valid).toBe(false)
+    })
+
+    it('accepts an http config with a public URL', () => {
+      const result = validateMcpServerConfig({
+        name: 'good',
+        type: 'http',
+        url: 'https://mcp.example.com/sse',
+        enabled: true,
+      })
+      expect(result).toEqual({ valid: true })
+    })
+
+    it('requires a command for stdio configs', () => {
+      expect(validateMcpServerConfig({ name: 'x', type: 'stdio', enabled: true }).valid).toBe(false)
+    })
+  })
+
+  describe('saveMcpServerConfig — fail-closed + CSPRNG id', () => {
+    it('generates a UUID-based id and persists a valid config', async () => {
+      const { resolver, store } = makeResolver()
+      const saved = await saveMcpServerConfig(resolver, {
+        name: 'good',
+        type: 'http',
+        url: 'https://mcp.example.com/sse',
+        enabled: true,
+      })
+      expect(saved.id).toMatch(
+        /^mcp_[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/,
+      )
+      expect(store.value).toHaveLength(1)
+    })
+
+    it('refuses to persist a config with an SSRF-prone URL', async () => {
+      const { resolver, store } = makeResolver()
+      await expect(
+        saveMcpServerConfig(resolver, {
+          name: 'evil',
+          type: 'http',
+          url: 'http://169.254.169.254/latest/meta-data',
+          enabled: true,
+        }),
+      ).rejects.toThrow(/Invalid MCP server config/i)
+      expect(store.value).toHaveLength(0)
+    })
+  })
+
+  describe('updateMcpServerConfig — fail-closed', () => {
+    it('refuses an update that introduces a blocked URL', async () => {
+      const existing: McpServerConfig = {
+        id: 'mcp_existing',
+        name: 'good',
+        type: 'http',
+        url: 'https://mcp.example.com/sse',
+        enabled: true,
+        createdAt: '2026-01-01T00:00:00.000Z',
+        updatedAt: '2026-01-01T00:00:00.000Z',
+      }
+      const { resolver, store } = makeResolver([existing])
+      await expect(
+        updateMcpServerConfig(resolver, 'mcp_existing', { url: 'file:///etc/passwd' }),
+      ).rejects.toThrow(/Invalid MCP server config/i)
+      expect(store.value[0]!.url).toBe('https://mcp.example.com/sse')
+    })
+  })
+})

package/src/modules/ai_assistant/lib/mcp-server-config.ts

@@ -1,3 +1,4 @@
+import { randomUUID } from 'node:crypto'
 import type { ModuleConfigService } from '@open-mercato/core/modules/configs/lib/module-config-service'
 
 // Types
@@ -152,6 +153,11 @@ export async function saveMcpServerConfig(
     updatedConfigs = [...configs, savedConfig]
   }
 
+  const validation = validateMcpServerConfig(savedConfig)
+  if (!validation.valid) {
+    throw new Error(`[internal] Invalid MCP server config: ${validation.error}`)
+  }
+
   await service.setValue('ai_assistant', MCP_SERVERS_CONFIG_KEY, updatedConfigs)
   return savedConfig
 }
@@ -185,6 +191,11 @@ export async function updateMcpServerConfig(
     updatedAt: new Date().toISOString(),
   }
 
+  const validation = validateMcpServerConfig(updatedConfig)
+  if (!validation.valid) {
+    throw new Error(`[internal] Invalid MCP server config: ${validation.error}`)
+  }
+
   const updatedConfigs = [
     ...configs.slice(0, existingIndex),
     updatedConfig,
@@ -246,9 +257,101 @@ export async function toggleMcpServerEnabled(
 
 /**
  * Generate a unique ID for a new MCP server config.
+ *
+ * Uses a CSPRNG (`randomUUID`) instead of `Math.random()` so the suffix is not
+ * predictable if the id ever surfaces in URLs, logs, or cache keys.
  */
 function generateId(): string {
-  return `mcp_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 9)}`
+  return `mcp_${randomUUID()}`
+}
+
+const ALLOWED_MCP_URL_PROTOCOLS = new Set(['http:', 'https:'])
+const BLOCKED_MCP_HOSTNAMES = new Set(['localhost', '0.0.0.0', '::', '::1'])
+
+function parseIpv4Octets(hostname: string): number[] | null {
+  const parts = hostname.split('.')
+  if (parts.length !== 4) return null
+  const octets = parts.map((part) => (/^\d{1,3}$/.test(part) ? Number(part) : NaN))
+  if (octets.some((value) => !Number.isInteger(value) || value < 0 || value > 255)) {
+    return null
+  }
+  return octets
+}
+
+function isPrivateOrLocalIpv4(octets: number[]): boolean {
+  const [first, second] = octets
+  if (first === 0) return true // "this" network / 0.0.0.0
+  if (first === 127) return true // loopback 127.0.0.0/8
+  if (first === 10) return true // RFC1918 10.0.0.0/8
+  if (first === 172 && second >= 16 && second <= 31) return true // RFC1918 172.16.0.0/12
+  if (first === 192 && second === 168) return true // RFC1918 192.168.0.0/16
+  if (first === 169 && second === 254) return true // link-local 169.254.0.0/16
+  return false
+}
+
+function isPrivateOrLocalIpv6(hostname: string): boolean {
+  const host = hostname.toLowerCase()
+  if (host === '::1' || host === '::') return true // loopback / unspecified
+  if (host.startsWith('fe80')) return true // link-local fe80::/10
+  if (host.startsWith('fc') || host.startsWith('fd')) return true // unique-local fc00::/7
+  const ipv4MappedDotted = host.match(/^::ffff:(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/)
+  if (ipv4MappedDotted) {
+    const octets = parseIpv4Octets(ipv4MappedDotted[1]!)
+    if (octets && isPrivateOrLocalIpv4(octets)) return true
+  }
+  // Node normalizes ::ffff:127.0.0.1 to its hex form (::ffff:7f00:1).
+  const ipv4MappedHex = host.match(/^::ffff:([0-9a-f]{1,4}):([0-9a-f]{1,4})$/)
+  if (ipv4MappedHex) {
+    const high = parseInt(ipv4MappedHex[1]!, 16)
+    const low = parseInt(ipv4MappedHex[2]!, 16)
+    const octets = [(high >> 8) & 0xff, high & 0xff, (low >> 8) & 0xff, low & 0xff]
+    if (isPrivateOrLocalIpv4(octets)) return true
+  }
+  return false
+}
+
+/**
+ * Validate that an external MCP server URL is safe to connect to.
+ *
+ * Rejects non-http(s) protocols (blocking `file:`/`gopher:`/`data:` local-file
+ * disclosure) and literal loopback, link-local, and RFC1918 private hosts to
+ * reduce SSRF exposure. Hostnames that are not IP literals are allowed here
+ * (DNS-rebinding to a private address would still need a resolution-time guard,
+ * which is out of scope for this dead-code hardening).
+ */
+export function validateMcpServerUrl(
+  rawUrl: string
+): { valid: boolean; error?: string } {
+  let parsed: URL
+  try {
+    parsed = new URL(rawUrl)
+  } catch {
+    return { valid: false, error: 'Invalid URL format' }
+  }
+
+  if (!ALLOWED_MCP_URL_PROTOCOLS.has(parsed.protocol)) {
+    return { valid: false, error: 'URL must use the http or https protocol' }
+  }
+
+  const hostname = parsed.hostname.toLowerCase().replace(/^\[/, '').replace(/\]$/, '')
+  if (!hostname) {
+    return { valid: false, error: 'URL host is required' }
+  }
+
+  if (BLOCKED_MCP_HOSTNAMES.has(hostname) || hostname === 'localhost' || hostname.endsWith('.localhost')) {
+    return { valid: false, error: 'URL host is not allowed' }
+  }
+
+  const ipv4 = parseIpv4Octets(hostname)
+  if (ipv4) {
+    if (isPrivateOrLocalIpv4(ipv4)) {
+      return { valid: false, error: 'URL host resolves to a private or loopback address' }
+    }
+  } else if (hostname.includes(':') && isPrivateOrLocalIpv6(hostname)) {
+    return { valid: false, error: 'URL host resolves to a private or loopback address' }
+  }
+
+  return { valid: true }
 }
 
 /**
@@ -270,10 +373,9 @@ export function validateMcpServerConfig(
       return { valid: false, error: 'URL is required for HTTP servers' }
     }
 
-    try {
-      new URL(config.url)
-    } catch {
-      return { valid: false, error: 'Invalid URL format' }
+    const urlCheck = validateMcpServerUrl(config.url)
+    if (!urlCheck.valid) {
+      return urlCheck
     }
   }