Open-source platform for 3D AI agents. Turn text or a photo into a rigged, animated GLB avatar, give it an LLM brain, memory and a wallet, and embed it anywhere with one web component. Remote MCP server, x402 payments, Three.js, browser-native.
JavaScript 3d-generationai-agentsanimationavatardigital-humangenerative-aiglbgltfimage-to-3dllmmcpmcp-servermodel-context-protocolsolanatext-to-3dthreejsweb-componentswebglwebxrx402
fix(home): make the floorplan's CSRF guard actually guard, and actually pass
nirholas4eb3c6e3524b
diff --git a/api/home/[id]/areas.js b/api/home/[id]/areas.jsindex a70375741..ced6348e0 100644--- a/api/home/[id]/areas.js+++ b/api/home/[id]/areas.js@@ -35,7 +35,7 @@ export default wrap(async (req, res) => {if (!access.ok) return error(res, access.status, access.code, access.message);const { caller, home, scoped } = access;- if (!requireCsrf(req, res)) return;+ if (!(await requireCsrf(req, res, caller.userId))) return;// A scoped member sees part of the house. A brand new room belongs to no// scope by definition, so they would create something they could not thendiff --git a/api/home/[id]/assign.js b/api/home/[id]/assign.jsindex 96536dea1..84966d880 100644--- a/api/home/[id]/assign.js+++ b/api/home/[id]/assign.js@@ -36,7 +36,7 @@ export default wrap(async (req, res) => {if (!access.ok) return error(res, access.status, access.code, access.message);const { caller, home, scope, scoped } = access;- if (!requireCsrf(req, res)) return;+ if (!(await requireCsrf(req, res, caller.userId))) return;const rl = await limits.homeAct(caller.userId);if (!rl.success) return rateLimited(res, rl, 'too many home writes, slow down');diff --git a/api/home/[id]/layout.js b/api/home/[id]/layout.jsindex 4f00de1a9..cfff85377 100644--- a/api/home/[id]/layout.js+++ b/api/home/[id]/layout.js@@ -41,7 +41,7 @@ export default wrap(async (req, res) => {return json(res, 200, await describe(home.id, caller.userId));}- if (!requireCsrf(req, res)) return;+ if (!(await requireCsrf(req, res, caller.userId))) return;if (req.method === 'DELETE') {const removed = await deleteLayout(home.id);diff --git a/tests/csrf-call-sites.test.js b/tests/csrf-call-sites.test.jsnew file mode 100644index 000000000..0b5cf3837--- /dev/null+++ b/tests/csrf-call-sites.test.js@@ -0,0 +1,112 @@+// Every requireCsrf call site, checked as source.+//+// `requireCsrf(req, res, userId)` is async and takes the caller's user id: the+// token row is bound to a user, so a call that omits the id matches no row and+// a call that omits `await` never blocks. Both mistakes are silent. Written the+// wrong way, as `if (!requireCsrf(req, res)) return;`, the guard returns a+// Promise, which is truthy, so the handler runs on regardless of the answer,+// and the rejection lands separately as a 403 the user reads as a broken+// feature. That shipped on the floorplan's own write endpoints, where it both+// stopped every browser save and left the check enforcing nothing.+//+// The unit tests cannot see this, because a suite that mocks CSRF is a suite+// that mocks exactly the argument that was missing. So this reads the source.++import fs from 'node:fs';+import path from 'node:path';+import { fileURLToPath } from 'node:url';++import { describe, expect, it } from 'vitest';++const API_DIR = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..', 'api');++/** Every .js file under api/, recursively. */+function apiFiles(dir = API_DIR, found = []) {+ for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {+ const full = path.join(dir, entry.name);+ if (entry.isDirectory()) apiFiles(full, found);+ else if (entry.name.endsWith('.js')) found.push(full);+ }+ return found;+}++/**+ * The arguments of one `requireCsrf(...)` call, split at top-level commas so a+ * nested call like `requireCsrf(req, res, session(req).id)` counts as three.+ */+function argsOf(source, openParen) {+ let depth = 0;+ const args = [];+ let current = '';+ for (let i = openParen; i < source.length; i += 1) {+ const ch = source[i];+ if (ch === '(') {+ depth += 1;+ if (depth === 1) continue;+ }+ if (ch === ')') {+ depth -= 1;+ if (depth === 0) {+ if (current.trim()) args.push(current.trim());+ return args;+ }+ }+ if (ch === ',' && depth === 1) {+ args.push(current.trim());+ current = '';+ continue;+ }+ current += ch;+ }+ return args;+}++function callSites() {+ const sites = [];+ for (const file of apiFiles()) {+ const source = fs.readFileSync(file, 'utf8');+ const rel = path.relative(path.join(API_DIR, '..'), file);+ for (let i = source.indexOf('requireCsrf('); i !== -1; i = source.indexOf('requireCsrf(', i + 1)) {+ // Skip the import line and the definition in _lib/csrf.js itself.+ const lineStart = source.lastIndexOf('\n', i) + 1;+ const line = source.slice(lineStart, source.indexOf('\n', i));+ if (line.includes('import ') || line.includes('export ')) continue;+ // Prose, not a call. Several handlers explain the guard in a comment+ // above it, and a comment cannot fail to await anything.+ const trimmed = line.trim();+ if (trimmed.startsWith('//') || trimmed.startsWith('*')) continue;+ sites.push({+ file: rel,+ line: source.slice(0, i).split('\n').length,+ text: line.trim(),+ args: argsOf(source, source.indexOf('(', i)),+ awaited: /await\s+requireCsrf\($/.test(source.slice(0, i + 'requireCsrf('.length)),+ });+ }+ }+ return sites;+}++describe('every requireCsrf call site', () => {+ const sites = callSites();++ it('finds the call sites at all, so a passing suite means something', () => {+ expect(sites.length).toBeGreaterThan(10);+ });++ it('passes the caller user id, because the token row is bound to a user', () => {+ const short = sites.filter((site) => site.args.length < 3);+ expect(+ short.map((s) => `${s.file}:${s.line} ${s.text}`),+ 'requireCsrf(req, res) matches no token row: pass the caller user id as the third argument',+ ).toEqual([]);+ });++ it('is awaited, because an unawaited guard is a truthy promise that blocks nothing', () => {+ const bare = sites.filter((site) => !site.awaited);+ expect(+ bare.map((s) => `${s.file}:${s.line} ${s.text}`),+ 'requireCsrf is async: without await the handler runs on regardless of the answer',+ ).toEqual([]);+ });+});