@agent-native/core 0.128.3 → 0.129.0

package/dist/mcp/oauth-client-metadata.js

@@ -0,0 +1,297 @@
+import { ssrfSafeFetch } from "../extensions/url-safety.js";
+const CLIENT_METADATA_MAX_BYTES = 64 * 1024;
+const CLIENT_METADATA_TIMEOUT_MS = 5_000;
+const CLIENT_METADATA_MAX_REDIRECTS = 2;
+const CLIENT_METADATA_MAX_CACHE_ENTRIES = 128;
+const CLIENT_METADATA_MAX_CACHE_TTL_MS = 5 * 60_000;
+const DISALLOWED_REDIRECT_SCHEMES = new Set([
+    "javascript:",
+    "data:",
+    "vbscript:",
+    "file:",
+    "blob:",
+    "about:",
+]);
+const clientMetadataCache = new Map();
+export function isUrlBasedOAuthClientId(clientId) {
+    return /^[a-z][a-z0-9+.-]*:/i.test(clientId);
+}
+export function validateOAuthClientMetadataUrl(clientId) {
+    if (!clientId || clientId !== clientId.trim() || clientId.length > 2048) {
+        throw new Error("Client metadata URL is invalid");
+    }
+    let url;
+    try {
+        url = new URL(clientId);
+    }
+    catch {
+        throw new Error("Client metadata URL is invalid");
+    }
+    if (url.protocol !== "https:" ||
+        url.pathname === "/" ||
+        !url.pathname ||
+        url.hash ||
+        url.username ||
+        url.password) {
+        throw new Error("Client metadata URL must be HTTPS with a non-root path");
+    }
+    const authorityEnd = clientId.indexOf("/", "https://".length);
+    const queryStart = clientId.indexOf("?", authorityEnd);
+    const rawPath = clientId.slice(authorityEnd, queryStart === -1 ? undefined : queryStart);
+    if (rawPath.split("/").some((segment) => {
+        try {
+            const decoded = decodeURIComponent(segment);
+            return decoded === "." || decoded === "..";
+        }
+        catch {
+            return true;
+        }
+    })) {
+        throw new Error("Client metadata URL must not contain dot path segments");
+    }
+    return url;
+}
+export function isAllowedOAuthRedirectUri(value) {
+    if (typeof value !== "string" || value.length > 2048)
+        return false;
+    try {
+        const url = new URL(value);
+        if (url.hash || url.username || url.password)
+            return false;
+        if (url.protocol === "https:")
+            return true;
+        if (url.protocol === "http:") {
+            return (url.hostname === "localhost" ||
+                url.hostname === "127.0.0.1" ||
+                url.hostname === "::1" ||
+                url.hostname === "[::1]");
+        }
+        return (!DISALLOWED_REDIRECT_SCHEMES.has(url.protocol) &&
+            /^[a-z][a-z0-9+.-]*:$/.test(url.protocol));
+    }
+    catch {
+        return false;
+    }
+}
+export function applicationTypeForRedirectUris(redirectUris) {
+    return redirectUris.some((value) => {
+        const url = new URL(value);
+        return (url.protocol !== "https:" ||
+            url.hostname === "localhost" ||
+            url.hostname === "127.0.0.1" ||
+            url.hostname === "::1" ||
+            url.hostname === "[::1]");
+    })
+        ? "native"
+        : "web";
+}
+function parseStringArray(value) {
+    return Array.isArray(value)
+        ? value.filter((item) => typeof item === "string")
+        : [];
+}
+function validateClientMetadataDocument(clientId, value) {
+    if (!value || typeof value !== "object" || Array.isArray(value)) {
+        throw new Error("Client metadata document must be a JSON object");
+    }
+    const document = value;
+    if (document.client_id !== clientId) {
+        throw new Error("Client metadata document client_id does not match its URL");
+    }
+    const clientName = typeof document.client_name === "string" ? document.client_name.trim() : "";
+    if (!clientName ||
+        clientName.length > 120 ||
+        /[\u0000-\u001f\u007f]/.test(clientName)) {
+        throw new Error("Client metadata document client_name is invalid");
+    }
+    const rawRedirectUris = document.redirect_uris;
+    const redirectUris = parseStringArray(rawRedirectUris);
+    if (!Array.isArray(rawRedirectUris) ||
+        redirectUris.length === 0 ||
+        redirectUris.length > 20 ||
+        redirectUris.length !== rawRedirectUris.length ||
+        !redirectUris.every(isAllowedOAuthRedirectUri)) {
+        throw new Error("Client metadata document redirect_uris are invalid");
+    }
+    const tokenEndpointAuthMethod = typeof document.token_endpoint_auth_method === "string"
+        ? document.token_endpoint_auth_method
+        : "none";
+    if (document.token_endpoint_auth_method !== undefined &&
+        typeof document.token_endpoint_auth_method !== "string") {
+        throw new Error("Client metadata document token_endpoint_auth_method is invalid");
+    }
+    if (tokenEndpointAuthMethod !== "none") {
+        throw new Error("Only public Client ID Metadata clients are supported");
+    }
+    const grantTypes = parseStringArray(document.grant_types);
+    if ((document.grant_types !== undefined &&
+        (!Array.isArray(document.grant_types) ||
+            grantTypes.length !== document.grant_types.length)) ||
+        grantTypes.length > 10 ||
+        !grantTypes.every((grant) => grant === "authorization_code" || grant === "refresh_token")) {
+        throw new Error("Client metadata document grant_types are unsupported");
+    }
+    const responseTypes = parseStringArray(document.response_types);
+    if ((document.response_types !== undefined &&
+        (!Array.isArray(document.response_types) ||
+            responseTypes.length !== document.response_types.length)) ||
+        responseTypes.length > 10 ||
+        !responseTypes.every((responseType) => responseType === "code")) {
+        throw new Error("Client metadata document response_types are unsupported");
+    }
+    const requestedApplicationType = typeof document.application_type === "string"
+        ? document.application_type
+        : undefined;
+    if ((document.application_type !== undefined &&
+        typeof document.application_type !== "string") ||
+        (requestedApplicationType &&
+            requestedApplicationType !== "native" &&
+            requestedApplicationType !== "web")) {
+        throw new Error("Client metadata document application_type is unsupported");
+    }
+    const applicationType = requestedApplicationType === "native" || requestedApplicationType === "web"
+        ? requestedApplicationType
+        : applicationTypeForRedirectUris(redirectUris);
+    return {
+        clientId,
+        clientName,
+        redirectUris: [...new Set(redirectUris)],
+        grantTypes: grantTypes.length
+            ? [...new Set(grantTypes)]
+            : ["authorization_code", "refresh_token"],
+        responseTypes: responseTypes.length
+            ? [...new Set(responseTypes)]
+            : ["code"],
+        tokenEndpointAuthMethod: "none",
+        applicationType,
+    };
+}
+async function readBoundedResponseBody(response) {
+    const contentLength = Number(response.headers.get("content-length"));
+    if (Number.isFinite(contentLength) &&
+        contentLength > CLIENT_METADATA_MAX_BYTES) {
+        await response.body?.cancel().catch(() => undefined);
+        throw new Error("Client metadata document is too large");
+    }
+    if (!response.body)
+        return "";
+    const reader = response.body.getReader();
+    const decoder = new TextDecoder();
+    let bytesRead = 0;
+    let text = "";
+    try {
+        for (;;) {
+            const { done, value } = await reader.read();
+            if (done)
+                break;
+            bytesRead += value.byteLength;
+            if (bytesRead > CLIENT_METADATA_MAX_BYTES) {
+                await reader.cancel().catch(() => undefined);
+                throw new Error("Client metadata document is too large");
+            }
+            text += decoder.decode(value, { stream: true });
+        }
+        text += decoder.decode();
+        return text;
+    }
+    finally {
+        reader.releaseLock();
+    }
+}
+function cacheTtlMs(headers, now) {
+    const cacheControl = headers.get("cache-control")?.toLowerCase() ?? "";
+    if (/(?:^|,)\s*(?:no-store|no-cache|private)(?:\s|,|$)/.test(cacheControl)) {
+        return 0;
+    }
+    const maxAge = cacheControl.match(/(?:^|,)\s*max-age=(\d+)/)?.[1];
+    if (maxAge) {
+        return Math.min(Number(maxAge) * 1_000, CLIENT_METADATA_MAX_CACHE_TTL_MS);
+    }
+    const expiresAt = Date.parse(headers.get("expires") ?? "");
+    if (Number.isFinite(expiresAt) && expiresAt > now) {
+        return Math.min(expiresAt - now, CLIENT_METADATA_MAX_CACHE_TTL_MS);
+    }
+    return 0;
+}
+function cacheClientMetadata(clientId, metadata, response, now) {
+    const ttlMs = cacheTtlMs(response.headers, now);
+    if (ttlMs <= 0)
+        return;
+    clientMetadataCache.delete(clientId);
+    clientMetadataCache.set(clientId, {
+        expiresAt: now + ttlMs,
+        metadata,
+    });
+    while (clientMetadataCache.size > CLIENT_METADATA_MAX_CACHE_ENTRIES) {
+        const oldest = clientMetadataCache.keys().next().value;
+        if (typeof oldest !== "string")
+            break;
+        clientMetadataCache.delete(oldest);
+    }
+}
+async function fetchOAuthClientMetadataDocument(clientId, signal) {
+    const response = await ssrfSafeFetch(clientId, {
+        headers: {
+            Accept: "application/json, application/client-metadata+json",
+        },
+        signal,
+    }, {
+        maxRedirects: CLIENT_METADATA_MAX_REDIRECTS,
+        httpsOnly: true,
+    });
+    if (!response.ok) {
+        await response.body?.cancel().catch(() => undefined);
+        throw new Error(`Client metadata document request failed with ${response.status}`);
+    }
+    const contentType = response.headers.get("content-type")?.split(";", 1)[0]?.trim() ?? "";
+    if (contentType !== "application/json" &&
+        contentType !== "application/client-metadata+json") {
+        await response.body?.cancel().catch(() => undefined);
+        throw new Error("Client metadata document content type is invalid");
+    }
+    const body = await readBoundedResponseBody(response);
+    let parsed;
+    try {
+        parsed = JSON.parse(body);
+    }
+    catch {
+        throw new Error("Client metadata document is not valid JSON");
+    }
+    return {
+        metadata: validateClientMetadataDocument(clientId, parsed),
+        response,
+    };
+}
+export async function resolveOAuthClientMetadataDocument(clientId) {
+    validateOAuthClientMetadataUrl(clientId);
+    const now = Date.now();
+    const cached = clientMetadataCache.get(clientId);
+    if (cached && cached.expiresAt > now) {
+        clientMetadataCache.delete(clientId);
+        clientMetadataCache.set(clientId, cached);
+        return cached.metadata;
+    }
+    if (cached)
+        clientMetadataCache.delete(clientId);
+    const abort = new AbortController();
+    let timeout;
+    try {
+        const timedOut = new Promise((_, reject) => {
+            timeout = setTimeout(() => {
+                abort.abort();
+                reject(new Error("Client metadata document request timed out"));
+            }, CLIENT_METADATA_TIMEOUT_MS);
+        });
+        const { metadata, response } = await Promise.race([
+            fetchOAuthClientMetadataDocument(clientId, abort.signal),
+            timedOut,
+        ]);
+        cacheClientMetadata(clientId, metadata, response, now);
+        return metadata;
+    }
+    finally {
+        if (timeout)
+            clearTimeout(timeout);
+    }
+}
+//# sourceMappingURL=oauth-client-metadata.js.map

package/dist/mcp/oauth-client-metadata.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"oauth-client-metadata.js","sourceRoot":"","sources":["../../src/mcp/oauth-client-metadata.ts"],"names":[],"mappings":"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","sourcesContent":["import { ssrfSafeFetch } from \"../extensions/url-safety.js\";\n\nconst CLIENT_METADATA_MAX_BYTES = 64 * 1024;\nconst CLIENT_METADATA_TIMEOUT_MS = 5_000;\nconst CLIENT_METADATA_MAX_REDIRECTS = 2;\nconst CLIENT_METADATA_MAX_CACHE_ENTRIES = 128;\nconst CLIENT_METADATA_MAX_CACHE_TTL_MS = 5 * 60_000;\n\nconst DISALLOWED_REDIRECT_SCHEMES = new Set([\n  \"javascript:\",\n  \"data:\",\n  \"vbscript:\",\n  \"file:\",\n  \"blob:\",\n  \"about:\",\n]);\n\nexport interface OAuthClientMetadataDocument {\n  clientId: string;\n  clientName: string;\n  redirectUris: string[];\n  grantTypes: string[];\n  responseTypes: string[];\n  tokenEndpointAuthMethod: \"none\";\n  applicationType: \"native\" | \"web\";\n}\n\ninterface CachedClientMetadata {\n  expiresAt: number;\n  metadata: OAuthClientMetadataDocument;\n}\n\nconst clientMetadataCache = new Map<string, CachedClientMetadata>();\n\nexport function isUrlBasedOAuthClientId(clientId: string): boolean {\n  return /^[a-z][a-z0-9+.-]*:/i.test(clientId);\n}\n\nexport function validateOAuthClientMetadataUrl(clientId: string): URL {\n  if (!clientId || clientId !== clientId.trim() || clientId.length > 2048) {\n    throw new Error(\"Client metadata URL is invalid\");\n  }\n  let url: URL;\n  try {\n    url = new URL(clientId);\n  } catch {\n    throw new Error(\"Client metadata URL is invalid\");\n  }\n  if (\n    url.protocol !== \"https:\" ||\n    url.pathname === \"/\" ||\n    !url.pathname ||\n    url.hash ||\n    url.username ||\n    url.password\n  ) {\n    throw new Error(\"Client metadata URL must be HTTPS with a non-root path\");\n  }\n  const authorityEnd = clientId.indexOf(\"/\", \"https://\".length);\n  const queryStart = clientId.indexOf(\"?\", authorityEnd);\n  const rawPath = clientId.slice(\n    authorityEnd,\n    queryStart === -1 ? undefined : queryStart,\n  );\n  if (\n    rawPath.split(\"/\").some((segment) => {\n      try {\n        const decoded = decodeURIComponent(segment);\n        return decoded === \".\" || decoded === \"..\";\n      } catch {\n        return true;\n      }\n    })\n  ) {\n    throw new Error(\"Client metadata URL must not contain dot path segments\");\n  }\n  return url;\n}\n\nexport function isAllowedOAuthRedirectUri(value: unknown): value is string {\n  if (typeof value !== \"string\" || value.length > 2048) return false;\n  try {\n    const url = new URL(value);\n    if (url.hash || url.username || url.password) return false;\n    if (url.protocol === \"https:\") return true;\n    if (url.protocol === \"http:\") {\n      return (\n        url.hostname === \"localhost\" ||\n        url.hostname === \"127.0.0.1\" ||\n        url.hostname === \"::1\" ||\n        url.hostname === \"[::1]\"\n      );\n    }\n    return (\n      !DISALLOWED_REDIRECT_SCHEMES.has(url.protocol) &&\n      /^[a-z][a-z0-9+.-]*:$/.test(url.protocol)\n    );\n  } catch {\n    return false;\n  }\n}\n\nexport function applicationTypeForRedirectUris(\n  redirectUris: string[],\n): \"native\" | \"web\" {\n  return redirectUris.some((value) => {\n    const url = new URL(value);\n    return (\n      url.protocol !== \"https:\" ||\n      url.hostname === \"localhost\" ||\n      url.hostname === \"127.0.0.1\" ||\n      url.hostname === \"::1\" ||\n      url.hostname === \"[::1]\"\n    );\n  })\n    ? \"native\"\n    : \"web\";\n}\n\nfunction parseStringArray(value: unknown): string[] {\n  return Array.isArray(value)\n    ? value.filter((item): item is string => typeof item === \"string\")\n    : [];\n}\n\nfunction validateClientMetadataDocument(\n  clientId: string,\n  value: unknown,\n): OAuthClientMetadataDocument {\n  if (!value || typeof value !== \"object\" || Array.isArray(value)) {\n    throw new Error(\"Client metadata document must be a JSON object\");\n  }\n  const document = value as Record<string, unknown>;\n  if (document.client_id !== clientId) {\n    throw new Error(\n      \"Client metadata document client_id does not match its URL\",\n    );\n  }\n  const clientName =\n    typeof document.client_name === \"string\" ? document.client_name.trim() : \"\";\n  if (\n    !clientName ||\n    clientName.length > 120 ||\n    /[\\u0000-\\u001f\\u007f]/.test(clientName)\n  ) {\n    throw new Error(\"Client metadata document client_name is invalid\");\n  }\n\n  const rawRedirectUris = document.redirect_uris;\n  const redirectUris = parseStringArray(rawRedirectUris);\n  if (\n    !Array.isArray(rawRedirectUris) ||\n    redirectUris.length === 0 ||\n    redirectUris.length > 20 ||\n    redirectUris.length !== rawRedirectUris.length ||\n    !redirectUris.every(isAllowedOAuthRedirectUri)\n  ) {\n    throw new Error(\"Client metadata document redirect_uris are invalid\");\n  }\n\n  const tokenEndpointAuthMethod =\n    typeof document.token_endpoint_auth_method === \"string\"\n      ? document.token_endpoint_auth_method\n      : \"none\";\n  if (\n    document.token_endpoint_auth_method !== undefined &&\n    typeof document.token_endpoint_auth_method !== \"string\"\n  ) {\n    throw new Error(\n      \"Client metadata document token_endpoint_auth_method is invalid\",\n    );\n  }\n  if (tokenEndpointAuthMethod !== \"none\") {\n    throw new Error(\"Only public Client ID Metadata clients are supported\");\n  }\n\n  const grantTypes = parseStringArray(document.grant_types);\n  if (\n    (document.grant_types !== undefined &&\n      (!Array.isArray(document.grant_types) ||\n        grantTypes.length !== document.grant_types.length)) ||\n    grantTypes.length > 10 ||\n    !grantTypes.every(\n      (grant) => grant === \"authorization_code\" || grant === \"refresh_token\",\n    )\n  ) {\n    throw new Error(\"Client metadata document grant_types are unsupported\");\n  }\n\n  const responseTypes = parseStringArray(document.response_types);\n  if (\n    (document.response_types !== undefined &&\n      (!Array.isArray(document.response_types) ||\n        responseTypes.length !== document.response_types.length)) ||\n    responseTypes.length > 10 ||\n    !responseTypes.every((responseType) => responseType === \"code\")\n  ) {\n    throw new Error(\"Client metadata document response_types are unsupported\");\n  }\n\n  const requestedApplicationType =\n    typeof document.application_type === \"string\"\n      ? document.application_type\n      : undefined;\n  if (\n    (document.application_type !== undefined &&\n      typeof document.application_type !== \"string\") ||\n    (requestedApplicationType &&\n      requestedApplicationType !== \"native\" &&\n      requestedApplicationType !== \"web\")\n  ) {\n    throw new Error(\"Client metadata document application_type is unsupported\");\n  }\n  const applicationType: \"native\" | \"web\" =\n    requestedApplicationType === \"native\" || requestedApplicationType === \"web\"\n      ? requestedApplicationType\n      : applicationTypeForRedirectUris(redirectUris);\n\n  return {\n    clientId,\n    clientName,\n    redirectUris: [...new Set(redirectUris)],\n    grantTypes: grantTypes.length\n      ? [...new Set(grantTypes)]\n      : [\"authorization_code\", \"refresh_token\"],\n    responseTypes: responseTypes.length\n      ? [...new Set(responseTypes)]\n      : [\"code\"],\n    tokenEndpointAuthMethod: \"none\",\n    applicationType,\n  };\n}\n\nasync function readBoundedResponseBody(response: Response): Promise<string> {\n  const contentLength = Number(response.headers.get(\"content-length\"));\n  if (\n    Number.isFinite(contentLength) &&\n    contentLength > CLIENT_METADATA_MAX_BYTES\n  ) {\n    await response.body?.cancel().catch(() => undefined);\n    throw new Error(\"Client metadata document is too large\");\n  }\n  if (!response.body) return \"\";\n\n  const reader = response.body.getReader();\n  const decoder = new TextDecoder();\n  let bytesRead = 0;\n  let text = \"\";\n  try {\n    for (;;) {\n      const { done, value } = await reader.read();\n      if (done) break;\n      bytesRead += value.byteLength;\n      if (bytesRead > CLIENT_METADATA_MAX_BYTES) {\n        await reader.cancel().catch(() => undefined);\n        throw new Error(\"Client metadata document is too large\");\n      }\n      text += decoder.decode(value, { stream: true });\n    }\n    text += decoder.decode();\n    return text;\n  } finally {\n    reader.releaseLock();\n  }\n}\n\nfunction cacheTtlMs(headers: Headers, now: number): number {\n  const cacheControl = headers.get(\"cache-control\")?.toLowerCase() ?? \"\";\n  if (/(?:^|,)\\s*(?:no-store|no-cache|private)(?:\\s|,|$)/.test(cacheControl)) {\n    return 0;\n  }\n  const maxAge = cacheControl.match(/(?:^|,)\\s*max-age=(\\d+)/)?.[1];\n  if (maxAge) {\n    return Math.min(Number(maxAge) * 1_000, CLIENT_METADATA_MAX_CACHE_TTL_MS);\n  }\n  const expiresAt = Date.parse(headers.get(\"expires\") ?? \"\");\n  if (Number.isFinite(expiresAt) && expiresAt > now) {\n    return Math.min(expiresAt - now, CLIENT_METADATA_MAX_CACHE_TTL_MS);\n  }\n  return 0;\n}\n\nfunction cacheClientMetadata(\n  clientId: string,\n  metadata: OAuthClientMetadataDocument,\n  response: Response,\n  now: number,\n): void {\n  const ttlMs = cacheTtlMs(response.headers, now);\n  if (ttlMs <= 0) return;\n  clientMetadataCache.delete(clientId);\n  clientMetadataCache.set(clientId, {\n    expiresAt: now + ttlMs,\n    metadata,\n  });\n  while (clientMetadataCache.size > CLIENT_METADATA_MAX_CACHE_ENTRIES) {\n    const oldest = clientMetadataCache.keys().next().value;\n    if (typeof oldest !== \"string\") break;\n    clientMetadataCache.delete(oldest);\n  }\n}\n\nasync function fetchOAuthClientMetadataDocument(\n  clientId: string,\n  signal: AbortSignal,\n): Promise<{ metadata: OAuthClientMetadataDocument; response: Response }> {\n  const response = await ssrfSafeFetch(\n    clientId,\n    {\n      headers: {\n        Accept: \"application/json, application/client-metadata+json\",\n      },\n      signal,\n    },\n    {\n      maxRedirects: CLIENT_METADATA_MAX_REDIRECTS,\n      httpsOnly: true,\n    },\n  );\n  if (!response.ok) {\n    await response.body?.cancel().catch(() => undefined);\n    throw new Error(\n      `Client metadata document request failed with ${response.status}`,\n    );\n  }\n  const contentType =\n    response.headers.get(\"content-type\")?.split(\";\", 1)[0]?.trim() ?? \"\";\n  if (\n    contentType !== \"application/json\" &&\n    contentType !== \"application/client-metadata+json\"\n  ) {\n    await response.body?.cancel().catch(() => undefined);\n    throw new Error(\"Client metadata document content type is invalid\");\n  }\n\n  const body = await readBoundedResponseBody(response);\n  let parsed: unknown;\n  try {\n    parsed = JSON.parse(body);\n  } catch {\n    throw new Error(\"Client metadata document is not valid JSON\");\n  }\n  return {\n    metadata: validateClientMetadataDocument(clientId, parsed),\n    response,\n  };\n}\n\nexport async function resolveOAuthClientMetadataDocument(\n  clientId: string,\n): Promise<OAuthClientMetadataDocument> {\n  validateOAuthClientMetadataUrl(clientId);\n  const now = Date.now();\n  const cached = clientMetadataCache.get(clientId);\n  if (cached && cached.expiresAt > now) {\n    clientMetadataCache.delete(clientId);\n    clientMetadataCache.set(clientId, cached);\n    return cached.metadata;\n  }\n  if (cached) clientMetadataCache.delete(clientId);\n\n  const abort = new AbortController();\n  let timeout: ReturnType<typeof setTimeout> | undefined;\n  try {\n    const timedOut = new Promise<never>((_, reject) => {\n      timeout = setTimeout(() => {\n        abort.abort();\n        reject(new Error(\"Client metadata document request timed out\"));\n      }, CLIENT_METADATA_TIMEOUT_MS);\n    });\n    const { metadata, response } = await Promise.race([\n      fetchOAuthClientMetadataDocument(clientId, abort.signal),\n      timedOut,\n    ]);\n    cacheClientMetadata(clientId, metadata, response, now);\n    return metadata;\n  } finally {\n    if (timeout) clearTimeout(timeout);\n  }\n}\n"]}

package/dist/mcp/oauth-route.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oauth-route.d.ts","sourceRoot":"","sources":["../../src/mcp/oauth-route.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AA2BlC,MAAM,WAAW,oBAAoB;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AA4HD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAIpE;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAItE;AAWD;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,EAAE,CAuB7D;AAED,wBAAgB,uCAAuC,CACrD,KAAK,EAAE,OAAO,GACb,MAAM,GAAG,SAAS,CAIpB;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAM7D;AAqBD,wBAAgB,uCAAuC,CACrD,KAAK,EAAE,OAAO,GACb,QAAQ,CAeV;AAED,wBAAgB,yCAAyC,CACvD,KAAK,EAAE,OAAO,GACb,QAAQ,CAsBV;AAyrBD,wBAAsB,cAAc,CAClC,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,oBAAyB,GACjC,OAAO,CAAC,QAAQ,CAAC,CAenB"}
+{"version":3,"file":"oauth-route.d.ts","sourceRoot":"","sources":["../../src/mcp/oauth-route.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAgClC,MAAM,WAAW,oBAAoB;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAiID,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAIpE;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAItE;AAWD;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,EAAE,CAuB7D;AAED,wBAAgB,uCAAuC,CACrD,KAAK,EAAE,OAAO,GACb,MAAM,GAAG,SAAS,CAIpB;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAM7D;AAqBD,wBAAgB,uCAAuC,CACrD,KAAK,EAAE,OAAO,GACb,QAAQ,CAeV;AAED,wBAAgB,yCAAyC,CACvD,KAAK,EAAE,OAAO,GACb,QAAQ,CAwBV;AAkrBD,wBAAsB,cAAc,CAClC,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,oBAAyB,GACjC,OAAO,CAAC,QAAQ,CAAC,CAenB"}

package/dist/mcp/oauth-route.js

@@ -13,9 +13,12 @@ import { getOrgDomain } from "../org/context.js";
 import { getConfiguredLoginHtml, getSession } from "../server/auth.js";
 import { getAuthSecret } from "../server/better-auth-instance.js";
 import { readBody } from "../server/h3-helpers.js";
+import { applicationTypeForRedirectUris, isAllowedOAuthRedirectUri, isUrlBasedOAuthClientId, resolveOAuthClientMetadataDocument, } from "./oauth-client-metadata.js";
 import { createOAuthCode, createOAuthRefreshToken, consumeOAuthCode, generateOpaqueToken, getOAuthClient, getOAuthCode, getOAuthRefreshToken, registerOAuthClient, touchOAuthRefreshToken, } from "./oauth-store.js";
-import { MCP_OAUTH_ACCESS_TOKEN_TTL_SECONDS, MCP_OAUTH_DEFAULT_SCOPE, MCP_OAUTH_SCOPES, normalizeOAuthScope, signMcpOAuthAccessToken, } from "./oauth-token.js";
+import { MCP_OAUTH_ACCESS_TOKEN_TTL_SECONDS, MCP_OAUTH_SCOPES, normalizeOAuthScope, signMcpOAuthAccessToken, } from "./oauth-token.js";
 import { MCP_PUBLIC_ROUTE_PREFIX, MCP_ROUTE_PREFIXES } from "./route-paths.js";
+const MCP_OAUTH_RESOURCE_SCOPES = MCP_OAUTH_SCOPES.filter((scope) => scope !== "offline_access");
+const MCP_OAUTH_RESOURCE_SCOPE = MCP_OAUTH_RESOURCE_SCOPES.join(" ");
 function json(body, status = 200) {
     return new Response(JSON.stringify(body), {
         status,
@@ -187,7 +190,7 @@ export function getMcpOAuthProtectedResourceMetadataUrl(event) {
 }
 export function buildMcpOAuthChallenge(event) {
     const metadata = getMcpOAuthProtectedResourceMetadataUrl(event);
-    const scope = MCP_OAUTH_DEFAULT_SCOPE;
+    const scope = MCP_OAUTH_RESOURCE_SCOPE;
     return metadata
         ? `Bearer resource_metadata="${metadata}", scope="${scope}"`
         : `Bearer scope="${scope}"`;
@@ -220,7 +223,7 @@ export function handleMcpOAuthProtectedResourceMetadata(event) {
     return json({
         resource,
         authorization_servers: [issuer],
-        scopes_supported: MCP_OAUTH_SCOPES,
+        scopes_supported: MCP_OAUTH_RESOURCE_SCOPES,
         resource_documentation: issuer,
     });
 }
@@ -245,54 +248,10 @@ export function handleMcpOAuthAuthorizationServerMetadata(event) {
         code_challenge_methods_supported: ["S256"],
         token_endpoint_auth_methods_supported: ["none"],
         scopes_supported: MCP_OAUTH_SCOPES,
+        authorization_response_iss_parameter_supported: true,
+        client_id_metadata_document_supported: true,
     });
 }
-// Schemes that must never be accepted as a redirect target: they can execute
-// script or read local resources if a redirect is ever rendered in a browser
-// or webview context.
-const DISALLOWED_REDIRECT_SCHEMES = new Set([
-    "javascript:",
-    "data:",
-    "vbscript:",
-    "file:",
-    "blob:",
-    "about:",
-]);
-// Native/desktop IDE clients (Cursor, VS Code, …) register a private-use URI
-// scheme callback such as `cursor://` or `vscode://` (RFC 8252 §7.1) instead of
-// an https/loopback URL. The authorization code is bound by PKCE (S256), so
-// delivering it through a client-registered app scheme is safe.
-function isPrivateUseRedirectScheme(protocol) {
-    if (DISALLOWED_REDIRECT_SCHEMES.has(protocol))
-        return false;
-    // RFC 3986 scheme grammar: ALPHA *( ALPHA / DIGIT / "+" / "-" / "." ), with a
-    // trailing ":" from URL.protocol. Require a non-http(s) custom scheme here;
-    // http/https are handled explicitly above.
-    return /^[a-z][a-z0-9+.-]*:$/.test(protocol);
-}
-function isAllowedRedirectUri(value) {
-    if (typeof value !== "string" || value.length > 2048)
-        return false;
-    try {
-        const url = new URL(value);
-        if (url.hash)
-            return false;
-        if (url.username || url.password)
-            return false;
-        if (url.protocol === "https:")
-            return true;
-        if (url.protocol === "http:") {
-            return (url.hostname === "localhost" ||
-                url.hostname === "127.0.0.1" ||
-                url.hostname === "::1" ||
-                url.hostname === "[::1]");
-        }
-        return isPrivateUseRedirectScheme(url.protocol);
-    }
-    catch {
-        return false;
-    }
-}
 function parseStringArray(value) {
     return Array.isArray(value)
         ? value.filter((item) => typeof item === "string")
@@ -306,7 +265,7 @@ async function handleRegister(event) {
     const redirectUris = parseStringArray(body.redirect_uris);
     if (redirectUris.length === 0 ||
         redirectUris.length > 20 ||
-        !redirectUris.every(isAllowedRedirectUri)) {
+        !redirectUris.every(isAllowedOAuthRedirectUri)) {
         return oauthError("invalid_client_metadata", "redirect_uris must contain valid HTTPS or localhost callback URLs");
     }
     const grantTypes = parseStringArray(body.grant_types);
@@ -324,6 +283,15 @@ async function handleRegister(event) {
     if (method !== "none") {
         return oauthError("invalid_client_metadata", "Only public OAuth clients are supported");
     }
+    const requestedApplicationType = typeof body.application_type === "string"
+        ? body.application_type
+        : undefined;
+    if (requestedApplicationType &&
+        requestedApplicationType !== "native" &&
+        requestedApplicationType !== "web") {
+        return oauthError("invalid_client_metadata", "application_type must be native or web");
+    }
+    const applicationType = requestedApplicationType ?? applicationTypeForRedirectUris(redirectUris);
     const clientName = typeof body.client_name === "string"
         ? body.client_name.trim().slice(0, 120)
         : null;
@@ -351,11 +319,13 @@ async function handleRegister(event) {
         grant_types: client.grantTypes,
         response_types: client.responseTypes,
         token_endpoint_auth_method: client.tokenEndpointAuthMethod,
+        application_type: applicationType,
     }, 201);
 }
 function redirectWithOAuthError(params) {
     const url = new URL(params.redirectUri);
     url.searchParams.set("error", params.error);
+    url.searchParams.set("iss", params.issuer);
     if (params.description) {
         url.searchParams.set("error_description", params.description);
     }
@@ -366,6 +336,7 @@ function redirectWithOAuthError(params) {
 function buildCodeRedirectUrl(params) {
     const url = new URL(params.redirectUri);
     url.searchParams.set("code", params.code);
+    url.searchParams.set("iss", params.issuer);
     if (params.state)
         url.searchParams.set("state", params.state);
     return url.toString();
@@ -467,6 +438,7 @@ function renderConsentPage(params) {
   <h1>Authorize ${escapeHtml(params.clientName)}</h1>
   <p>${escapeHtml(params.appName)} will let this MCP client act as ${escapeHtml(params.email)} for these scopes:</p>
   <ul>${scopes}</ul>
+  <p>After authorization, your browser will return to <code>${escapeHtml(params.redirectUri)}</code>.</p>
   <form method="post">
     ${hidden}
     <div class="actions">
@@ -561,6 +533,7 @@ async function handleAuthorize(event, options) {
         return oauthError("invalid_request", "Cross-origin authorize POST rejected", 403);
     }
     const params = await readOAuthParams(event);
+    const issuer = getMcpOAuthIssuer(event);
     const state = params.state;
     const clientId = params.client_id;
     const redirectUri = params.redirect_uri;
@@ -571,6 +544,7 @@ async function handleAuthorize(event, options) {
     }
     if (!clientId ||
         !redirectUri ||
+        !issuer ||
         !resource ||
         !expectedResources.includes(resource)) {
         return oauthError("invalid_request", "Invalid OAuth authorization request");
@@ -578,7 +552,9 @@ async function handleAuthorize(event, options) {
     if (params.code_challenge_method !== "S256" || !params.code_challenge) {
         return oauthError("invalid_request", "PKCE S256 is required");
     }
-    const client = await getOAuthClient(clientId);
+    const client = isUrlBasedOAuthClientId(clientId)
+        ? await resolveOAuthClientMetadataDocument(clientId).catch(() => null)
+        : await getOAuthClient(clientId);
     if (!client || !client.redirectUris.includes(redirectUri)) {
         return oauthError("invalid_client", "Unknown client or redirect_uri");
     }
@@ -587,6 +563,7 @@ async function handleAuthorize(event, options) {
         if (params.prompt === "none") {
             return redirectWithOAuthError({
                 redirectUri,
+                issuer,
                 state,
                 error: "login_required",
             });
@@ -600,6 +577,7 @@ async function handleAuthorize(event, options) {
     if (!scope) {
         return redirectWithOAuthError({
             redirectUri,
+            issuer,
             state,
             error: "invalid_scope",
         });
@@ -609,6 +587,7 @@ async function handleAuthorize(event, options) {
             appName: options.appName || options.appId || "Agent Native",
             email: session.email,
             clientName: client.clientName || client.clientId,
+            redirectUri,
             scopes: scope.split(/\s+/),
             fields: {
                 response_type: "code",
@@ -643,6 +622,7 @@ async function handleAuthorize(event, options) {
     if (params.decision !== "approve") {
         return redirectWithOAuthError({
             redirectUri,
+            issuer,
             state,
             error: "access_denied",
         });
@@ -670,7 +650,7 @@ async function handleAuthorize(event, options) {
         isDeepLinkRedirect =
             protocol !== "http:" &&
                 protocol !== "https:" &&
-                isPrivateUseRedirectScheme(protocol);
+                /^[a-z][a-z0-9+.-]*:$/.test(protocol);
     }
     catch {
         isDeepLinkRedirect = false;
@@ -681,12 +661,18 @@ async function handleAuthorize(event, options) {
             clientName: client.clientName ?? null,
             redirectUrl: buildCodeRedirectUrl({
                 redirectUri,
+                issuer,
                 state,
                 code: code.code,
             }),
         }));
     }
-    return redirectWithCode({ redirectUri, state, code: code.code });
+    return redirectWithCode({
+        redirectUri,
+        issuer,
+        state,
+        code: code.code,
+    });
 }
 async function issueTokenSet(params) {
     const refreshToken = generateOpaqueToken();