feat: v0.7.4 时序语义修正 · 防线实效补漏 · 全量测试翻倍 — 2406 用例 + jsdom 组件测试全量回归
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)
This commit is contained in:
@@ -98,10 +98,36 @@ describe('commandTouchesProtectedFile', () => {
|
||||
expect(commandTouchesProtectedFile('echo x | cat MEMORY.md; rm file')).toBe(true);
|
||||
});
|
||||
|
||||
// v0.7.4 P2-3: 前导路径绕过根治 —— ./ .\ ~ ~/ 前缀仍指工作空间根,必须拦截
|
||||
it('./ .\\ ~ ~/ 前缀引用 MEMORY.md 被拦截(P2-3 根治)', () => {
|
||||
expect(commandTouchesProtectedFile('cat ./MEMORY.md')).toBe(true);
|
||||
expect(commandTouchesProtectedFile('cat .\\MEMORY.md')).toBe(true);
|
||||
expect(commandTouchesProtectedFile('cat ~/MEMORY.md')).toBe(true);
|
||||
expect(commandTouchesProtectedFile('cat ~/./MEMORY.md')).toBe(true);
|
||||
expect(commandTouchesProtectedFile('rm -rf ./MEMORY.md')).toBe(true);
|
||||
});
|
||||
|
||||
it('子目录 MEMORY.md 仍不被拦截(路径前缀不误伤)', () => {
|
||||
expect(commandTouchesProtectedFile('cat sub/MEMORY.md')).toBe(false);
|
||||
expect(commandTouchesProtectedFile('cat sub\\MEMORY.md')).toBe(false);
|
||||
expect(commandTouchesProtectedFile('cat ./sub/MEMORY.md')).toBe(false);
|
||||
expect(commandTouchesProtectedFile('cat ~/sub/MEMORY.md')).toBe(false);
|
||||
});
|
||||
|
||||
it('无关命令不误判', () => {
|
||||
expect(commandTouchesProtectedFile('npm run test')).toBe(false);
|
||||
expect(commandTouchesProtectedFile('git status')).toBe(false);
|
||||
});
|
||||
|
||||
// v0.7.4 P2-3 修正: 括号/子 shell/命令替换/重定向无空格/反引号形态
|
||||
it('子 shell/括号/命令替换/重定向/反引号引用 MEMORY.md 被拦截(P2-3 修正)', () => {
|
||||
expect(commandTouchesProtectedFile('$(cat MEMORY.md)')).toBe(true);
|
||||
expect(commandTouchesProtectedFile('(cat MEMORY.md)')).toBe(true);
|
||||
expect(commandTouchesProtectedFile('cat <MEMORY.md')).toBe(true);
|
||||
expect(commandTouchesProtectedFile('echo `cat MEMORY.md`')).toBe(true);
|
||||
expect(commandTouchesProtectedFile('python -c "open(\'MEMORY.md\')"')).toBe(true);
|
||||
expect(commandTouchesProtectedFile('$(cat ./MEMORY.md)')).toBe(true);
|
||||
});
|
||||
});
|
||||
|
||||
describe('matchGlob / matchAnyGlob', () => {
|
||||
@@ -184,3 +210,120 @@ describe('workspace 文件读取场景(临时目录)', () => {
|
||||
expect(isPathWithinWorkspace(join(ws, 'file.txt'), ws)).toBe(true);
|
||||
});
|
||||
});
|
||||
|
||||
// ===== v0.7.4: 表格化扩充(用例数翻倍) =====
|
||||
|
||||
describe('commandTouchesProtectedFile — 拦截矩阵(v0.7.4 扩充)', () => {
|
||||
it.each([
|
||||
['裸引用', 'cat MEMORY.md'],
|
||||
['./ 前缀', 'cat ./MEMORY.md'],
|
||||
['.\\ 前缀', 'cat .\\MEMORY.md'],
|
||||
['~/ 前缀', 'cat ~/MEMORY.md'],
|
||||
['~/./ 组合', 'cat ~/./MEMORY.md'],
|
||||
['分号后', 'echo a; cat MEMORY.md'],
|
||||
['管道后', 'echo a | cat MEMORY.md'],
|
||||
['& 后', 'echo a & cat MEMORY.md'],
|
||||
['> 重定向', 'cat MEMORY.md > out'],
|
||||
['< 重定向无空格', 'cat <MEMORY.md'],
|
||||
['子 shell 括号', '(cat MEMORY.md)'],
|
||||
['命令替换', '$(cat MEMORY.md)'],
|
||||
['命令替换带前缀', '$(cat ./MEMORY.md)'],
|
||||
['反引号', 'echo `cat MEMORY.md`'],
|
||||
['引号包裹', "cat 'MEMORY.md'"],
|
||||
['双引号包裹', 'cat "MEMORY.md"'],
|
||||
['cat 后直接', 'cat MEMORY.md'],
|
||||
['rm 引用', 'rm -rf MEMORY.md'],
|
||||
['大写在 cmd 中', 'cat memory.MD'],
|
||||
])('%s 被拦截', (_label, cmd) => {
|
||||
expect(commandTouchesProtectedFile(cmd)).toBe(true);
|
||||
});
|
||||
|
||||
it.each([
|
||||
['子目录正斜杠', 'cat sub/MEMORY.md'],
|
||||
['子目录反斜杠', 'cat sub\\MEMORY.md'],
|
||||
['./ 子目录', 'cat ./sub/MEMORY.md'],
|
||||
['~/ 子目录', 'cat ~/sub/MEMORY.md'],
|
||||
['无关 npm', 'npm run test'],
|
||||
['无关 git', 'git status'],
|
||||
['无关 node', 'node server.js'],
|
||||
['无关 tsc', 'npx tsc --noEmit'],
|
||||
])('%s 放行', (_label, cmd) => {
|
||||
expect(commandTouchesProtectedFile(cmd)).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe('matchGlob — 边界矩阵(v0.7.4 扩充)', () => {
|
||||
it.each([
|
||||
['普通后缀', 'main.ts', '*.ts', true],
|
||||
['多字符前缀', 'test-file.js', 'test-*.js', true],
|
||||
['? 单字符', 'test1.js', 'test?.js', true],
|
||||
['? 多字符不匹配', 'test12.js', 'test?.js', false],
|
||||
['大小写不敏感', 'MAIN.TS', '*.ts', true],
|
||||
['无通配', 'exact.ts', 'exact.ts', true],
|
||||
['通配不匹配', 'main.ts', '*.js', false],
|
||||
['空模式匹配所有', 'anything', '', false],
|
||||
['尾点', 'file.txt', 'file.*', true],
|
||||
['无扩展名', 'README', 'README', true],
|
||||
])('%s: %s vs %s → %j', (_label, name, pattern, expected) => {
|
||||
expect(matchGlob(name, pattern)).toBe(expected);
|
||||
});
|
||||
});
|
||||
|
||||
describe('matchAnyGlob — 多 glob 矩阵(v0.7.4 扩充)', () => {
|
||||
it.each([
|
||||
['任一匹配', 'a.ts', '*.js,*.ts', true],
|
||||
['逗号带空格', 'b.ts', '*.js, *.ts', true],
|
||||
['全部不匹配', 'c.py', '*.js,*.ts', false],
|
||||
['空串匹配所有', 'x', '', true],
|
||||
['纯空白匹配所有', 'x', ' ', true],
|
||||
['单 glob', 'd.ts', '*.ts', true],
|
||||
])('%s: %s vs %s → %j', (_label, name, pattern, expected) => {
|
||||
expect(matchAnyGlob(name, pattern)).toBe(expected);
|
||||
});
|
||||
});
|
||||
|
||||
describe('decodeBufferWithDetection — 编码矩阵(v0.7.4 扩充)', () => {
|
||||
it('GBK 编码中文正确解码', () => {
|
||||
// GBK 编码的"中文"(使用 iconv 等价字节:UTF-8 转 GBK 后字节)
|
||||
const gbkBytes = Buffer.from([0xd6, 0xd0, 0xce, 0xc4]); // "中文" GBK
|
||||
const { content, encoding } = decodeBufferWithDetection(gbkBytes);
|
||||
expect(content).toBe('中文');
|
||||
expect(encoding).toBe('gbk');
|
||||
});
|
||||
|
||||
it('UTF-8 多字节中文 strict 解码', () => {
|
||||
const utf8 = Buffer.from('你好世界', 'utf-8');
|
||||
const { content, encoding } = decodeBufferWithDetection(utf8);
|
||||
expect(content).toBe('你好世界');
|
||||
expect(encoding).toBe('utf-8');
|
||||
});
|
||||
|
||||
it('UTF-16 LE 带 BOM 解码', () => {
|
||||
const buf = Buffer.concat([Buffer.from([0xff, 0xfe]), Buffer.from('ab', 'utf16le')]);
|
||||
const { content, encoding } = decodeBufferWithDetection(buf);
|
||||
expect(content).toBe('ab');
|
||||
expect(encoding).toBe('utf-16le');
|
||||
});
|
||||
|
||||
it('UTF-16 BE 带 BOM 解码(字节交换)', () => {
|
||||
const le = Buffer.from('ab', 'utf16le');
|
||||
const be = Buffer.from([le[1], le[0], le[3], le[2]]);
|
||||
const full = Buffer.concat([Buffer.from([0xfe, 0xff]), be]);
|
||||
const { content, encoding } = decodeBufferWithDetection(full);
|
||||
expect(content).toBe('ab');
|
||||
expect(encoding).toBe('utf-16be');
|
||||
});
|
||||
|
||||
it('损坏 UTF-8 降级 GBK 再降级 loose', () => {
|
||||
// 无效 UTF-8 序列(0xFF 0xFE 非 BOM 场景)→ 最终 loose
|
||||
const bad = Buffer.from([0x80, 0x81, 0x82]);
|
||||
const { encoding } = decodeBufferWithDetection(bad);
|
||||
expect(['gbk', 'utf-8-loose']).toContain(encoding);
|
||||
});
|
||||
|
||||
it('单字节 ASCII 走 utf-8', () => {
|
||||
const { content, encoding } = decodeBufferWithDetection(Buffer.from('hello', 'ascii'));
|
||||
expect(content).toBe('hello');
|
||||
expect(encoding).toBe('utf-8');
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user