fix: enforce the OAuth deadline across the proxy hop (#2319 round 5)

Two findings, both real.

The race bounded only the caller's promise on the browser path.
`createRemoteFetch` dropped the signal, so an abort — including the
deadline's own — left the POST to /api/fetch in flight; the backend
never saw its request cancelled and its outbound fetch ran on with
neither signal nor timeout, holding a handler and an authorization-server
socket per timed-out attempt. `createRemoteFetch` now forwards the
caller's signal (init.signal when present and not undefined, else a
Request's own), and the /api/fetch route composes `c.req.raw.signal`
with a server-side deadline matching the client budget, cleared in
`finally` so a streaming response is not severed.

A probe's own timeout was swallowed by `withRfc8414OidcCompat`, which
returned the preceding 404 and discarded the endpoint name the deadline
exists to provide. A deadline the Inspector imposed is its own error,
not the server's answer, so it escapes now; every other probe failure
still falls back as documented. Nothing regresses: every candidate the
loop probes is one the SDK's own buildDiscoveryUrls emits, so a stall
there is one the SDK would have hit itself, unbounded.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01YFnM6RqB4nXqNysgUYmjmq
Signed-off-by: cliffhall <cliff@futurescale.com>
This commit is contained in:
cliffhall 2026-09-11 03:23:26 -04:00
commit d848300077

View file

@ -28,6 +28,7 @@ import { bodyLimit } from "hono/body-limit";
import { watch as chokidarWatch, type FSWatcher } from "chokidar";
import { createTransportNode } from "../../node/transport.js";
import { createProxyFetch } from "../../node/proxyFetch.js";
import { DEFAULT_OAUTH_REQUEST_TIMEOUT_MS } from "../../../auth/requestTimeout.js";
import type {
RemoteConnectRequest,
RemoteSendRequest,
@ -1216,6 +1217,33 @@ export function createRemoteApp(
return c.json({ error: "Missing url" }, 400);
}
// #2319: bound the outbound call, and release it when the browser gives up.
// This hop is where a client-side deadline used to stop being enforceable:
// the browser abandons its promise, but the request it made is served here,
// and an outbound fetch with neither a signal nor a timeout holds a handler
// and an authorization-server socket open indefinitely — once per timed-out
// retry (Copilot). `c.req.raw.signal` is the propagated cancellation, now
// that `createRemoteFetch` forwards it; the timer is the backstop for a
// client that vanishes without aborting, and it matches the client-side
// budget so the two agree on when this is hopeless.
const controller = new AbortController();
const clientSignal: AbortSignal | undefined = c.req.raw.signal;
const signal = clientSignal
? AbortSignal.any([controller.signal, clientSignal])
: controller.signal;
// Cleared in `finally`, before the handler returns. A streaming response is
// returned here without its body being read, so a timer left armed would
// sever a live stream 30 seconds in.
const timer = setTimeout(
() =>
controller.abort(
new Error(
`proxied request to ${url} timed out after ${DEFAULT_OAUTH_REQUEST_TIMEOUT_MS}ms`,
),
),
DEFAULT_OAUTH_REQUEST_TIMEOUT_MS,
);
try {
// Proxy-aware, not the bare global. This route is the browser's ONLY way
// out to the network: the web client's `environment.fetch` is
@ -1228,6 +1256,7 @@ export function createRemoteApp(
method,
headers: new Headers(headers),
body: reqBody,
signal,
});
const resHeaders: Record<string, string> = {};
@ -1254,6 +1283,8 @@ export function createRemoteApp(
} catch (err) {
const msg = err instanceof Error ? err.message : String(err);
return c.json({ error: msg }, 500);
} finally {
clearTimeout(timer);
}
});