W8: teammates wake a team workspace from the phone (team-route wake; owner route not widened) (#155)

* feat(w8): teammates wake a team workspace from the phone (team route long-poll wake, same access/billing/cap; owner route stays the fallback)

* test(w8): team wake refuses an admin on a private row, never returns the endpoint; phone never falls back on 401/403
This commit is contained in:
Neil
2026-11-09 19:59:10 -08:00
committed by GitHub
parent 5e9fdffc41
commit 6bc1fffc67
4 changed files with 143 additions and 8 deletions
+9
View File
@@ -24,6 +24,8 @@
// cannot enroll devices, manage secrets or connect GitHub.
// /v1/team/workspaces[/:id[/presence|wake|lease|grants[/:grantId]]], /v1/team/links/resolve, /v1/team/prompts
// team workspace registry, presence, per-device grants (src/workspaces.ts, src/grants.ts)
// POST /v1/team/workspaces/:id/wake?wait=30s: any member who can open it wakes it (single-flight,
// billed to the account, counted on the owner's seat like every wake) -> {state, endpoint: null, …}
// /v1/sandboxes/* is the owner's lifecycle API: only the workspace's owner (and, for suspend and
// destroy, an org admin) can reach a row there, because resume hands back an orcad pairing offer.
// Browser (GitHub redirects): GET /v1/github/setup, GET /v1/github/callback
@@ -1306,6 +1308,13 @@ async function workspaceRoute(request: Request, url: URL, env: Env, deps: Deps,
if (!canOpen(caller, row)) {
throw new WorkspaceError('not_found')
}
if (url.searchParams.has('wait')) {
// The same single-flight long-poll wake as the owner's POST /v1/sandboxes/:id/wake (phones),
// billed and capped exactly like it. The endpoint stays out: a teammate gets in only through
// their own grant, never by learning where the VM listens.
const answer = await wakeSandbox(life, row, { waitMs: parseWakeWait(url, null), ...workspaceConfig(env, deps) })
return json({ ...answer, endpoint: null })
}
// Never returns the owner's pairing offer; teammates get in through their own grant.
const ready = await resumeSandbox(life, row)
return json({ workspace: await view(ready.row) })
@@ -4,6 +4,7 @@ import { fileURLToPath } from 'node:url'
import { describe, expect, it } from 'vitest'
import { generateGrantRecipientKey, nodeSealedGrantPrimitives } from '../../../../src/main/cloud-workspaces/sealed-grant-node'
import { openSealedGrant } from '../../../../src/shared/cloud-workspaces/sealed-grant'
import { HostedWakeResponseSchema } from '../../../../src/shared/hosted-sandbox/hosted-sandbox-wire'
import { REVOKE_COMMAND } from '../src/grant-revokes'
import { GRANT_COMMAND } from '../src/grants'
import { createHarness } from './harness'
@@ -236,6 +237,55 @@ describe('workspace grants (E2EE pairing through the control plane)', () => {
})
})
describe('team wake (phones)', () => {
it('a teammate wakes a team workspace with the single-flight wake, never learns the endpoint, billed to the team', async () => {
const t = await team()
await t.req(t.alice, 'PATCH', `/v1/team/workspaces/${t.id}`, { visibility: 'team' })
await t.req(t.alice, 'POST', `/v1/sandboxes/${t.id}/suspend`)
const checksBefore = t.h.billing.checks.length
const woke = await t.req(t.bob, 'POST', `/v1/team/workspaces/${t.id}/wake?wait=30s`)
expect(woke.status).toBe(200)
expect(HostedWakeResponseSchema.parse(woke.body)).toMatchObject({ state: 'ready', endpoint: null, sandboxId: t.id })
// The same start check as the owner's own wake: the team's account pays.
expect(t.h.billing.checks.slice(checksBefore)).toEqual([expect.objectContaining({ accountId: 'org:acme' })])
// Racing wakes from teammate and owner start the VM once.
await t.req(t.alice, 'POST', `/v1/sandboxes/${t.id}/suspend`)
const answers = await Promise.all([
t.req(t.bob, 'POST', `/v1/team/workspaces/${t.id}/wake?wait=30s`),
t.req(t.alice, 'POST', `/v1/sandboxes/${t.id}/wake?wait=30s`)
])
expect(answers.map((a) => a.body.state)).toEqual(['ready', 'ready'])
})
it('is not found for a non-member, for a private workspace, and for an archived one', async () => {
const t = await team()
await t.req(t.alice, 'POST', `/v1/sandboxes/${t.id}/suspend`)
// Private (the default): teammates cannot wake it.
expect((await t.req(t.bob, 'POST', `/v1/team/workspaces/${t.id}/wake?wait=1s`)).status).toBe(404)
await t.req(t.alice, 'PATCH', `/v1/team/workspaces/${t.id}`, { visibility: 'team' })
const outsider = await t.as('mallory', 'member', 'globex')
expect((await t.req(outsider, 'POST', `/v1/team/workspaces/${t.id}/wake?wait=1s`)).status).toBe(404)
await t.req(t.alice, 'POST', `/v1/sandboxes/${t.id}/archive`, {})
expect((await t.req(t.bob, 'POST', `/v1/team/workspaces/${t.id}/wake?wait=1s`)).status).toBe(404)
})
it('an org admin cannot wake a private workspace, and a running one never hands a teammate its endpoint', async () => {
const t = await team()
expect((await t.req(t.admin, 'POST', `/v1/team/workspaces/${t.id}/wake?wait=1s`)).status).toBe(404)
await t.req(t.alice, 'PATCH', `/v1/team/workspaces/${t.id}`, { visibility: 'team' })
const running = await t.req(t.bob, 'POST', `/v1/team/workspaces/${t.id}/wake?wait=1s`)
expect(running.body).toMatchObject({ state: 'ready', endpoint: null })
})
it('keeps the desktop blocking wake (no wait) answering {workspace}', async () => {
const t = await team()
await t.req(t.alice, 'PATCH', `/v1/team/workspaces/${t.id}`, { visibility: 'team' })
await t.req(t.alice, 'POST', `/v1/sandboxes/${t.id}/suspend`)
const woke = await t.req(t.bob, 'POST', `/v1/team/workspaces/${t.id}/wake`)
expect(woke.body.workspace).toMatchObject({ id: t.id, status: 'running' })
})
})
describe('grant races', () => {
it('a removal that lands while the grant is being issued wins: the new device is killed, not activated', async () => {
const t = await team()