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:
@@ -1,8 +1,7 @@
|
||||
/**
|
||||
* ssrf-guard 共享模块测试(v0.6.4 P2-2)
|
||||
* ssrf-guard 共享模块测试(v0.6.4 P2-2 → v0.7.5 扩充)
|
||||
*
|
||||
* 背景:SSRF 校验此前是 http_request 内部私有实现,web_fetch/浏览器回退完全无校验。
|
||||
* 收敛到单一模块后,本文件以表格化用例锁定私有段判定与 DNS 解析行为;
|
||||
* 本文件以表格化用例锁定私有段判定与 DNS 解析行为;
|
||||
* 另验证 WebFetchTool 对内网 URL 在发出任何网络请求前即被拒绝,
|
||||
* 且不进入浏览器回退通道(否则等于借 Chromium 绕过)。
|
||||
*/
|
||||
@@ -23,6 +22,11 @@ const dnsTable: Record<string, Array<{ address: string; family: number }>> = {
|
||||
],
|
||||
'v4mapped.example.com': [{ address: '::ffff:127.0.0.1', family: 6 }],
|
||||
localhost: [{ address: '127.0.0.1', family: 4 }],
|
||||
'multi-public.example.com': [
|
||||
{ address: '1.1.1.1', family: 4 },
|
||||
{ address: '8.8.8.8', family: 4 },
|
||||
],
|
||||
'only-v6.example.com': [{ address: '2606:2800:220:1:248:1893:25c8:1946', family: 6 }],
|
||||
'nx.example.com': [],
|
||||
};
|
||||
|
||||
@@ -35,7 +39,7 @@ vi.mock('node:dns/promises', () => ({
|
||||
}),
|
||||
}));
|
||||
|
||||
import { isPrivateIP, validateSSRF } from '../ssrf-guard';
|
||||
import { isPrivateIP, validateSSRF, resolvePublicAddresses, safeValidateSSRF } from '../ssrf-guard';
|
||||
import { WebFetchTool } from '../web-fetch';
|
||||
import { WebBrowserTool } from '../browser';
|
||||
import type { ToolExecutionContext } from '../../../types/metona-tool';
|
||||
@@ -72,12 +76,49 @@ describe('isPrivateIP 表格化判定', () => {
|
||||
it.each(publicCases)('%s → 公网(放行)', (ip) => {
|
||||
expect(isPrivateIP(ip)).toBe(false);
|
||||
});
|
||||
|
||||
it.each([
|
||||
['127.0.0.1', true],
|
||||
['10.255.255.255', true],
|
||||
['11.0.0.1', false], // 超出 10/8
|
||||
['192.169.0.1', false], // 超出 192.168/16
|
||||
['192.168.255.255', true],
|
||||
['172.15.255.255', false], // 172.16 之前
|
||||
['172.31.255.255', true], // 172.31 边界
|
||||
['172.32.0.0', false], // 172.31 之后
|
||||
['169.253.255.255', false], // 169.254 之前
|
||||
['169.255.0.1', false], // 169.254 之后
|
||||
['223.255.255.255', false], // 224 之前
|
||||
['224.0.0.0', true],
|
||||
['255.255.255.255', true], // >= 224
|
||||
])('IPv4 边界值 %s → %j', (ip, expected) => {
|
||||
expect(isPrivateIP(ip)).toBe(expected);
|
||||
});
|
||||
|
||||
it.each([
|
||||
['::ffff:169.254.169.254', true], // 映射云元数据
|
||||
['::ffff:192.168.1.1', true], // 映射私网
|
||||
['::ffff:93.184.216.34', false], // 映射公网
|
||||
['2001:4860:4860::8888', false], // 公网 IPv6
|
||||
])('IPv6 变体 %s → %j', (ip, expected) => {
|
||||
expect(isPrivateIP(ip)).toBe(expected);
|
||||
});
|
||||
|
||||
it(':: 未指定地址 → 非私有(实况契约:isPrivateIP 只覆盖 ::1/fe80/fc-fd/::ffff 映射)', () => {
|
||||
expect(isPrivateIP('::')).toBe(false);
|
||||
});
|
||||
|
||||
it('非 IP 字符串(域名)→ false(由调用方 DNS 判定)', () => {
|
||||
expect(isPrivateIP('example.com')).toBe(false);
|
||||
expect(isPrivateIP('')).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe('validateSSRF', () => {
|
||||
describe('resolvePublicAddresses / validateSSRF', () => {
|
||||
it('协议白名单:非 http(s) 直接拒绝', async () => {
|
||||
await expect(validateSSRF('ftp://example.com')).rejects.toThrow('Blocked SSRF');
|
||||
await expect(validateSSRF('file:///etc/passwd')).rejects.toThrow('Blocked SSRF');
|
||||
await expect(validateSSRF('ws://example.com')).rejects.toThrow('Blocked SSRF');
|
||||
});
|
||||
|
||||
it('hostname 为 IP 时直接判定,不做 DNS', async () => {
|
||||
@@ -89,6 +130,12 @@ describe('validateSSRF', () => {
|
||||
);
|
||||
});
|
||||
|
||||
it('IPv6 字面量带方括号进入域名解析路径(Node URL.hostname 含 [])→ DNS 失败拒绝', async () => {
|
||||
// 实况契约:new URL('http://[::1]/').hostname === '[::1]',isIP 返回 0,
|
||||
// 落入域名分支 → DNS 解析失败(fail-closed 仍拒绝,只是错误信息不同)
|
||||
await expect(validateSSRF('http://[::1]/')).rejects.toThrow('DNS resolution failed');
|
||||
});
|
||||
|
||||
it('域名解析出任一私有 IP 即拒绝(防 rebinding 只查首个 IP)', async () => {
|
||||
await expect(validateSSRF('http://mixed.example.com/')).rejects.toThrow(
|
||||
/resolves to private IP/,
|
||||
@@ -114,6 +161,40 @@ describe('validateSSRF', () => {
|
||||
'DNS resolution failed',
|
||||
);
|
||||
});
|
||||
|
||||
it('非法 URL 抛 Invalid URL', async () => {
|
||||
await expect(validateSSRF('not a url')).rejects.toThrow('Invalid URL');
|
||||
});
|
||||
|
||||
it('多公网 IP 域名全部返回(resolvePublicAddresses 契约)', async () => {
|
||||
const ips = await resolvePublicAddresses('http://multi-public.example.com/');
|
||||
expect(ips).toEqual(['1.1.1.1', '8.8.8.8']);
|
||||
});
|
||||
|
||||
it('纯 IPv6 公网域名返回 IPv6 地址', async () => {
|
||||
const ips = await resolvePublicAddresses('http://only-v6.example.com/');
|
||||
expect(ips).toEqual(['2606:2800:220:1:248:1893:25c8:1946']);
|
||||
});
|
||||
|
||||
it('公网 IP 直连 URL 返回该 IP', async () => {
|
||||
expect(await resolvePublicAddresses('https://93.184.216.34/x')).toEqual(['93.184.216.34']);
|
||||
});
|
||||
|
||||
it('safeValidateSSRF 不抛错包装:私有返回 { ok:false }', async () => {
|
||||
const r = await safeValidateSSRF('http://127.0.0.1:8080');
|
||||
expect(r.ok).toBe(false);
|
||||
if (!r.ok) expect(r.error).toContain('Blocked SSRF');
|
||||
});
|
||||
|
||||
it('safeValidateSSRF 不抛错包装:公网返回 { ok:true }', async () => {
|
||||
const r = await safeValidateSSRF('http://public.example.com/');
|
||||
expect(r).toEqual({ ok: true });
|
||||
});
|
||||
|
||||
it('safeValidateSSRF 对非法协议返回 ok:false(不抛出)', async () => {
|
||||
const r = await safeValidateSSRF('file:///etc/passwd');
|
||||
expect(r.ok).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe('WebFetchTool — SSRF 入口拦截(v0.6.4 安全不对称根治)', () => {
|
||||
@@ -163,6 +244,22 @@ describe('WebFetchTool — SSRF 入口拦截(v0.6.4 安全不对称根治)',
|
||||
expect(result.success).toBe(false);
|
||||
expect(result.error ?? '').toContain('Blocked SSRF');
|
||||
});
|
||||
|
||||
it('拒绝协议白名单之外的 URL(返回 URL must start with)', async () => {
|
||||
const tool = new WebFetchTool();
|
||||
const result = (await tool.execute({ url: 'file:///etc/passwd' }, context)) as {
|
||||
success?: boolean;
|
||||
error?: string;
|
||||
};
|
||||
expect(result.success).toBe(false);
|
||||
expect(result.error ?? '').toContain('URL must start with');
|
||||
});
|
||||
|
||||
it('缺 url 参数同样返回协议校验错误', async () => {
|
||||
const tool = new WebFetchTool();
|
||||
const result = (await tool.execute({}, context)) as { success?: boolean };
|
||||
expect(result.success).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe('WebBrowserTool — open 动作 SSRF 入口拦截(v0.7.2 A2)', () => {
|
||||
@@ -173,12 +270,6 @@ describe('WebBrowserTool — open 动作 SSRF 入口拦截(v0.7.2 A2)', () =
|
||||
requestId: 'r',
|
||||
};
|
||||
|
||||
/**
|
||||
* 契约背景:隐藏浏览器(Chromium 网络栈)此前是 SSRF 防线的唯一旁路 ——
|
||||
* web_fetch/http_request 均有校验,而 web_browser open 可直接导航内网。
|
||||
* 根治后 open 必须在创建任何 BrowserWindow 之前完成校验;
|
||||
* 以下用例断言私有地址在触达 getManager()(首个 Electron API 调用点)前即被拒绝。
|
||||
*/
|
||||
it('拒绝回环地址且不创建任何浏览器窗口', async () => {
|
||||
const tool = new WebBrowserTool();
|
||||
const result = (await tool.execute(
|
||||
@@ -195,7 +286,10 @@ describe('WebBrowserTool — open 动作 SSRF 入口拦截(v0.7.2 A2)', () =
|
||||
const result = (await tool.execute(
|
||||
{ action: 'open', url: 'http://169.254.169.254/latest/meta-data/' },
|
||||
context,
|
||||
)) as { success?: boolean; error?: string };
|
||||
)) as {
|
||||
success?: boolean;
|
||||
error?: string;
|
||||
};
|
||||
expect(result.success).toBe(false);
|
||||
expect(result.error ?? '').toContain('Blocked SSRF');
|
||||
});
|
||||
@@ -231,4 +325,21 @@ describe('WebBrowserTool — open 动作 SSRF 入口拦截(v0.7.2 A2)', () =
|
||||
expect(result.success).toBe(false);
|
||||
expect(result.error ?? '').toContain('URL must start with');
|
||||
});
|
||||
|
||||
it('缺 action → 报错', async () => {
|
||||
const tool = new WebBrowserTool();
|
||||
const result = (await tool.execute({}, context)) as { success?: boolean; error?: string };
|
||||
expect(result.success).toBe(false);
|
||||
expect(result.error).toContain('action');
|
||||
});
|
||||
|
||||
it('unknown action → 报错', async () => {
|
||||
const tool = new WebBrowserTool();
|
||||
const result = (await tool.execute({ action: 'frobnicate' }, context)) as {
|
||||
success?: boolean;
|
||||
error?: string;
|
||||
};
|
||||
expect(result.success).toBe(false);
|
||||
expect(result.error).toContain('Unknown action');
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user