Self-hosted, Self-Improving, Federated Everything App — dev management, agent orchestration, persistent mind, digital twin, second brain, and creative pipeline from a single dashboard over Tailscale to port the user into the OS
JavaScript ai-agentsdashboarddeveloper-toolsdigital-twinquantified-selfsecond-brainself-hostedtailscale
fix: end remote desktop viewer tokens and live VNC bridges when PortOS sessions are revoked (#12810)
Adam Eivy11278f02c629
diff --git a/server/index.js b/server/index.jsindex 9cfde156c5..06c5d3769a 100644--- a/server/index.js+++ b/server/index.js@@ -190,6 +190,7 @@ import remoteDesktopRoutes from './routes/remoteDesktop.js';import remoteDesktopViewerRoutes from './routes/remoteDesktopViewer.js';import { initSocket } from './services/socket.js';import { remoteDesktopBroker } from './services/remoteDesktop.js';+import { authEvents } from './services/auth.js';import { mountEidoverseOnServer } from './services/eidoverseHost.js';import { bootstrapServices, runBootSequence, registerShutdownHandlers } from './services/bootstrap.js';import { errorMiddleware } from './lib/errorHandler.js';@@ -238,6 +239,8 @@ const io = new Server(httpServer, {// request input. Mount the HTTPS server and its optional loopback HTTP mirror.remoteDesktopBroker.mountWebSocket(httpServer);remoteDesktopBroker.mountWebSocket(localHttpServer);+// Viewer tokens obey the same revocation contract as every other session credential.+authEvents.on('sessions:revoked-all', () => remoteDesktopBroker.revokeAll('PortOS sessions revoked'));// Eidoverse same-origin path + root allowlist (active only after the on-demand// host starts). Upgrade for `/ws` and `/eidoverse-host/**` on both listeners.mountEidoverseOnServer(null, [httpServer, localHttpServer]);diff --git a/server/services/remoteDesktop.js b/server/services/remoteDesktop.jsindex 6ac4c0c1a1..91cbca2b6f 100644--- a/server/services/remoteDesktop.js+++ b/server/services/remoteDesktop.js@@ -36,6 +36,8 @@ export const createRemoteDesktopBroker = ({connectedSessionTtlMs = CONNECTED_SESSION_TTL_MS,} = {}) => {const sessions = new Map();+ // Live bridges per token so revokeAll can end connections the session map no longer gates.+ const liveBridges = new Map();const mountedServers = new WeakSet();const deleteExpiredSessions = () => {@@ -139,6 +141,9 @@ export const createRemoteDesktopBroker = ({const vncSocket = connect({ host, port });const webSocketStream = createWebSocketStream(webSocket, { encoding: null });let cleanedUp = false;+ let bridges = liveBridges.get(token);+ if (!bridges) liveBridges.set(token, bridges = new Set());+ bridges.add(webSocket);const expiryTimer = setTimeout(() => {webSocket.close(1000, 'Remote desktop session expired');}, Math.max(1, expiresAt - now()));@@ -147,6 +152,8 @@ export const createRemoteDesktopBroker = ({if (cleanedUp) return;cleanedUp = true;clearTimeout(expiryTimer);+ bridges.delete(webSocket);+ if (bridges.size === 0 && liveBridges.get(token) === bridges) liveBridges.delete(token);releaseSession(token);vncSocket.destroy();webSocketStream.destroy();@@ -160,7 +167,17 @@ export const createRemoteDesktopBroker = ({});};- return { createSession, hasSession, mountWebSocket, status };+ // Mirrors the auth contract that every PortOS session credential dies on+ // revocation: drop all tokens, then close bridges (close runs cleanup, which+ // destroys the VNC socket).+ const revokeAll = (reason = 'Remote desktop access revoked') => {+ sessions.clear();+ for (const bridges of [...liveBridges.values()]) {+ for (const webSocket of [...bridges]) webSocket.close(1008, reason);+ }+ };++ return { createSession, hasSession, mountWebSocket, revokeAll, status };};export const remoteDesktopBroker = createRemoteDesktopBroker();diff --git a/server/services/remoteDesktop.test.js b/server/services/remoteDesktop.test.jsindex 50252cd239..dd3ab806c5 100644--- a/server/services/remoteDesktop.test.js+++ b/server/services/remoteDesktop.test.js@@ -1,3 +1,4 @@+import { readFileSync } from 'node:fs';import { createServer } from 'node:net';import { createServer as createHttpServer } from 'node:http';import { afterEach, describe, expect, it, vi } from 'vitest';@@ -119,4 +120,47 @@ describe('remote desktop broker', () => {await vi.waitFor(() => expect(broker.hasSession(token)).toBe(false));await new Promise((resolve) => httpServer.close(resolve));});++ it('revokeAll drops every token and closes live bridges, refusing reconnects', async () => {+ const vncSockets = [];+ const vncServer = createServer((socket) => { vncSockets.push(socket); socket.pipe(socket); });+ servers.push(vncServer);+ await new Promise((resolve) => vncServer.listen(0, '127.0.0.1', resolve));+ const broker = createRemoteDesktopBroker({ port: vncServer.address().port });+ const tokenOf = async () => new URL((await broker.createSession()).viewerPath, 'http://portos.invalid').searchParams.get('token');+ const liveToken = await tokenOf();+ const idleToken = await tokenOf();+ const httpServer = createHttpServer();+ broker.mountWebSocket(httpServer);+ await new Promise((resolve) => httpServer.listen(0, '127.0.0.1', resolve));+ const url = (token) => `ws://127.0.0.1:${httpServer.address().port}/remote-desktop/ws?token=${token}`;+ const client = new WebSocket(url(liveToken));+ await new Promise((resolve, reject) => { client.once('open', resolve); client.once('error', reject); });+ const probeCount = vncSockets.length;+ await vi.waitFor(() => expect(vncSockets).toHaveLength(probeCount + 1));+ const bridgeVnc = vncSockets[probeCount];++ const closed = new Promise((resolve) => client.once('close', (code) => resolve(code)));+ broker.revokeAll('PortOS sessions revoked');++ expect(await closed).toBe(1008);+ expect(broker.hasSession(liveToken)).toBe(false);+ expect(broker.hasSession(idleToken)).toBe(false);+ await vi.waitFor(() => expect(bridgeVnc.destroyed).toBe(true));+ const rejected = new WebSocket(url(liveToken));+ const status = await new Promise((resolve) => rejected.once('unexpected-response', (_req, res) => resolve(res.statusCode)));+ expect(status).toBe(401);++ const fresh = await tokenOf();+ const reopened = new WebSocket(url(fresh));+ await new Promise((resolve, reject) => { reopened.once('open', resolve); reopened.once('error', reject); });+ reopened.close();+ await new Promise((resolve) => reopened.once('close', resolve));+ await new Promise((resolve) => httpServer.close(resolve));+ });++ it('server boot revokes the broker whenever PortOS sessions are revoked', () => {+ const source = readFileSync(new URL('../index.js', import.meta.url), 'utf8');+ expect(source).toMatch(/authEvents\.on\('sessions:revoked-all',[^;]*remoteDesktopBroker\.revokeAll\(/);+ });});