refactor: simplify authorization boundaries

This commit is contained in:
morluto
2026-07-18 05:49:14 +00:00
parent b537ebfa34
commit 2e5b44365f
59 changed files with 381 additions and 6286 deletions
+39 -24
View File
@@ -19,29 +19,30 @@ import {
const RESPONSE_KEY = "process_capture_grant";
const STATE_VERSION = 1;
const STATE_TTL_MS = 600_000;
const MAX_CONSUMED_NONCES = 4_096;
const grantResponseSchema = z.object({
lifetime: z.enum(["once", "session"]).default("session"),
/** Shared continuation, replay, and round limits for process capture consent. */
export const PROCESS_CAPTURE_ELICITATION_POLICY = {
protocolVersions: ["2026-07-28"],
stateTtlSeconds: 600,
roundTimeoutMs: 600_000,
maxConsumedNonces: 4_096,
} as const;
const grantResponseSchema = z.strictObject({
lifetime: z.enum(["once", "session"]).meta({ default: "session" }),
});
const grantResponseJsonSchema = {
type: "object" as const,
properties: {
lifetime: {
type: "string" as const,
enum: ["once", "session"],
default: "session",
},
},
required: ["lifetime"],
};
const grantResponseJsonSchema = { ...z.toJSONSchema(grantResponseSchema) };
// MCP elicitation accepts a reduced JSON Schema subset. These generator
// annotations do not change the schema's fields or validation semantics; the
// Standard Schema marker would make the SDK regenerate the removed keywords.
Reflect.deleteProperty(grantResponseJsonSchema, "$schema");
Reflect.deleteProperty(grantResponseJsonSchema, "additionalProperties");
const stateSchema = z.object({
const stateSchema = z.strictObject({
version: z.literal(STATE_VERSION),
nonce: z.string().uuid(),
request: z.object({
request: z.strictObject({
capability: z.literal("process_capture"),
roots: z.array(z.string()),
executables: z.array(z.string()),
@@ -58,13 +59,14 @@ export type ProcessCaptureElicitationState = z.infer<typeof stateSchema>;
/** Connection-owned SDK state used for process-capture grant elicitation. */
export interface ProcessCaptureElicitation {
readonly stateCodec: RequestStateCodec<ProcessCaptureElicitationState>;
readonly supported: () => boolean;
readonly modern: () => boolean;
readonly supported: (context: ProcessCaptureElicitationContext) => boolean;
readonly now: () => number;
readonly consumedNonces: Map<string, number>;
}
interface ProcessCaptureElicitationContext {
readonly mcpReq: {
readonly envelope?: Readonly<Record<string, unknown>>;
readonly inputResponses?: Record<string, unknown>;
readonly requestState: () => unknown;
};
@@ -79,7 +81,7 @@ export const authorizeProcessCaptureWithElicitation = async (
context: ProcessCaptureElicitationContext,
elicitation: ProcessCaptureElicitation,
): Promise<PermissionResult | InputRequiredResult> => {
const supported = elicitation.supported() && elicitation.modern();
const supported = elicitation.supported(context);
const initial = await authority.authorize(request, "read", {
elicitationSupported: supported,
});
@@ -101,7 +103,13 @@ export const authorizeProcessCaptureWithElicitation = async (
return initial;
const response = inputResponse(context.mcpReq.inputResponses, RESPONSE_KEY);
if (response.kind === "elicit") {
if (!consumeNonce(elicitation.consumedNonces, state.data.nonce))
if (
!consumeNonce(
elicitation.consumedNonces,
state.data.nonce,
elicitation.now(),
)
)
return initial;
}
if (response.kind === "elicit" && response.action === "accept") {
@@ -208,12 +216,19 @@ const sameOptionalStrings = (
const consumeNonce = (
consumed: Map<string, number>,
nonce: string,
now: number,
): boolean => {
const now = Date.now();
for (const [candidate, expiresAt] of consumed)
if (expiresAt <= now) consumed.delete(candidate);
if (consumed.has(nonce) || consumed.size >= MAX_CONSUMED_NONCES) return false;
consumed.set(nonce, now + STATE_TTL_MS);
if (
consumed.has(nonce) ||
consumed.size >= PROCESS_CAPTURE_ELICITATION_POLICY.maxConsumedNonces
)
return false;
consumed.set(
nonce,
now + PROCESS_CAPTURE_ELICITATION_POLICY.stateTtlSeconds * 1_000,
);
return true;
};
+29 -9
View File
@@ -1,8 +1,10 @@
import { randomBytes } from "node:crypto";
import {
CLIENT_CAPABILITIES_META_KEY,
createRequestStateCodec,
McpServer,
PROTOCOL_VERSION_META_KEY,
} from "@modelcontextprotocol/server";
import type { AnalysisOperationPort } from "../application/AnalysisProvider.js";
@@ -35,7 +37,10 @@ import type {
import type { ManagedRuntimePolicy } from "../application/ManagedRuntimeCorrelationService.js";
import { LinuxJavaScriptReplayRunner } from "../replay/LinuxJavaScriptReplayRunner.js";
import { SystemJavaScriptReplayHost } from "../replay/SystemJavaScriptReplayHost.js";
import type { ProcessCaptureElicitationState } from "./ProcessCaptureElicitation.js";
import {
PROCESS_CAPTURE_ELICITATION_POLICY,
type ProcessCaptureElicitationState,
} from "./ProcessCaptureElicitation.js";
export interface CreateServerOptions {
readonly logger?: Logger;
@@ -78,7 +83,7 @@ export const createServer = (
const processCaptureStateCodec =
createRequestStateCodec<ProcessCaptureElicitationState>({
key: randomBytes(32),
ttlSeconds: 600,
ttlSeconds: PROCESS_CAPTURE_ELICITATION_POLICY.stateTtlSeconds,
});
const server = new McpServer(
{
@@ -90,7 +95,10 @@ export const createServer = (
tools: { listChanged: true },
resources: { listChanged: true },
},
inputRequired: { maxRounds: 3, roundTimeoutMs: 600_000 },
inputRequired: {
maxRounds: 3,
roundTimeoutMs: PROCESS_CAPTURE_ELICITATION_POLICY.roundTimeoutMs,
},
requestState: { verify: processCaptureStateCodec.verify },
instructions:
session === undefined
@@ -268,15 +276,27 @@ export const createServer = (
startedAt,
processCaptureElicitation: {
stateCodec: processCaptureStateCodec,
supported: () =>
server.server.getClientCapabilities()?.elicitation?.form !==
undefined,
modern: () =>
server.server.getNegotiatedProtocolVersion()?.startsWith("2026-") ===
true,
supported: (context) => {
const envelope = context.mcpReq.envelope;
const version = envelope?.[PROTOCOL_VERSION_META_KEY];
const capabilities = envelope?.[CLIENT_CAPABILITIES_META_KEY];
return (
typeof version === "string" &&
PROCESS_CAPTURE_ELICITATION_POLICY.protocolVersions.some(
(supported) => supported === version,
) &&
isRecord(capabilities) &&
isRecord(capabilities.elicitation) &&
capabilities.elicitation.form !== undefined
);
},
now: Date.now,
consumedNonces: new Map(),
},
});
}
return server;
};
const isRecord = (value: unknown): value is Record<string, unknown> =>
typeof value === "object" && value !== null && !Array.isArray(value);