P1 修复面收口: - 超时三态区分(aborted→USER_INTERRUPT / ETIMEDOUT→TIMEOUT / 其余→ERROR), 根治"真实网络超时被误报为用户中断" - 流空闲超时统一(SSE/Ollama/Anthropic 读循环 60s 无数据抛 504 进重试通道) - 同会话并发 sendMessage 防重入(isRunning 守卫)+ 会话存在性预检 + 前置调用移入 try(ERROR+DONE 双事件保证,根治 isStreaming 假死) - 清空审计后 resetChainCache(根治 verifyChain 误报 TAMPERED) - DONE 不再提前清理 TRACE(TERMINATED 统一收尾,补全最终迭代录制) - IME 合成回车不发送(普通 Enter + Cmd/Ctrl+Enter 双分支)+ handleSend 闭包修复 P2 安全纵深: - preload 移除原始 electronAPI 暴露(渲染层零使用,关掉 XSS invoke 任意通道单点风险) - CORS 同源回显根治(仅当前浏览页面 Origin,did-navigate 同步) - MEMORY.md 命令保护正则扩展(括号/$/反引号/< 重定向边界 + 前导路径) - write_file append TOCTOU 统一(open 后 realpath 校验,新文件分支补漏) - 敏感键归一化(authKey 驼峰/连字符命中)+ MCP headers 鉴权值加密落库 - ReDoS 检测共享化(search_files/file_editor 统一拦截) - run_tests/lint_code 升风险 + 需确认 + npx --no-install(执行边界对齐 run_command) - MCP/SearXNG/llm.baseURL/updateFeedUrl 配置类 URL 高危目标校验(IPv6 去括号 + 十六进制映射解析 + 尾点剥离) P3 架构还债: - temperature/maxTokens 热生效(引擎/编排器/SubAgent 三处接线)+ setBatch 单事务落盘 - SessionRecorder flush 竞态根治(flushPromise 等待 + 超限内联落盘 + stopRecording async) - 内存收口(lastConsolidationBySession LRU / subTraces 清理 / 会话删除 disposeEngine) - i18n 全量收口(28 组件 + 353 key 双字典,状态标签改渲染时函数) - 死代码清理(updateTraceStep/HEADER_HEIGHT/void preA/失实注释) - 斜杠菜单 MUI 化 + 删除逻辑收敛 resetSessionState + Blob URL 统一释放 + 用户消息"仅保存"落库(saveMessage 透传前端 id 修复 id 错位) P4 能力演进: - 死循环检测拆分(驻留前置 + 乒乓后置带进度信号,合法交替不误报) - run-lock 30s 超时强制 abort(旧 run 卡死不无限排队) - RETRY 双通道 stream_reset(前端按 run 归属精确清空,根治重试文本重复) - FTS5 trigram 中文子串搜索(迁移 9 版本化 SCHEMA_VERSION=2,≤2 字符 LIKE 回退) - getContextWindow 兜底 1M→128K(未知模型防 413) 测试: - 855 → 2406 用例(+1551,2.8 倍):服务层 +325(含 MemoryManager 51 新用例)、 工具实体 +483、IPC/适配器 +390(含 OpenAI/Anthropic/Ollama 独立套件)、 纯函数表格化 +330;引入 jsdom + @testing-library(14 组件测试文件 249 用例) - 修复 R1(saveMessage id 透传)/ R2(stream_reset 精确归属)两个回归缺陷 - 遗留低危项清零:git-tools 顺序耦合 / web-fetch 真实时间退避 / slo 内存断言 / mcp-security 多余 skipIf / deepseek-balance 命名误导 / 组件 mock 注入脆弱性 版本: 0.7.4; README 同步(工具风险表/版本徽章); 依赖: 移除 @electron-toolkit/preload, 新增 jsdom/@testing-library(devDependencies 不打包) 回归: typecheck 双端 0 错误; ESLint 0/0; Electron ABI 全量 2406/2406 零跳过; 系统 Node 2110 通过 296 跳过(better-sqlite3 ABI)
280 lines
10 KiB
TypeScript
280 lines
10 KiB
TypeScript
/**
|
||
* MCP 命令安全面 + SLO 监控契约测试(v0.7.0 覆盖补齐)
|
||
*
|
||
* mcp-manager 的三个安全纯函数此前零测试(命令白名单/参数元字符检测/
|
||
* env 敏感变量剥离),是 MCP 攻击面的第一道防线 —— 逐条表测锁定。
|
||
* HealthChecker/SLOMonitor 此前为"活代码无契约",本文件锁定其健康判定与
|
||
* SLO 指标计算(percentile/burnRate/violated/窗口淘汰)。
|
||
*/
|
||
|
||
import { describe, it, expect, vi } from 'vitest';
|
||
|
||
vi.mock('electron-log', () => ({
|
||
default: { info: vi.fn(), warn: vi.fn(), error: vi.fn(), debug: vi.fn() },
|
||
}));
|
||
|
||
import {
|
||
safeParseArgs,
|
||
safeParseHeaders,
|
||
validateMcpCommand,
|
||
buildSafeEnv,
|
||
isSensitiveHeaderKey,
|
||
serializeHeadersForStorage,
|
||
parseStoredHeaders,
|
||
} from '../mcp-manager.service';
|
||
import { SLOMonitor, HealthChecker } from '../../utils/slo';
|
||
|
||
// ===== MCP:safeParseArgs =====
|
||
|
||
describe('safeParseArgs — JSON args 解析', () => {
|
||
it('合法 JSON 数组 → string[]', () => {
|
||
expect(safeParseArgs('["--flag","value"]')).toEqual(['--flag', 'value']);
|
||
});
|
||
|
||
it('非数组/坏 JSON/空输入 → 空数组兜底', () => {
|
||
expect(safeParseArgs('{"a":1}')).toEqual([]);
|
||
expect(safeParseArgs('not json')).toEqual([]);
|
||
expect(safeParseArgs('')).toEqual([]);
|
||
});
|
||
});
|
||
|
||
// ===== MCP:safeParseHeaders(v0.7.2 P2-8 headers 列接线) =====
|
||
|
||
describe('safeParseHeaders — headers 列解析', () => {
|
||
it('合法 JSON 对象(键值均为字符串)→ Record<string,string>', () => {
|
||
expect(safeParseHeaders('{"Authorization":"Bearer t1","X-Route":"a"}')).toEqual({
|
||
Authorization: 'Bearer t1',
|
||
'X-Route': 'a',
|
||
});
|
||
});
|
||
|
||
it('空输入(null/undefined/空串)→ undefined(匿名连接)', () => {
|
||
expect(safeParseHeaders(null)).toBeUndefined();
|
||
expect(safeParseHeaders(undefined)).toBeUndefined();
|
||
expect(safeParseHeaders('')).toBeUndefined();
|
||
});
|
||
|
||
it('非对象/数组/坏 JSON → undefined(不阻断 server 连接)', () => {
|
||
expect(safeParseHeaders('["a","b"]')).toBeUndefined();
|
||
expect(safeParseHeaders('"plain"')).toBeUndefined();
|
||
expect(safeParseHeaders('not json')).toBeUndefined();
|
||
expect(safeParseHeaders('{}')).toBeUndefined(); // 空对象等价匿名
|
||
});
|
||
|
||
it('非字符串值逐项丢弃,字符串项保留(部分损坏只损失损坏项)', () => {
|
||
expect(safeParseHeaders('{"ok":"v1","bad":123,"worse":{"x":1}}')).toEqual({ ok: 'v1' });
|
||
});
|
||
});
|
||
|
||
// ===== v0.7.4 P2-5: MCP headers 敏感值加密落库 =====
|
||
|
||
describe('MCP headers 敏感值加密(P2-5)', () => {
|
||
it('isSensitiveHeaderKey 识别鉴权类键', () => {
|
||
expect(isSensitiveHeaderKey('Authorization')).toBe(true);
|
||
expect(isSensitiveHeaderKey('authorization')).toBe(true);
|
||
expect(isSensitiveHeaderKey('X-API-Key')).toBe(true);
|
||
expect(isSensitiveHeaderKey('Proxy-Authorization')).toBe(true);
|
||
expect(isSensitiveHeaderKey('x-auth-token')).toBe(true);
|
||
expect(isSensitiveHeaderKey('Accept')).toBe(false);
|
||
expect(isSensitiveHeaderKey('Content-Type')).toBe(false);
|
||
expect(isSensitiveHeaderKey('X-Route')).toBe(false);
|
||
});
|
||
|
||
it('serializeHeadersForStorage 加密敏感值、普通值明文', () => {
|
||
const stored = JSON.parse(
|
||
serializeHeadersForStorage({
|
||
Authorization: 'Bearer secret-token',
|
||
'X-Route': 'gateway',
|
||
}),
|
||
) as Record<string, string>;
|
||
// 敏感值带加密前缀(safeStorage 在测试环境不可用则明文 + WARN —— 兼容两种)
|
||
if (stored.Authorization !== 'Bearer secret-token') {
|
||
expect(String(stored.Authorization)).toMatch(/^metona-enc:v1:/);
|
||
}
|
||
expect(stored['X-Route']).toBe('gateway');
|
||
});
|
||
|
||
it('parseStoredHeaders 解密加密值、透传明文(历史兼容)', () => {
|
||
// 明文历史数据原样透传
|
||
expect(parseStoredHeaders('{"Authorization":"Bearer plain"}')).toEqual({
|
||
Authorization: 'Bearer plain',
|
||
});
|
||
// 加密值解密还原(若 safeStorage 可用)
|
||
const stored = JSON.parse(serializeHeadersForStorage({ 'X-API-Key': 'k-123456' })) as Record<
|
||
string,
|
||
string
|
||
>;
|
||
const parsed = parseStoredHeaders(JSON.stringify(stored));
|
||
if (String(stored['X-API-Key']).startsWith('metona-enc:v1:')) {
|
||
expect(parsed?.['X-API-Key']).toBe('k-123456');
|
||
} else {
|
||
// safeStorage 不可用时明文存储 —— 行为与 encryptConfigValue 降级一致
|
||
expect(parsed?.['X-API-Key']).toBe('k-123456');
|
||
}
|
||
});
|
||
});
|
||
|
||
// ===== MCP:validateMcpCommand =====
|
||
|
||
describe('validateMcpCommand — stdio 命令白名单防线', () => {
|
||
it('白名单内命令正常放行;目录前缀剥除后匹配 basename,但扩展名不剥除', () => {
|
||
for (const cmd of ['npx', 'node', 'npm', 'python', 'python3', 'uv', 'uvx', 'bun', 'deno']) {
|
||
expect(() => validateMcpCommand(cmd, [])).not.toThrow();
|
||
}
|
||
// 目录前缀被剥除 → basename 命中白名单
|
||
expect(() =>
|
||
validateMcpCommand('/usr/local/bin/npx', ['-y', '@modelcontextprotocol/server']),
|
||
).not.toThrow();
|
||
// 现状锁定(比预期更严):扩展名不参与剥除 —— 'npx.cmd' 不在名单,直接拒绝。
|
||
// 这是当前安全基线的一部分:宁可收紧也不放过任何可执行变体。
|
||
expect(() => validateMcpCommand('C:\tools\npx.cmd', [])).toThrow(/allowed list/);
|
||
});
|
||
|
||
it('白名单外命令直接拒绝', () => {
|
||
for (const cmd of ['curl', 'bash', 'sh', 'pwsh', 'cmd', 'powershell.exe', './unknown-server']) {
|
||
expect(() => validateMcpCommand(cmd, [])).toThrow(/not in the allowed list/);
|
||
}
|
||
});
|
||
|
||
it('args 中携带 shell 元字符(; & | 反引号 $ 等)拒绝;普通参数放行', () => {
|
||
const evil: Array<string[]> = [
|
||
[';whoami'],
|
||
['a&b'],
|
||
['x|cat'],
|
||
['`id`'],
|
||
['$HOME'],
|
||
['<in'],
|
||
['>out'],
|
||
['line\nbreak'],
|
||
];
|
||
for (const args of evil) {
|
||
expect(() => validateMcpCommand('node', ['server.js', ...args])).toThrow();
|
||
}
|
||
expect(() => validateMcpCommand('node', ['server.js', '--port', '3000'])).not.toThrow();
|
||
});
|
||
});
|
||
|
||
// ===== MCP:buildSafeEnv =====
|
||
|
||
describe('buildSafeEnv — 子进程环境净化', () => {
|
||
it('命中后缀黑名单的敏感键被剔除,其余保留', () => {
|
||
const baseEnv = {
|
||
PATH: '/usr/bin',
|
||
HOME: '/home/u',
|
||
MY_API_KEY: 'sk-secret',
|
||
ACCESS_TOKEN: 'tok',
|
||
DB_PASSWORD: 'p@ss',
|
||
AWS_SECRET_ACCESS_KEY2: 'k',
|
||
DEPLOY_PRIVATE_KEY: '----', // 后缀 _PRIVATE_KEY 命中
|
||
GITEA_CREDENTIALS: '{"u":"x"}', // 后缀 _CREDENTIALS 命中(真实 CI/部署泄漏形态)
|
||
SAFE_NAME: 'keepme',
|
||
};
|
||
vi.stubGlobal('process', { ...process, env: baseEnv as NodeJS.ProcessEnv });
|
||
const env = buildSafeEnv();
|
||
expect(env.PATH).toBe('/usr/bin');
|
||
expect(env.SAFE_NAME).toBe('keepme');
|
||
expect(env.MY_API_KEY).toBeUndefined();
|
||
expect(env.ACCESS_TOKEN).toBeUndefined();
|
||
expect(env.DB_PASSWORD).toBeUndefined();
|
||
expect(env.DEPLOY_PRIVATE_KEY).toBeUndefined();
|
||
expect(env.GITEA_CREDENTIALS).toBeUndefined();
|
||
vi.unstubAllGlobals();
|
||
});
|
||
});
|
||
|
||
// ===== SLOMonitor =====
|
||
|
||
describe('SLOMonitor — 窗口指标 / 分位数 / 燃烧率', () => {
|
||
function makeMonitor(): SLOMonitor {
|
||
return new SLOMonitor({
|
||
target: 0.99,
|
||
windowMs: 60_000,
|
||
latencyPercentiles: [0.5, 0.95],
|
||
latencyThresholdMs: 5_000,
|
||
});
|
||
}
|
||
|
||
it('空窗口:totalRequests=0、errorRate=0、violated=false、burnRate=0', () => {
|
||
const s = makeMonitor().getStatus();
|
||
expect(s.totalRequests).toBe(0);
|
||
expect(s.errorRate).toBe(0);
|
||
expect(s.violated).toBe(false);
|
||
expect(s.burnRate).toBe(0);
|
||
});
|
||
|
||
it('统计请求成功率/平均延迟/吞吐量、分位数字段齐全且单调', async () => {
|
||
const m = makeMonitor();
|
||
const t0 = Date.now();
|
||
const latencies = [100, 200, 400, 800, 1600]; // 全成功
|
||
latencies.forEach((ms, i) => {
|
||
m.recordRequest(ms, true);
|
||
void i;
|
||
});
|
||
void t0;
|
||
const s = m.getStatus();
|
||
expect(s.totalRequests).toBe(5);
|
||
expect(s.errorRequests).toBe(0);
|
||
expect(s.avgLatencyMs).toBe(620);
|
||
expect(Object.keys(s.percentiles)).toEqual(['P50', 'P95']);
|
||
expect(s.percentiles['P50']).toBeGreaterThanOrEqual(200);
|
||
expect(s.percentiles['P95']).toBeLessThanOrEqual(1600);
|
||
expect(s.burnRate).toBe(0);
|
||
expect(s.target).toBeCloseTo(0.99);
|
||
expect(s.errorBudget).toBeCloseTo(0.01);
|
||
});
|
||
|
||
it('错误率超预算 → burnRate>1 且 violated=true(全错样本:burnRate=100)', async () => {
|
||
const m = new SLOMonitor({
|
||
target: 0.99,
|
||
windowMs: 60_000,
|
||
latencyPercentiles: [0.5],
|
||
latencyThresholdMs: 10_000,
|
||
});
|
||
for (let i = 0; i < 4; i++) m.recordRequest(50 + i, false);
|
||
const s = m.getStatus();
|
||
expect(s.errorRate).toBe(1);
|
||
expect(s.burnRate).toBeGreaterThan(1);
|
||
expect(s.violated).toBe(true);
|
||
});
|
||
|
||
it('窗口外记录被淘汰:回到基线 totalRequests=0(真实短窗口计时)', async () => {
|
||
const m = new SLOMonitor({
|
||
target: 0.99,
|
||
windowMs: 50,
|
||
latencyPercentiles: [0.5],
|
||
latencyThresholdMs: 10_000,
|
||
});
|
||
m.recordRequest(100, true);
|
||
m.recordRequest(120, false);
|
||
expect(m.getStatus().totalRequests).toBe(2);
|
||
|
||
// 越过 50ms 窗口后读取
|
||
await new Promise((r) => setTimeout(r, 70));
|
||
expect(m.getStatus().totalRequests).toBe(0);
|
||
});
|
||
});
|
||
|
||
// ===== HealthChecker =====
|
||
|
||
describe('HealthChecker — 三项健康检查(v0.7.4 移除多余 skipIf)', () => {
|
||
// v0.7.4 回归修复: 本套件用注入的 broken DB,不依赖 better-sqlite3 ABI,
|
||
// 原 skipIf(!dbAvailable) 使系统 Node 下整个套件被跳过(与 slo.test.ts 的
|
||
// 无门控 HealthChecker 套件门控不一致)。移除门控后双轨均执行。
|
||
// 注:真实库连通性由 database-migration.test.ts(PRAGMA user_version 套件)以
|
||
// 完整 DatabaseService.initialize() 覆盖;此处仅保留纯依赖注入的确定性用例。
|
||
|
||
it('DB ping 失败 → database check 不健康、healthy=false', async () => {
|
||
const broken = {
|
||
prepare: () => {
|
||
throw new Error('disk I/O error');
|
||
},
|
||
} as unknown as import('better-sqlite3').Database;
|
||
const hc = new HealthChecker(() => broken, ':memory:');
|
||
const report = await hc.check();
|
||
const dbCheck = report.checks.find((c) => c.name === 'database');
|
||
expect(dbCheck?.healthy).toBe(false);
|
||
expect(String(dbCheck?.error ?? '')).toContain('I/O');
|
||
expect(report.healthy).toBe(false);
|
||
});
|
||
});
|