cloudflare-mcp-smart-proxy 1.5.9 → 1.5.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudflare-mcp-smart-proxy",
-  "version": "1.5.9",
+  "version": "1.5.10",
   "description": "Smart proxy for Cloudflare MCP - routes tools to cloud or local execution",
   "repository": {
     "type": "git",

package/src/memory-schema.js

@@ -40,7 +40,12 @@ function normalizeStringArray(value, limit = 32) {
 }
 
 export function assertNoSensitiveMemory(input = {}) {
-  const text = [input.title, input.content, ...(input.evidenceRefs || input.evidence_refs || [])]
+  const text = [
+    input.title,
+    input.content,
+    ...(input.tags || []),
+    ...(input.evidenceRefs || input.evidence_refs || [])
+  ]
     .filter(Boolean).join('\n');
   if (SENSITIVE_MEMORY_PATTERNS.some((pattern) => pattern.test(text))) {
     throw new Error('Memory content appears to contain a secret or approval credential');

package/src/reference-connectors.js

@@ -44,19 +44,40 @@ function ensureDir(targetPath) {
   }
 }
 
-function resolveAtomicWriteTarget(filePath) {
+function isPathWithin(rootPath, candidatePath) {
+  const relative = path.relative(rootPath, candidatePath);
+  return relative === '' || (!relative.startsWith(`..${path.sep}`) && relative !== '..' && !path.isAbsolute(relative));
+}
+
+function resolveAtomicWriteTarget(filePath, { allowedRoot = null, followFinalSymlink = true } = {}) {
+  const resolvedFilePath = path.resolve(filePath);
+  const resolvedAllowedRoot = allowedRoot ? fs.realpathSync(path.resolve(allowedRoot)) : null;
+  if (resolvedAllowedRoot) {
+    const physicalParent = fs.realpathSync(path.dirname(resolvedFilePath));
+    if (!isPathWithin(resolvedAllowedRoot, physicalParent)) {
+      throw new Error(`Connector configuration target escapes the selected workspace: ${filePath}`);
+    }
+  }
+
   try {
-    if (fs.lstatSync(filePath).isSymbolicLink()) {
-      return fs.realpathSync(filePath);
+    if (fs.lstatSync(resolvedFilePath).isSymbolicLink()) {
+      if (!followFinalSymlink) {
+        throw new Error(`Connector configuration target must not be a symbolic link: ${filePath}`);
+      }
+      const physicalTarget = fs.realpathSync(resolvedFilePath);
+      if (resolvedAllowedRoot && !isPathWithin(resolvedAllowedRoot, physicalTarget)) {
+        throw new Error(`Connector configuration target escapes the selected workspace: ${filePath}`);
+      }
+      return physicalTarget;
     }
   } catch (error) {
     if (error?.code !== 'ENOENT') throw error;
   }
-  return filePath;
+  return resolvedFilePath;
 }
 
-export function writeFileAtomically(filePath, content) {
-  const writeTarget = resolveAtomicWriteTarget(filePath);
+export function writeFileAtomically(filePath, content, options = {}) {
+  const writeTarget = resolveAtomicWriteTarget(filePath, options);
   ensureDir(writeTarget);
   const temporaryPath = `${writeTarget}.${process.pid}.${Date.now()}.tmp`;
   try {
@@ -65,6 +86,7 @@ export function writeFileAtomically(filePath, content) {
       flag: 'wx',
       mode: 0o600
     });
+    resolveAtomicWriteTarget(filePath, options);
     fs.renameSync(temporaryPath, writeTarget);
   } catch (error) {
     if (fs.existsSync(temporaryPath)) fs.unlinkSync(temporaryPath);
@@ -367,6 +389,13 @@ export function installReferenceConnector({
     runtime
   });
 
+  const writeOptions = target.scope === 'project'
+    ? { allowedRoot: workspaceRoot, followFinalSymlink: false }
+    : {};
+  if (target.scope === 'project') {
+    resolveAtomicWriteTarget(target.targetFile, writeOptions);
+  }
+
   let renderedContent = '';
   if (target.format === 'toml') {
     const existingContent = fs.existsSync(target.targetFile)
@@ -383,7 +412,7 @@ export function installReferenceConnector({
   }
 
   if (!dryRun) {
-    writeFileAtomically(target.targetFile, renderedContent);
+    writeFileAtomically(target.targetFile, renderedContent, writeOptions);
   }
 
   return {

package/src/router.js

@@ -45,7 +45,6 @@ export class SmartRouter {
     this.workspaceRoot = workspaceRoot || process.cwd();
     this.deviceIdentity = deviceIdentity;
     this.getScopeHeaders = typeof getScopeHeaders === 'function' ? getScopeHeaders : () => ({});
-    
     // 工具路由规则
     this.routingRules = {
       // 本地工具（需要文件系统访问）
@@ -136,30 +135,22 @@ export class SmartRouter {
     return 'cloud';
   }
 
-  getWorkspaceWarnings() {
-    const resolution = this.localTools?.connectorBridge?.state?.workspaceResolution;
-    if (resolution?.workspaceId) return [];
-    return Array.isArray(resolution?.warnings) ? resolution.warnings : [];
-  }
-
   /**
    * 执行工具调用
    */
   async executeTool(toolName, params) {
     const route = this.routeTool(toolName);
-    const workspaceWarnings = this.getWorkspaceWarnings();
-    if (route === 'cloud' && workspaceWarnings.length) {
-      return {
-        objectType: 'connector_workspace_warning',
-        executed: false,
-        warnings: workspaceWarnings
-      };
-    }
-    
+
     if (route === 'local') {
       return await this.localTools.execute(toolName, params);
     } else {
-      return await this.callCloudTool(toolName, params);
+      const recoveryParams = toolName === 'request_project_workspace_registration'
+        ? {
+            ...params,
+            projectIdentity: this.localTools?.connectorBridge?.state?.projectIdentity
+          }
+        : params;
+      return await this.callCloudTool(toolName, recoveryParams);
     }
   }
 
@@ -187,7 +178,7 @@ export class SmartRouter {
   /**
    * 调用云端工具
    */
-  async callCloudTool(toolName, params) {
+  async callCloudTool(toolName, params, { workspaceId = null } = {}) {
     // 对于 skill_* 工具，自动注入项目根路径信息
     if (toolName.startsWith('skill_')) {
       // 如果参数中没有 project_root 且没有 paths，自动添加 project_root
@@ -231,6 +222,7 @@ export class SmartRouter {
           'Authorization': `Bearer ${this.cloudApiKey}`,
           'Content-Type': 'application/json',
           ...this.getScopeHeaders(),
+          ...(workspaceId ? { 'X-CloudMCP-Workspace-ID': workspaceId } : {}),
           ...signedHeaders
         },
         body
@@ -302,14 +294,6 @@ export class SmartRouter {
    * 获取所有工具列表（合并云端和本地）
    */
   async getAllTools() {
-    const workspaceWarnings = this.getWorkspaceWarnings();
-    if (workspaceWarnings.length) {
-      const localTools = await this.localTools.listTools();
-      const recoveryTools = new Set(['connector_bridge_status', 'connector_discover_project_probe']);
-      return localTools
-        .filter((tool) => recoveryTools.has(tool.name))
-        .map((tool) => ({ ...tool, source: 'local' }));
-    }
     const [cloudTools, localTools] = await Promise.all([
       this.getCloudTools(),
       this.localTools.listTools()
@@ -334,7 +318,7 @@ export class SmartRouter {
   /**
    * 获取云端工具列表
    */
-  async getCloudTools() {
+  async getCloudTools({ workspaceId = null } = {}) {
     const body = JSON.stringify({
         jsonrpc: '2.0',
         id: Date.now(),
@@ -350,6 +334,7 @@ export class SmartRouter {
           'Authorization': `Bearer ${this.cloudApiKey}`,
           'Content-Type': 'application/json',
           ...this.getScopeHeaders(),
+          ...(workspaceId ? { 'X-CloudMCP-Workspace-ID': workspaceId } : {}),
           ...signedHeaders
         },
         body