diff --git a/apps/mcp/src/server/auth/rbac.test.ts b/apps/mcp/src/server/auth/rbac.test.ts index bbb0143d..baaa3ad3 100644 --- a/apps/mcp/src/server/auth/rbac.test.ts +++ b/apps/mcp/src/server/auth/rbac.test.ts @@ -1,6 +1,10 @@ import { describe, expect, it } from "vitest" import type { SessionInfo } from "../../shared/types" -import { effectiveContainerTagAccess } from "./rbac" +import { + assertWriteAccess, + ContainerTagAccessError, + effectiveContainerTagAccess, +} from "./rbac" const baseSession: SessionInfo = { user: { id: "user_test" }, @@ -47,3 +51,53 @@ describe("effectiveContainerTagAccess", () => { ]) }) }) + +describe("assertWriteAccess", () => { + it("does not throw when the session has write access to the tag", () => { + expect(() => assertWriteAccess("one", baseSession)).not.toThrow() + }) + + it("throws ContainerTagAccessError for a restricted read-only tag", () => { + const session: SessionInfo = { + ...baseSession, + accessType: "restricted", + containerTags: [{ containerTag: "one", permission: "read" }], + } + + expect(() => assertWriteAccess("one", session)).toThrow( + ContainerTagAccessError, + ) + }) + + it("throws for a tag outside a scoped session's assigned tags", () => { + const session: SessionInfo = { + ...baseSession, + scope: { type: "scoped", permission: "write", tags: ["allowed"] }, + } + + expect(() => assertWriteAccess("other", session)).toThrow( + ContainerTagAccessError, + ) + }) + + it("throws for a read-only scoped session even on its own tag", () => { + const session: SessionInfo = { + ...baseSession, + scope: { type: "scoped", permission: "read", tags: ["one"] }, + } + + expect(() => assertWriteAccess("one", session)).toThrow( + ContainerTagAccessError, + ) + }) + + it("does not throw for a restricted member with explicit write access", () => { + const session: SessionInfo = { + ...baseSession, + accessType: "restricted", + containerTags: [{ containerTag: "one", permission: "write" }], + } + + expect(() => assertWriteAccess("one", session)).not.toThrow() + }) +}) diff --git a/apps/mcp/src/server/auth/rbac.ts b/apps/mcp/src/server/auth/rbac.ts index 327587a2..89e17ef7 100644 --- a/apps/mcp/src/server/auth/rbac.ts +++ b/apps/mcp/src/server/auth/rbac.ts @@ -32,3 +32,25 @@ export function effectiveContainerTagAccess( return { containerTag, permission } }) } + +// Tools that write (save/forget a memory, upload a file) must call this +// before performing the write. effectiveContainerTagAccess above is used +// elsewhere only to build picker/dropdown option lists for the widgets -- +// nothing stops a client from calling a write tool directly with an +// arbitrary containerTag, bypassing whatever the UI would have offered. +export class ContainerTagAccessError extends Error { + constructor(containerTag: string) { + super(`You do not have write access to space "${containerTag}".`) + this.name = "ContainerTagAccessError" + } +} + +export function assertWriteAccess( + containerTag: string, + session: SessionInfo, +): void { + const [access] = effectiveContainerTagAccess([containerTag], session) + if (access?.permission !== "write") { + throw new ContainerTagAccessError(containerTag) + } +} diff --git a/apps/mcp/src/server/tools/add-memory.ts b/apps/mcp/src/server/tools/add-memory.ts index c708deb5..26510c00 100644 --- a/apps/mcp/src/server/tools/add-memory.ts +++ b/apps/mcp/src/server/tools/add-memory.ts @@ -1,4 +1,5 @@ import { z } from "zod" +import { assertWriteAccess } from "../auth/rbac" import { optionalContainerTagSchema } from "../container-tag" import { MEMORY_TOOL_ANNOTATIONS } from "./annotations" import { addMemoryOutputSchema, type AddMemoryOutput } from "./output-schemas" @@ -26,6 +27,9 @@ export function register(deps: ToolDeps) { async (args) => { try { const effectiveTag = await deps.resolveContainerTag(args.containerTag) + const session = await deps.getSession() + assertWriteAccess(effectiveTag, session) + const client = deps.getClient(effectiveTag) if (args.action === "forget") { diff --git a/apps/mcp/src/server/tools/save-memory.ts b/apps/mcp/src/server/tools/save-memory.ts index 8b53f032..a9132941 100644 --- a/apps/mcp/src/server/tools/save-memory.ts +++ b/apps/mcp/src/server/tools/save-memory.ts @@ -1,6 +1,7 @@ import { z } from "zod" import { saveSuccessViewSchema, type ViewMessage } from "../../shared/types" import { appResultMeta, appToolMeta } from "../app-metadata" +import { assertWriteAccess } from "../auth/rbac" import { containerTagSchema } from "../container-tag" import { ADDITIVE_MEMORY_TOOL_ANNOTATIONS } from "./annotations" import { textContent, type ToolDeps } from "./types" @@ -21,6 +22,9 @@ export function register(deps: ToolDeps) { }, async (args) => { try { + const session = await deps.getSession() + assertWriteAccess(args.containerTag, session) + const viewId = args.viewId ?? crypto.randomUUID() const client = deps.getClient(args.containerTag) const result = await client.createMemory(args.content)