Token Vault
Protected credential workspace
From c86e773bdf818c813bb0ac01b59d44128e2ada3f Mon Sep 17 00:00:00 2001 From: zskbot <241179063+zskbot@users.noreply.github.com> Date: Sun, 8 Nov 2026 01:06:45 +0700 Subject: [PATCH 01/10] feat(token-vault): add Cloudflare Access staff identity and owner member controls --- security/token-vault/src/worker.js | 95 ++++++++++++++++++++++++++---- 1 file changed, 82 insertions(+), 13 deletions(-) diff --git a/security/token-vault/src/worker.js b/security/token-vault/src/worker.js index 5d1a849..33808c4 100644 --- a/security/token-vault/src/worker.js +++ b/security/token-vault/src/worker.js @@ -76,13 +76,20 @@ async function audit(env, actor, action, resource, outcome = "success") { await env.DB.prepare("INSERT INTO audit_events(id,actor,action,resource_id,outcome) VALUES(?,?,?,?,?)") .bind(crypto.randomUUID(), actor, action, resource || null, outcome).run(); } -async function currentUser(req, env) { +async function currentUser(req, env, ctx) { const id = await verify(cookieValue(req), env.SESSION_SIGNING_KEY); if (!id) return null; const row = await env.DB.prepare("SELECT s.subject,i.role,s.expires_at,i.active FROM sessions s JOIN identities i ON i.subject=s.subject WHERE s.id_hash=? AND s.revoked=0") .bind(await hash(id)).first(); - if (!row || !row.active || row.expires_at <= Math.floor(Date.now() / 1000)) return null; - return { subject: row.subject, role: row.role }; + if (row && row.active && row.expires_at > Math.floor(Date.now() / 1000)) return { subject: row.subject, role: row.role, auth: "session" }; + if (ctx?.access && typeof ctx.access.getIdentity === "function") { + const identity = await ctx.access.getIdentity(); + const email = typeof identity?.email === "string" ? identity.email.trim().toLowerCase() : ""; + if (!email || email.length > 254) return null; + const member = await env.DB.prepare("SELECT subject,role,active FROM identities WHERE subject=?").bind(email).first(); + if (member?.active) return { subject: member.subject, role: member.role, auth: "cloudflare-access" }; + } + return null; } async function key(env) { return crypto.subtle.importKey("raw", unb64(env.TOKEN_ENCRYPTION_KEY), "AES-GCM", false, ["encrypt", "decrypt"]); @@ -141,20 +148,28 @@ async function login(req, env) { await audit(env, "TOKEN", "login", null); return json({ ok: true }, 200, { "set-cookie": cookie(await sign(id, env.SESSION_SIGNING_KEY), SESSION_TTL) }); } -async function route(req, env) { +async function route(req, env, ctx) { const path = new URL(req.url).pathname; - if (req.method === "GET" && (path === "/" || path === "/login")) return page(LOGIN_HTML); - if (path.startsWith("/api/agent/")) { + const isAgentApi = path.startsWith("/api/agent/"); + if (env.ACCESS_REQUIRED === "true" && !isAgentApi && !ctx?.access) return json({ error: "Cloudflare Access authentication required" }, 403); + if (req.method === "GET" && (path === "/" || path === "/login")) { + if (ctx?.access) { + configured(env); + if (await currentUser(req, env, ctx)) return Response.redirect(new URL("/vault", req.url), 303); + } + return page(LOGIN_HTML); + } + if (isAgentApi) { if (req.headers.has("origin")) return json({ error: "Forbidden" }, 403); - } else if ((req.method === "POST" || req.method === "DELETE") && !sameOrigin(req)) return json({ error: "Forbidden" }, 403); + } else if (["POST", "PATCH", "DELETE"].includes(req.method) && !sameOrigin(req)) return json({ error: "Forbidden" }, 403); if (req.method === "GET" && path === "/vault") { configured(env); - return await currentUser(req, env) ? page(VAULT_HTML) : Response.redirect(new URL("/", req.url), 303); + return await currentUser(req, env, ctx) ? page(VAULT_HTML) : Response.redirect(new URL("/", req.url), 303); } configured(env); if (req.method === "POST" && path === "/api/login") return login(req, env); if (req.method === "POST" && path === "/api/logout") { - const user = await currentUser(req, env), id = await verify(cookieValue(req), env.SESSION_SIGNING_KEY); + const user = await currentUser(req, env, ctx), id = await verify(cookieValue(req), env.SESSION_SIGNING_KEY); if (id) await env.DB.prepare("UPDATE sessions SET revoked=1 WHERE id_hash=?").bind(await hash(id)).run(); if (user) await audit(env, user.subject, "logout", null); return json({ ok: true }, 200, { "set-cookie": cookie("", 0) }); @@ -195,9 +210,63 @@ async function route(req, env) { } return json({ error: "Not found" }, 404); } - const user = await currentUser(req, env); + const user = await currentUser(req, env, ctx); if (!user) return json({ error: "Unauthorized" }, 401); - if (req.method === "GET" && path === "/api/me") return json({ subject: user.subject, role: user.role }); + if (req.method === "GET" && path === "/api/me") return json({ subject: user.subject, role: user.role, auth: user.auth || "session" }); + + if (req.method === "GET" && path === "/api/members") { + if (user.role !== "owner") return json({ error: "Forbidden" }, 403); + const rows = await env.DB.prepare( + "SELECT subject,role,active FROM identities WHERE subject<>'TOKEN' AND role<>'ai_agent' ORDER BY subject" + ).all(); + return json({ members: rows.results }); + } + if (req.method === "POST" && path === "/api/members") { + if (user.role !== "owner") return json({ error: "Forbidden" }, 403); + let body; try { body = await req.json(); } catch { return json({ error: "Invalid request" }, 400); } + const email = typeof body.email === "string" ? body.email.trim().toLowerCase() : ""; + const role = body.role; + if (!/^[^\\s@]+@[^\\s@]+\\.[^\\s@]+$/.test(email) || email.length > 254 || + !["security_admin", "developer", "auditor"].includes(role)) { + return json({ error: "Invalid member email or role" }, 400); + } + try { + await env.DB.prepare("INSERT INTO identities(id,subject,role,active) VALUES(?,?,?,1)") + .bind(crypto.randomUUID(), email, role).run(); + } catch { + return json({ error: "Member already exists or could not be created" }, 409); + } + await audit(env, user.subject, "member.create", email); + return json({ ok: true, email, role }, 201); + } + const memberPath = path.match(/^\\/api\\/members\\/(.+)$/); + if (memberPath && req.method === "PATCH") { + if (user.role !== "owner") return json({ error: "Forbidden" }, 403); + const email = decodeURIComponent(memberPath[1]).trim().toLowerCase(); + let body; try { body = await req.json(); } catch { return json({ error: "Invalid request" }, 400); } + if (email === "TOKEN" || !["security_admin", "developer", "auditor"].includes(body.role)) { + return json({ error: "Invalid member role" }, 400); + } + const result = await env.DB.prepare("UPDATE identities SET role=? WHERE subject=? AND role<>'ai_agent'") + .bind(body.role, email).run(); + if (!result.meta?.changes) return json({ error: "Member not found" }, 404); + await audit(env, user.subject, "member.role.update", email); + return json({ ok: true }); + } + if (memberPath && req.method === "DELETE") { + if (user.role !== "owner") return json({ error: "Forbidden" }, 403); + const email = decodeURIComponent(memberPath[1]).trim().toLowerCase(); + if (email === "TOKEN") return json({ error: "Cannot revoke bootstrap owner" }, 400); + const result = await env.DB.batch([ + env.DB.prepare("UPDATE identities SET active=0 WHERE subject=? AND role<>'ai_agent'").bind(email), + env.DB.prepare("UPDATE sessions SET revoked=1 WHERE subject=?").bind(email) + ]); + const check = await env.DB.prepare("SELECT active FROM identities WHERE subject=?").bind(email).first(); + if (!check) return json({ error: "Member not found" }, 404); + await audit(env, user.subject, "member.revoke", email); + return json({ ok: true, active: !!check.active }); + } + if (req.method === "GET" && path === "/api/agents") { if (user.role !== "owner") return json({ error: "Forbidden" }, 403); @@ -313,8 +382,8 @@ async function route(req, env) { return json({ error: "Not found" }, 404); } export default { - async fetch(req, env) { - try { return await route(req, env); } + async fetch(req, env, ctx) { + try { return await route(req, env, ctx); } catch { return json({ error: "Vault temporarily unavailable" }, 503); } } }; From fa7195b92adfb12af7497a48381a818070f97d9f Mon Sep 17 00:00:00 2001 From: zskbot <241179063+zskbot@users.noreply.github.com> Date: Sun, 8 Nov 2026 01:06:58 +0700 Subject: [PATCH 02/10] fix(token-vault): correct staff route matchers and prevent agent identity revocation via member API --- security/token-vault/src/worker.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/security/token-vault/src/worker.js b/security/token-vault/src/worker.js index 33808c4..9815503 100644 --- a/security/token-vault/src/worker.js +++ b/security/token-vault/src/worker.js @@ -226,7 +226,7 @@ async function route(req, env, ctx) { let body; try { body = await req.json(); } catch { return json({ error: "Invalid request" }, 400); } const email = typeof body.email === "string" ? body.email.trim().toLowerCase() : ""; const role = body.role; - if (!/^[^\\s@]+@[^\\s@]+\\.[^\\s@]+$/.test(email) || email.length > 254 || + if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email) || email.length > 254 || !["security_admin", "developer", "auditor"].includes(role)) { return json({ error: "Invalid member email or role" }, 400); } @@ -239,7 +239,7 @@ async function route(req, env, ctx) { await audit(env, user.subject, "member.create", email); return json({ ok: true, email, role }, 201); } - const memberPath = path.match(/^\\/api\\/members\\/(.+)$/); + const memberPath = path.match(/^\/api\/members\/(.+)$/); if (memberPath && req.method === "PATCH") { if (user.role !== "owner") return json({ error: "Forbidden" }, 403); const email = decodeURIComponent(memberPath[1]).trim().toLowerCase(); @@ -257,14 +257,14 @@ async function route(req, env, ctx) { if (user.role !== "owner") return json({ error: "Forbidden" }, 403); const email = decodeURIComponent(memberPath[1]).trim().toLowerCase(); if (email === "TOKEN") return json({ error: "Cannot revoke bootstrap owner" }, 400); - const result = await env.DB.batch([ - env.DB.prepare("UPDATE identities SET active=0 WHERE subject=? AND role<>'ai_agent'").bind(email), + const check = await env.DB.prepare("SELECT active,role FROM identities WHERE subject=?").bind(email).first(); + if (!check || check.role === "ai_agent") return json({ error: "Member not found" }, 404); + await env.DB.batch([ + env.DB.prepare("UPDATE identities SET active=0 WHERE subject=?").bind(email), env.DB.prepare("UPDATE sessions SET revoked=1 WHERE subject=?").bind(email) ]); - const check = await env.DB.prepare("SELECT active FROM identities WHERE subject=?").bind(email).first(); - if (!check) return json({ error: "Member not found" }, 404); await audit(env, user.subject, "member.revoke", email); - return json({ ok: true, active: !!check.active }); + return json({ ok: true, active: false }); } From 3d82371bf9bfffb3e6c99167486da66767e88fac Mon Sep 17 00:00:00 2001 From: zskbot <241179063+zskbot@users.noreply.github.com> Date: Sun, 8 Nov 2026 01:07:07 +0700 Subject: [PATCH 03/10] test(token-vault): verify Cloudflare Access staff role mapping and least privilege --- .../token-vault/tests/agent-scope.test.mjs | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/security/token-vault/tests/agent-scope.test.mjs b/security/token-vault/tests/agent-scope.test.mjs index 1d3dd40..08dddb3 100644 --- a/security/token-vault/tests/agent-scope.test.mjs +++ b/security/token-vault/tests/agent-scope.test.mjs @@ -128,3 +128,44 @@ test("AI agent grants isolate projects and reveal permission, and revocation wor const afterRevoke = await call("/api/agent/tokens?project_id=project-alpha", env, { headers: bearer }); assert.equal(afterRevoke.status, 401); }); + + +test("Cloudflare Access maps only provisioned staff identities to their assigned roles", async () => { + const { env, password } = makeEnv(); + env.ACCESS_REQUIRED = "true"; + const login = await call("/api/login", env, { + method: "POST", headers: browserHeaders(), body: { password } + }); + assert.equal(login.status, 200); + const cookie = login.headers.get("set-cookie").split(";")[0]; + + const addMember = await call("/api/members", env, { + method: "POST", + headers: browserHeaders(cookie), + body: { email: "dev@example.com", role: "developer" } + }); + assert.equal(addMember.status, 201); + + const accessContext = { access: { getIdentity: async () => ({ email: "DEV@example.com" }) } }; + const staffMe = await worker.fetch(new Request("https://vault.example/api/me"), env, accessContext); + assert.equal(staffMe.status, 200); + assert.deepEqual(await staffMe.json(), { + subject: "dev@example.com", + role: "developer", + auth: "cloudflare-access" + }); + + const deniedWrite = await worker.fetch(new Request("https://vault.example/api/tokens", { + method: "POST", + headers: browserHeaders(), + body: JSON.stringify({ label: "test", provider: "test", project_id: "project-alpha", value: "some-secret-value" }) + }), env, accessContext); + assert.equal(deniedWrite.status, 403); + + const unprovisioned = { access: { getIdentity: async () => ({ email: "unknown@example.com" }) } }; + const unknown = await worker.fetch(new Request("https://vault.example/api/me"), env, unprovisioned); + assert.equal(unknown.status, 401); + + const noAccess = await worker.fetch(new Request("https://vault.example/"), env); + assert.equal(noAccess.status, 403); +}); From 747008e3453d0f96d4ccf88b6dbd3fd96673df8c Mon Sep 17 00:00:00 2001 From: zskbot <241179063+zskbot@users.noreply.github.com> Date: Sun, 8 Nov 2026 01:07:16 +0700 Subject: [PATCH 04/10] feat(token-vault): add owner-only authorized personnel management UI --- security/token-vault/src/worker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/token-vault/src/worker.js b/security/token-vault/src/worker.js index 9815503..6ecda8d 100644 --- a/security/token-vault/src/worker.js +++ b/security/token-vault/src/worker.js @@ -128,7 +128,7 @@ function validProject(value) { return typeof value === "string" && /^[a-z0-9][a-z0-9._-]{1,63}$/.test(value); } const LOGIN_HTML = '
Protected credential workspace
Encrypted storage · Explicit reveal · Audited access
Secrets are encrypted before storage. Reveal is restricted to privileged roles. Revealed values are cleared after 15 seconds.
Encrypted storage · Explicit reveal · Audited access
Secrets are encrypted before storage. Reveal is restricted to privileged roles. Revealed values are cleared after 15 seconds.