executor 两项评审加固。① /exec 拒绝 cwd 恰为任务根(评审意见成立):任务根是全部会话目录的父目录,此前缺省 cwd 或显式传任务根会命中 isolatedCommand 的不隔离分支、暴露所有会话;现 handleExec 以 REAL_TASK_ROOT(启动时 realpath)显式拦截返回 400,缺省落任务根同样被拒、等效 cwd 必填——「任务根下的命令必进隔离 wrapper」自此成为硬不变式。评审给的 checkCwd 内比较 root===DEFAULT_CWD 的写法在本配置(ROOTS=/workspace)下永不命中,改为对 realpath 相等判断。core 侧三个调用点(terminal 传 taskDir、skills 传 skillDir)均在边界外零影响。② 写后断连守卫(评审意见方向成立但原方案有误,已修正实现):实测 Node 20 对 destroyed res 的 write/end 静默丢弃,未复现声称的崩溃;且原补丁用 writableEnded 判断(断连路径恒 false、永不命中)、finish 顶部 return 会跳过 clearInterval(ping) 泄漏定时器。改为:sseWrite/ping 统一 writableEnded||destroyed 前置拦截,finish 清理与 exit 日志先行、断开时不再触碰 res。smoke 主套 cwd 移到任务根外 .taskroot 边界目录并全部显式传参,新增缺省 cwd 400 / 任务根 400 / 半路断连不击穿服务三用例,宿主机与容器内均 21/21。ARCHITECTURE.md §6 同步。
This commit is contained in:
+31
-10
@@ -1,9 +1,14 @@
|
||||
// agent-executor 冒烟测试:node smoke-test.js(在本目录执行)。
|
||||
// 覆盖:/health、/exec 流式输出与退出事件、增量下发时序、cwd 白名单拒绝、DELETE 取消、EXECUTOR_TOKEN 鉴权、per-task 挂载隔离。
|
||||
// 注意:隔离用例需 root/CAP_SYS_ADMIN(unshare+mount),无权限时自动 SKIP 不计失败。
|
||||
// 覆盖:/health、/exec 流式输出与退出事件、增量下发时序、cwd 白名单拒绝、任务根边界(缺省/恰为任务根 → 400)、DELETE 取消、EXECUTOR_TOKEN 鉴权、per-task 挂载隔离、客户端半路断连不击穿服务。
|
||||
// 注意:隔离用例需 root/CAP_SYS_ADMIN(unshare+mount),无权限时自动 SKIP 不计失败;其余用例 cwd 故意取任务根外目录,保持非隔离路径可在无权限环境跑。
|
||||
process.env.PORT = process.env.PORT || '19000';
|
||||
process.env.EXECUTOR_ROOTS = process.env.__SELF_DIR__ || __dirname; // 宿主机测试:白名单取本目录
|
||||
process.env.EXECUTOR_CWD = process.env.__SELF_DIR__ || __dirname;
|
||||
const SELF = process.env.__SELF_DIR__ || __dirname; // 宿主机测试:白名单取本目录
|
||||
process.env.EXECUTOR_ROOTS = SELF;
|
||||
// 任务根改用专用子目录(不建在任务根下):主套命令的 cwd 传 SELF(任务根外 → 不进 wrapper),
|
||||
// 同时留出「cwd=任务根 → 400」的可测边界。
|
||||
const TASK_ROOT = SELF + '/.taskroot';
|
||||
require('fs').mkdirSync(TASK_ROOT, { recursive: true });
|
||||
process.env.EXECUTOR_CWD = TASK_ROOT;
|
||||
delete process.env.EXECUTOR_TOKEN; // 主实例不带 token,鉴权单独测
|
||||
|
||||
const { spawn } = require('child_process');
|
||||
@@ -42,7 +47,7 @@ async function main() {
|
||||
|
||||
// 2. 基本执行:stdout/stderr/exit,且增量分块下发(a 与 b 之间 sleep,验证非攒到最后)
|
||||
const t0 = Date.now();
|
||||
const r2 = await fetch(BASE + '/exec', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ command: 'echo a; sleep 0.6; echo b; echo e1 >&2; exit 3' }) });
|
||||
const r2 = await fetch(BASE + '/exec', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ command: 'echo a; sleep 0.6; echo b; echo e1 >&2; exit 3', cwd: SELF }) });
|
||||
const evs2 = [];
|
||||
const marks = [];
|
||||
for await (const e of sse(r2)) { evs2.push(e); if (e.type === 'out') marks.push(Date.now() - t0); }
|
||||
@@ -57,8 +62,14 @@ async function main() {
|
||||
const r3 = await fetch(BASE + '/exec', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ command: 'pwd', cwd: '/etc' }) });
|
||||
check('cwd 越权 400', r3.status === 400, 'status=' + r3.status);
|
||||
|
||||
// 3.5 任务根边界:缺省 cwd(落任务根)与显式 cwd=任务根都必须 400——任务根是全部会话目录的父目录,放行会绕过隔离。
|
||||
const rb1 = await fetch(BASE + '/exec', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ command: 'echo hi' }) });
|
||||
check('cwd 缺省(落任务根)400', rb1.status === 400, 'status=' + rb1.status);
|
||||
const rb2 = await fetch(BASE + '/exec', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ command: 'echo hi', cwd: TASK_ROOT }) });
|
||||
check('cwd=任务根本身 400', rb2.status === 400, 'status=' + rb2.status);
|
||||
|
||||
// 4. 取消:sleep 30 启动后立即 DELETE
|
||||
const r4 = await fetch(BASE + '/exec', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ command: 'sleep 30' }) });
|
||||
const r4 = await fetch(BASE + '/exec', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ command: 'sleep 30', cwd: SELF }) });
|
||||
let id4 = null; const evs4 = [];
|
||||
for await (const e of sse(r4)) { evs4.push(e); if (e.type === 'start' && !id4) { id4 = e.id; const k = await fetch(BASE + '/exec/' + id4, { method: 'DELETE' }); check('DELETE /exec/:id 返回 ok', (await k.json()).ok === true); } }
|
||||
const exit4 = evs4[evs4.length - 1];
|
||||
@@ -66,19 +77,28 @@ async function main() {
|
||||
|
||||
// 5. 超时自杀
|
||||
const t5 = Date.now();
|
||||
const r5 = await fetch(BASE + '/exec', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ command: 'sleep 30', timeout_ms: 600 }) });
|
||||
const r5 = await fetch(BASE + '/exec', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ command: 'sleep 30', timeout_ms: 600, cwd: SELF }) });
|
||||
const evs5 = await collect(r5);
|
||||
const exit5 = evs5[evs5.length - 1];
|
||||
check('超时 killed_by=timeout', exit5 && exit5.killed_by === 'timeout', JSON.stringify(exit5));
|
||||
check('超时耗时接近设定值', Date.now() - t5 < 3000, (Date.now() - t5) + 'ms');
|
||||
|
||||
// 6. 输出截断
|
||||
const r6 = await fetch(BASE + '/exec', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ command: 'printf x%.0s $(seq 1 500); echo', max_output_chars: 100 }) });
|
||||
const r6 = await fetch(BASE + '/exec', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ command: 'printf x%.0s $(seq 1 500); echo', max_output_chars: 100, cwd: SELF }) });
|
||||
const evs6 = await collect(r6);
|
||||
const outChars = evs6.filter(e => e.type === 'out').reduce((s, e) => s + e.chunk.length, 0);
|
||||
const exit6 = evs6[evs6.length - 1];
|
||||
check('输出按 max_output_chars 截断', outChars <= 100 && exit6.truncated === true, 'chars=' + outChars + ' exit=' + JSON.stringify(exit6));
|
||||
|
||||
// 7. 客户端半路断连:持续小输出中 abort 掉 SSE 连接,服务不能崩(write-after-destroy 回归护栏)。
|
||||
const ac7 = new AbortController();
|
||||
const r7 = await fetch(BASE + '/exec', { method: 'POST', headers: { 'Content-Type': 'application/json' }, signal: ac7.signal, body: JSON.stringify({ command: 'while :; do echo x; sleep 0.05; done', cwd: SELF }) });
|
||||
for await (const e of sse(r7)) { if (e.type === 'start') break; }
|
||||
await new Promise(r => setTimeout(r, 300)); // 让服务端先下发若干 out 帧
|
||||
ac7.abort();
|
||||
await new Promise(r => setTimeout(r, 800)); // 留给服务端 close→杀进程→finish 走完
|
||||
check('客户端半路断连不击穿服务(/health 仍 200)', (await fetch(BASE + '/health')).status === 200);
|
||||
|
||||
// 7.5 per-task 挂载隔离:另起一个实例(端口 19002),EXECUTOR_CWD=.iso-tasks(任务根),
|
||||
// 下放 iso-a / iso-b 两个「会话」目录;cwd 取 iso-a 的深层子目录(模拟 terminal 的 cd),验证:
|
||||
// 任务根下只看到 iso-a、cd 兄弟会话被拒、自己文件可读;无 mount 权限时整组 SKIP。
|
||||
@@ -115,14 +135,15 @@ async function main() {
|
||||
// 8. token 鉴权:另起一个带 EXECUTOR_TOKEN 的实例(子进程,端口 19001)
|
||||
const child = spawn(process.execPath, [__dirname + '/server.js'], { env: Object.assign({}, process.env, { PORT: '19001', EXECUTOR_TOKEN: 't9' }), stdio: 'ignore' });
|
||||
await new Promise(r => setTimeout(r, 500));
|
||||
const noTok = await fetch('http://127.0.0.1:19001/exec', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ command: 'echo hi' }) });
|
||||
const noTok = await fetch('http://127.0.0.1:19001/exec', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ command: 'echo hi', cwd: SELF }) });
|
||||
check('无 token 401', noTok.status === 401, 'status=' + noTok.status);
|
||||
const healthNoTok = await fetch('http://127.0.0.1:19001/health');
|
||||
check('带 token 时 /health 仍免鉴权', healthNoTok.status === 200);
|
||||
const withTok = await fetch('http://127.0.0.1:19001/exec', { method: 'POST', headers: { 'Content-Type': 'application/json', Authorization: 'Bearer t9' }, body: JSON.stringify({ command: 'echo hi' }) });
|
||||
const withTok = await fetch('http://127.0.0.1:19001/exec', { method: 'POST', headers: { 'Content-Type': 'application/json', Authorization: 'Bearer t9' }, body: JSON.stringify({ command: 'echo hi', cwd: SELF }) });
|
||||
const evs8 = await collect(withTok);
|
||||
check('带 token 正常执行', evs8.some(e => e.type === 'out' && e.chunk.trim() === 'hi'), JSON.stringify(evs8));
|
||||
child.kill('SIGKILL');
|
||||
fs.rmSync(TASK_ROOT, { recursive: true, force: true });
|
||||
|
||||
console.log(failed ? '\n' + failed + ' 项失败' : '\n全部通过');
|
||||
process.exit(failed ? 1 : 0);
|
||||
|
||||
Reference in New Issue
Block a user