diff --git a/doc/tailscale-environments.md b/doc/tailscale-environments.md index 3f40328ce48..cdcfd7d9f3b 100644 --- a/doc/tailscale-environments.md +++ b/doc/tailscale-environments.md @@ -74,6 +74,9 @@ tools or enter MCP discovery. Management requires an instance administrator with access to the company. Only the person who started a pending sign-in can retrieve its sign-in link. Existing SSH environment access governs which agents execute there. Cloud and self-hosted instances use the same Tailscale device sign-in. +For Cloud owners, the board access summary reports the effective instance-admin +rights computed by Cloud authentication while `enableOwnerInstanceAdmin` is +enabled. Disabling that setting removes those rights on the next request. The instance starts a private userspace Tailscale device and returns its generated `https://login.tailscale.com/a/...` sign-in address. Pending device state is stored diff --git a/server/src/__tests__/cli-auth-routes.test.ts b/server/src/__tests__/cli-auth-routes.test.ts index 24b6857ecb9..dc2e52d24d3 100644 --- a/server/src/__tests__/cli-auth-routes.test.ts +++ b/server/src/__tests__/cli-auth-routes.test.ts @@ -106,6 +106,38 @@ describe("cli auth routes", () => { await Promise.all([import("../routes/access.js"), import("../middleware/index.js")]); }); + it.each([ + [true, false], + [false, true], + ])("reports effective Cloud owner access when actor admin=%s and stored admin=%s", async (effectiveAdmin, storedAdmin) => { + mockBoardAuthService.resolveBoardAccess.mockResolvedValue({ + user: { id: "user-1", name: "User One", email: "user@example.com" }, + companyIds: ["company-1"], + memberships: [{ companyId: "company-1", membershipRole: "owner", status: "active" }], + isInstanceAdmin: storedAdmin, + }); + const app = await createApp({ type: "board", source: "cloud_tenant", userId: "user-1", isInstanceAdmin: effectiveAdmin }); + const res = await request(app).get("/api/cli-auth/me"); + expect(res.status).toBe(200); + expect(res.body).toMatchObject({ source: "cloud_tenant", isInstanceAdmin: effectiveAdmin, companyIds: ["company-1"] }); + }); + + it.each(["session", "board_key"])("keeps the fresh stored access snapshot for %s authentication", async source => { + mockBoardAuthService.resolveBoardAccess.mockResolvedValue({ user: null, companyIds: [], isInstanceAdmin: false }); + const app = await createApp({ type: "board", source, userId: "user-1", isInstanceAdmin: true }); + const res = await request(app).get("/api/cli-auth/me"); + expect(res.status).toBe(200); + expect(res.body.isInstanceAdmin).toBe(false); + }); + + it.each([{ type: "none", source: "none" }, { type: "agent", source: "agent_key", agentId: "agent-1" }])( + "denies the board access summary to $type callers", async actor => { + const app = await createApp(actor); + expect((await request(app).get("/api/cli-auth/me")).status).toBe(401); + expect(mockBoardAuthService.resolveBoardAccess).not.toHaveBeenCalled(); + }, + ); + it("creates a CLI auth challenge with approval metadata", async () => { mockBoardAuthService.createCliAuthChallenge.mockResolvedValue({ challenge: { diff --git a/server/src/routes/access.ts b/server/src/routes/access.ts index 96e549afdfa..67071145726 100644 --- a/server/src/routes/access.ts +++ b/server/src/routes/access.ts @@ -2892,7 +2892,9 @@ export function accessRoutes( res.json({ user: accessSnapshot.user, userId: req.actor.userId, - isInstanceAdmin: accessSnapshot.isInstanceAdmin, + isInstanceAdmin: req.actor.source === "cloud_tenant" + ? req.actor.isInstanceAdmin === true + : accessSnapshot.isInstanceAdmin, companyIds: accessSnapshot.companyIds, memberships: accessSnapshot.memberships, source: req.actor.source ?? "none",