Added method for parsing WWW-Authenticate header

modelcontextprotocol · pcarleton · Jul 15, 2025 · Jul 2, 2025 · Jul 2, 2025 · Jul 2, 2025
commit cfb3f7e3ce5ff7dcc5a34df558ee34451544df1f
diff --git a/src/mcp/client/auth.py b/src/mcp/client/auth.py
@@ -7,6 +7,7 @@
 import base64
 import hashlib
 import logging
+import re
 import secrets
 import string
 import time
@@ -33,6 +34,30 @@
 logger = logging.getLogger(__name__)
 
 
+def _extract_resource_metadata_from_www_auth(header_value: str) -> str | None:
+    """
+    Parse WWW-Authenticate header to extract resource_metadata parameter.
+
+    According to RFC9728, the header format is:
+    WWW-Authenticate: Bearer resource_metadata="https://example.com/.well-known/oauth-protected-resource"
+
+    Returns the resource_metadata URL if found, None otherwise.
+    """
+    if not header_value:
+        return None
+
+    # Look for resource_metadata parameter in the header
+    # Pattern matches: resource_metadata="url" or resource_metadata=url (unquoted)
+    pattern = r'resource_metadata=(?:"([^"]+)"|([^\s,]+))'
+    match = re.search(pattern, header_value)
+
+    if match:
+        # Return quoted value if present, otherwise unquoted value
+        return match.group(1) or match.group(2)
+
+    return None
+
+
 class OAuthFlowError(Exception):
     """Base exception for OAuth flow errors."""