Harden MCP broker sandbox handoff

This commit is contained in:
Codex
2026-04-27 21:33:05 +00:00
parent fdb18300eb
commit fd0959d994
18 changed files with 634 additions and 101 deletions
+24 -8
View File
@@ -1,16 +1,13 @@
import { NextResponse } from "next/server"
import { syncSandboxMcpManifest } from "@/app/lib/sandboxMcpManifest"
import { brokerBaseUrlForSandbox } from "@/app/lib/mcpBrokerUrl"
import { revokeSandboxMcpManifest, syncSandboxMcpManifest } from "@/app/lib/sandboxMcpManifest"
import { revokeBrokerNetworkAccess, syncBrokerNetworkAccess } from "@/app/lib/sandboxPermissions"
function readSandboxName(request: Request) {
const requestUrl = new URL(request.url)
return requestUrl.searchParams.get("sandboxName") || null
}
function brokerBaseUrl(request: Request) {
const origin = new URL(request.url).origin
return process.env.OPENSHELL_CONTROL_MCP_BROKER_URL || `${origin}/api/mcp/broker`
}
export async function GET(
request: Request,
{ params }: { params: Promise<{ sandboxId: string }> },
@@ -18,7 +15,7 @@ export async function GET(
try {
const { sandboxId } = await params
const sandboxName = readSandboxName(request)
const brokerUrl = brokerBaseUrl(request)
const brokerUrl = await brokerBaseUrlForSandbox(request, { id: sandboxId, name: sandboxName })
return NextResponse.json({
ok: true,
sandboxId,
@@ -50,14 +47,33 @@ export async function POST(
const { sandboxId } = await params
const body = await request.json().catch(() => ({}))
const sandboxName = typeof body?.sandboxName === "string" ? body.sandboxName : readSandboxName(request)
const action = typeof body?.action === "string" ? body.action : "sync"
const brokerUrl = await brokerBaseUrlForSandbox(request, { id: sandboxId, name: sandboxName })
if (action === "revoke") {
const [synced, network] = await Promise.all([
revokeSandboxMcpManifest({ id: sandboxId, name: sandboxName }),
revokeBrokerNetworkAccess(sandboxId, brokerUrl),
])
return NextResponse.json({
ok: true,
sandboxId,
synced,
network,
note: `Revoked MCP broker config for ${synced.sandboxName}.`,
})
}
const synced = await syncSandboxMcpManifest(
{ id: sandboxId, name: sandboxName },
{ brokerBaseUrl: brokerBaseUrl(request) },
{ brokerBaseUrl: brokerUrl },
)
const network = await syncBrokerNetworkAccess(sandboxId, brokerUrl)
return NextResponse.json({
ok: true,
sandboxId,
synced,
network,
note: `Issued MCP broker config at ${synced.path}.`,
})
} catch (error) {