fix(gateway-lock): verify lock owner identity via startTime + reject non-integer ports

fuleinist · claude · fuleinist · commit 8ed5e99fb129 · 2026-03-30T09:15:24.000+08:00
- Guard applyGatewayRuntimePortEnvOverride against PID reuse: when a lock carries startTime, compare it against the current process start time read from /proc/{pid}/stat before trusting the runtime-port override. If the times differ the lock is stale (PID recycled) and is ignored. - Add Number.isInteger check in readLockPayload so malformed locks with fractional ports (e.g. 18789.5) are treated as missing, preventing ERR_SOCKET_BAD_PORT from net.createConnection during owner probes. - Export readLinuxStartTime so it can be used by paths.ts for the startTime verification above. Addresses chatgpt-codex-connector[bot] P2 comments on #42496. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
diff --git a/src/config/paths.ts b/src/config/paths.ts
@@ -306,13 +306,22 @@ export async function applyGatewayRuntimePortEnvOverride(
   }
 
   // Dynamic import to avoid circular dependency
-  const { readGatewayLockPayload } = await import("../infra/gateway-lock.js");
+  const { readGatewayLockPayload, readLinuxStartTime } = await import("../infra/gateway-lock.js");
   const { isPidAlive } = await import("../shared/pid-alive.js");
   const payload = await readGatewayLockPayload(env);
 
-  // Verify the PID is still alive before using the port
+  // Verify the PID is still alive and the lock startTime matches (to guard
+  // against PID reuse by an unrelated process) before using the port.
   if (payload?.pid && payload.port && Number.isFinite(payload.port) && payload.port > 0) {
     if (isPidAlive(payload.pid)) {
+      // If the lock carries a startTime, verify it matches the current process
+      // start time to confirm this lock is still owned by the same process.
+      if (payload.startTime !== undefined) {
+        const currentStartTime = readLinuxStartTime(payload.pid);
+        if (currentStartTime !== payload.startTime) {
+          return; // Stale lock — PID was recycled
+        }
+      }
       env.OPENCLAW_GATEWAY_PORT = String(payload.port);
     }
   }
diff --git a/src/infra/gateway-lock.ts b/src/infra/gateway-lock.ts
@@ -57,7 +57,7 @@ function readLinuxCmdline(pid: number): string[] | null {
   }
 }
 
-function readLinuxStartTime(pid: number): number | null {
+export function readLinuxStartTime(pid: number): number | null {
   try {
     const raw = fsSync.readFileSync(`/proc/${pid}/stat`, "utf8").trim();
     const closeParen = raw.lastIndexOf(")");
@@ -157,6 +157,7 @@ async function readLockPayload(lockPath: string): Promise<LockPayload | null> {
     const port =
       typeof parsed.port === "number" &&
       Number.isFinite(parsed.port) &&
+      Number.isInteger(parsed.port) &&
       parsed.port > 0 &&
       parsed.port <= 65535
         ? parsed.port
