mirror of
https://github.com/screentinker/screentinker.git
synced 2026-08-14 14:23:14 -06:00
Six places verified a session JWT inline instead of going through requireAuth, each repeating a slightly different subset of its checks. Introduce resolveSessionUser() in middleware/auth.js as the single definition of "this token is a usable session, and here is whose it is", and route all of them through it: the three /api/status token routes, the screenshot route, the content-reference gate, and the /dashboard socket handshake. requireAuth is now a thin wrapper over the same helper, so the two cannot drift. Also: - Give the pre-TOTP token a distinct audience so it is redeemable only through verifyMfaPendingToken (POST /api/auth/totp/verify). verifyToken refuses any token carrying an audience, so a token minted for one purpose cannot be redeemed on another path. - The dashboard socket handshake now takes userId/userRole from the live users row rather than from the token claim, so role changes take effect on the next connection instead of riding the token's remaining lifetime. - Add test/session-token-resolution.test.js covering all six surfaces, including the socket handshake. Every call site keeps the status code and error body it returned before. Net query cost: the content-reference gate and the socket handshake each gain one users-by-id lookup (the same one requireAuth already does per request); the other four are unchanged or replace an equivalent lookup. In-flight pre-TOTP tokens are invalidated by the audience change; they live 5 minutes, so the window is a re-login at worst. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
159 lines
7.8 KiB
JavaScript
159 lines
7.8 KiB
JavaScript
const heartbeat = require('../services/heartbeat');
|
|
const { resolveSessionUser } = require('../middleware/auth');
|
|
const { db } = require('../db/database');
|
|
const { accessContext, accessibleWorkspaceIds } = require('../lib/tenancy');
|
|
const { workspaceRoom } = require('../lib/socket-rooms');
|
|
const { protectSocket } = require('../lib/safe-socket');
|
|
|
|
// Phase 2.3: workspace-scoped socket rooms + per-command permission gates.
|
|
// Replaces the previous flat dashboardNs.emit broadcast (which leaked every
|
|
// device's status/screenshot/playback events to every connected dashboard)
|
|
// and the legacy admin/superadmin role bypass (dead code post-Phase-1
|
|
// rename - admin -> user, superadmin -> platform_admin).
|
|
//
|
|
// On connect: enumerate the user's accessible workspace_ids and socket.join
|
|
// a room per workspace. Outbound broadcasts route via dashboardNs.to(room).
|
|
// Inbound commands check permission against the target device's workspace.
|
|
|
|
// Permission gate for inbound socket commands. Read tier = workspace_viewer+;
|
|
// write tier = workspace_editor+. Platform_admin and org_owner/admin always
|
|
// pass via actingAs.
|
|
function canActOnDevice(socket, deviceId, tier /* 'read' | 'write' */) {
|
|
const device = db.prepare('SELECT workspace_id FROM devices WHERE id = ?').get(deviceId);
|
|
if (!device || !device.workspace_id) return false;
|
|
const ws = db.prepare('SELECT * FROM workspaces WHERE id = ?').get(device.workspace_id);
|
|
if (!ws) return false;
|
|
const ctx = accessContext(socket.userId, socket.userRole, ws);
|
|
if (!ctx) return false;
|
|
if (ctx.actingAs) return true; // platform_admin or org admin
|
|
if (tier === 'read') return !!ctx.workspaceRole; // viewer/editor/admin all OK
|
|
// write tier: workspace_editor or workspace_admin
|
|
return ctx.workspaceRole === 'workspace_editor' || ctx.workspaceRole === 'workspace_admin';
|
|
}
|
|
|
|
module.exports = function setupDashboardSocket(io) {
|
|
const dashboardNs = io.of('/dashboard');
|
|
const deviceNs = io.of('/device');
|
|
|
|
dashboardNs.use((socket, next) => {
|
|
const token = socket.handshake.auth?.token;
|
|
if (!token) return next(new Error('Authentication required'));
|
|
let session;
|
|
try {
|
|
// Same resolver as requireAuth, so the socket inherits the pre-TOTP refusal and the
|
|
// forced-password-change gate that the HTTP surface enforces.
|
|
session = resolveSessionUser(token);
|
|
} catch (err) {
|
|
if (err.code === 'mfa_required') return next(new Error('mfa_required'));
|
|
if (err.code === 'password_change_required') return next(new Error('password_change_required'));
|
|
return next(new Error('Invalid token'));
|
|
}
|
|
// Break-glass identities have no users row and no workspace membership, so
|
|
// canActOnDevice -> accessContext already denied them every command. Refuse the
|
|
// handshake rather than hold open a socket that can do nothing.
|
|
if (session.viaRecovery) return next(new Error('Invalid token'));
|
|
socket.userId = session.user.id;
|
|
// Role + existence come from the LIVE users row, not the token claim: a deleted or
|
|
// demoted user no longer keeps fleet control for the remainder of a 7-day JWT.
|
|
socket.userRole = session.user.role;
|
|
next();
|
|
});
|
|
|
|
dashboardNs.on('connection', (socket) => {
|
|
// #146: same per-connection fail-fast as the device namespace — a throwing
|
|
// dashboard handler disconnects only that client, never crashes the server.
|
|
protectSocket(socket, () => socket.userId);
|
|
// Note on workspace-switch lifecycle: the switcher (Phase 3 MVP) calls
|
|
// window.location.reload() after switching, which forces a new socket
|
|
// connection with fresh JWT claims. So workspace memberships are
|
|
// re-evaluated at connect time and we don't need to re-evaluate per-emit.
|
|
const wsIds = accessibleWorkspaceIds(socket.userId, socket.userRole);
|
|
for (const wsId of wsIds) socket.join(workspaceRoom(wsId));
|
|
console.log(`Dashboard client connected: ${socket.id} (user: ${socket.userId}, rooms: ${wsIds.length})`);
|
|
|
|
socket.on('dashboard:request-screenshot', (data) => {
|
|
const { device_id } = data;
|
|
if (!canActOnDevice(socket, device_id, 'read')) return;
|
|
const conn = heartbeat.getConnection(device_id);
|
|
if (conn) deviceNs.to(device_id).emit('device:screenshot-request', {});
|
|
});
|
|
|
|
socket.on('dashboard:remote-touch', (data) => {
|
|
const { device_id, x, y, x2, y2, duration, action } = data;
|
|
if (!canActOnDevice(socket, device_id, 'write')) return;
|
|
// #159: a swipe/drag carries an end point + duration (for scrolling); tap is just x/y.
|
|
deviceNs.to(device_id).emit('device:remote-touch', { x, y, x2, y2, duration, action });
|
|
});
|
|
|
|
socket.on('dashboard:remote-key', (data) => {
|
|
const { device_id, keycode } = data;
|
|
if (!canActOnDevice(socket, device_id, 'write')) return;
|
|
console.log(`Remote key: ${keycode} -> ${device_id}`);
|
|
deviceNs.to(device_id).emit('device:remote-key', { keycode });
|
|
});
|
|
|
|
// Track which devices THIS dashboard socket has a live remote (screenshot-stream) session on, so
|
|
// we can stop them if the tab closes / the socket drops — an orphaned stream keeps the device
|
|
// capturing every second and can starve a weak panel's decoder (the black-screen we hit).
|
|
socket.remoteSessions = new Set();
|
|
|
|
socket.on('dashboard:remote-start', (data) => {
|
|
const { device_id } = data;
|
|
if (!canActOnDevice(socket, device_id, 'write')) return;
|
|
const room = deviceNs.adapter.rooms.get(device_id);
|
|
console.log(`Remote start for ${device_id}, room has ${room?.size || 0} socket(s)`);
|
|
socket.remoteSessions.add(device_id);
|
|
deviceNs.to(device_id).emit('device:remote-start', {});
|
|
console.log(`Remote session started for device ${device_id}`);
|
|
});
|
|
|
|
socket.on('dashboard:remote-stop', (data) => {
|
|
const { device_id } = data;
|
|
if (!canActOnDevice(socket, device_id, 'write')) return;
|
|
socket.remoteSessions.delete(device_id);
|
|
deviceNs.to(device_id).emit('device:remote-stop', {});
|
|
console.log(`Remote session stopped for device ${device_id}`);
|
|
});
|
|
|
|
socket.on('dashboard:device-command', (data, ack) => {
|
|
const { device_id, type, payload } = data;
|
|
if (!canActOnDevice(socket, device_id, 'write')) {
|
|
if (typeof ack === 'function') ack({ delivered: false, reason: 'forbidden' });
|
|
return;
|
|
}
|
|
const room = deviceNs.adapter.rooms.get(device_id);
|
|
if (room && room.size > 0) {
|
|
deviceNs.to(device_id).emit('device:command', { type, payload });
|
|
console.log(`Command delivered to device ${device_id}: ${type}`);
|
|
if (typeof ack === 'function') ack({ delivered: true });
|
|
return;
|
|
}
|
|
// Device offline at emit time. Try to queue (lazy require so reverting
|
|
// the queue commit doesn't break this commit - MODULE_NOT_FOUND on the
|
|
// first try gets cached by Node's module loader, giving consistent
|
|
// queued=false behavior on every subsequent call).
|
|
let queued = false;
|
|
try {
|
|
const queue = require('../lib/command-queue');
|
|
queued = queue.queueCommand(device_id, type, payload);
|
|
} catch (e) { /* command-queue module absent; fall through to lost */ }
|
|
console.log(`Command for offline device ${device_id}: ${type} (queued=${queued})`);
|
|
if (typeof ack === 'function') ack({ delivered: false, queued, reason: 'offline' });
|
|
});
|
|
|
|
socket.on('disconnect', () => {
|
|
console.log(`Dashboard client disconnected: ${socket.id}`);
|
|
// Stop any remote screenshot streams this socket left running (tab closed / navigated away),
|
|
// so the device isn't left capturing forever.
|
|
for (const device_id of socket.remoteSessions) {
|
|
deviceNs.to(device_id).emit('device:remote-stop', {});
|
|
console.log(`Auto-stopped orphaned remote session for ${device_id} (dashboard socket ${socket.id} gone)`);
|
|
}
|
|
socket.remoteSessions.clear();
|
|
});
|
|
});
|
|
|
|
return dashboardNs;
|
|
};
|
|
|