cc-viewer 1.8.10 → 1.8.11

package/server/routes/files-fs.js

@@ -6,7 +6,7 @@ import {
 import { join, dirname, basename, resolve, sep } from 'node:path';
 import { homedir, tmpdir } from 'node:os';
 import { execFile, spawn } from 'node:child_process';
-import { bumpWorkspacesVersion } from '../lib/file-access-policy.js';
+import { bumpWorkspacesVersion, isReadAllowed } from '../lib/file-access-policy.js';
 import { validateImportDir } from '../lib/file-api.js';
 import { PROFILE_PATH, _projectName, _logDir } from '../interceptor.js';
 import { LOG_DIR, getClaudeConfigDir } from '../../findcc.js';
@@ -659,6 +659,80 @@ function resolvePath(req, res, parsedUrl, isLocal, deps) {
   });
 }
 
+// Lightweight existence probe for the chat markdown code-span feature: the web
+// client batches path-looking inline code spans here and only renders them
+// clickable when the file provably exists. Uniform {exists:false} for every
+// not-readable-as-regular-file outcome (missing / outside allowlist / denied /
+// directory) — never echoes policy reasons, so this is a strictly weaker oracle
+// than /api/file-content's 404/403 split.
+const FILES_EXISTS_MAX_BATCH = 50;
+const FILES_EXISTS_MAX_PATH = 1024;
+const FILES_EXISTS_MAX_BODY = 256 * 1024; // 50 × 1024 + JSON overhead ≪ this
+
+function filesExists(req, res, parsedUrl, isLocal, deps) {
+  let body = '';
+  let aborted = false;
+  req.on('data', chunk => {
+    body += chunk;
+    if (body.length > FILES_EXISTS_MAX_BODY && !aborted) {
+      aborted = true;
+      res.writeHead(413, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify({ error: 'Request too large' }));
+      req.destroy();
+    }
+  });
+  req.on('end', () => {
+    if (aborted) return;
+    let parsed;
+    try { parsed = JSON.parse(body); } catch {
+      res.writeHead(400, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify({ error: 'Invalid request body' }));
+      return;
+    }
+    const paths = parsed && parsed.paths;
+    if (!Array.isArray(paths)) {
+      res.writeHead(400, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify({ error: 'Invalid paths' }));
+      return;
+    }
+    if (paths.length > FILES_EXISTS_MAX_BATCH) {
+      res.writeHead(400, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify({ error: 'Too many paths' }));
+      return;
+    }
+    for (const p of paths) {
+      if (typeof p !== 'string' || p.length > FILES_EXISTS_MAX_PATH) {
+        res.writeHead(400, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ error: 'Invalid path' }));
+        return;
+      }
+    }
+    const cwd = process.env.CCV_PROJECT_DIR || process.cwd();
+    const results = paths.map(p => ({ path: p, exists: probeFileExists(p, cwd) }));
+    res.writeHead(200, { 'Content-Type': 'application/json' });
+    res.end(JSON.stringify({ results }));
+  });
+}
+
+function probeFileExists(p, cwd) {
+  try {
+    const isAbs = /^([a-zA-Z]:[\\/]|[\\/])/.test(p);
+    // Mirrors /api/file-content: a relative `..` segment can never be opened by
+    // the click path either, so report it as non-existent rather than 400.
+    // Segment-wise check — a legit filename like `foo..bar.md` must not match.
+    if (!isAbs && p.split(/[\\/]/).includes('..')) return false;
+    // Resolve BEFORE isReadAllowed: realpathSync inside the policy resolves
+    // relative input against process.cwd(), which is the app dir (not the
+    // project) in packaged Electron runs.
+    const absPath = isAbs ? p : resolve(cwd, p);
+    const policy = isReadAllowed(absPath);
+    if (!policy.ok) return false;
+    return statSync(policy.real).isFile();
+  } catch {
+    return false; // one bad path must not sink the whole batch
+  }
+}
+
 function createFile(req, res, parsedUrl, isLocal, deps) {
   let body = '';
   req.on('data', chunk => { body += chunk; if (body.length > deps.MAX_POST_BODY) req.destroy(); });
@@ -964,6 +1038,7 @@ export const filesFsRoutes = [
   { method: 'POST', match: 'exact', path: '/api/reveal-file', handler: revealFile },
   { method: 'POST', match: 'exact', path: '/api/open-file', handler: openFile },
   { method: 'POST', match: 'exact', path: '/api/resolve-path', handler: resolvePath },
+  { method: 'POST', match: 'exact', path: '/api/files-exists', handler: filesExists },
   { method: 'POST', match: 'exact', path: '/api/create-file', handler: createFile },
   { method: 'POST', match: 'exact', path: '/api/open-terminal', handler: openTerminal },
   { method: 'POST', match: 'exact', path: '/api/create-dir', handler: createDir },

package/server/routes/skills.js

@@ -2,7 +2,7 @@
 import { mkdirSync, writeFileSync, existsSync } from 'node:fs';
 import { join, resolve, sep, dirname } from 'node:path';
 import { getClaudeConfigDir } from '../../findcc.js';
-import { listSkills, moveSkill, deleteSkill, validateSkillName } from '../lib/skills-api.js';
+import { listSkills, moveSkill, deleteSkill, validateSkillName, parseSkillFrontmatter } from '../lib/skills-api.js';
 import { isAdminReq } from '../lib/is-admin.js';
 
 async function skillsList(req, res) {
@@ -81,22 +81,35 @@ function skillsDelete(req, res, parsedUrl, isLocal) {
 // 设计要点（与原实现一致）：
 //  · 扩展名白名单只放 zip / md（忽略大小写）；其他类型 415；
 //  · zip 内必须含 SKILL.md（任意子目录、忽略大小写），取最浅的那个所在目录作为 skill 根；
-//  · skill 名优先取 SKILL.md frontmatter 的 name，回落 zip 根目录名 / 文件名（去扩展名）；
+//  · Strict spec check (unified across all three entries): SKILL.md frontmatter must contain
+//    a name (must pass validateSkillName) and a description; violations reject with
+//    INVALID_FRONTMATTER / MISSING_NAME / INVALID_NAME / MISSING_DESCRIPTION — no more
+//    filename / zip-root-dir fallback;
 //  · zip bomb 防护：单文件 ≤50MB，总解压 ≤200MB；拒绝 symlink entry。
 
-const parseNameFromMd = (text) => {
-  const m = /^---\s*\n([\s\S]*?)\n---/.exec(text);
-  if (!m) return null;
-  const nm = /^name\s*:\s*(.*)$/m.exec(m[1]);
-  if (!nm) return null;
-  return nm[1].trim().replace(/^["']|["']$/g, '');
-};
+// Shared size caps for the zip path (declared-size pass + actual-size re-check).
+const MAX_SKILL_FILE = 50 * 1024 * 1024;
+const MAX_SKILL_TOTAL = 200 * 1024 * 1024;
 
-const fallbackBaseName = (filename, stripExt) => {
-  let n = filename.replace(/^.*[\\/]/, '');
-  if (stripExt) n = n.replace(/\.[^.]+$/, '');
-  return n;
-};
+// Strict skill-spec validation shared by all three import entries (folder / zip / SKILL.md).
+// Check order is fixed (tests depend on it): no frontmatter block → INVALID_FRONTMATTER;
+// missing name → MISSING_NAME; invalid name → INVALID_NAME; missing description → MISSING_DESCRIPTION.
+function requireSkillSpec(text) {
+  const fm = parseSkillFrontmatter(text);
+  if (!fm) {
+    throw Object.assign(new Error('SKILL.md is missing valid frontmatter'), { status: 400, code: 'INVALID_FRONTMATTER' });
+  }
+  if (!fm.name) {
+    throw Object.assign(new Error('SKILL.md frontmatter is missing a name'), { status: 400, code: 'MISSING_NAME' });
+  }
+  if (!validateSkillName(fm.name)) {
+    throw Object.assign(new Error(`Invalid skill name: ${fm.name}`), { status: 400, code: 'INVALID_NAME' });
+  }
+  if (!fm.description) {
+    throw Object.assign(new Error('SKILL.md frontmatter is missing a description'), { status: 400, code: 'MISSING_DESCRIPTION' });
+  }
+  return fm;
+}
 
 /**
  * 解析一段 multipart body（已组装好的 Buffer）→ { skillName, files: [{relPath, data}] }。
@@ -136,7 +149,7 @@ export async function parseSkillUpload(buf, boundary, windowsReservedRe) {
 
   if (isMd) {
     const text = fileData.toString('utf8');
-    skillName = parseNameFromMd(text) || fallbackBaseName(originalName, true);
+    skillName = requireSkillSpec(text).name;
     skillFiles = [{ relPath: 'SKILL.md', data: fileData }];
   } else {
     const AdmZip = (await import('adm-zip')).default;
@@ -147,8 +160,6 @@ export async function parseSkillUpload(buf, boundary, windowsReservedRe) {
       throw Object.assign(new Error('Invalid zip archive'), { status: 400, code: 'INVALID_ZIP' });
     }
     const entries = zip.getEntries();
-    const MAX_PER_FILE = 50 * 1024 * 1024;
-    const MAX_TOTAL_UNCOMPRESSED = 200 * 1024 * 1024;
     let totalUncompressed = 0;
     for (const e of entries) {
       if (e.isDirectory) continue;
@@ -157,11 +168,11 @@ export async function parseSkillUpload(buf, boundary, windowsReservedRe) {
         throw Object.assign(new Error('Symlinks not allowed in zip'), { status: 400, code: 'INVALID_ZIP' });
       }
       const sizeRaw = e.header?.size || 0;
-      if (sizeRaw > MAX_PER_FILE) {
+      if (sizeRaw > MAX_SKILL_FILE) {
         throw Object.assign(new Error('File too large in archive'), { status: 400, code: 'ZIP_BOMB' });
       }
       totalUncompressed += sizeRaw;
-      if (totalUncompressed > MAX_TOTAL_UNCOMPRESSED) {
+      if (totalUncompressed > MAX_SKILL_TOTAL) {
         throw Object.assign(new Error('Archive expands too large'), { status: 400, code: 'ZIP_BOMB' });
       }
     }
@@ -179,12 +190,16 @@ export async function parseSkillUpload(buf, boundary, windowsReservedRe) {
     if (!bestSkillEntry) {
       throw Object.assign(new Error('SKILL.md not found in zip'), { status: 400, code: 'MISSING_SKILL_MD' });
     }
+    // Guard BEFORE inflating: header.size is attacker-controlled, but a declared oversize at
+    // least lets us reject before spending memory on getData() (actual-size re-check below
+    // still catches a lying small header).
+    if ((bestSkillEntry.header?.size || 0) > MAX_SKILL_FILE) {
+      throw Object.assign(new Error('File too large in archive'), { status: 400, code: 'ZIP_BOMB' });
+    }
     const lastSlash = bestSkillEntry.entryName.lastIndexOf('/');
     const skillRootPrefix = lastSlash >= 0 ? bestSkillEntry.entryName.slice(0, lastSlash + 1) : '';
     const skillMdText = bestSkillEntry.getData().toString('utf8');
-    skillName = parseNameFromMd(skillMdText)
-      || (skillRootPrefix ? skillRootPrefix.replace(/\/$/, '').split('/').pop() : null)
-      || fallbackBaseName(originalName, true);
+    skillName = requireSkillSpec(skillMdText).name;
 
     // 二次校验：header.size 来自 zip 中央目录是攻击者可控的（可谎报 size=0），用真实 data.length 复核。
     let actualTotal = 0;
@@ -194,11 +209,11 @@ export async function parseSkillUpload(buf, boundary, windowsReservedRe) {
       const rel = skillRootPrefix ? e.entryName.slice(skillRootPrefix.length) : e.entryName;
       if (!rel || rel.includes('..')) continue;
       const data = e.getData();
-      if (data.length > MAX_PER_FILE) {
+      if (data.length > MAX_SKILL_FILE) {
         throw Object.assign(new Error('File actual size too large'), { status: 400, code: 'ZIP_BOMB' });
       }
       actualTotal += data.length;
-      if (actualTotal > MAX_TOTAL_UNCOMPRESSED) {
+      if (actualTotal > MAX_SKILL_TOTAL) {
         throw Object.assign(new Error('Archive actual size too large'), { status: 400, code: 'ZIP_BOMB' });
       }
       const finalRel = rel.split('/').pop().toLowerCase() === 'skill.md'
@@ -208,6 +223,8 @@ export async function parseSkillUpload(buf, boundary, windowsReservedRe) {
     }
   }
 
+  // defense-in-depth: requireSkillSpec already validated the name (and would have
+  // thrown first); keep this re-check so future refactors can't silently skip it.
   if (!validateSkillName(skillName)) {
     throw Object.assign(new Error(`Invalid skill name: ${skillName}`), { status: 400, code: 'INVALID_NAME' });
   }
@@ -264,7 +281,8 @@ export function importSkillTo(req, res, { skillsRoot, windowsReserved }) {
   const contentLength = parseInt(req.headers['content-length'] || '0', 10);
   if (contentLength > MAX_UPLOAD) {
     res.writeHead(413, { 'Content-Type': 'application/json' });
-    res.end(JSON.stringify({ error: 'File too large (max 100MB)' }));
+    // code 字段供前端 skillImportErrorKey 映射成 i18n 文案,而不是裸英文
+    res.end(JSON.stringify({ error: 'File too large (max 100MB)', code: 'TOO_LARGE' }));
     return;
   }
   const boundary = boundaryMatch[1].trim().replace(/^["']|["']$/g, '');
@@ -276,7 +294,7 @@ export function importSkillTo(req, res, { skillsRoot, windowsReserved }) {
     if (totalSize > MAX_UPLOAD) {
       aborted = true;
       res.writeHead(413, { 'Content-Type': 'application/json' });
-      res.end(JSON.stringify({ error: 'File too large (max 100MB)' }));
+      res.end(JSON.stringify({ error: 'File too large (max 100MB)', code: 'TOO_LARGE' }));
       req.destroy();
       return;
     }