mirror of
https://github.com/Studio-Saelix/sencho.git
synced 2026-08-28 03:06:57 +00:00
d882f223f4
* feat(api-tokens): switch to sen_sk_ prefixed opaque keys
Replace JWT-shaped API tokens with 56-char opaque keys of the form
`sen_sk_<43-char base62 random><6-char base62 checksum>` (256-bit
entropy, sha256-truncated checksum). Node-proxy tokens stay JWTs.
Why:
* The api_token path was already a sha256 DB lookup; the JWT signature
was wasted work and the 400d JWT ceiling vs DB expires_at was a
confusing dual bound.
* Opaque tokens carry a verifiable checksum so malformed/typoed values
are rejected before any SQLite lookup.
* `sen_sk_` prefix is recognizable to GitHub, TruffleHog, GitGuardian
and makes the on-wire shape visually distinct from node_proxy JWTs.
Changes:
* New `utils/apiTokenFormat.ts` (generate + checksum-verify, CSPRNG via
randomInt, timingSafeEqual on the checksum compare).
* `middleware/auth.ts` and `websocket/upgradeHandler.ts` route opaque
tokens before any jwt.verify; 401 messages unified to avoid a
token-existence oracle.
* `middleware/rateLimiters.ts` short-circuits opaque tokens in the
node_proxy detection and keys per-token via a non-reversible sha256
slice so each token keeps its own bucket without a DB hit.
* All six existing tests migrated from jwt.sign({scope:'api_token'})
to generateApiToken(); new format-only test suite covering prefix,
length, alphabet, checksum reject paths, and a 10k-iteration
collision/integrity loop.
* Docs (features/api-tokens.mdx, api-reference/overview.mdx) describe
the shape and drop the obsolete JWT-ceiling note.
* fix(api-tokens): clear CI lint and CodeQL false positives
* Drop unused TEST_USERNAME import in remote-console-session.test.ts;
the migration to generateApiToken() left it orphaned.
* Add a CodeQL barrier model so `generateApiToken`'s ReturnValue does
not flow into the `insufficient-password-hash` query. The function
emits 256-bit CSPRNG opaque keys; sha256 of the raw token is the
correct construction for high-entropy API tokens (bcrypt-class
hashes target low-entropy human passwords). CodeQL's name heuristic
was treating "Token" as a password source and flagging the standard
sha256 wrapping at all 9 call sites.
* ci(codeql): exclude js/insufficient-password-hash for token paths
The previous barrierModel data extension was a no-op for this rule: the
js/insufficient-password-hash query identifies its "password" sources via
SensitiveExpr's name heuristic ("token", "secret", "key" substrings),
which is upstream of the taint-tracking layer where barrierModel applies.
Verified by post-push re-analysis: 9 alerts still open, all undismissed.
Replace the dead extension with a path-scoped query-filter in
codeql-config.yml so the rule no longer fires on apiTokenFormat,
apiTokens, and the test directory. Real user-password hashing code
elsewhere in the repo (auth, users, setup routes) remains analyzed.
The 9 existing alerts on PR #1062 are dismissed via API as false
positives with a justification pointing at this config. Future runs
will not re-flag them because of the path filter.
234 lines
10 KiB
TypeScript
234 lines
10 KiB
TypeScript
/**
|
|
* Regression guard for WebSocket upgrade dispatch order.
|
|
*
|
|
* `websocket/upgradeHandler.ts` dispatches upgrades in a first-match-wins
|
|
* ladder: pilot tunnel, then auth, then API-token scope gate, then
|
|
* notifications (local-only), then remote forwarder, then stack logs, then
|
|
* host console, then generic. Reordering the ladder silently breaks several
|
|
* product paths. This test pins each position by observing behavior that
|
|
* could only originate from the expected handler.
|
|
*/
|
|
import { describe, it, expect, beforeAll, afterAll } from 'vitest';
|
|
import WebSocket from 'ws';
|
|
import jwt from 'jsonwebtoken';
|
|
import crypto from 'crypto';
|
|
import type { AddressInfo } from 'net';
|
|
import { setupTestDb, cleanupTestDb, TEST_USERNAME, TEST_JWT_SECRET } from './helpers/setupTestDb';
|
|
import { generateApiToken } from '../utils/apiTokenFormat';
|
|
|
|
describe('WebSocket upgrade dispatch order', () => {
|
|
let tmpDir: string;
|
|
let server: import('http').Server;
|
|
let port: number;
|
|
let sessionCookie: string;
|
|
let remoteNodeId: number;
|
|
|
|
beforeAll(async () => {
|
|
tmpDir = await setupTestDb();
|
|
({ server } = await import('../index'));
|
|
|
|
await new Promise<void>((resolve) => server.listen(0, '127.0.0.1', resolve));
|
|
const addr = server.address() as AddressInfo;
|
|
port = addr.port;
|
|
|
|
const { DatabaseService } = await import('../services/DatabaseService');
|
|
remoteNodeId = DatabaseService.getInstance().addNode({
|
|
name: 'upgrade-order-remote',
|
|
type: 'remote',
|
|
compose_dir: '/tmp',
|
|
is_default: false,
|
|
api_url: 'http://127.0.0.1:1',
|
|
api_token: 'upgrade-order-token',
|
|
});
|
|
|
|
const token = jwt.sign({ username: TEST_USERNAME }, TEST_JWT_SECRET, { expiresIn: '1m' });
|
|
sessionCookie = `sencho_token=${token}`;
|
|
});
|
|
|
|
afterAll(async () => {
|
|
await new Promise<void>((resolve, reject) => {
|
|
server.close((err) => (err ? reject(err) : resolve()));
|
|
});
|
|
cleanupTestDb(tmpDir);
|
|
});
|
|
|
|
function connect(pathAndQuery: string, opts: { cookie?: string; bearer?: string } = {}): WebSocket {
|
|
const headers: Record<string, string> = {};
|
|
if (opts.cookie) headers['cookie'] = opts.cookie;
|
|
if (opts.bearer) headers['authorization'] = `Bearer ${opts.bearer}`;
|
|
return new WebSocket(`ws://127.0.0.1:${port}${pathAndQuery}`, { headers });
|
|
}
|
|
|
|
/** Wait for an open or a failure; resolves with one of several outcomes. */
|
|
function waitForOutcome(ws: WebSocket, timeoutMs = 3000): Promise<
|
|
| { kind: 'open' }
|
|
| { kind: 'unexpected'; status: number }
|
|
| { kind: 'close'; code: number }
|
|
| { kind: 'error' }
|
|
| { kind: 'timeout' }
|
|
> {
|
|
return new Promise((resolve) => {
|
|
const timer = setTimeout(() => resolve({ kind: 'timeout' }), timeoutMs);
|
|
const done = (outcome: Awaited<ReturnType<typeof waitForOutcome>>): void => {
|
|
clearTimeout(timer);
|
|
resolve(outcome);
|
|
};
|
|
ws.once('open', () => done({ kind: 'open' }));
|
|
ws.once('unexpected-response', (_req, res) => done({ kind: 'unexpected', status: res.statusCode ?? 0 }));
|
|
ws.once('close', (code: number) => done({ kind: 'close', code }));
|
|
ws.once('error', () => done({ kind: 'error' }));
|
|
});
|
|
}
|
|
|
|
async function waitForSubscriberCount(target: number, timeoutMs = 2000): Promise<number> {
|
|
const { NotificationService } = await import('../services/NotificationService');
|
|
const deadline = Date.now() + timeoutMs;
|
|
while (Date.now() < deadline) {
|
|
const count = NotificationService.getInstance().getSubscriberCount();
|
|
if (count === target) return count;
|
|
await new Promise((r) => setTimeout(r, 25));
|
|
}
|
|
return NotificationService.getInstance().getSubscriberCount();
|
|
}
|
|
|
|
it('rejects unauthenticated upgrades with HTTP 401 (default-deny)', async () => {
|
|
const ws = connect('/ws');
|
|
const outcome = await waitForOutcome(ws);
|
|
expect(outcome.kind).toBe('unexpected');
|
|
if (outcome.kind === 'unexpected') expect(outcome.status).toBe(401);
|
|
});
|
|
|
|
it('routes /ws/notifications (local, no nodeId) to the notifications handler', async () => {
|
|
const { NotificationService } = await import('../services/NotificationService');
|
|
const before = NotificationService.getInstance().getSubscriberCount();
|
|
|
|
const ws = connect('/ws/notifications', { cookie: sessionCookie });
|
|
const outcome = await waitForOutcome(ws);
|
|
expect(outcome.kind).toBe('open');
|
|
|
|
const afterOpen = NotificationService.getInstance().getSubscriberCount();
|
|
expect(afterOpen).toBe(before + 1);
|
|
|
|
ws.close();
|
|
const afterClose = await waitForSubscriberCount(before);
|
|
expect(afterClose).toBe(before);
|
|
});
|
|
|
|
it('routes /ws/notifications?nodeId=<remote> to the remote forwarder, not local notifications', async () => {
|
|
const { NotificationService } = await import('../services/NotificationService');
|
|
const before = NotificationService.getInstance().getSubscriberCount();
|
|
|
|
const ws = connect(`/ws/notifications?nodeId=${remoteNodeId}`, { cookie: sessionCookie });
|
|
await waitForOutcome(ws);
|
|
|
|
// Whichever outcome arrives, the local subscriber count MUST NOT have
|
|
// incremented. If it did, a remote-targeted upgrade is reaching the local
|
|
// notifications handler, which is exactly the bug the dispatch order
|
|
// prevents.
|
|
await new Promise((r) => setTimeout(r, 50));
|
|
expect(NotificationService.getInstance().getSubscriberCount()).toBe(before);
|
|
try { ws.terminate(); } catch { /* ignore */ }
|
|
});
|
|
|
|
it('routes /api/stacks/<name>/logs to the logs handler (distinct error frame on invalid name)', async () => {
|
|
const ws = connect('/api/stacks/%2Einvalid/logs', { cookie: sessionCookie });
|
|
|
|
const firstMessage = await new Promise<string>((resolve, reject) => {
|
|
const timer = setTimeout(() => reject(new Error('no frame received')), 2000);
|
|
ws.once('message', (data: WebSocket.Data) => {
|
|
clearTimeout(timer);
|
|
resolve(data.toString());
|
|
});
|
|
ws.once('error', (e) => { clearTimeout(timer); reject(e); });
|
|
});
|
|
|
|
expect(firstMessage).toContain('Invalid stack name');
|
|
try { ws.terminate(); } catch { /* ignore */ }
|
|
});
|
|
|
|
describe('/api/mesh/proxy-tunnel scope gating', () => {
|
|
// The mesh proxy-tunnel ingress is machine-to-machine. The dispatch
|
|
// ladder must accept the credentials that fleet enrollment produces
|
|
// (node_proxy JWTs) AND the full-admin api_token scope, while rejecting
|
|
// session cookies and restricted api_token scopes. These cases pin the
|
|
// scope contract so a future re-tightening cannot silently regress to
|
|
// the "full-admin only" behaviour that trapped operators following the
|
|
// Add Remote Node dialog's Node Token instructions.
|
|
|
|
it('accepts a node_proxy Bearer (fleet enrollment token) at the upgrade and reaches the handler', async () => {
|
|
const nodeProxyToken = jwt.sign({ scope: 'node_proxy' }, TEST_JWT_SECRET, { expiresIn: '1m' });
|
|
const ws = connect('/api/mesh/proxy-tunnel', { bearer: nodeProxyToken });
|
|
const outcome = await waitForOutcome(ws);
|
|
// Pilot-mode rejection (404) or normal open both indicate the upgrade
|
|
// passed the scope gate and was handed to handleMeshProxyTunnel.
|
|
// The pre-fix behaviour was unequivocal: HTTP 403 from the dispatcher.
|
|
expect(outcome.kind).not.toBe('unexpected');
|
|
if (outcome.kind === 'unexpected') {
|
|
expect(outcome.status).not.toBe(403);
|
|
}
|
|
try { ws.terminate(); } catch { /* ignore */ }
|
|
});
|
|
|
|
it('accepts a full-admin api_token at the upgrade and reaches the handler', async () => {
|
|
const { DatabaseService } = await import('../services/DatabaseService');
|
|
const rawToken = generateApiToken();
|
|
const tokenHash = crypto.createHash('sha256').update(rawToken).digest('hex');
|
|
const adminId = DatabaseService.getInstance().getUserByUsername(TEST_USERNAME)!.id;
|
|
DatabaseService.getInstance().addApiToken({
|
|
token_hash: tokenHash,
|
|
name: `mesh-scope-gate-${Date.now()}`,
|
|
scope: 'full-admin',
|
|
user_id: adminId,
|
|
created_at: Date.now(),
|
|
expires_at: null,
|
|
});
|
|
const ws = connect('/api/mesh/proxy-tunnel', { bearer: rawToken });
|
|
const outcome = await waitForOutcome(ws);
|
|
expect(outcome.kind).not.toBe('unexpected');
|
|
if (outcome.kind === 'unexpected') {
|
|
expect(outcome.status).not.toBe(403);
|
|
}
|
|
try { ws.terminate(); } catch { /* ignore */ }
|
|
});
|
|
|
|
it('rejects a read-only api_token at the upgrade with HTTP 403', async () => {
|
|
const { DatabaseService } = await import('../services/DatabaseService');
|
|
const rawToken = generateApiToken();
|
|
const tokenHash = crypto.createHash('sha256').update(rawToken).digest('hex');
|
|
const adminId = DatabaseService.getInstance().getUserByUsername(TEST_USERNAME)!.id;
|
|
DatabaseService.getInstance().addApiToken({
|
|
token_hash: tokenHash,
|
|
name: `mesh-scope-readonly-${Date.now()}`,
|
|
scope: 'read-only',
|
|
user_id: adminId,
|
|
created_at: Date.now(),
|
|
expires_at: null,
|
|
});
|
|
const ws = connect('/api/mesh/proxy-tunnel', { bearer: rawToken });
|
|
const outcome = await waitForOutcome(ws);
|
|
expect(outcome.kind).toBe('unexpected');
|
|
if (outcome.kind === 'unexpected') expect(outcome.status).toBe(403);
|
|
});
|
|
|
|
it('rejects a session cookie at the upgrade with HTTP 403 (mesh is not a UI surface)', async () => {
|
|
const ws = connect('/api/mesh/proxy-tunnel', { cookie: sessionCookie });
|
|
const outcome = await waitForOutcome(ws);
|
|
expect(outcome.kind).toBe('unexpected');
|
|
if (outcome.kind === 'unexpected') expect(outcome.status).toBe(403);
|
|
});
|
|
});
|
|
|
|
it('dispatches /api/pilot/tunnel to the pilot handler (rejects non-pilot bearer before path-based dispatch)', async () => {
|
|
// A plain session cookie is a valid *user* JWT but not a pilot JWT. The
|
|
// pilot handler runs first (before the shared cookie/Bearer auth) and
|
|
// does its own Bearer check. Because this request carries only a cookie
|
|
// and no Bearer, pilotTunnel rejects with 401. Any other outcome means
|
|
// the ladder has been reordered: either the shared auth ran first and
|
|
// let the cookie through, or the unknown-path catch-all handled it.
|
|
const ws = connect('/api/pilot/tunnel', { cookie: sessionCookie });
|
|
const outcome = await waitForOutcome(ws);
|
|
expect(outcome.kind).toBe('unexpected');
|
|
if (outcome.kind === 'unexpected') expect(outcome.status).toBe(401);
|
|
});
|
|
});
|