fix(mcp): honor the mcp:connect carve-out in transport route guards (#11139)

Validated on the combined batch board over tip 17897cc3: gates clean (changelog, file-size 159 frozen, complexity 2628<=2774, cognitive 1184<=1223, dead-code 409<=416, provider-consistency 267/350/0), typecheck:core clean, 83/83 PR suites + neighbors green (mcp-route-scope-carveout 15 tests with bug-injection proof, management-auth-hardening per-route call-shape pinning). The route layer now honors the #9159 mcp:connect carve-out exactly like the policy layer — audit/audit-stats deliberately stay manage-only, oma_ tokens still require admin. Thank you @HouMinXi!
This commit is contained in:
Bob.Hou
2026-08-23 01:18:06 -04:00
committed by GitHub
parent 0a7bd62401
commit dea5345397
7 changed files with 345 additions and 12 deletions

View File

@@ -30,7 +30,7 @@ async function guardEnabled(): Promise<NextResponse | null> {
}
export async function GET(request: NextRequest) {
const authError = await requireManagementAuth(request);
const authError = await requireManagementAuth(request, { acceptMcpConnectScope: true });
if (authError) return authError;
const blocked = await guardEnabled();
if (blocked) return blocked;
@@ -38,7 +38,7 @@ export async function GET(request: NextRequest) {
}
export async function POST(request: NextRequest) {
const authError = await requireManagementAuth(request);
const authError = await requireManagementAuth(request, { acceptMcpConnectScope: true });
if (authError) return authError;
const blocked = await guardEnabled();
if (blocked) return blocked;

View File

@@ -14,7 +14,7 @@ import { getCachedSettings } from "@/lib/db/settings";
import { requireManagementAuth } from "@/lib/api/requireManagementAuth";
export async function GET(request: Request) {
const authError = await requireManagementAuth(request);
const authError = await requireManagementAuth(request, { acceptMcpConnectScope: true });
if (authError) return authError;
try {
const [heartbeat, stats, lastCallPage, settings] = await Promise.all([

View File

@@ -33,7 +33,7 @@ async function guardEnabled(): Promise<NextResponse | null> {
}
export async function POST(request: NextRequest) {
const authError = await requireManagementAuth(request);
const authError = await requireManagementAuth(request, { acceptMcpConnectScope: true });
if (authError) return authError;
const blocked = await guardEnabled();
if (blocked) return blocked;
@@ -41,7 +41,7 @@ export async function POST(request: NextRequest) {
}
export async function GET(request: NextRequest) {
const authError = await requireManagementAuth(request);
const authError = await requireManagementAuth(request, { acceptMcpConnectScope: true });
if (authError) return authError;
const blocked = await guardEnabled();
if (blocked) return blocked;
@@ -49,7 +49,7 @@ export async function GET(request: NextRequest) {
}
export async function DELETE(request: NextRequest) {
const authError = await requireManagementAuth(request);
const authError = await requireManagementAuth(request, { acceptMcpConnectScope: true });
if (authError) return authError;
const blocked = await guardEnabled();
if (blocked) return blocked;

View File

@@ -3,7 +3,7 @@ import { MCP_TOOLS, MCP_TOOL_MAP } from "@omniroute/open-sse/mcp-server/schemas/
import { requireManagementAuth } from "@/lib/api/requireManagementAuth";
export async function GET(request: Request) {
const authError = await requireManagementAuth(request);
const authError = await requireManagementAuth(request, { acceptMcpConnectScope: true });
if (authError) return authError;
try {
return NextResponse.json({

View File

@@ -8,7 +8,9 @@ import { isTrustedLoopbackInternalServiceRequest } from "@/lib/api/internalServi
import { AUTHZ_HEADER_AUTH_KIND, AUTHZ_HEADER_AUTH_LABEL } from "@/server/authz/headers";
import {
MANAGE_SCOPE,
MCP_CONNECT_SCOPE,
hasManageScope as hasManageScopeShared,
hasMcpConnectOrManageScope,
} from "@/shared/constants/managementScopes";
export { MANAGE_SCOPE };
@@ -26,6 +28,13 @@ export function hasManageScope(scopes: string[] = []): boolean {
interface RequireManagementAuthOptions {
alwaysRequireAuth?: boolean;
invalidApiKeyStatus?: 401 | 403;
/**
* Accept the narrow `mcp:connect` scope in the API-key branch, mirroring the
* #9159 carve-out the central managementPolicy already applies to /api/mcp/*
* paths. Only the MCP transport routes (stream/sse/status/tools) may enable
* this — every other management route stays manage/admin-only.
*/
acceptMcpConnectScope?: boolean;
}
function invalidManagementTokenResponse(options: RequireManagementAuthOptions): Response {
@@ -117,11 +126,26 @@ export async function requireManagementAuth(
});
}
if (meta && hasManageScope(meta.scopes)) return null;
// API-key branch: with acceptMcpConnectScope (MCP transport routes) the
// #9159 carve-out applies — hasMcpConnectOrManageScope accepts manage,
// admin, and mcp:connect. Without it, the guard stays manage-only. A null
// meta (valid key, metadata unavailable — deleted mid-request) falls
// through to the same 403 as the default path for every caller, keeping
// the error contract uniform.
if (
meta &&
(options.acceptMcpConnectScope
? hasMcpConnectOrManageScope(meta.scopes)
: hasManageScope(meta.scopes))
) {
return null;
}
return createErrorResponse({
status: 403,
message: "API key lacks 'manage' scope. Enable it in the API Keys dashboard.",
message: options.acceptMcpConnectScope
? `API key lacks '${MCP_CONNECT_SCOPE}' (or 'manage') scope. Enable it in the API Keys dashboard.`
: "API key lacks 'manage' scope. Enable it in the API Keys dashboard.",
type: "invalid_request",
});
}