feat(board-link): ssh 路径可选 sshpass 支持(PBA_BOARD_SSH_PASS env) — 板镜像 UsePAM 强制 password 时非交互 ssh 喂密码; +1 测试 45过 tsc0
Some checks are pending
CI / quality-gate (push) Waiting to run
CI / type-drift (push) Waiting to run

This commit is contained in:
d-robotics 2026-08-17 12:32:15 +08:00
parent 23e643da2a
commit 0648995bac
2 changed files with 26 additions and 0 deletions

View File

@ -263,6 +263,12 @@ export function makeExec(board: BoardSpec, underlying: ExecFn): MakeExecResult {
// 且 applySandboxToArgv 的 RUNNER_TOKEN 前缀会让 ssh 把 token 当 host(broken)。
// 故 ssh 路径只过 shouldRunCommand 门(fail-closed),不 wrap argv,直接 spawn ssh。
// (RUNNER_TOKEN wrap + landlock-run 隔离只对 local 路径有意义——agent 在板上跑本地命令时。)
// 可选 sshpass:板镜像若 UsePAM 强制 password(key auth 不可),设 PBA_BOARD_SSH_PASS
// 环境变量(不入库)→ 用 sshpass -p 包一层喂密码,非交互 ssh 即可(密钥铁律:仅 env)。
const sshPass = process.env.PBA_BOARD_SSH_PASS;
if (sshPass && sshPass.length > 0) {
return underlying("sshpass", ["-p", sshPass, "ssh", ...sshArgs], opts);
}
return underlying("ssh", [...sshArgs], opts);
};
return { exec, transport: `ssh:${board.address}`, isStub: false };

View File

@ -302,6 +302,26 @@ describe("board-link makeExec", () => {
expect(call?.[2]).toBe(opts);
});
it("ssh: PBA_BOARD_SSH_PASS 设 → sshpass -p 包一层喂密码(板镜像 UsePAM 强制 password)", async () => {
const prev = process.env.PBA_BOARD_SSH_PASS;
process.env.PBA_BOARD_SSH_PASS = "root";
try {
resetBoardSandboxProbe();
const mock = makeMockExec({ stdout: "aarch64\n", exitCode: 0 });
const board = sshBoard("x5", "root@10.112.12.221:22");
const { exec } = makeExec(board, mock);
const result = await exec("uname", ["-m"], { timeout: 5000 });
expect(result.exitCode).toBe(0);
const call = mock.mock.calls[0];
expect(call?.[0]).toBe("sshpass");
const callArgs = call?.[1] as string[];
expect(callArgs).toEqual(["-p", "root", "ssh", "root@10.112.12.221", "uname", "-m"]);
} finally {
if (prev === undefined) delete process.env.PBA_BOARD_SSH_PASS;
else process.env.PBA_BOARD_SSH_PASS = prev;
}
});
it("ssh: 默认端口 22 不加 -p", async () => {
const mock = makeMockExec();
const board = sshBoard("x5", "root@192.168.1.100:22");