fix(board-link): ssh 路径去掉 applySandboxToArgv wrap(真 bug)
makeExec ssh 路径之前 underlying("ssh", [...wrapped]) 把 RUNNER_TOKEN 当 ssh 首参 → ssh 把 pba-board-sandbox 当 host(broken)。ssh 是远端传输:命令在板跑,本地 landlock argv 前缀保不了远端。改:ssh 只过 shouldRunCommand fail-closed 门,不 wrap,直接 spawn ssh+buildSshArgs。RUNNER_TOKEN wrap 仅对 local 路径有意义(agent 在板上跑本地命令)。
测试原断言 wrap 前缀(buggy,mock 不真跑 ssh 没抓到)→ 改断 buildSshArgs 直拼。44 测试过 tsc0。
Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
parent
fa9a600583
commit
23e643da2a
@ -259,14 +259,11 @@ export function makeExec(board: BoardSpec, underlying: ExecFn): MakeExecResult {
|
||||
return Promise.resolve(SANDBOX_REFUSED_RESULT);
|
||||
}
|
||||
const sshArgs = buildSshArgs(board, command, args);
|
||||
// 沙箱包装 ssh argv(模拟 runner token 前缀)
|
||||
const { argv: wrapped } = applySandboxToArgv(
|
||||
sshArgs,
|
||||
DEFAULT_BOARD_SANDBOX_POLICY,
|
||||
probe.capability,
|
||||
);
|
||||
// wrapped 是 readonly string[];ExecFn 期望 mutable string[],展开拷贝
|
||||
return underlying("ssh", [...wrapped], opts);
|
||||
// ssh 是远端传输:命令在板子上跑,本地 landlock argv 前缀保不了远端,
|
||||
// 且 applySandboxToArgv 的 RUNNER_TOKEN 前缀会让 ssh 把 token 当 host(broken)。
|
||||
// 故 ssh 路径只过 shouldRunCommand 门(fail-closed),不 wrap argv,直接 spawn ssh。
|
||||
// (RUNNER_TOKEN wrap + landlock-run 隔离只对 local 路径有意义——agent 在板上跑本地命令时。)
|
||||
return underlying("ssh", [...sshArgs], opts);
|
||||
};
|
||||
return { exec, transport: `ssh:${board.address}`, isStub: false };
|
||||
}
|
||||
|
||||
@ -283,15 +283,13 @@ describe("board-link makeExec", () => {
|
||||
expect(result.stdout).toBe("/tmp\n");
|
||||
expect(isStub).toBe(false);
|
||||
expect(transport).toBe("ssh:root@192.168.1.100:2222");
|
||||
// 验证 mock 被调时 command="ssh" 且 args 含沙箱包装 + ssh 拼接
|
||||
// 验证 mock 被调时 command="ssh" 且 args = buildSshArgs 直接拼接(ssh 远端跑,
|
||||
// 不走 applySandboxToArgv 的 RUNNER_TOKEN 前缀 wrap——那会让 ssh 把 token 当 host broken)
|
||||
const call = mock.mock.calls[0];
|
||||
expect(call?.[0]).toBe("ssh");
|
||||
const callArgs = call?.[1] as string[];
|
||||
// 沙箱包装前缀 + 原始 ssh 拼接后缀
|
||||
expect(callArgs).toEqual([
|
||||
"pba-board-sandbox", "--ro", "/", "--rw", "/workspace", "--",
|
||||
"-p", "2222", "root@192.168.1.100", "pwd",
|
||||
]);
|
||||
// ssh 路径只过 shouldRunCommand 门,不 wrap:args = buildSshArgs(端口非 22 加 -p)
|
||||
expect(callArgs).toEqual(["-p", "2222", "root@192.168.1.100", "pwd"]);
|
||||
});
|
||||
|
||||
it("ssh: opts 透传到 underlying", async () => {
|
||||
@ -311,11 +309,8 @@ describe("board-link makeExec", () => {
|
||||
await exec("dmesg", []);
|
||||
const callArgs = mock.mock.calls[0]?.[1] as string[];
|
||||
expect(callArgs).not.toContain("-p");
|
||||
// 沙箱包装 + 默认端口 ssh 拼接(无 -p)
|
||||
expect(callArgs).toEqual([
|
||||
"pba-board-sandbox", "--ro", "/", "--rw", "/workspace", "--",
|
||||
"root@192.168.1.100", "dmesg",
|
||||
]);
|
||||
// ssh 路径不 wrap(远端跑):args = buildSshArgs,默认端口 22 无 -p
|
||||
expect(callArgs).toEqual(["root@192.168.1.100", "dmesg"]);
|
||||
});
|
||||
|
||||
it("serial: 返回 stub,isStub=true,不调 underlying", async () => {
|
||||
@ -516,7 +511,7 @@ describe("board-side 沙箱 fail-closed (T05)", () => {
|
||||
expect(mock.mock.calls).toHaveLength(0);
|
||||
});
|
||||
|
||||
it("ssh: runner 可用 + 内核 5.13 → exec 跑通,argv 含沙箱包装", async () => {
|
||||
it("ssh: runner 可用 + 内核 5.13 → exec 跑通,argv = buildSshArgs 直拼(不 wrap)", async () => {
|
||||
process.env.PBA_BOARD_SANDBOX_RUNNER = "1";
|
||||
process.env.PBA_BOARD_KERNEL = "5.13.0";
|
||||
resetBoardSandboxProbe();
|
||||
@ -529,13 +524,14 @@ describe("board-side 沙箱 fail-closed (T05)", () => {
|
||||
|
||||
expect(result.exitCode).toBe(0);
|
||||
expect(result.stdout).toBe("ok\n");
|
||||
// underlying 被调用,且 argv 含沙箱 runner token
|
||||
// underlying 被调,command="ssh",args = buildSshArgs 直拼(ssh 远端跑,不 wrap:
|
||||
// RUNNER_TOKEN 前缀会让 ssh 把 token 当 host;landlock 隔离只对 local 路径有意义)
|
||||
expect(mock.mock.calls).toHaveLength(1);
|
||||
expect(mock.mock.calls[0]?.[0]).toBe("ssh");
|
||||
const callArgs = mock.mock.calls[0]?.[1] as string[];
|
||||
expect(callArgs).toContain("pba-board-sandbox");
|
||||
expect(callArgs).toContain("--ro");
|
||||
expect(callArgs).toContain("--rw");
|
||||
expect(callArgs).toContain("--");
|
||||
expect(callArgs).toEqual(["root@192.168.1.100", "ls", "/tmp"]);
|
||||
expect(callArgs).not.toContain("pba-board-sandbox");
|
||||
expect(callArgs).not.toContain("--");
|
||||
});
|
||||
|
||||
it("local: runner 不可用 → exec 返回 exitCode 126 + 拒绝 stderr,不 spawn underlying", async () => {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user