Skip to content

feat(relayauth): self-sufficient workspace-path mint #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
khaliqgant merged 1 commit into from
Jun 3, 2026
Merged

feat(relayauth): self-sufficient workspace-path mint #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 65 additions & 31 deletions packages/server/src/__tests__/tokens-route.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,21 +673,38 @@ test("POST /v1/tokens/path", async (t) => {
});

test("POST /v1/tokens/workspace-path", async (t) => {
async function seedWorkspace(
app: ReturnType<typeof createTestApp>,
workspaceId = "ws_tokens_route",
orgId = "org_tokens_route",
): Promise<void> {
await seedWorkspaceContext(app, {
id: workspaceId,
workspaceId,
orgId,
scopes: [],
roles: [],
await t.test("requires workspaceId", async () => {
const { app, authHeaders } = await createHarness({
authClaims: {
scopes: [
"relayauth:api-key:manage:*",
"relayfile:fs:read:*",
"relayfile:fs:write:*",
],
},
});
}
const orgApiKey = await issueApiKey(app, authHeaders, [
"relayauth:api-key:manage:*",
"relayfile:fs:read:*",
"relayfile:fs:write:*",
]);

await t.test("mints a short-lived relay_pa directly from an org api key", async () => {
const response = await requestRoute(app, "POST", "/v1/tokens/workspace-path", {
body: {
paths: ["/github/repos/AgentWorkforce/cloud/issues/123/**"],
scopes: ["relayfile:fs:write:/github/repos/AgentWorkforce/cloud/issues/123/**"],
},
headers: {
"x-api-key": orgApiKey.key,
},
});

await assertJsonResponse<ErrorBody>(response, 400, (body) => {
assert.equal(body.code, "workspaceId_required");
});
});

await t.test("mints a short-lived relay_pa directly from an org api key without a seeded workspace row", async () => {
const { app, authHeaders } = await createHarness({
authClaims: {
scopes: [
Expand All @@ -697,7 +714,6 @@ test("POST /v1/tokens/workspace-path", async (t) => {
],
},
});
await seedWorkspace(app);
const orgApiKey = await issueApiKey(app, authHeaders, [
"relayauth:api-key:manage:*",
"relayfile:fs:read:*",
Expand All @@ -706,7 +722,7 @@ test("POST /v1/tokens/workspace-path", async (t) => {

const response = await requestRoute(app, "POST", "/v1/tokens/workspace-path", {
body: {
workspaceId: "ws_tokens_route",
workspaceId: " ws_tokens_route ",
agentName: "cloud-team-member",
paths: ["/github/repos/AgentWorkforce/cloud/issues/123/**"],
scopes: ["relayfile:fs:write:/github/repos/AgentWorkforce/cloud/issues/123/**"],
Expand All @@ -732,6 +748,7 @@ test("POST /v1/tokens/workspace-path", async (t) => {
const accessClaims = decodeJwtJsonSegment<RelayAuthTokenClaims>(body.accessToken, 1);
assert.equal(accessClaims.sub, "agent_cloud-team-member");
assert.equal(accessClaims.wks, "ws_tokens_route");
assert.equal(accessClaims.org, "org_tokens_route");
assert.equal(accessClaims.meta?.tokenClass, "path");
assert.equal(accessClaims.meta?.workspaceTokenId, undefined);
assert.equal(accessClaims.parentTokenId, undefined);
Expand All @@ -743,52 +760,71 @@ test("POST /v1/tokens/workspace-path", async (t) => {
assert.ok(accessClaims.exp - accessClaims.iat <= 120, "direct path access TTL should honor short ttlSeconds");
});

await t.test("caps direct path token TTL at the agent-token maximum", async () => {
await t.test("stamps the authenticated org even when the workspaceId is associated with another org", async () => {
const { app, authHeaders } = await createHarness({
authClaims: {
org: "org_a",
scopes: [
"relayauth:api-key:manage:*",
"relayfile:fs:read:*",
"relayfile:fs:write:*",
],
},
});
await seedWorkspace(app);
await seedWorkspaceContext(app, {
id: "ws_owned_by_org_b",
workspaceId: "ws_owned_by_org_b",
orgId: "org_b",
scopes: [],
roles: [],
});
const orgApiKey = await issueApiKey(app, authHeaders, [
"relayauth:api-key:manage:*",
"relayfile:fs:read:*",
"relayfile:fs:write:*",
]);

const response = await requestRoute(app, "POST", "/v1/tokens/workspace-path", {
body: {
workspaceId: "ws_tokens_route",
workspaceId: "ws_owned_by_org_b",
paths: ["/github/repos/AgentWorkforce/cloud/issues/123/*"],
ttlSeconds: 7200,
scopes: ["relayfile:fs:write:/github/repos/AgentWorkforce/cloud/issues/123/*"],
},
headers: {
"x-api-key": orgApiKey.key,
},
headers: authHeaders,
});

const body = await assertJsonResponse<WorkspacePathTokenPair>(response, 201);
const accessClaims = decodeJwtJsonSegment<RelayAuthTokenClaims>(body.accessToken, 1);
assert.ok(accessClaims.exp - accessClaims.iat <= 3600, "direct path access TTL should cap at 1h");
assert.equal(accessClaims.org, "org_a");
assert.equal(accessClaims.wks, "ws_owned_by_org_b");
assert.equal(body.workspaceId, "ws_owned_by_org_b");
});

await t.test("rejects a workspace outside the caller org", async () => {
await t.test("caps direct path token TTL at the agent-token maximum", async () => {
const { app, authHeaders } = await createHarness({
authClaims: {
scopes: ["relayauth:api-key:manage:*", "relayfile:fs:write:*"],
scopes: [
"relayauth:api-key:manage:*",
"relayfile:fs:read:*",
"relayfile:fs:write:*",
],
},
});
await seedWorkspace(app, "ws_other_org", "org_other");

const response = await requestRoute(app, "POST", "/v1/tokens/workspace-path", {
body: {
workspaceId: "ws_other_org",
workspaceId: "ws_tokens_route",
paths: ["/github/repos/AgentWorkforce/cloud/issues/123/*"],
scopes: ["relayfile:fs:write:/github/repos/AgentWorkforce/cloud/issues/123/*"],
ttlSeconds: 7200,
},
headers: authHeaders,
});

await assertJsonResponse<ErrorBody>(response, 404, (body) => {
assert.equal(body.code, "workspace_not_found");
});
const body = await assertJsonResponse<WorkspacePathTokenPair>(response, 201);
const accessClaims = decodeJwtJsonSegment<RelayAuthTokenClaims>(body.accessToken, 1);
assert.ok(accessClaims.exp - accessClaims.iat <= 3600, "direct path access TTL should cap at 1h");
});

await t.test("rejects requested scopes outside the org api-key grant", async () => {
Expand All @@ -797,7 +833,6 @@ test("POST /v1/tokens/workspace-path", async (t) => {
scopes: ["relayauth:api-key:manage:*", "relayfile:fs:read:*"],
},
});
await seedWorkspace(app);

const response = await requestRoute(app, "POST", "/v1/tokens/workspace-path", {
body: {
Expand All @@ -819,7 +854,6 @@ test("POST /v1/tokens/workspace-path", async (t) => {
scopes: ["relayauth:api-key:manage:*", "relayfile:fs:write:*"],
},
});
await seedWorkspace(app);

const degenerate = await requestRoute(app, "POST", "/v1/tokens/workspace-path", {
body: {
Expand Down
11 changes: 6 additions & 5 deletions packages/server/src/routes/tokens.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,10 +442,11 @@ tokens.post("/workspace-path", async (c) => {
}

const storage = getSqlStorage(c.get("storage"));
const workspace = await storage.contexts.getWorkspace(workspaceId);
if (!workspace || workspace.orgId !== auth.claims.org) {
return c.json({ error: "workspace_not_found", code: "workspace_not_found" }, 404);
}
// Direct workspace-path minting is intentionally equivalent to:
// POST /v1/tokens/workspace (org API key + caller-supplied workspaceId)
// followed by /v1/tokens/path.
// The org API key grant is the authorization boundary here; the workspace
// row is not an auth source and must not be required on this hot path.

const paths = normalizePathTokenPaths(body.paths);
if (!paths.ok) {
Expand All @@ -469,7 +470,7 @@ tokens.post("/workspace-path", async (c) => {
agentId,
agentName,
orgId: auth.claims.org,
workspaceId: workspace.workspaceId,
workspaceId,

@cubic-dev-ai cubic-dev-ai Bot Jun 3, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P0: Do not trust the requested workspaceId for workspace-token callers. Pin this field to the caller’s workspace claim (or reject workspace tokens here), otherwise a workspace token with relayauth:api-key:manage:* can mint path tokens outside its workspace boundary.

Prompt for AI agents 
Check if this issue is valid — if so, understand the root cause and fix it. At packages/server/src/routes/tokens.ts, line 473:

<comment>Do not trust the requested `workspaceId` for workspace-token callers. Pin this field to the caller’s workspace claim (or reject workspace tokens here), otherwise a workspace token with `relayauth:api-key:manage:*` can mint path tokens outside its workspace boundary.</comment>

<file context>
@@ -413,6 +421,88 @@ tokens.post("/path", async (c) => {
+    agentId,
+    agentName,
+    orgId: auth.claims.org,
+    workspaceId,
+    sponsorId: auth.claims.sponsorId,
+    sponsorChain: auth.claims.sponsorChain,
</file context>

sponsorId: auth.claims.sponsorId,
sponsorChain: auth.claims.sponsorChain,
scopes: auth.claims.scopes,
Expand Down
Loading