diff --git a/packages/adapter-utils/src/server-utils.test.ts b/packages/adapter-utils/src/server-utils.test.ts index 6ea975407a4..c15bc4923f6 100644 --- a/packages/adapter-utils/src/server-utils.test.ts +++ b/packages/adapter-utils/src/server-utils.test.ts @@ -789,6 +789,49 @@ describe("runChildProcess", () => { expect(finishedAt - startedAt).toBeGreaterThanOrEqual(spawnDelayMs); }); + it("strips systemd service-manager vars (NOTIFY_SOCKET/LISTEN_FDS/LISTEN_PID/LISTEN_FDNAMES) from both inherited and caller-supplied env", async () => { + const SERVICE_MANAGER_VARS = ["NOTIFY_SOCKET", "LISTEN_FDS", "LISTEN_PID", "LISTEN_FDNAMES"] as const; + const originalValues: Record = {}; + for (const key of SERVICE_MANAGER_VARS) { + originalValues[key] = process.env[key]; + process.env[key] = `inherited-${key}`; + } + + try { + const result = await runChildProcess( + randomUUID(), + process.execPath, + ["-e", "process.stdout.write(JSON.stringify(process.env))"], + { + cwd: process.cwd(), + env: { + NOTIFY_SOCKET: "/run/caller-supplied.sock", + LISTEN_FDS: "1", + LISTEN_PID: "12345", + LISTEN_FDNAMES: "caller", + }, + timeoutSec: 5, + graceSec: 1, + onLog: async () => {}, + }, + ); + + expect(result.exitCode).toBe(0); + const childEnv = JSON.parse(result.stdout) as Record; + for (const key of SERVICE_MANAGER_VARS) { + expect(childEnv[key]).toBeUndefined(); + } + } finally { + for (const key of SERVICE_MANAGER_VARS) { + if (originalValues[key] === undefined) { + delete process.env[key]; + } else { + process.env[key] = originalValues[key]; + } + } + } + }); + it.skipIf(process.platform === "win32")( "kills descendant processes on timeout via the process group", async () => { diff --git a/packages/adapter-utils/src/server-utils.ts b/packages/adapter-utils/src/server-utils.ts index 8538a710687..78217c44904 100644 --- a/packages/adapter-utils/src/server-utils.ts +++ b/packages/adapter-utils/src/server-utils.ts @@ -4829,6 +4829,22 @@ export async function runChildProcess( delete rawMerged[key]; } + // Strip systemd service-manager vars so the spawned agent process can't + // reach the Paperclip server's own readiness/socket-activation channel. + // NOTIFY_SOCKET in particular lets any process with it in its env call + // sd_notify on the server's readiness socket; systemd only accepts + // notifications from the service's registered main PID, so an agent + // subprocess inheriting it just spams "reception only permitted for + // main PID" warnings, but it's still an unintended channel and must not + // be handed to child processes. These vars can arrive either via + // process.env (systemd sets them on the server process) or via + // opts.env (adapters that build their env as `{ ...process.env, ... }`), + // so strip them after the merge, not just from the process.env side. + const SERVICE_MANAGER_VARS = ["NOTIFY_SOCKET", "LISTEN_FDS", "LISTEN_PID", "LISTEN_FDNAMES"] as const; + for (const key of SERVICE_MANAGER_VARS) { + delete rawMerged[key]; + } + const mergedEnv = ensurePathInEnv(rawMerged); if (opts.localProcessSandbox?.homeDir) { mergedEnv.HOME = opts.localProcessSandbox.homeDir;