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)
168 lines
6.2 KiB
TypeScript
168 lines
6.2 KiB
TypeScript
/**
|
||
* 子进程环境净化单源测试(v0.7.3 P3-2)
|
||
*
|
||
* buildSafeChildEnv 是 run_command 与 MCP stdio 启动的唯一净化实现:
|
||
* E1 敏感后缀剔除;E2 敏感精确名单剔除;E3 非敏感变量保留(黑名单不误伤);
|
||
* E4 runtime 注入覆盖;E5 空值剔除。
|
||
*/
|
||
|
||
import { describe, it, expect } from 'vitest';
|
||
import { buildSafeChildEnv } from '../safe-env';
|
||
|
||
const SAMPLE_ENV: Record<string, string | undefined> = {
|
||
PATH: '/usr/bin',
|
||
LANG: 'zh_CN.UTF-8',
|
||
DEEPSEEK_API_KEY: 'sk-secret',
|
||
MY_SERVICE_TOKEN: 't',
|
||
APP_PASSWORD: 'p',
|
||
GITEA_PASSWORD: 'g',
|
||
GITHUB_TOKEN: 'gh',
|
||
HOME: '/home/u',
|
||
};
|
||
|
||
describe('buildSafeChildEnv', () => {
|
||
it('E1: 敏感后缀变量全部剔除(_API_KEY/_TOKEN/_PASSWORD/_SECRET/...)', () => {
|
||
const env = buildSafeChildEnv({ source: SAMPLE_ENV });
|
||
expect(env['DEEPSEEK_API_KEY']).toBeUndefined();
|
||
expect(env['MY_SERVICE_TOKEN']).toBeUndefined();
|
||
expect(env['APP_PASSWORD']).toBeUndefined();
|
||
expect(env['GITHUB_TOKEN']).toBeUndefined();
|
||
});
|
||
|
||
it('E2: 精确名单剔除(大小写不敏感后缀 + 精确 key)', () => {
|
||
const env = buildSafeChildEnv({ source: { GITEA_PASSWORD: 'g', DATABASE_PASSWORD: 'd' } });
|
||
expect(env['GITEA_PASSWORD']).toBeUndefined();
|
||
expect(env['DATABASE_PASSWORD']).toBeUndefined();
|
||
});
|
||
|
||
it('E3: 非敏感变量保留(黑名单不误伤 GIT_*/代理/路径类变量)', () => {
|
||
const env = buildSafeChildEnv({
|
||
source: { ...SAMPLE_ENV, GIT_AUTHOR_NAME: 'metona', HTTPS_PROXY: 'http://p:7890' },
|
||
});
|
||
expect(env['PATH']).toBe('/usr/bin');
|
||
expect(env['LANG']).toBe('zh_CN.UTF-8');
|
||
expect(env['HOME']).toBe('/home/u');
|
||
expect(env['GIT_AUTHOR_NAME']).toBe('metona');
|
||
expect(env['HTTPS_PROXY']).toBe('http://p:7890');
|
||
});
|
||
|
||
it('E4: runtime 注入覆盖净化结果(调用方运行时差异显式可控)', () => {
|
||
const env = buildSafeChildEnv({
|
||
source: SAMPLE_ENV,
|
||
runtime: { NODE_ENV: 'production', LANG: 'C.utf8' },
|
||
});
|
||
expect(env['NODE_ENV']).toBe('production');
|
||
// runtime 覆盖同名的净化保留值
|
||
expect(env['LANG']).toBe('C.utf8');
|
||
});
|
||
|
||
it('E5: 空值/undefined 变量剔除', () => {
|
||
const env = buildSafeChildEnv({ source: { EMPTY: '', UNSET: undefined, KEEP: 'x' } });
|
||
expect('EMPTY' in env).toBe(false);
|
||
expect('UNSET' in env).toBe(false);
|
||
expect(env['KEEP']).toBe('x');
|
||
});
|
||
|
||
it('E6: 无 source 时回退 process.env(运行路径契约;至少保留 PATH 类基本变量)', () => {
|
||
const env = buildSafeChildEnv({ runtime: { NODE_ENV: 'production' } });
|
||
expect(env['NODE_ENV']).toBe('production');
|
||
});
|
||
|
||
it('E7: 精确名单包含的 key 即使值非空也剔除', () => {
|
||
const env = buildSafeChildEnv({
|
||
source: { DEEPSEEK_API_KEY: 'sk-d', AGNES_API_KEY: 'sk-a', MIMO_API_KEY: 'sk-m' },
|
||
});
|
||
expect(env['DEEPSEEK_API_KEY']).toBeUndefined();
|
||
expect(env['AGNES_API_KEY']).toBeUndefined();
|
||
expect(env['MIMO_API_KEY']).toBeUndefined();
|
||
});
|
||
|
||
it('E8: 后缀匹配大小写不敏感(小写后缀同样剔除)', () => {
|
||
const env = buildSafeChildEnv({
|
||
source: {
|
||
my_api_key: 'k1',
|
||
service_token: 't',
|
||
db_password: 'p',
|
||
api_secret: 's',
|
||
},
|
||
});
|
||
expect(env['my_api_key']).toBeUndefined();
|
||
expect(env['service_token']).toBeUndefined();
|
||
expect(env['db_password']).toBeUndefined();
|
||
expect(env['api_secret']).toBeUndefined();
|
||
});
|
||
|
||
it('E9: 后缀匹配要求 key 以"_后缀"结尾(非后缀含子串不误伤)', () => {
|
||
const env = buildSafeChildEnv({
|
||
source: {
|
||
API_KEYSTORE_PATH: '/tmp/keys', // 含 KEYSTORE 但非 _API_KEY 结尾 → 保留
|
||
TOKENIZER_MODEL: 'bert', // 含 TOKEN 但非 _TOKEN 结尾 → 保留
|
||
SECRETARY_NAME: 'x', // 含 SECRET 但非 _SECRET 结尾 → 保留
|
||
},
|
||
});
|
||
expect(env['API_KEYSTORE_PATH']).toBe('/tmp/keys');
|
||
expect(env['TOKENIZER_MODEL']).toBe('bert');
|
||
expect(env['SECRETARY_NAME']).toBe('x');
|
||
});
|
||
|
||
it('E10: _PRIVATE_KEY / _CREDENTIALS 等长后缀精确匹配', () => {
|
||
const env = buildSafeChildEnv({
|
||
source: {
|
||
SSH_PRIVATE_KEY: 'pk',
|
||
AWS_CREDENTIALS: 'creds',
|
||
DB_CREDENTIAL: 'cred',
|
||
GITHUB_PASSWORD: 'pw',
|
||
},
|
||
});
|
||
expect(env['SSH_PRIVATE_KEY']).toBeUndefined();
|
||
expect(env['AWS_CREDENTIALS']).toBeUndefined();
|
||
expect(env['DB_CREDENTIAL']).toBeUndefined();
|
||
expect(env['GITHUB_PASSWORD']).toBeUndefined();
|
||
});
|
||
|
||
it('E11: runtime 注入的敏感变量绕过净化(调用方显式控制,覆盖黑名单)', () => {
|
||
const env = buildSafeChildEnv({
|
||
source: { API_KEY_EXTERNAL: 'secret' },
|
||
runtime: { API_KEY_EXTERNAL: 'override' },
|
||
});
|
||
expect(env['API_KEY_EXTERNAL']).toBe('override');
|
||
});
|
||
|
||
it('E12: 返回对象是普通对象且不含原型链自有属性泄漏', () => {
|
||
const env = buildSafeChildEnv({ source: { HAS_OWN_PROP: 'x' } });
|
||
expect(Object.getPrototypeOf(env)).toBe(Object.prototype);
|
||
// toString 等原型方法不是 env 的自有属性
|
||
expect(Object.prototype.hasOwnProperty.call(env, 'toString')).toBe(false);
|
||
expect(Object.prototype.hasOwnProperty.call(env, 'constructor')).toBe(false);
|
||
});
|
||
|
||
it('E13: runtime 注入后源中同名敏感变量被覆盖且不再触发剔除', () => {
|
||
const env = buildSafeChildEnv({
|
||
source: { DEEPSEEK_API_KEY: 'sk-raw' },
|
||
runtime: { DEEPSEEK_API_KEY: 'sk-safe-runtime' },
|
||
});
|
||
expect(env['DEEPSEEK_API_KEY']).toBe('sk-safe-runtime');
|
||
});
|
||
|
||
it('E14: 大量变量混合场景整体净化结果正确(端到端快照)', () => {
|
||
const env = buildSafeChildEnv({
|
||
source: {
|
||
PATH: '/bin',
|
||
HOME: '/home/u',
|
||
OPENAI_API_KEY: 'sk-openai',
|
||
ANTHROPIC_AUTH_TOKEN: 'tok',
|
||
GITEA_PASSWORD: 'g',
|
||
HTTPS_PROXY: 'http://p:1',
|
||
LANG: 'en',
|
||
},
|
||
});
|
||
expect(env['PATH']).toBe('/bin');
|
||
expect(env['HOME']).toBe('/home/u');
|
||
expect(env['HTTPS_PROXY']).toBe('http://p:1');
|
||
expect(env['LANG']).toBe('en');
|
||
expect(env['OPENAI_API_KEY']).toBeUndefined();
|
||
expect(env['ANTHROPIC_AUTH_TOKEN']).toBeUndefined();
|
||
expect(env['GITEA_PASSWORD']).toBeUndefined();
|
||
});
|
||
});
|