cc-viewer 1.8.9 → 1.8.11

package/server/routes/skills.js

@@ -2,7 +2,8 @@
 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) {
   try {
@@ -44,10 +45,12 @@ function skillsToggle(req, res) {
   });
 }
 
-// Skill 永久删除 —— 把单个 skill 文件夹从 skills/ 或 skills-skip/ 彻底删除（不可恢复）
-// loopback-only：不可逆 rmSync 不向局域网暴露（toggle 是可逆 move，这里更严）。
+// Permanently delete a skill — rmSync the skill folder from skills/ or skills-skip/ (irreversible).
+// admin-only: an irreversible rmSync is not exposed to unauthenticated LAN clients (toggle is a
+// reversible move — this is stricter); an authenticated remote admin (container/cloud) is allowed
+// the same as the loopback admin.
 function skillsDelete(req, res, parsedUrl, isLocal) {
-  if (!isLocal) {
+  if (!isAdminReq(req, isLocal)) {
     res.writeHead(403, { 'Content-Type': 'application/json' });
     res.end(JSON.stringify({ error: 'Loopback only' }));
     return;
@@ -78,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}] }。
@@ -133,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;
@@ -144,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;
@@ -154,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' });
       }
     }
@@ -176,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;
@@ -191,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'
@@ -205,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' });
   }
@@ -261,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, '');
@@ -273,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;
     }

package/server/routes/voice-pack.js

@@ -1,6 +1,6 @@
 // Voice-pack routes (moved verbatim from server.js handleRequest).
 // Manages user-uploaded audio + serves the bundled "皇上系列" default pack.
-// Uploads are loopback-only — LAN clients can play but not write.
+// Uploads/deletes are admin-only (loopback, or authenticated remote admin) — other clients can play but not write.
 import { lstatSync, statSync, createReadStream } from 'node:fs';
 import { LOG_DIR } from '../../findcc.js';
 import {
@@ -18,6 +18,7 @@ import {
   EVENT_KEYS as VP_EVENT_KEYS,
   MAX_AUDIO_BYTES as VP_MAX_BYTES,
 } from '../lib/voice-pack-manager.js';
+import { isAdminReq } from '../lib/is-admin.js';
 
 function voicePackList(req, res) {
   try {
@@ -45,10 +46,10 @@ function voicePackList(req, res) {
 }
 
 function voicePackUpload(req, res, parsedUrl, isLocal) {
-  // Loopback-only — refuse LAN clients even if they hold a valid token.
-  // The token already gates LAN access but voice-pack writes touch the local FS
-  // and end up reachable from every client; keep the write side strictly local.
-  if (!isLocal) {
+  // Admin-only — refuse unauthenticated LAN clients even if they hold a valid token.
+  // The token already gates LAN access but voice-pack writes touch the local FS and end up
+  // reachable from every client; an authenticated remote admin (container/cloud) is allowed.
+  if (!isAdminReq(req, isLocal)) {
     res.writeHead(403, { 'Content-Type': 'application/json' });
     res.end(JSON.stringify({ error: 'Upload allowed from loopback only' }));
     return;
@@ -106,7 +107,7 @@ function voicePackUpload(req, res, parsedUrl, isLocal) {
 }
 
 function voicePackDelete(req, res, parsedUrl, isLocal) {
-  if (!isLocal) {
+  if (!isAdminReq(req, isLocal)) {
     res.writeHead(403, { 'Content-Type': 'application/json' });
     res.end(JSON.stringify({ error: 'Delete allowed from loopback only' }));
     return;

package/server/server.js

@@ -757,17 +757,27 @@ async function handleRequest(req, res) {
   const isLocal = remoteIp === '127.0.0.1' || remoteIp === '::1' || remoteIp === '::ffff:127.0.0.1';
   const isStaticAsset = url.startsWith('/assets/') || url === '/favicon.ico';
   const wantsHtml = method === 'GET' && ((req.headers.accept || '').includes('text/html') || url === '/');
+  // Hoisted so decideAuth and the isAdmin computation share the SAME credential values.
+  const urlToken = parsedUrl.searchParams.get('token');
+  const cookieToken = parseCookies(req.headers.cookie).ccv_auth;
   const authDecision = decideAuth({
     isStaticAsset,
     pathname: url,
     isLocal,
-    urlToken: parsedUrl.searchParams.get('token'),
-    cookieToken: parseCookies(req.headers.cookie).ccv_auth,
+    urlToken,
+    cookieToken,
     accessToken: ACCESS_TOKEN,
     enabled: authConfig.enabled,
     password: authConfig.password,
     wantsHtml,
   });
+  // Remote-admin elevation (container/cloud deploy): an authenticated remote caller is
+  // treated as admin for management routes (isAdminReq in lib/is-admin.js). isAdmin comes
+  // straight from decideAuth (single source of truth — it mirrors the remote-allow branches
+  // and can never drift from them). Loopback is always admin. This MUST NOT relax the
+  // internal machine bridges (events.js hook notifies, ask-perm.js streamChunk) — those
+  // stay strictly loopback + INTERNAL_TOKEN.
+  req.ccvIsAdmin = authDecision.isAdmin === true;
   if (authDecision.action === 'login-page') {
     const lang = localeFromAcceptLanguage(req.headers['accept-language']) || getLang();
     res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8', 'Cache-Control': 'no-store' });