@google/gemini-cli-a2a-server 0.58.0-preview.0 → 0.59.0-nightly.20260827.g3c311beac

package/dist/a2a-server.mjs

@@ -891,15 +891,15 @@ var require_colorize = __commonJS({
        * function colorize (lookup, level, message)
        * Performs multi-step colorization using @colors/colors/safe
        */
-      colorize(lookup, level, message) {
+      colorize(lookup2, level, message) {
         if (typeof message === "undefined") {
           message = level;
         }
-        if (!Array.isArray(_Colorizer.allColors[lookup])) {
-          return colors[_Colorizer.allColors[lookup]](message);
+        if (!Array.isArray(_Colorizer.allColors[lookup2])) {
+          return colors[_Colorizer.allColors[lookup2]](message);
         }
-        for (let i3 = 0, len = _Colorizer.allColors[lookup].length; i3 < len; i3++) {
-          message = colors[_Colorizer.allColors[lookup][i3]](message);
+        for (let i3 = 0, len = _Colorizer.allColors[lookup2].length; i3 < len; i3++) {
+          message = colors[_Colorizer.allColors[lookup2][i3]](message);
         }
         return message;
       }
@@ -27762,7 +27762,7 @@ var require_mime_types = __commonJS({
     exports2.contentType = contentType;
     exports2.extension = extension;
     exports2.extensions = /* @__PURE__ */ Object.create(null);
-    exports2.lookup = lookup;
+    exports2.lookup = lookup2;
     exports2.types = /* @__PURE__ */ Object.create(null);
     exports2._extensionConflicts = [];
     populateMaps(exports2.extensions, exports2.types);
@@ -27805,7 +27805,7 @@ var require_mime_types = __commonJS({
       }
       return exts[0];
     }
-    function lookup(path99) {
+    function lookup2(path99) {
       if (!path99 || typeof path99 !== "string") {
         return false;
       }
@@ -31311,7 +31311,7 @@ var require_view = __commonJS({
       this.engine = opts.engines[this.ext];
       this.path = this.lookup(fileName);
     }
-    View.prototype.lookup = function lookup(name3) {
+    View.prototype.lookup = function lookup2(name3) {
       var path100;
       var roots = [].concat(this.root);
       debug2('lookup "%s"', name3);
@@ -43576,12 +43576,12 @@ var require_base64_js = __commonJS({
     exports2.byteLength = byteLength;
     exports2.toByteArray = toByteArray;
     exports2.fromByteArray = fromByteArray;
-    var lookup = [];
+    var lookup2 = [];
     var revLookup = [];
     var Arr = typeof Uint8Array !== "undefined" ? Uint8Array : Array;
     var code = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
     for (i3 = 0, len = code.length; i3 < len; ++i3) {
-      lookup[i3] = code[i3];
+      lookup2[i3] = code[i3];
       revLookup[code.charCodeAt(i3)] = i3;
     }
     var i3;
@@ -43634,7 +43634,7 @@ var require_base64_js = __commonJS({
       return arr;
     }
     function tripletToBase64(num) {
-      return lookup[num >> 18 & 63] + lookup[num >> 12 & 63] + lookup[num >> 6 & 63] + lookup[num & 63];
+      return lookup2[num >> 18 & 63] + lookup2[num >> 12 & 63] + lookup2[num >> 6 & 63] + lookup2[num & 63];
     }
     function encodeChunk(uint8, start2, end) {
       var tmp;
@@ -43657,12 +43657,12 @@ var require_base64_js = __commonJS({
       if (extraBytes === 1) {
         tmp = uint8[len2 - 1];
         parts2.push(
-          lookup[tmp >> 2] + lookup[tmp << 4 & 63] + "=="
+          lookup2[tmp >> 2] + lookup2[tmp << 4 & 63] + "=="
         );
       } else if (extraBytes === 2) {
         tmp = (uint8[len2 - 2] << 8) + uint8[len2 - 1];
         parts2.push(
-          lookup[tmp >> 10] + lookup[tmp >> 4 & 63] + lookup[tmp << 2 & 63] + "="
+          lookup2[tmp >> 10] + lookup2[tmp >> 4 & 63] + lookup2[tmp << 2 & 63] + "="
         );
       }
       return parts2.join("");
@@ -71326,11 +71326,11 @@ var require_suffix_array = __commonJS({
         }
       }
     }
-    function compare(string3, lookup, m3, n2) {
-      return string3[m3] - string3[n2] || (m3 % 3 === 2 ? string3[m3 + 1] - string3[n2 + 1] || lookup[m3 + 2] - lookup[n2 + 2] : lookup[m3 + 1] - lookup[n2 + 1]);
+    function compare(string3, lookup2, m3, n2) {
+      return string3[m3] - string3[n2] || (m3 % 3 === 2 ? string3[m3 + 1] - string3[n2 + 1] || lookup2[m3 + 2] - lookup2[n2 + 2] : lookup2[m3 + 1] - lookup2[n2 + 1]);
     }
     function build(string3, l2) {
-      var a = [], b2 = [], al = 2 * l2 / 3 | 0, bl = l2 - al, r3 = al + 1 >> 1, i3 = al, j2 = 0, k2, lookup = [], result2 = [];
+      var a = [], b2 = [], al = 2 * l2 / 3 | 0, bl = l2 - al, r3 = al + 1 >> 1, i3 = al, j2 = 0, k2, lookup2 = [], result2 = [];
       if (l2 === 1)
         return [0];
       while (i3--)
@@ -71349,9 +71349,9 @@ var require_suffix_array = __commonJS({
           a[i3] = b2[i3] < r3 ? b2[i3] * 3 + 1 : (b2[i3] - r3) * 3 + 2;
       }
       for (i3 = al; i3--; )
-        lookup[a[i3]] = i3;
-      lookup[l2] = -1;
-      lookup[l2 + 1] = -2;
+        lookup2[a[i3]] = i3;
+      lookup2[l2] = -1;
+      lookup2[l2 + 1] = -2;
       b2 = l2 % 3 === 1 ? [l2 - 1] : [];
       for (i3 = 0; i3 < al; i3++) {
         if (a[i3] % 3 === 1)
@@ -71359,7 +71359,7 @@ var require_suffix_array = __commonJS({
       }
       sort(string3, b2, 0);
       for (i3 = 0, j2 = 0, k2 = 0; i3 < al && j2 < bl; )
-        result2[k2++] = compare(string3, lookup, a[i3], b2[j2]) < 0 ? a[i3++] : b2[j2++];
+        result2[k2++] = compare(string3, lookup2, a[i3], b2[j2]) < 0 ? a[i3++] : b2[j2++];
       while (i3 < al)
         result2[k2++] = a[i3++];
       while (j2 < bl)
@@ -149010,7 +149010,7 @@ var require_namespace = __commonJS({
       });
       return this;
     };
-    Namespace.prototype.lookup = function lookup(path99, filterTypes, parentAlreadyChecked) {
+    Namespace.prototype.lookup = function lookup2(path99, filterTypes, parentAlreadyChecked) {
       if (typeof filterTypes === "boolean") {
         parentAlreadyChecked = filterTypes;
         filterTypes = void 0;
@@ -149045,7 +149045,7 @@ var require_namespace = __commonJS({
       }
       return null;
     };
-    Namespace.prototype._lookupImpl = function lookup(path99, flatPath) {
+    Namespace.prototype._lookupImpl = function lookup2(path99, flatPath) {
       if (Object.prototype.hasOwnProperty.call(this._lookupCache, flatPath)) {
         return this._lookupCache[flatPath];
       }
@@ -221064,8 +221064,8 @@ var GIT_COMMIT_INFO, CLI_VERSION;
 var init_git_commit = __esm({
   "packages/core/dist/src/generated/git-commit.js"() {
     "use strict";
-    GIT_COMMIT_INFO = "812f7a2bc";
-    CLI_VERSION = "0.58.0-preview.0";
+    GIT_COMMIT_INFO = "3c311beac";
+    CLI_VERSION = "0.59.0-nightly.20260827.g3c311beac";
   }
 });
 
@@ -322929,7 +322929,7 @@ var require_dns = __commonJS({
   "packages/core/node_modules/undici/lib/interceptor/dns.js"(exports2, module2) {
     "use strict";
     var { isIP: isIP3 } = __require("node:net");
-    var { lookup } = __require("node:dns");
+    var { lookup: lookup2 } = __require("node:dns");
     var DecoratorHandler = require_decorator_handler();
     var { InvalidArgumentError, InformationalError } = require_errors7();
     var maxInt = Math.pow(2, 31) - 1;
@@ -323019,7 +323019,7 @@ var require_dns = __commonJS({
         }
       }
       #defaultLookup(origin, opts, cb) {
-        lookup(
+        lookup2(
           origin.hostname,
           {
             all: true,
@@ -336796,7 +336796,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.58.0-preview.0";
+    return "0.59.0-nightly.20260827.g3c311beac";
   })();
   return versionPromise;
 }
@@ -359661,6 +359661,10 @@ function updateGlobalFetchTimeouts(timeoutMs) {
 function sanitizeHostname(hostname3) {
   return hostname3.startsWith("[") && hostname3.endsWith("]") ? hostname3.slice(1, -1) : hostname3;
 }
+function isLoopbackHost(hostname3) {
+  const sanitized = sanitizeHostname(hostname3);
+  return sanitized === "localhost" || sanitized === "127.0.0.1" || sanitized === "::1";
+}
 function isPrivateIp(url5) {
   try {
     const hostname3 = new URL7(url5).hostname;
@@ -374542,18 +374546,97 @@ var init_http_provider = __esm({
 });
 
 // packages/core/dist/src/mcp/oauth-utils.js
-var ResourceMismatchError, FIVE_MIN_BUFFER_MS, OAuthUtils;
+import { lookup } from "node:dns/promises";
+function isLoopbackUrl(urlStr) {
+  try {
+    const url5 = new URL(urlStr);
+    return isLoopbackHost(url5.hostname);
+  } catch {
+    return false;
+  }
+}
+async function validateOAuthEndpointUrl(urlStr, options) {
+  let resolvedUrl = urlStr.trim();
+  if (options?.allowRelative && options.baseUri) {
+    try {
+      resolvedUrl = new URL(resolvedUrl, options.baseUri).toString();
+    } catch (e3) {
+      throw new OAuthSecurityError(`Failed to resolve relative OAuth URL "${urlStr}" against base "${options.baseUri}": ${getErrorMessage(e3)}`);
+    }
+  }
+  let parsed;
+  try {
+    parsed = new URL(resolvedUrl);
+  } catch (e3) {
+    throw new OAuthSecurityError(`Invalid OAuth endpoint URL "${resolvedUrl}": ${getErrorMessage(e3)}`);
+  }
+  const isHttp = parsed.protocol === "http:";
+  const isHttps = parsed.protocol === "https:";
+  if (!isHttp && !isHttps) {
+    throw new OAuthSecurityError(`Invalid OAuth endpoint protocol "${parsed.protocol}". Only HTTPS (and HTTP for local development) is supported.`);
+  }
+  const hostname3 = sanitizeHostname(parsed.hostname);
+  const isLoopback = isLoopbackHost(hostname3);
+  if (isHttp && (!options?.allowLoopback || !isLoopback)) {
+    throw new OAuthSecurityError(`Insecure HTTP OAuth endpoint "${resolvedUrl}" is not allowed. OAuth endpoints must use HTTPS unless connecting to localhost.`);
+  }
+  if (options?.expectedOrigin) {
+    let expected;
+    try {
+      expected = new URL(options.expectedOrigin).origin;
+    } catch {
+      throw new OAuthSecurityError(`Invalid expected origin "${options.expectedOrigin}".`);
+    }
+    if (parsed.origin !== expected) {
+      throw new OAuthSecurityError(`OAuth endpoint origin "${parsed.origin}" does not match expected origin "${expected}".`);
+    }
+  }
+  if (isLoopback) {
+    if (!options?.allowLoopback) {
+      throw new OAuthSecurityError(`Loopback OAuth endpoint "${resolvedUrl}" is not allowed for remote MCP servers.`);
+    }
+    return parsed.toString();
+  }
+  if (isAddressPrivate(hostname3)) {
+    throw new OAuthSecurityError(`OAuth endpoint "${resolvedUrl}" points to private or reserved IP address which is blocked.`);
+  }
+  try {
+    const addresses = await lookup(hostname3, { all: true });
+    if (!addresses || addresses.length === 0) {
+      throw new OAuthSecurityError(`Failed to resolve hostname "${hostname3}" for OAuth endpoint "${resolvedUrl}".`);
+    }
+    for (const addr2 of addresses) {
+      if (isAddressPrivate(addr2.address)) {
+        throw new OAuthSecurityError(`OAuth endpoint "${resolvedUrl}" resolves to private network address "${addr2.address}" which is blocked.`);
+      }
+    }
+  } catch (error2) {
+    if (error2 instanceof OAuthSecurityError) {
+      throw error2;
+    }
+    throw new OAuthSecurityError(`DNS lookup failed for OAuth endpoint host "${hostname3}": ${getErrorMessage(error2)}`);
+  }
+  return parsed.toString();
+}
+var ResourceMismatchError, OAuthSecurityError, FIVE_MIN_BUFFER_MS, OAuthUtils;
 var init_oauth_utils = __esm({
   "packages/core/dist/src/mcp/oauth-utils.js"() {
     "use strict";
     init_errors2();
     init_debugLogger();
+    init_fetch();
     ResourceMismatchError = class extends Error {
       constructor(message) {
         super(message);
         this.name = "ResourceMismatchError";
       }
     };
+    OAuthSecurityError = class extends Error {
+      constructor(message) {
+        super(message);
+        this.name = "OAuthSecurityError";
+      }
+    };
     FIVE_MIN_BUFFER_MS = 5 * 60 * 1e3;
     OAuthUtils = class {
       /**
@@ -374583,16 +374666,24 @@ var init_oauth_utils = __esm({
        * Fetch OAuth protected resource metadata.
        *
        * @param resourceMetadataUrl The protected resource metadata URL
+       * @param options Validation options including loopback allowance and expected origin
        * @returns The protected resource metadata or null if not available
        */
-      static async fetchProtectedResourceMetadata(resourceMetadataUrl) {
+      static async fetchProtectedResourceMetadata(resourceMetadataUrl, options) {
         try {
-          const response = await fetch(resourceMetadataUrl);
+          const validatedUrl = await validateOAuthEndpointUrl(resourceMetadataUrl, {
+            allowLoopback: options?.allowLoopback,
+            expectedOrigin: options?.expectedOrigin
+          });
+          const response = await fetch(validatedUrl);
           if (!response.ok) {
             return null;
           }
           return await response.json();
         } catch (error2) {
+          if (error2 instanceof OAuthSecurityError) {
+            throw error2;
+          }
           debugLogger.debug(`Failed to fetch protected resource metadata from ${resourceMetadataUrl}: ${getErrorMessage(error2)}`);
           return null;
         }
@@ -374601,16 +374692,23 @@ var init_oauth_utils = __esm({
        * Fetch OAuth authorization server metadata.
        *
        * @param authServerMetadataUrl The authorization server metadata URL
+       * @param options Validation options including loopback allowance
        * @returns The authorization server metadata or null if not available
        */
-      static async fetchAuthorizationServerMetadata(authServerMetadataUrl) {
+      static async fetchAuthorizationServerMetadata(authServerMetadataUrl, options) {
         try {
-          const response = await fetch(authServerMetadataUrl);
+          const validatedUrl = await validateOAuthEndpointUrl(authServerMetadataUrl, {
+            allowLoopback: options?.allowLoopback
+          });
+          const response = await fetch(validatedUrl);
           if (!response.ok) {
             return null;
           }
           return await response.json();
         } catch (error2) {
+          if (error2 instanceof OAuthSecurityError) {
+            throw error2;
+          }
           debugLogger.debug(`Failed to fetch authorization server metadata from ${authServerMetadataUrl}: ${getErrorMessage(error2)}`);
           return null;
         }
@@ -374635,10 +374733,14 @@ var init_oauth_utils = __esm({
        * trying the standard well-known endpoints.
        *
        * @param authServerUrl The authorization server URL
+       * @param options Validation options including loopback allowance
        * @returns The authorization server metadata or null if not found
        */
-      static async discoverAuthorizationServerMetadata(authServerUrl) {
-        const authServerUrlObj = new URL(authServerUrl);
+      static async discoverAuthorizationServerMetadata(authServerUrl, options) {
+        const validatedBaseUrl = await validateOAuthEndpointUrl(authServerUrl, {
+          allowLoopback: options?.allowLoopback
+        });
+        const authServerUrlObj = new URL(validatedBaseUrl);
         const base = `${authServerUrlObj.protocol}//${authServerUrlObj.host}`;
         const endpointsToTry = [];
         if (authServerUrlObj.pathname !== "/") {
@@ -374649,7 +374751,7 @@ var init_oauth_utils = __esm({
         endpointsToTry.push(new URL("/.well-known/oauth-authorization-server", base).toString());
         endpointsToTry.push(new URL("/.well-known/openid-configuration", base).toString());
         for (const endpoint of endpointsToTry) {
-          const authServerMetadata = await this.fetchAuthorizationServerMetadata(endpoint);
+          const authServerMetadata = await this.fetchAuthorizationServerMetadata(endpoint, options);
           if (authServerMetadata) {
             return authServerMetadata;
           }
@@ -374665,13 +374767,15 @@ var init_oauth_utils = __esm({
        */
       static async discoverOAuthConfig(serverUrl) {
         try {
+          const allowLoopback = isLoopbackUrl(serverUrl);
+          const expectedOrigin = new URL(serverUrl).origin;
           const wellKnownUrls = this.buildWellKnownUrls(serverUrl);
-          let resourceMetadata = await this.fetchProtectedResourceMetadata(wellKnownUrls.protectedResource);
+          let resourceMetadata = await this.fetchProtectedResourceMetadata(wellKnownUrls.protectedResource, { allowLoopback, expectedOrigin });
           if (!resourceMetadata) {
             const url5 = new URL(serverUrl);
             if (url5.pathname && url5.pathname !== "/") {
               const rootBasedUrls = this.buildWellKnownUrls(serverUrl, true);
-              resourceMetadata = await this.fetchProtectedResourceMetadata(rootBasedUrls.protectedResource);
+              resourceMetadata = await this.fetchProtectedResourceMetadata(rootBasedUrls.protectedResource, { allowLoopback, expectedOrigin });
             }
           }
           if (resourceMetadata) {
@@ -374682,7 +374786,9 @@ var init_oauth_utils = __esm({
           }
           if (resourceMetadata?.authorization_servers?.length) {
             const authServerUrl = resourceMetadata.authorization_servers[0];
-            const authServerMetadata2 = await this.discoverAuthorizationServerMetadata(authServerUrl);
+            const authServerMetadata2 = await this.discoverAuthorizationServerMetadata(authServerUrl, {
+              allowLoopback
+            });
             if (authServerMetadata2) {
               const config2 = this.metadataToOAuthConfig(authServerMetadata2);
               if (authServerMetadata2.registration_endpoint) {
@@ -374692,7 +374798,9 @@ var init_oauth_utils = __esm({
             }
           }
           debugLogger.debug(`Trying OAuth discovery fallback at ${serverUrl}`);
-          const authServerMetadata = await this.discoverAuthorizationServerMetadata(serverUrl);
+          const authServerMetadata = await this.discoverAuthorizationServerMetadata(serverUrl, {
+            allowLoopback
+          });
           if (authServerMetadata) {
             const config2 = this.metadataToOAuthConfig(authServerMetadata);
             if (authServerMetadata.registration_endpoint) {
@@ -374702,7 +374810,7 @@ var init_oauth_utils = __esm({
           }
           return null;
         } catch (error2) {
-          if (error2 instanceof ResourceMismatchError) {
+          if (error2 instanceof ResourceMismatchError || error2 instanceof OAuthSecurityError) {
             throw error2;
           }
           debugLogger.debug(`Failed to discover OAuth configuration: ${getErrorMessage(error2)}`);
@@ -374716,9 +374824,9 @@ var init_oauth_utils = __esm({
        * @returns The resource metadata URI if found
        */
       static parseWWWAuthenticateHeader(header) {
-        const match2 = header.match(/resource_metadata="([^"]+)"/);
+        const match2 = header.match(/resource_metadata=(?:"([^"]+)"|([^\s,]+))/);
         if (match2) {
-          return match2[1];
+          return match2[1] || match2[2] || null;
         }
         return null;
       }
@@ -374734,7 +374842,18 @@ var init_oauth_utils = __esm({
         if (!resourceMetadataUri) {
           return null;
         }
-        const resourceMetadata = await this.fetchProtectedResourceMetadata(resourceMetadataUri);
+        const allowLoopback = mcpServerUrl ? isLoopbackUrl(mcpServerUrl) : false;
+        const expectedOrigin = mcpServerUrl ? new URL(mcpServerUrl).origin : void 0;
+        const validatedResourceMetadataUrl = await validateOAuthEndpointUrl(resourceMetadataUri, {
+          allowLoopback,
+          expectedOrigin,
+          allowRelative: true,
+          baseUri: mcpServerUrl
+        });
+        const resourceMetadata = await this.fetchProtectedResourceMetadata(validatedResourceMetadataUrl, {
+          allowLoopback,
+          expectedOrigin
+        });
         if (resourceMetadata && mcpServerUrl) {
           const expectedResource = this.buildResourceParameter(mcpServerUrl);
           if (!this.isEquivalentResourceIdentifier(resourceMetadata.resource, expectedResource)) {
@@ -374745,7 +374864,9 @@ var init_oauth_utils = __esm({
           return null;
         }
         const authServerUrl = resourceMetadata.authorization_servers[0];
-        const authServerMetadata = await this.discoverAuthorizationServerMetadata(authServerUrl);
+        const authServerMetadata = await this.discoverAuthorizationServerMetadata(authServerUrl, {
+          allowLoopback
+        });
         if (authServerMetadata) {
           return this.metadataToOAuthConfig(authServerMetadata);
         }
@@ -378613,7 +378734,11 @@ async function exchangeCodeForToken(config2, code, codeVerifier, redirectPort, r
   if (resource) {
     params.append("resource", resource);
   }
-  const response = await fetch(config2.tokenUrl, {
+  const allowLoopback = resource ? isLoopbackUrl(resource) : isLoopbackUrl(config2.tokenUrl);
+  const validatedTokenUrl = await validateOAuthEndpointUrl(config2.tokenUrl, {
+    allowLoopback
+  });
+  const response = await fetch(validatedTokenUrl, {
     method: "POST",
     headers: {
       "Content-Type": "application/x-www-form-urlencoded",
@@ -378641,7 +378766,11 @@ async function refreshAccessToken(config2, refreshToken, tokenUrl, resource) {
   if (resource) {
     params.append("resource", resource);
   }
-  const response = await fetch(tokenUrl, {
+  const allowLoopback = resource ? isLoopbackUrl(resource) : isLoopbackUrl(tokenUrl);
+  const validatedTokenUrl = await validateOAuthEndpointUrl(tokenUrl, {
+    allowLoopback
+  });
+  const response = await fetch(validatedTokenUrl, {
     method: "POST",
     headers: {
       "Content-Type": "application/x-www-form-urlencoded",
@@ -378656,6 +378785,7 @@ var init_oauth_flow = __esm({
   "packages/core/dist/src/utils/oauth-flow.js"() {
     "use strict";
     init_debugLogger();
+    init_oauth_utils();
     REDIRECT_PATH = "/oauth/callback";
     HTTP_OK = 200;
   }
@@ -407152,7 +407282,11 @@ var init_oauth_provider = __esm({
        * @param redirectPort The port to use for the redirect URI
        * @returns The registered client information
        */
-      async registerClient(registrationUrl, config2, redirectPort) {
+      async registerClient(registrationUrl, config2, redirectPort, mcpServerUrl) {
+        const allowLoopback = mcpServerUrl ? isLoopbackUrl(mcpServerUrl) : isLoopbackUrl(registrationUrl);
+        const validatedRegistrationUrl = await validateOAuthEndpointUrl(registrationUrl, {
+          allowLoopback
+        });
         const redirectUri = getRedirectUri(config2, redirectPort);
         const registrationRequest = {
           client_name: "Gemini CLI MCP Client",
@@ -407163,7 +407297,7 @@ var init_oauth_provider = __esm({
           // Public client
           scope: config2.scopes?.join(" ") || ""
         };
-        const response = await fetch(registrationUrl, {
+        const response = await fetch(validatedRegistrationUrl, {
           method: "POST",
           headers: {
             "Content-Type": "application/json"
@@ -407185,7 +407319,8 @@ var init_oauth_provider = __esm({
       async discoverOAuthFromMCPServer(mcpServerUrl) {
         return OAuthUtils.discoverOAuthConfig(mcpServerUrl);
       }
-      async discoverAuthServerMetadataForRegistration(issuer) {
+      async discoverAuthServerMetadataForRegistration(issuer, mcpServerUrl) {
+        const allowLoopback = mcpServerUrl ? isLoopbackUrl(mcpServerUrl) : isLoopbackUrl(issuer);
         const authUrl = new URL9(issuer);
         const oidcPatterns = [
           "/protocol/openid-connect/auth",
@@ -407218,11 +407353,11 @@ var init_oauth_provider = __esm({
         const attemptedIssuers = Array.from(issuerCandidates);
         let selectedIssuer = attemptedIssuers[0];
         let discoveredMetadata = null;
-        for (const issuer2 of attemptedIssuers) {
-          debugLogger.debug(`   Trying issuer URL: ${issuer2}`);
-          const metadata2 = await OAuthUtils.discoverAuthorizationServerMetadata(issuer2);
+        for (const issuerCandidate of attemptedIssuers) {
+          debugLogger.debug(`   Trying issuer URL: ${issuerCandidate}`);
+          const metadata2 = await OAuthUtils.discoverAuthorizationServerMetadata(issuerCandidate, { allowLoopback });
           if (metadata2) {
-            selectedIssuer = issuer2;
+            selectedIssuer = issuerCandidate;
             discoveredMetadata = metadata2;
             break;
           }
@@ -407311,7 +407446,7 @@ var init_oauth_provider = __esm({
               }
             }
           } catch (error2) {
-            if (error2 instanceof ResourceMismatchError) {
+            if (error2 instanceof ResourceMismatchError || error2 instanceof OAuthSecurityError) {
               throw error2;
             }
             debugLogger.debug(`Failed to check endpoint for authentication requirements: ${getErrorMessage(error2)}`);
@@ -407347,11 +407482,11 @@ var init_oauth_provider = __esm({
               throw new Error("Cannot perform dynamic registration without issuer");
             }
             debugLogger.debug("\u2192 Attempting dynamic client registration...");
-            const { metadata: authServerMetadata } = await this.discoverAuthServerMetadataForRegistration(config2.issuer);
+            const { metadata: authServerMetadata } = await this.discoverAuthServerMetadataForRegistration(config2.issuer, mcpServerUrl);
             registrationUrl = authServerMetadata.registration_endpoint;
           }
           if (registrationUrl) {
-            const clientRegistration = await this.registerClient(registrationUrl, config2, redirectPort);
+            const clientRegistration = await this.registerClient(registrationUrl, config2, redirectPort, mcpServerUrl);
             config2.clientId = clientRegistration.client_id;
             if (clientRegistration.client_secret) {
               config2.clientSecret = clientRegistration.client_secret;
@@ -407364,6 +407499,13 @@ var init_oauth_provider = __esm({
         if (!config2.clientId || !config2.authorizationUrl || !config2.tokenUrl) {
           throw new Error("Missing required OAuth configuration after discovery and registration");
         }
+        const allowLoopback = mcpServerUrl ? isLoopbackUrl(mcpServerUrl) : (config2.authorizationUrl ? isLoopbackUrl(config2.authorizationUrl) : false) || (config2.tokenUrl ? isLoopbackUrl(config2.tokenUrl) : false);
+        await validateOAuthEndpointUrl(config2.authorizationUrl, {
+          allowLoopback
+        });
+        await validateOAuthEndpointUrl(config2.tokenUrl, {
+          allowLoopback
+        });
         const flowConfig = {
           clientId: config2.clientId,
           clientSecret: config2.clientSecret,