@ai-sdk/mcp 1.0.89 → 1.0.91

package/dist/index.mjs

@@ -529,6 +529,8 @@ function checkResourceAllowed({
 
 // src/tool/oauth.ts
 import {
+  fetchWithValidatedEndpoint,
+  fetchWithValidatedRedirects,
   parseJSON as parseJSON2,
   validateDownloadUrl
 } from "@ai-sdk/provider-utils";
@@ -545,8 +547,8 @@ function isOAuthLoopbackHost(hostname) {
   const normalized = hostname.toLowerCase().replace(/\.+$/, "");
   return normalized === "localhost" || normalized.endsWith(".localhost") || normalized === "127.0.0.1" || normalized === "[::1]" || normalized === "::1";
 }
-function assertSafeOAuthEndpoint(endpointUrl) {
-  if ((endpointUrl.protocol === "http:" || endpointUrl.protocol === "https:") && isOAuthLoopbackHost(endpointUrl.hostname)) {
+function assertSafeOAuthEndpoint(endpointUrl, { allowLoopback = false } = {}) {
+  if (allowLoopback && (endpointUrl.protocol === "http:" || endpointUrl.protocol === "https:") && isOAuthLoopbackHost(endpointUrl.hostname)) {
     return;
   }
   try {
@@ -558,6 +560,10 @@ function assertSafeOAuthEndpoint(endpointUrl) {
     });
   }
 }
+function getTrustedLoopbackOrigin(authorizationServerUrl) {
+  const url = new URL(authorizationServerUrl);
+  return isOAuthLoopbackHost(url.hostname) ? url.origin : void 0;
+}
 function createAuthorizationServerInformation(authorizationServerUrl, metadata) {
   return {
     authorizationServerUrl: normalizeUrl(authorizationServerUrl),
@@ -697,13 +703,27 @@ function buildWellKnownPath(wellKnownPrefix, pathname = "", options = {}) {
   }
   return options.prependPathname ? `${pathname}/.well-known/${wellKnownPrefix}` : `/.well-known/${wellKnownPrefix}${pathname}`;
 }
-async function fetchWithCorsRetry(url, headers, fetchFn = fetch) {
+async function fetchWithCorsRetry(url, headers, fetchFn = fetch, trustedOrigin) {
   try {
-    return await fetchFn(url, { headers });
+    return await fetchWithValidatedRedirects({
+      url: url.href,
+      fetch: async (input, init) => fetchWithValidatedEndpoint({
+        url: input,
+        init: {
+          ...init,
+          headers: new Headers(init == null ? void 0 : init.headers).has("MCP-Protocol-Version") ? headers : void 0
+        },
+        fetch: fetchFn,
+        trustedOrigin,
+        redirect: "manual"
+      }),
+      headers,
+      trustedOrigin
+    });
   } catch (error) {
     if (error instanceof TypeError) {
       if (headers) {
-        return fetchWithCorsRetry(url, void 0, fetchFn);
+        return fetchWithCorsRetry(url, void 0, fetchFn, trustedOrigin);
       } else {
         return void 0;
       }
@@ -711,11 +731,11 @@ async function fetchWithCorsRetry(url, headers, fetchFn = fetch) {
     throw error;
   }
 }
-async function tryMetadataDiscovery(url, protocolVersion, fetchFn = fetch) {
+async function tryMetadataDiscovery(url, protocolVersion, fetchFn = fetch, trustedOrigin) {
   const headers = {
     "MCP-Protocol-Version": protocolVersion
   };
-  return await fetchWithCorsRetry(url, headers, fetchFn);
+  return await fetchWithCorsRetry(url, headers, fetchFn, trustedOrigin);
 }
 function shouldAttemptFallback(response, pathname) {
   return !response || response.status >= 400 && response.status < 500 && pathname !== "/";
@@ -732,10 +752,20 @@ async function discoverMetadataWithFallback(serverUrl, wellKnownType, fetchFn, o
     url = new URL(wellKnownPath, (_b3 = opts == null ? void 0 : opts.metadataServerUrl) != null ? _b3 : issuer);
     url.search = issuer.search;
   }
-  let response = await tryMetadataDiscovery(url, protocolVersion, fetchFn);
+  let response = await tryMetadataDiscovery(
+    url,
+    protocolVersion,
+    fetchFn,
+    opts == null ? void 0 : opts.trustedOrigin
+  );
   if (!(opts == null ? void 0 : opts.metadataUrl) && shouldAttemptFallback(response, issuer.pathname)) {
     const rootUrl = new URL(`/.well-known/${wellKnownType}`, issuer);
-    response = await tryMetadataDiscovery(rootUrl, protocolVersion, fetchFn);
+    response = await tryMetadataDiscovery(
+      rootUrl,
+      protocolVersion,
+      fetchFn,
+      opts == null ? void 0 : opts.trustedOrigin
+    );
   }
   return response;
 }
@@ -746,7 +776,10 @@ async function discoverOAuthProtectedResourceMetadata(serverUrl, opts, fetchFn =
     fetchFn,
     {
       protocolVersion: opts == null ? void 0 : opts.protocolVersion,
-      metadataUrl: opts == null ? void 0 : opts.resourceMetadataUrl
+      metadataUrl: opts == null ? void 0 : opts.resourceMetadataUrl,
+      // The configured MCP server is trusted as a request target. Redirects
+      // crossing its origin are still validated before they are followed.
+      trustedOrigin: new URL(serverUrl).origin
     }
   );
   if (!response || response.status === 404) {
@@ -819,13 +852,19 @@ function assertMetadataIssuerMatches(metadata, expectedIssuer) {
 }
 async function discoverAuthorizationServerMetadata(authorizationServerUrl, {
   fetchFn = fetch,
-  protocolVersion = LATEST_PROTOCOL_VERSION
+  protocolVersion = LATEST_PROTOCOL_VERSION,
+  trustedOrigin
 } = {}) {
   var _a3;
   const headers = { "MCP-Protocol-Version": protocolVersion };
   const urlsToTry = buildDiscoveryUrls(authorizationServerUrl);
   for (const { url: endpointUrl, type, expectedIssuer } of urlsToTry) {
-    const response = await fetchWithCorsRetry(endpointUrl, headers, fetchFn);
+    const response = await fetchWithCorsRetry(
+      endpointUrl,
+      headers,
+      fetchFn,
+      trustedOrigin
+    );
     if (!response) {
       continue;
     }
@@ -991,7 +1030,10 @@ async function exchangeAuthorization(authorizationServerUrl, {
   var _a3;
   const grantType = "authorization_code";
   const tokenUrl = (metadata == null ? void 0 : metadata.token_endpoint) ? new URL(metadata.token_endpoint) : new URL("/token", authorizationServerUrl);
-  assertSafeOAuthEndpoint(tokenUrl);
+  const trustedOrigin = getTrustedLoopbackOrigin(authorizationServerUrl);
+  assertSafeOAuthEndpoint(tokenUrl, {
+    allowLoopback: tokenUrl.origin === trustedOrigin
+  });
   if ((metadata == null ? void 0 : metadata.grant_types_supported) && !metadata.grant_types_supported.includes(grantType)) {
     throw new Error(
       `Incompatible auth server: does not support grant type ${grantType}`
@@ -1025,11 +1067,15 @@ async function exchangeAuthorization(authorizationServerUrl, {
   if (resource) {
     params.set("resource", resourceUrlStripSlash(resource));
   }
-  const response = await (fetchFn != null ? fetchFn : fetch)(tokenUrl, {
-    method: "POST",
-    headers,
-    body: params,
-    redirect: "error"
+  const response = await fetchWithValidatedEndpoint({
+    url: tokenUrl,
+    init: {
+      method: "POST",
+      headers,
+      body: params
+    },
+    fetch: fetchFn,
+    trustedOrigin
   });
   if (!response.ok) {
     throw await parseErrorResponse(response);
@@ -1057,7 +1103,10 @@ async function refreshAuthorization(authorizationServerUrl, {
   } else {
     tokenUrl = new URL("/token", authorizationServerUrl);
   }
-  assertSafeOAuthEndpoint(tokenUrl);
+  const trustedOrigin = getTrustedLoopbackOrigin(authorizationServerUrl);
+  assertSafeOAuthEndpoint(tokenUrl, {
+    allowLoopback: tokenUrl.origin === trustedOrigin
+  });
   const headers = new Headers({
     "Content-Type": "application/x-www-form-urlencoded",
     Accept: "application/json"
@@ -1084,11 +1133,15 @@ async function refreshAuthorization(authorizationServerUrl, {
   if (resource) {
     params.set("resource", resourceUrlStripSlash(resource));
   }
-  const response = await (fetchFn != null ? fetchFn : fetch)(tokenUrl, {
-    method: "POST",
-    headers,
-    body: params,
-    redirect: "error"
+  const response = await fetchWithValidatedEndpoint({
+    url: tokenUrl,
+    init: {
+      method: "POST",
+      headers,
+      body: params
+    },
+    fetch: fetchFn,
+    trustedOrigin
   });
   if (!response.ok) {
     throw await parseErrorResponse(response);
@@ -1114,14 +1167,21 @@ async function registerClient(authorizationServerUrl, {
   } else {
     registrationUrl = new URL("/register", authorizationServerUrl);
   }
-  assertSafeOAuthEndpoint(registrationUrl);
-  const response = await (fetchFn != null ? fetchFn : fetch)(registrationUrl, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json"
+  const trustedOrigin = getTrustedLoopbackOrigin(authorizationServerUrl);
+  assertSafeOAuthEndpoint(registrationUrl, {
+    allowLoopback: registrationUrl.origin === trustedOrigin
+  });
+  const response = await fetchWithValidatedEndpoint({
+    url: registrationUrl,
+    init: {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify(clientMetadata)
     },
-    body: JSON.stringify(clientMetadata),
-    redirect: "error"
+    fetch: fetchFn,
+    trustedOrigin
   });
   if (!response.ok) {
     throw await parseErrorResponse(response);
@@ -1130,8 +1190,9 @@ async function registerClient(authorizationServerUrl, {
 }
 async function auth(provider, options) {
   var _a3, _b3, _c;
+  const refreshAttempt = {};
   try {
-    return await authInternal(provider, options);
+    return await authInternal(provider, options, refreshAttempt);
   } catch (error) {
     if (error instanceof InvalidClientError || error instanceof UnauthorizedClientError) {
       if (options.authorizationCode !== void 0 || !await ((_a3 = provider.isClientInformationDynamicallyRegistered) == null ? void 0 : _a3.call(provider))) {
@@ -1139,8 +1200,10 @@ async function auth(provider, options) {
       }
       await ((_b3 = provider.invalidateCredentials) == null ? void 0 : _b3.call(provider, "all"));
       return await authInternal(provider, options);
-    } else if (error instanceof InvalidGrantError) {
-      await ((_c = provider.invalidateCredentials) == null ? void 0 : _c.call(provider, "tokens"));
+    } else if (error instanceof InvalidGrantError && refreshAttempt.tokens) {
+      await ((_c = provider.invalidateCredentials) == null ? void 0 : _c.call(provider, "tokens", {
+        tokens: refreshAttempt.tokens
+      }));
       return await authInternal(provider, options);
     }
     throw error;
@@ -1174,7 +1237,7 @@ async function authInternal(provider, {
   scope,
   resourceMetadataUrl,
   fetchFn
-}) {
+}, refreshAttempt) {
   var _a3, _b3, _c;
   let resourceMetadata;
   let authorizationServerUrl;
@@ -1204,6 +1267,14 @@ async function authInternal(provider, {
   if (!authorizationServerUrl) {
     authorizationServerUrl = (_a3 = callbackAuthorizationServerInformation == null ? void 0 : callbackAuthorizationServerInformation.authorizationServerUrl) != null ? _a3 : serverUrl;
   }
+  const parsedServerUrl = new URL(serverUrl);
+  const parsedAuthorizationServerUrl = new URL(authorizationServerUrl);
+  const serverOrigin = parsedServerUrl.origin;
+  const authorizationServerOrigin = parsedAuthorizationServerUrl.origin;
+  const trustedAuthorizationServerOrigin = authorizationServerOrigin === serverOrigin || isOAuthLoopbackHost(parsedServerUrl.hostname) && isOAuthLoopbackHost(parsedAuthorizationServerUrl.hostname) ? authorizationServerOrigin : void 0;
+  if (!trustedAuthorizationServerOrigin) {
+    assertSafeOAuthEndpoint(new URL(authorizationServerUrl));
+  }
   const resource = await selectResourceURL(
     serverUrl,
     provider,
@@ -1217,7 +1288,8 @@ async function authInternal(provider, {
   const metadata = await discoverAuthorizationServerMetadata(
     authorizationServerUrl,
     {
-      fetchFn
+      fetchFn,
+      trustedOrigin: trustedAuthorizationServerOrigin
     }
   );
   const currentAuthorizationServerInformation = createAuthorizationServerInformation(authorizationServerUrl, metadata);
@@ -1309,10 +1381,15 @@ async function authInternal(provider, {
         currentAuthorizationServerInformation
       });
     } else {
-      await ((_c = provider.invalidateCredentials) == null ? void 0 : _c.call(provider, "tokens"));
+      await ((_c = provider.invalidateCredentials) == null ? void 0 : _c.call(provider, "tokens", {
+        tokens: { ...tokens }
+      }));
     }
     try {
       if (storedAuthorizationServerInformation) {
+        if (refreshAttempt) {
+          refreshAttempt.tokens = { ...tokens };
+        }
         const newTokens = await refreshAuthorization(authorizationServerUrl, {
           metadata,
           clientInformation,