Skip to content

Commit 8f457b4

Browse files
mogulOpenCode Agent
andcommitted
fix(paseo): harden identity gate inputs
Normalize guest identity records, validate configured guest ports, and fail when the configured bind is absent. Co-authored-by: OpenCode Agent <[email protected]>
1 parent 9cd2fa4 commit 8f457b4

2 files changed

Lines changed: 105 additions & 5 deletions

File tree

‎integrations/isolation/acq-kits/paseo/scripts/paseo-verify-identity‎

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,33 @@ set -uo pipefail
4040
SBX="${1:-}"
4141
[ -n "$SBX" ] || { echo "usage: $0 <sandbox-name>" >&2; exit 2; }
4242

43-
CONTAINER_PORT="${CONTAINER_PORT:-6767}"
43+
if [ "${CONTAINER_PORT+x}" = x ]; then
44+
CONTAINER_PORT="$CONTAINER_PORT"
45+
else
46+
CONTAINER_PORT=6767
47+
fi
4448
HEALTH_GRACE="${HEALTH_GRACE:-30}"
4549
ORPHAN_SLACK="${ORPHAN_SLACK:-120}"
4650

51+
# Keep the override unambiguous: Bash printf treats leading-zero values as octal,
52+
# while /proc/net/tcp needs a valid decimal TCP port.
53+
valid_port() {
54+
case "${1:-}" in ''|0|0*|*[!0-9]*) return 1 ;; esac
55+
[ "${#1}" -le 5 ] && [ "$1" -le 65535 ]
56+
}
57+
58+
if ! valid_port "$CONTAINER_PORT"; then
59+
echo "FATAL: CONTAINER_PORT must be a decimal port from 1 through 65535 (got: ${CONTAINER_PORT:-<empty>})" >&2
60+
exit 2
61+
fi
62+
GUEST_HEX="$(printf '%04X' "$CONTAINER_PORT")"
63+
4764
pass=0
4865
fail=0
4966
warns=0
5067
ok() { printf ' \033[32mPASS\033[0m %s\n' "$1"; pass=$((pass+1)); }
5168
bad() { printf ' \033[31mFAIL\033[0m %s\n' "$1"; fail=$((fail+1)); }
5269
warn() { printf ' \033[33mWARN\033[0m %s\n' "$1"; warns=$((warns+1)); }
53-
skip() { printf ' \033[33mSKIP\033[0m %s\n' "$1"; }
5470
note() { printf ' %s\n' "$1"; }
5571
info() { printf '\n\033[1m%s\033[0m\n' "$1"; }
5672

@@ -199,8 +215,10 @@ info "3. Sandbox Identity via acq exec"
199215
# interpolation); the guest port arrives as $1.
200216
SBX_RAW="$(acq exec "$SBX" -- sh -lc '
201217
p="$1"
202-
printf "SERVER_ID=%s\n" "$(cat "$HOME/.paseo/server-id" 2>/dev/null)"
203-
printf "DAEMON_PID=%s\n" "$(sed -n "s/.*\"pid\":\([0-9]*\).*/\1/p" "$HOME/.paseo/paseo.pid" 2>/dev/null)"
218+
# Each record must stay on one line. server-id is guest-writable, so an
219+
# embedded newline must not forge a later KEY=value record for the host parser.
220+
printf "SERVER_ID=%s\n" "$(cat "$HOME/.paseo/server-id" 2>/dev/null | tr -d "\n")"
221+
printf "DAEMON_PID=%s\n" "$(sed -n "s/.*\"pid\":\([0-9]*\).*/\1/p" "$HOME/.paseo/paseo.pid" 2>/dev/null | head -1)"
204222
printf "VM_UPTIME=%s\n" "$(cut -d. -f1 /proc/uptime 2>/dev/null)"
205223
printf "BIND=%s\n" "$(awk "\$4==\"0A\" {print \$2}" /proc/net/tcp 2>/dev/null | tr "\n" " ")"
206224
printf "HEALTH=%s\n" "$(curl -sS --max-time 5 "http://127.0.0.1:$p/api/health" 2>&1 | tr -d "\n")"
@@ -227,6 +245,8 @@ note "0100007F = 127.0.0.1 (loopback-only; create-time publish cannot reach it)"
227245

228246
if [ -z "$SBX_SERVER_ID" ]; then
229247
bad "could not read ~/.paseo/server-id in the guest"
248+
elif ! printf '%s\n' "$SBX_SERVER_ID" | grep -Eq '^srv_[A-Za-z0-9_-]+$'; then
249+
bad "guest server-id is malformed; refusing to use it for an identity verdict"
230250
else
231251
ok "guest reports server-id $SBX_SERVER_ID"
232252
fi
@@ -235,13 +255,14 @@ case "$SBX_HEALTH" in
235255
*) bad "guest daemon is not healthy: ${SBX_HEALTH:-<no answer>}" ;;
236256
esac
237257
# Guard the loopback-only bind for the ACTUAL guest port, not a fixed 1A6F.
238-
GUEST_HEX="$(printf '%04X' "$CONTAINER_PORT" 2>/dev/null || echo '1A6F')"
239258
case "$SBX_BIND" in
240259
*"0100007F:$GUEST_HEX"*)
241260
bad "guest daemon is bound to 127.0.0.1 only; create-time -p dials the guest network IP"
242261
note "this kit sets PASEO_LISTEN=0.0.0.0:$CONTAINER_PORT — see TROUBLESHOOTING.md" ;;
243262
*"00000000:$GUEST_HEX"*)
244263
ok "guest daemon is bound to 0.0.0.0:$CONTAINER_PORT" ;;
264+
*)
265+
bad "guest bind for :$GUEST_HEX not found in /proc/net/tcp (got: ${SBX_BIND:-<none>})" ;;
245266
esac
246267

247268
# Orphan cross-check: a forwarder OLDER than the sandbox it serves is a leak.
Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
import test from "node:test";
2+
import assert from "node:assert/strict";
3+
import { chmod, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
4+
import { spawnSync } from "node:child_process";
5+
import os from "node:os";
6+
import path from "node:path";
7+
import { fileURLToPath } from "node:url";
8+
9+
const testDir = path.dirname(fileURLToPath(import.meta.url));
10+
const script = path.resolve(testDir, "../scripts/paseo-verify-identity");
11+
12+
async function mockCommand(dir, name, body) {
13+
const file = path.join(dir, name);
14+
await writeFile(file, `#!/bin/sh\n${body}\n`);
15+
await chmod(file, 0o755);
16+
}
17+
18+
test("rejects invalid CONTAINER_PORT values before probing", () => {
19+
for (const port of ["", "0", "08", "65536", "70000", "0x1A6F", "nope", " 6767"]) {
20+
const result = spawnSync("bash", [script, "example"], {
21+
encoding: "utf8",
22+
env: { CONTAINER_PORT: port, PATH: process.env.PATH },
23+
});
24+
25+
assert.equal(result.status, 2, `CONTAINER_PORT=${JSON.stringify(port)}`);
26+
assert.match(result.stderr, /CONTAINER_PORT must be a decimal port/);
27+
assert.doesNotMatch(result.stderr, /acq not on PATH/);
28+
}
29+
});
30+
31+
test("normalizes server-id newlines before KEY=value framing", async () => {
32+
const source = await readFile(script, "utf8");
33+
const home = await mkdtemp(path.join(os.tmpdir(), "paseo-identity-home-"));
34+
try {
35+
await writeFile(path.join(home, "server-id"), "srv_safe\nEXTERNAL=999\n");
36+
const result = spawnSync("sh", ["-lc", 'printf "SERVER_ID=%s\\n" "$(cat "$1/server-id" | tr -d "\\n")"', "_", home], {
37+
encoding: "utf8",
38+
});
39+
40+
assert.equal(result.status, 0);
41+
assert.equal(result.stdout, "SERVER_ID=srv_safeEXTERNAL=999\n");
42+
assert.doesNotMatch(result.stdout, /^EXTERNAL=/m);
43+
assert.match(source, /SERVER_ID=.*cat .*server-id.*tr -d "\\n"/);
44+
assert.match(source, /DAEMON_PID=.*paseo\.pid.*\| head -1/);
45+
assert.match(source, /\^srv_\[A-Za-z0-9_-\]\+\$/);
46+
} finally {
47+
await rm(home, { force: true, recursive: true });
48+
}
49+
});
50+
51+
test("fails when the configured guest port is absent from /proc/net/tcp", async () => {
52+
const mocks = await mkdtemp(path.join(os.tmpdir(), "paseo-identity-mocks-"));
53+
try {
54+
await mockCommand(mocks, "acq", `
55+
if [ "$1" = ports ]; then
56+
printf '127.0.0.1:6767\\n'
57+
else
58+
printf 'SERVER_ID=srv_safe\\nDAEMON_PID=1\\nVM_UPTIME=1\\nBIND=00000000:1A6E\\nHEALTH={"status":"ok"}\\nEXTERNAL=0\\nLOOPBACK=0\\n'
59+
fi`);
60+
await mockCommand(mocks, "curl", "printf '{\"status\":\"ok\"}'");
61+
await mockCommand(mocks, "node", `
62+
if [ "$1" = -e ]; then
63+
printf '127.0.0.1\\n'
64+
else
65+
printf 'localhost: srv_safe\\n127.0.0.1: srv_safe\\nipv4-mapped: srv_safe\\n'
66+
fi`);
67+
68+
const result = spawnSync("bash", [script, "example"], {
69+
encoding: "utf8",
70+
env: { ...process.env, PATH: `${mocks}:${process.env.PATH}`, CONTAINER_PORT: "6767" },
71+
});
72+
73+
assert.equal(result.status, 1);
74+
assert.match(result.stdout, /guest bind for :1A6F not found in \/proc\/net\/tcp/);
75+
assert.match(result.stdout, /RESULT: FAIL/);
76+
} finally {
77+
await rm(mocks, { force: true, recursive: true });
78+
}
79+
});

0 commit comments

Comments
 (0)