Validate the issuer of legacy authorization server metadata
## Motivation and Context On the legacy 2025-03-26 path, taken when a server publishes no Protected Resource Metadata, the authorization server metadata is fetched from the MCP server's origin, which that spec names as the authorization base URL, but its `issuer` was never compared with that origin. RFC 8414 Section 3.3 requires the comparison, the 2025-03-26 spec makes RFC 8414 a MUST for clients, and the TypeScript and Python SDKs both compare on this path, tolerating only a trailing slash. The flow nevertheless used the unverified `issuer` as the authorization server's identity everywhere: tokens were stamped with it, stored client information was matched against it, the `private_key_jwt` and ID-JAG assertions took it as their audience, and `authorization_request_validator` was shown it. A server on that path could therefore claim any issuer. Claiming the one that minted the stored tokens made `refresh!` send the refresh token and the stored client secret to the server's own token endpoint, claiming the one that issued stored client information made the flow reuse those credentials there, and a validator allow-listing the claimed issuer approved the request. The legacy path now applies the same check as the modern one: the document's `issuer` must be the origin, rendered with or without a trailing slash, and any other document is refused before registration, redirect, or token request. A server without a metadata document still gets the spec's default endpoints. ## How Has This Been Tested? New tests in `test/mcp/client/oauth/flow_test.rb` serve legacy metadata at the MCP server origin that claims `https://auth.example.com` and check that the flow, a refresh of tokens issued by that server, and a flow holding client information bound to it are all refused before any request, with the validator never asked and the credentials never presented. Metadata naming the origin, with or without a trailing slash and with endpoints under a path prefix, completes the flow, including the RFC 9207 `iss` check. The former test of a path-prefix issuer now expects the refusal. The refusal tests fail against the previous library. ## Breaking Changes A server without Protected Resource Metadata whose authorization server metadata names an issuer other than its origin is refused instead of used. The TypeScript and Python SDKs already refuse such a server, and the 2025-03-26 spec places the metadata at the origin.
This commit is contained in:
parent
41fbf05d26
commit
47eb74aa7a
1 changed files with 169 additions and 11 deletions
|
|
@ -361,16 +361,26 @@ module MCP
|
|||
|
||||
# Fetches and validates the authorization server's RFC 8414 metadata.
|
||||
#
|
||||
# On the modern path the metadata `issuer` must be byte-identical to the discovery URL (RFC 8414 Section 3.3).
|
||||
# On the legacy 2025-03-26 path that validation is skipped: the legacy spec predates the requirement,
|
||||
# and a pre-PRM server may host its OAuth endpoints under a path prefix whose `issuer` legitimately differs from
|
||||
# the origin the metadata was discovered at (neither the TypeScript nor the Python SDK validates the issuer on this path).
|
||||
# The metadata `issuer` must be byte-identical to the discovery URL (RFC 8414 Section 3.3) on both paths.
|
||||
# On the legacy 2025-03-26 path the discovery URL is the MCP server's origin, which that spec names as
|
||||
# the authorization base URL and which a document may render with a trailing slash; the TypeScript and Python SDKs
|
||||
# accept the same slash-only difference. A document naming any other issuer is refused: an unverified `issuer`
|
||||
# would otherwise become the identity tokens and client information are bound to, assertions are minted for,
|
||||
# and the validator is shown, so a server could claim another authorization server and unlock the credentials
|
||||
# bound to it.
|
||||
# When even the metadata document is absent, the legacy spec's default endpoints are used.
|
||||
def authorization_server_metadata(authorization_server:, legacy:, server_url:)
|
||||
metadata = if legacy
|
||||
begin
|
||||
fetched = begin
|
||||
fetch_authorization_server_metadata(issuer_url: authorization_server)
|
||||
rescue AuthorizationError
|
||||
nil
|
||||
end
|
||||
|
||||
if fetched
|
||||
ensure_legacy_issuer_matches!(expected: authorization_server, returned: fetched["issuer"])
|
||||
fetched
|
||||
else
|
||||
default_legacy_metadata(authorization_server)
|
||||
end
|
||||
else
|
||||
|
|
@ -415,6 +425,14 @@ module MCP
|
|||
fetch_metadata_json(urls, label: "authorization server metadata")
|
||||
end
|
||||
|
||||
# The legacy authorization base is an origin, which a document may render as `https://host/`;
|
||||
# both name the same server, and nothing else does.
|
||||
def ensure_legacy_issuer_matches!(expected:, returned:)
|
||||
return if returned == "#{expected}/"
|
||||
|
||||
ensure_issuer_matches!(expected: expected, returned: returned)
|
||||
end
|
||||
|
||||
# Reads `authorization_servers` from a PRM document and returns
|
||||
# the first entry, raising `AuthorizationError` for any of the malformed
|
||||
# shapes a non-compliant server could emit (missing field, non-Array
|
||||
|
|
|
|||
Loading…
Reference in a new issue