P0 会话可靠性收口(根治"模型思考着会话就停止"): - P0-1 finish_reason 全链路贯通:DONE 事件与 IterationStep 新增 finishReason,OpenAI 共享 SSE / Anthropic message_delta.stop_reason / Ollama done_reason 三路采集,TRACE 层弃用硬编码 'stop' 记录真值 - P0-2 空响应守卫 + 降级重试:零产出流→可重试错误走退避;思考耗尽输出预算(reasoning-only + length)→自动关闭思考降级重试一次;仍失败→OUTPUT_LENGTH_EXCEEDED 结构化错误 + 故障转移;附带根治 abort 恰逢零工具调用轮被 COMPLETED 抢占的真实缺陷 - P0-3 思考×能力×预算三对齐:DeepSeek/MiMo/Agnes/Ollama 四家 supportsThinking=false 强制不发思考参数;小输出预算告警;设置页联动提示 - P0-4 渲染层可见性:截断/空完成/友好错误三类提示,i18n 全部出层 - P0-5 回归四件套:reasoning-only 终止判定、集成级空闲超时、504 引擎重试归类、思考中 abort→USER_INTERRUPT、P4-2 强制收尾路径 FEAT-1:LLM 设置新增「最大输出上限」——Provider 支持矩阵显隐 + 模型上限钳制提示 + 超限保存警告 + llm.maxTokens 热生效 P1 修复面收口: - 渲染层三缺陷根治:后台会话回放缓冲(2000 条/4MB 有界 + agent:getReplayState + 事件总线)+ abort 双层自愈 + sendMessage 收尾兜底 + 中断卡片清扫 - 工具 abort 信号全覆盖:web_search/web_fetch/http_request/code_search/git 系列/delegate_task 全部接入引擎中断;web_search 时间预算收敛(720s→≤240s);移除伪造 ToolExecutionContext 与死代码 - 安全:本地 Pinned CONNECT 代理根治浏览器通道 DNS rebinding(校验期 IP pinning,可注入 resolver 表测);配置 URL 域名解析深校验(DeepCheckSoftFailure 软失败);SSE 空 error 帧防御修复;Ollama generate/embed AbortSignal.any 合并 - 缺陷清单:UTF-16 BOM 读取、tmp 同毫秒碰撞(nanoid 后缀)、code_search JS 回退参数对称(case_sensitive/前后文独立)、list_directory include_node_modules、崩溃自愈退避(60s 窗 ≥3 次停 reload)、MemoryViewer/Sidebar i18n 收口 P2 能力演进: - 会话回收站:SCHEMA_VERSION 3 + 迁移 10(deleted_at,存在性守卫),软删除/恢复/彻底删除/30 天自动清理(启动+24h),searchMessages 聚合剔除,Sidebar 回收站面板 - 会话回放播放器:sessions:listRecordings/readRecording(白名单+目录边界+20MB 上限),SessionReplayPlayer 时间轴/步进/变速,Trace 面板入口 - electron-updater 自动更新:双轨(手动 feed 比对保留),生产环境启动静默检查 + update:status 广播 + app:updateInstall + LogsSettings UpdatePanel + builder publish 配置 - @ 文件提及:workspace.listFiles/readFileClip(边界/512KB/NUL 拒绝/MEMORY.md 保护),ChatInput Fuse 联想+键盘导航+附件管线注入 - MCP Resources/Prompts 发现:可选能力 try/catch 降级,mcp:listServerContents,MCPSettings 展开视图 - 文档对齐:内部 API 标准 HTML(Adapter 清单补 MiMo/已实现注记/STREAM_RESET/DONE.finishReason/ repetition_truncation 映射);README v0.8.0 亮点表 P3 测试基建: - 新增 4 个测试文件:engine-stream-contract(6)、engine-stream-reliability(4:集成空闲超时/504 重试/思考中 abort/P4-2 强制收尾)、thinking-capability-gate(7)、pinned-proxy(9,含深校验 5)、session-trash(5,DB 域)、use-agent-stream hook 级(5)、agent.test 回放缓冲(2) - 契约更新:orchestrator 被中断 SubAgent success=false(abort 优先级修复语义)、SSE 空 error 帧、UTF-16 正常读取、DeepSeek 未配置思考显式 disabled、迁移矩阵 v2→3 - 弱断言根治:registry WEBP 单向断言、hooks-contracts 自比恒真、memory 空 token 补强 全量验证:typecheck 0 错误 / lint 0 问题 / 系统 Node 2144 通过(301 DB 用例按 ABI 跳过)/ Electron ABI 2445/2445 全量通过 0 跳过
268 lines
8.9 KiB
TypeScript
268 lines
8.9 KiB
TypeScript
/**
|
||
* Pinned CONNECT Proxy — Agent 浏览器通道的 SSRF 根治层(v0.8.0 P1-4)
|
||
*
|
||
* 背景:web_fetch 的浏览器回退通道与 web_browser 走 Chromium 自有网络栈,
|
||
* 此前只有工具入口一次 SSRF 校验 —— Chromium 自己解析 DNS,入口校验通过到
|
||
* 实际连接之间若攻击者切换 DNS(TTL=0),可借隐藏浏览器触达内网(DNS
|
||
* rebinding 残余窗口,比 HTTP 通道的 DNS pinning 防线弱一档)。
|
||
*
|
||
* 根治方案:主进程启动本地 HTTP 代理(127.0.0.1 随机端口),Agent 浏览器
|
||
* 分区(persist:metona-agent-browser)的全部流量经此代理:
|
||
* - CONNECT(https):解析目标 host → resolvePublicAddresses 校验(与工具
|
||
* 入口同策略:仅公网)→ **直连校验阶段锁定的 IP** 建立隧道。TLS/SNI/证书
|
||
* 校验仍由 Chromium 端到端完成(隧道内字节透传,不做 MITM),既闭
|
||
* rebinding 又不破坏 HTTPS。
|
||
* - 绝对形式 HTTP:同校验后按 pinned IP 转发。
|
||
* - 校验失败 → 403 拒绝 + WARN 日志(fail-closed)。
|
||
*
|
||
* 边界(显式记录):
|
||
* - 用户已配置 network.proxyUrl(isProxyActive())时,调用方不启用本代理,
|
||
* 保持用户代理语义 —— 代理模式下 DNS 在代理端解析,pinning 不可实现
|
||
* (与 M7 结论一致,该场景的已知限制维持原文档口径)。
|
||
* - 代理启动失败时降级为"无 pinned 代理"(可用性优先),仅 WARN,不阻断
|
||
* 浏览器工具。
|
||
*/
|
||
|
||
import * as http from 'http';
|
||
import * as net from 'net';
|
||
import log from 'electron-log';
|
||
import { resolvePublicAddresses } from '../harness/tools/built-in/ssrf-guard';
|
||
|
||
/** 校验函数签名(可注入以便测试;默认为生产实现 resolvePublicAddresses) */
|
||
export type AddressResolver = (url: string) => Promise<string[]>;
|
||
|
||
export interface PinnedProxy {
|
||
/** 本地监听端口(127.0.0.1) */
|
||
port: number;
|
||
/** 停止代理服务器 */
|
||
close: () => Promise<void>;
|
||
}
|
||
|
||
/** 解析 "host:port" 形态(CONNECT 请求行目标) */
|
||
function splitHostPort(target: string): { host: string; port: number } | null {
|
||
const lastColon = target.lastIndexOf(':');
|
||
if (lastColon <= 0) return null;
|
||
let host = target.slice(0, lastColon);
|
||
const portStr = target.slice(lastColon + 1);
|
||
// IPv6 字面量目标:去方括号(resolvePublicAddresses 侧已处理 [host] 形态)
|
||
if (host.startsWith('[') && host.endsWith(']')) {
|
||
host = host.slice(1, -1);
|
||
}
|
||
const port = Number(portStr);
|
||
if (!Number.isInteger(port) || port <= 0 || port > 65535) return null;
|
||
return { host, port };
|
||
}
|
||
|
||
/** 400/403 之类的简易响应后断开 */
|
||
function rejectRequest(socket: net.Socket, status: string, body: string): void {
|
||
if (socket.writable) {
|
||
socket.write(
|
||
`HTTP/1.1 ${status}\r\nConnection: close\r\nContent-Length: ${body.length}\r\n\r\n${body}`,
|
||
);
|
||
}
|
||
socket.destroy();
|
||
}
|
||
|
||
/**
|
||
* 创建 Pinned 代理服务器(工厂形式,测试可注入 resolver)。
|
||
*
|
||
* @param resolve 地址校验/解析实现(默认 resolvePublicAddresses —— 仅公网放行)
|
||
*/
|
||
export function createPinnedProxy(
|
||
resolve: AddressResolver = resolvePublicAddresses,
|
||
): Promise<PinnedProxy> {
|
||
const server = http.createServer((req, res) => {
|
||
// 绝对形式 HTTP(Chromium 经代理的明文请求):同校验后按 pinned IP 转发
|
||
void handlePlainHttp(req, res, resolve);
|
||
});
|
||
server.on('connect', (req, clientSocket, head) => {
|
||
void handleConnect(req, clientSocket as net.Socket, head, resolve);
|
||
});
|
||
server.on('clientError', (_err, socket) => {
|
||
try {
|
||
socket.destroy();
|
||
} catch {
|
||
/* ignore */
|
||
}
|
||
});
|
||
|
||
return new Promise<PinnedProxy>((resolvePromise, rejectPromise) => {
|
||
const onError = (err: Error): void => {
|
||
server.removeListener('listening', onListening);
|
||
rejectPromise(err);
|
||
};
|
||
const onListening = (): void => {
|
||
server.removeListener('error', onError);
|
||
const addr = server.address();
|
||
const port = typeof addr === 'object' && addr ? addr.port : 0;
|
||
resolvePromise({
|
||
port,
|
||
close: () =>
|
||
new Promise<void>((res) => {
|
||
server.close(() => res());
|
||
}),
|
||
});
|
||
};
|
||
server.once('error', onError);
|
||
server.once('listening', onListening);
|
||
server.listen(0, '127.0.0.1');
|
||
});
|
||
}
|
||
|
||
/** CONNECT 隧道:校验目标 → 直连 pinned IP → 双向管道 */
|
||
async function handleConnect(
|
||
req: http.IncomingMessage,
|
||
clientSocket: net.Socket,
|
||
head: Buffer,
|
||
resolve: AddressResolver,
|
||
): Promise<void> {
|
||
const target = req.url ?? '';
|
||
const parsed = splitHostPort(target);
|
||
if (!parsed) {
|
||
rejectRequest(clientSocket, '400 Bad Request', 'Invalid CONNECT target');
|
||
return;
|
||
}
|
||
const { host, port } = parsed;
|
||
|
||
let ips: string[];
|
||
try {
|
||
// 以 http(s) 形式构造 URL 供 resolvePublicAddresses 校验(其只关心协议与 host;
|
||
// 443 用 https 仅为语义准确,校验逻辑对两者一致)
|
||
const scheme = port === 443 ? 'https' : 'http';
|
||
ips = await resolve(`${scheme}://${host}:${port}`);
|
||
} catch (err) {
|
||
log.warn(`[PinnedProxy] CONNECT ${host}:${port} blocked: ${(err as Error).message}`);
|
||
rejectRequest(clientSocket, '403 Forbidden', 'SSRF validation failed');
|
||
return;
|
||
}
|
||
|
||
const upstream = net.connect({ host: ips[0] ?? host, port });
|
||
let established = false;
|
||
|
||
upstream.once('connect', () => {
|
||
established = true;
|
||
if (clientSocket.writable) {
|
||
clientSocket.write('HTTP/1.1 200 Connection Established\r\n\r\n');
|
||
if (head && head.length > 0) upstream.write(head);
|
||
clientSocket.pipe(upstream);
|
||
upstream.pipe(clientSocket);
|
||
} else {
|
||
upstream.destroy();
|
||
}
|
||
});
|
||
|
||
const cleanup = (): void => {
|
||
try {
|
||
clientSocket.destroy();
|
||
} catch {
|
||
/* ignore */
|
||
}
|
||
try {
|
||
upstream.destroy();
|
||
} catch {
|
||
/* ignore */
|
||
}
|
||
};
|
||
clientSocket.once('error', cleanup);
|
||
clientSocket.once('close', () => {
|
||
if (established) cleanup();
|
||
});
|
||
upstream.once('error', (err) => {
|
||
log.warn(`[PinnedProxy] upstream error for ${host}:${port}: ${(err as Error).message}`);
|
||
if (!established) {
|
||
rejectRequest(clientSocket, '502 Bad Gateway', 'Upstream connect failed');
|
||
} else {
|
||
cleanup();
|
||
}
|
||
});
|
||
}
|
||
|
||
/** 绝对形式 HTTP 转发:校验目标 → 按 pinned IP 发起请求 → 回写响应 */
|
||
async function handlePlainHttp(
|
||
req: http.IncomingMessage,
|
||
res: http.ServerResponse,
|
||
resolve: AddressResolver,
|
||
): Promise<void> {
|
||
const rawUrl = req.url ?? '';
|
||
let parsed: URL;
|
||
try {
|
||
parsed = new URL(rawUrl);
|
||
} catch {
|
||
res.writeHead(400).end('Invalid absolute-form URL');
|
||
return;
|
||
}
|
||
if (parsed.protocol !== 'http:') {
|
||
// https 走 CONNECT,明文通道只处理 http 绝对形式
|
||
res.writeHead(400).end('Only http absolute-form supported (https uses CONNECT)');
|
||
return;
|
||
}
|
||
|
||
let ips: string[];
|
||
try {
|
||
ips = await resolve(rawUrl);
|
||
} catch (err) {
|
||
log.warn(`[PinnedProxy] HTTP ${parsed.host} blocked: ${(err as Error).message}`);
|
||
res.writeHead(403).end('SSRF validation failed');
|
||
return;
|
||
}
|
||
|
||
const port = parsed.port ? Number(parsed.port) : 80;
|
||
const upstreamReq = http.request(
|
||
{
|
||
host: ips[0] ?? parsed.hostname,
|
||
port,
|
||
method: req.method,
|
||
path: parsed.pathname + parsed.search,
|
||
headers: { ...req.headers, host: parsed.host },
|
||
},
|
||
(upstreamRes) => {
|
||
res.writeHead(upstreamRes.statusCode ?? 502, upstreamRes.headers);
|
||
upstreamRes.pipe(res);
|
||
},
|
||
);
|
||
upstreamReq.on('error', (err) => {
|
||
log.warn(`[PinnedProxy] upstream http error for ${parsed.host}: ${(err as Error).message}`);
|
||
if (!res.headersSent) res.writeHead(502);
|
||
res.end('Upstream request failed');
|
||
});
|
||
req.pipe(upstreamReq);
|
||
}
|
||
|
||
// ===== 模块级单例(BrowserWindowManager / network-proxy 消费) =====
|
||
|
||
let singleton: PinnedProxy | null = null;
|
||
let starting: Promise<PinnedProxy | null> | null = null;
|
||
|
||
/** 是否已有 Pinned 代理在运行(applySessionProxy 据此决定是否覆盖分区代理) */
|
||
export function isPinnedProxyActive(): boolean {
|
||
return singleton !== null;
|
||
}
|
||
|
||
/**
|
||
* 确保 Pinned 代理已启动,返回端口;失败返回 null(调用方降级为无 pinned 代理)。
|
||
* 幂等:并发调用共享同一次启动。
|
||
*/
|
||
export async function ensurePinnedProxy(): Promise<number | null> {
|
||
if (singleton) return singleton.port;
|
||
if (!starting) {
|
||
starting = (async (): Promise<PinnedProxy | null> => {
|
||
try {
|
||
singleton = await createPinnedProxy();
|
||
log.info(`[PinnedProxy] SSRF-pinned proxy listening on 127.0.0.1:${singleton.port}`);
|
||
return singleton;
|
||
} catch (err) {
|
||
log.warn(
|
||
'[PinnedProxy] failed to start pinned proxy (browser channel falls back to unpinned):',
|
||
err,
|
||
);
|
||
singleton = null;
|
||
return null;
|
||
} finally {
|
||
starting = null;
|
||
}
|
||
})();
|
||
}
|
||
const result = await starting;
|
||
return result?.port ?? null;
|
||
}
|