mirror of
https://github.com/Ark0N/Codeman.git
synced 2026-11-20 04:59:34 +01:00
fix(deepseek): make the Harness web tab render, not just authenticate
`dsh web` gates its own index behind a per-process launch token it prints on boot, and only that URL mints the `dsh-auth-*` cookie every later request needs. The managed tab stores the clean URL, so nothing on the browser side could present the token: the iframe rendered dsh's 401 text, a blank tab. Read the token out of the captured boot output, trade it for the cookie once at startup (`redirect: 'manual'`, since the 303 is what carries Set-Cookie), and let the proxy present it on both the HTTP and WebSocket legs. Scoped to the exact loopback authority the cookie was minted for; a token-less banner (an older dsh) keeps the previous behaviour untouched. The banner is scanned on its own 256 KB budget rather than the 16 KB error-tail buffer: a chatty profile can fill that cap before the banner prints. Authentication alone was not enough. dsh ships `<base href="./">`, which a browser resolves against the DOCUMENT url — and the proxy's runtime shim rewrites that url to strip the `/webview/<cap>/` prefix. The base therefore landed on Codeman's root: every module script 404'd and the page painted its inline `#151517` background with nothing on it (the black screen that replaced the white one). `rewriteHtml` now resolves a relative base against the proxy prefix before the mask can run, leaving a cross-origin base exactly as written. Verified against dsh 0.2.1-rc.5 and a live Codeman build: bare GET 401, captured cookie 200, proxied `/api` WebSocket 101, and a headless-Chrome load of the proxied tab boots the full Harness UI with no console errors.
This commit is contained in:
1 parent
e99b42c387
commit
0b3087918f
8 files changed
+474
-9
No files matched your search
@@ -50,6 +50,7 @@ import { readWebviews, writeWebviews } from '../../webview-store.js';
|
||||
import { webviewCapabilities } from '../../webview-capabilities.js';
|
||||
import { egressBlockedReason, webviewEgressLookup, webviewFetch, type EgressLookup } from '../webview-egress.js';
|
||||
import { blockedWebviewHostReason } from '../webview-egress-policy.js';
|
||||
import { getDeepSeekWebCookie } from '../../deepseek-web-server.js';
|
||||
import { ApiErrorCode, createErrorResponse } from '../../types.js';
|
||||
import type { Webview, WebviewOpenData, WebviewProbe } from '../../types.js';
|
||||
import { AUTH_COOKIE_NAME } from '../middleware/auth.js';
|
||||
@@ -426,6 +427,31 @@ function proxyHttp(
|
||||
return proxyRequest(req, reply, req.params.cap, req.params['*'] ?? '', basePath);
|
||||
}
|
||||
|
||||
/**
|
||||
* The credential a Codeman-managed dashboard needs on every upstream request.
|
||||
*
|
||||
* `dsh web` now gates its index and `/api` behind a cookie minted for the
|
||||
* authority it was started on, and only the URL it prints on boot carries the
|
||||
* token that buys it. The managed DeepSeek tab deliberately stores the clean
|
||||
* URL, so the browser can never hold that cookie: `deepseek-web-server.ts`
|
||||
* exchanges the token at startup, and this is where the supervisor's result
|
||||
* reaches the request.
|
||||
*
|
||||
* Strictly scoped to the exact loopback origin the cookie was minted for. A
|
||||
* web tab the user repointed at another host, or a stale tab still naming a
|
||||
* previous port, must not be handed a credential that is not its own.
|
||||
*
|
||||
* @param webview - the saved tab being proxied.
|
||||
* @param upstream - resolved upstream URL for this request.
|
||||
* @returns `name=value` cookie pair, or undefined when none applies.
|
||||
*/
|
||||
function managedDashboardCookie(webview: Webview, upstream: URL): string | undefined {
|
||||
if (webview.managed !== 'deepseek-web') return undefined;
|
||||
if (upstream.hostname !== '127.0.0.1') return undefined;
|
||||
const port = Number(upstream.port || (upstream.protocol === 'https:' ? 443 : 80));
|
||||
return getDeepSeekWebCookie(port) ?? undefined;
|
||||
}
|
||||
|
||||
/**
|
||||
* Proxy one request to the dashboard behind `cap`, serving `wildcard` as the
|
||||
* upstream path. Split out from the route handler so the 404 fallback (which has
|
||||
@@ -468,12 +494,14 @@ async function proxyRequest(
|
||||
}
|
||||
|
||||
const hasBody = req.method !== 'GET' && req.method !== 'HEAD';
|
||||
const injectedCookie = managedDashboardCookie(webview, upstream);
|
||||
const headers = buildUpstreamRequestHeaders(req.headers, upstream, {
|
||||
forwardCookies: webview.trusted,
|
||||
sessionCookieName: AUTH_COOKIE_NAME,
|
||||
refererPath:
|
||||
typeof req.headers.referer === 'string' ? stripProxyPrefix(req.headers.referer, cap, basePath) : undefined,
|
||||
relayBodyLength: hasBody && req.body !== undefined,
|
||||
...(injectedCookie ? { injectedCookie } : {}),
|
||||
});
|
||||
|
||||
// #237: the timeout bounds TIME-TO-HEADERS only. A plain AbortSignal.timeout on
|
||||
@@ -707,13 +735,19 @@ function proxyWebSocket(socket: WebSocket, req: FastifyRequest<{ Params: ProxyPa
|
||||
};
|
||||
|
||||
const protocols = req.headers['sec-websocket-protocol'];
|
||||
// The same credential the HTTP leg presents. A managed dashboard's realtime
|
||||
// channel is gated exactly like its index, so without this the page loads
|
||||
// and then sits there silently disconnected.
|
||||
const cookie =
|
||||
managedDashboardCookie(webview, upstream) ??
|
||||
(webview.trusted && req.headers.cookie ? String(req.headers.cookie) : undefined);
|
||||
// `lookup` is absent from ws's ClientOptions typings but flows through
|
||||
// http.request to net.connect untouched, which is where the resolved
|
||||
// address is judged (see webview-egress.ts).
|
||||
const upstreamOptions: WsClientOptions & { lookup: EgressLookup } = {
|
||||
headers: {
|
||||
origin: upstream.origin,
|
||||
...(webview.trusted && req.headers.cookie ? { cookie: String(req.headers.cookie) } : {}),
|
||||
...(cookie ? { cookie } : {}),
|
||||
},
|
||||
handshakeTimeout: WEBVIEW_WS_HANDSHAKE_TIMEOUT_MS,
|
||||
lookup: webviewEgressLookup,
|
||||
|
||||
@@ -311,7 +311,19 @@ export function filterCookieHeader(cookie: string | undefined, drop: string[]):
|
||||
export function buildUpstreamRequestHeaders(
|
||||
incoming: Record<string, string | string[] | undefined>,
|
||||
upstream: URL,
|
||||
opts: { forwardCookies: boolean; sessionCookieName: string; refererPath?: string; relayBodyLength?: boolean }
|
||||
opts: {
|
||||
forwardCookies: boolean;
|
||||
sessionCookieName: string;
|
||||
refererPath?: string;
|
||||
relayBodyLength?: boolean;
|
||||
/**
|
||||
* A credential the SERVER holds for this dashboard, replacing whatever the
|
||||
* browser sent. `dsh web` mints its session cookie for a loopback authority
|
||||
* the browser never visits, so the proxy is the only party that can present
|
||||
* it (see `deepseek-web-server.ts`).
|
||||
*/
|
||||
injectedCookie?: string;
|
||||
}
|
||||
): Record<string, string> {
|
||||
const headers: Record<string, string> = {};
|
||||
|
||||
@@ -343,6 +355,11 @@ export function buildUpstreamRequestHeaders(
|
||||
if (cookie) headers['cookie'] = cookie;
|
||||
}
|
||||
|
||||
// After the relay above, so a browser copy can never shadow it: these cookies
|
||||
// are scoped to the browser's origin, and the authority this request is for is
|
||||
// one it has never been able to store anything against.
|
||||
if (opts.injectedCookie) headers['cookie'] = opts.injectedCookie;
|
||||
|
||||
// Present as if the browser were talking to the dashboard directly. Apps that
|
||||
// check Origin on writes (CSRF defenses) need this to match their own origin.
|
||||
headers['origin'] = upstream.origin;
|
||||
@@ -646,6 +663,45 @@ try{
|
||||
}catch(e){}})();</script>`;
|
||||
}
|
||||
|
||||
/**
|
||||
* Make a page's own RELATIVE `<base href>` absolute under the proxy prefix.
|
||||
*
|
||||
* A base element is resolved against the document's URL, and {@link runtimeUrlShim}
|
||||
* deliberately rewrites that URL to strip the proxy prefix. So a page shipping
|
||||
* `<base href="./">` — which is what a Vite build does, DeepSeek Harness among
|
||||
* them — has its base re-resolved to Codeman's ROOT the moment the shim runs:
|
||||
* every module script, stylesheet and `fetch('./api')` then asks the Codeman
|
||||
* origin instead of the dashboard. The visible symptom is not an error page but
|
||||
* a blank one: the markup and inline `<style>` paint (dsh paints a dark
|
||||
* `#151517`), the module 404s, and nothing else ever renders.
|
||||
*
|
||||
* Resolving it here, while the prefix is still known, keeps the author's target
|
||||
* (the document as it existed before masking) and is idempotent: an
|
||||
* already-absolute path resolves to itself. Cross-origin bases are the author
|
||||
* pointing at a CDN and are left exactly as written.
|
||||
*
|
||||
* @param html - document with attributes already rebased.
|
||||
* @param prefix - proxy prefix the document was served from.
|
||||
* @returns the document with a relative base href made absolute.
|
||||
*/
|
||||
function rebaseRelativeBase(html: string, prefix: string): string {
|
||||
return html.replace(
|
||||
/(<base\b[^>]*?\bhref\s*=\s*)(["'])([^"']*)\2/i,
|
||||
(match: string, head: string, quote: string, href: string) => {
|
||||
let resolved: URL;
|
||||
try {
|
||||
// A stand-in origin: only the path is kept, and a different origin here
|
||||
// is exactly the "absolute base" case this must not touch.
|
||||
resolved = new URL(href, `http://codeman.invalid${prefix}`);
|
||||
} catch {
|
||||
return match;
|
||||
}
|
||||
if (resolved.origin !== 'http://codeman.invalid') return match;
|
||||
return `${head}${quote}${resolved.pathname}${resolved.search}${resolved.hash}${quote}`;
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Inject `<base href="/webview/<cap>/">` plus the runtime URL shim, and rebase
|
||||
* root-absolute `src`/`href`/`action` attributes, which `<base>` alone does not
|
||||
@@ -659,9 +715,12 @@ export function rewriteHtml(html: string, capability: string, basePath = ''): st
|
||||
const prefix = proxyPrefixFor(capability, basePath);
|
||||
|
||||
// Fresh regexes per call: module-level /g patterns carry `lastIndex` between calls.
|
||||
const rebased = html
|
||||
.replace(/(\s(?:src|href|action)\s*=\s*")\/(?!\/)/gi, `$1${prefix}`)
|
||||
.replace(/(\s(?:src|href|action)\s*=\s*')\/(?!\/)/gi, `$1${prefix}`);
|
||||
const rebased = rebaseRelativeBase(
|
||||
html
|
||||
.replace(/(\s(?:src|href|action)\s*=\s*")\/(?!\/)/gi, `$1${prefix}`)
|
||||
.replace(/(\s(?:src|href|action)\s*=\s*')\/(?!\/)/gi, `$1${prefix}`),
|
||||
prefix
|
||||
);
|
||||
|
||||
// A page that ships its own <base> keeps it (overriding it would break the
|
||||
// author's intent), but it STILL needs the shim, which is the layer that
|
||||
|
||||
Reference in new issue
Block a user