mirror of
https://github.com/Ark0N/Codeman.git
synced 2026-11-20 04:59:34 +01:00
fix(deepseek): only exchange a banner for the spawned loopback port
The launch URL comes from the child's output but fetching it is a request made by the Codeman server, so a banner naming another host or another local service could aim it. Require 127.0.0.1 and the port just spawned before the exchange runs, and mark the server as unusable for reuse if the check fails.
This commit is contained in:
1 parent
b1bcd1e3af
commit
7f729ee87b
4 files changed
+92
-6
No files matched your search
@@ -2,4 +2,4 @@
|
||||
"aicodeman": patch
|
||||
---
|
||||
|
||||
The DeepSeek Harness web tab opens on the dashboard again instead of a blank 401 page. `dsh web` now gates its own index behind a one-time launch token it prints on boot; the supervisor reads that token out of the captured output, trades it for the session cookie once at startup, and the webview proxy presents the cookie on both the HTTP and WebSocket legs — scoped to the loopback authority it was minted for. The banner reader scans every `dsh web:` line (diagnostics share the prefix) and only complete lines (a split write is waited for), so a `dsh web: loading profiles` line no longer makes boot give up. A server whose exchange failed is no longer reused, so asking to start the UI again restarts it and retries the exchange. The cookie is only presented to a tab whose owner holds the privileged-commands grant, and in multi-user mode only to the owner whose request started the process: `managed` is a client-supplied field and the live port is public, so the saved record alone is not an entitlement. A dsh without the gate keeps working unchanged.
|
||||
The DeepSeek Harness web tab opens on the dashboard again instead of a blank 401 page. `dsh web` now gates its own index behind a one-time launch token it prints on boot; the supervisor reads that token out of the captured output, trades it for the session cookie once at startup, and the webview proxy presents the cookie on both the HTTP and WebSocket legs — scoped to the loopback authority it was minted for. The banner reader scans every `dsh web:` line (diagnostics share the prefix) and only complete lines (a split write is waited for), so a `dsh web: loading profiles` line no longer makes boot give up. The printed token URL is only fetched when it names `127.0.0.1` on the port that was just spawned. A server whose exchange failed is no longer reused, so asking to start the UI again restarts it and retries the exchange. The cookie is only presented to a tab whose owner holds the privileged-commands grant, and in multi-user mode only to the owner whose request started the process: `managed` is a client-supplied field and the live port is public, so the saved record alone is not an entitlement. A dsh without the gate keeps working unchanged.
|
||||
@@ -300,11 +300,13 @@ authority it was minted for, so a repointed or stale tab cannot carry it
|
||||
elsewhere. The reader scans every `dsh web:` line (dsh prints diagnostics such as
|
||||
`dsh web: loading profiles` under the same prefix before the banner) and only
|
||||
complete lines, so a banner split across two output chunks is waited for rather
|
||||
than parsed truncated. A dsh without the gate prints a token-less banner and
|
||||
keeps working unchanged. If a token is printed but the exchange still fails, the
|
||||
server keeps running (its page serves, just 401) and is marked unusable for
|
||||
reuse: the next start request stops and respawns it, which is the "restart `dsh
|
||||
web`" the warning asks the user to perform.
|
||||
than parsed truncated. Before the token URL is fetched it must name `127.0.0.1`
|
||||
on the port the supervisor just spawned, so a banner cannot aim the server-side
|
||||
request at another host or local service. A dsh without the gate prints a
|
||||
token-less banner and keeps working unchanged. If a token is printed but the
|
||||
exchange still fails, the server keeps running (its page serves, just 401) and is
|
||||
marked unusable for reuse: the next start request stops and respawns it, which is
|
||||
the "restart `dsh web`" the warning asks the user to perform.
|
||||
|
||||
The cookie is also bound to a person, not to a URL. `managed` is accepted from the
|
||||
client on `POST/PATCH /api/webviews` and `GET /api/deepseek/web` publishes the live
|
||||
|
||||
@@ -209,6 +209,24 @@ export function parseLaunchUrl(output: string): string | null {
|
||||
return new URL(href).searchParams.get('token') ? href : null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether a launch URL names the loopback port this supervisor just spawned.
|
||||
*
|
||||
* The URL is read from the child's output, but fetching it is a request made by
|
||||
* the SERVER. A banner naming another host, or another local service's port, must
|
||||
* not turn that exchange into an SSRF primitive, so the target is required to be
|
||||
* the exact origin the token was minted for.
|
||||
*/
|
||||
export function launchUrlTargetsServer(launchUrl: string, port: number): boolean {
|
||||
try {
|
||||
const url = new URL(launchUrl);
|
||||
const effectivePort = Number(url.port || (url.protocol === 'https:' ? 443 : 80));
|
||||
return url.hostname === '127.0.0.1' && effectivePort === port;
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Trade the launch URL for the `dsh-auth-*` cookie the proxy will present.
|
||||
*
|
||||
@@ -257,6 +275,13 @@ async function captureSessionCookie(running: RunningServer): Promise<{ cookie: s
|
||||
const complete = banner.slice(0, banner.lastIndexOf('\n') + 1);
|
||||
const launchUrl = parseLaunchUrl(complete);
|
||||
if (launchUrl) {
|
||||
if (!launchUrlTargetsServer(launchUrl, running.port)) {
|
||||
console.warn(
|
||||
'[DeepSeek web] the printed launch URL does not name the loopback port this server was started on; ' +
|
||||
'not fetching it'
|
||||
);
|
||||
return { cookie: null, failed: true };
|
||||
}
|
||||
const cookie = await exchangeLaunchToken(launchUrl);
|
||||
// The URL is a credential: never log it, only the fact that it did not work.
|
||||
if (!cookie) {
|
||||
|
||||
@@ -20,10 +20,12 @@ import { describe, expect, it, beforeEach, afterEach, vi } from 'vitest';
|
||||
import { mkdtempSync, rmSync, writeFileSync } from 'node:fs';
|
||||
import { tmpdir } from 'node:os';
|
||||
import { join } from 'node:path';
|
||||
import http from 'node:http';
|
||||
import { DeepSeekWebStartSchema } from '../src/web/schemas.js';
|
||||
import {
|
||||
getDeepSeekWebCookie,
|
||||
getDeepSeekWebStatus,
|
||||
launchUrlTargetsServer,
|
||||
parseLaunchUrl,
|
||||
resetDeepSeekWebForTest,
|
||||
startDeepSeekWeb,
|
||||
@@ -116,6 +118,16 @@ describe('parseLaunchUrl: the one-time token dsh prints on boot', () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe('launchUrlTargetsServer: the exchange must hit the spawned port', () => {
|
||||
it('accepts only 127.0.0.1 on the port that was just spawned', () => {
|
||||
expect(launchUrlTargetsServer('http://127.0.0.1:3080/?token=x', 3080)).toBe(true);
|
||||
expect(launchUrlTargetsServer('http://127.0.0.1:3081/?token=x', 3080)).toBe(false);
|
||||
expect(launchUrlTargetsServer('http://localhost:3080/?token=x', 3080)).toBe(false);
|
||||
expect(launchUrlTargetsServer('http://evil.example:3080/?token=x', 3080)).toBe(false);
|
||||
expect(launchUrlTargetsServer('not a url', 3080)).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe('DeepSeek web supervisor: the launch-token cookie', () => {
|
||||
let dir: string;
|
||||
|
||||
@@ -269,6 +281,53 @@ http
|
||||
expect(third.reused).toBe(true);
|
||||
}, 20_000);
|
||||
|
||||
// The exchange is a request made by the SERVER. A banner naming another local
|
||||
// port would let captured child output aim it, so the URL is judged before it
|
||||
// is fetched at all.
|
||||
it('does not fetch a banner naming another port', async () => {
|
||||
const hits: string[] = [];
|
||||
const target = http.createServer((req, res) => {
|
||||
hits.push(req.url ?? '');
|
||||
res.writeHead(200, { 'content-type': 'text/plain' });
|
||||
res.end('should never be reached');
|
||||
});
|
||||
await new Promise<void>((resolve) => target.listen(0, '127.0.0.1', resolve));
|
||||
const address = target.address();
|
||||
if (!address || typeof address === 'string') throw new Error('target has no address');
|
||||
|
||||
try {
|
||||
writeFileSync(
|
||||
join(dir, 'dsh'),
|
||||
`#!/usr/bin/env node
|
||||
const http = require('node:http');
|
||||
const port = Number(process.argv[process.argv.indexOf('--port') + 1]);
|
||||
process.stdout.write('dsh web: http://127.0.0.1:${address.port}/?token=stolen\\n');
|
||||
http
|
||||
.createServer((_req, res) => {
|
||||
res.writeHead(401, { 'content-type': 'text/plain' });
|
||||
res.end('dsh web authentication required');
|
||||
})
|
||||
.listen(port, '127.0.0.1');
|
||||
`,
|
||||
{ mode: 0o755 }
|
||||
);
|
||||
|
||||
const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});
|
||||
try {
|
||||
const result = await startDeepSeekWeb(dir, 'localhost:3000');
|
||||
expect(result.ok).toBe(true);
|
||||
if (!result.ok) return;
|
||||
expect(getDeepSeekWebCookie(result.port)).toBeNull();
|
||||
expect(warn).toHaveBeenCalledWith(expect.stringContaining('not fetching it'));
|
||||
} finally {
|
||||
warn.mockRestore();
|
||||
}
|
||||
expect(hits).toEqual([]);
|
||||
} finally {
|
||||
await new Promise<void>((resolve) => target.close(() => resolve()));
|
||||
}
|
||||
}, 20_000);
|
||||
|
||||
it('leaves the old, ungated dsh working: no token means no cookie, not a failure', async () => {
|
||||
writeFileSync(
|
||||
join(dir, 'dsh'),
|
||||
|
||||
Reference in new issue
Block a user