## Motivation and Context The MCP authorization specification and SEP-1046 allow confidential clients to obtain tokens through the OAuth 2.1 `client_credentials` grant: a machine-to-machine flow with no user, no browser redirect, and no authorization code. The Ruby SDK previously supported only the interactive authorization-code flow, so it could not authenticate against a server that requires `client_credentials`. This makes the `auth/client-credentials-basic` conformance scenario pass and is removed from the expected failures list. Following the TypeScript SDK (`ClientCredentialsProvider`) and the Python SDK (`ClientCredentialsOAuthProvider`), the grant gets its own provider class rather than overloading the authorization-code provider. The change adds: - `MCP::Client::OAuth::ClientCredentialsProvider`, a dedicated provider for the grant. `client_id` and `client_secret` are mandatory (the grant is for confidential clients), `token_endpoint_auth_method` is `client_secret_basic` (default) or `client_secret_post` -- `none` is rejected because an unauthenticated `client_credentials` request is meaningless. It has no redirect arguments, so a credentials-only client never supplies the redirect URI / handlers that grant has no use for. - `MCP::Client::OAuth::StorageBackedProvider`, an internal module that shares the token / client-information persistence between the two provider classes so `Flow` can treat any provider uniformly. - `Provider#authorization_flow` (`:authorization_code`) and `ClientCredentialsProvider#authorization_flow` (`:client_credentials`). `Flow#run!` dispatches on this rather than inspecting `client_metadata[:grant_types]`, which is protocol metadata for the authorization server, not an SDK control signal. - `run_client_credentials!` shares the same PRM / AS metadata discovery and Communication Security checks as the interactive flow, then exchanges `grant_type=client_credentials` at the token endpoint via the existing `post_to_token_endpoint` (which already applies `client_secret_basic`). There is no PKCE, redirect, or `offline_access` augmentation, because the grant does not issue a refresh token (OAuth 2.1 Section 4.3.3). - `conformance/client.rb` builds a `ClientCredentialsProvider` for the `auth/client-credentials-*` scenarios, reusing the harness-injected `client_id` / `client_secret`. ## How Has This Been Tested? New `ClientCredentialsProvider` tests cover: credentials are stored as client information; `authorization_flow` is `:client_credentials`; `client_secret_post` is accepted; missing `client_id` / `client_secret` and `token_endpoint_auth_method: "none"` are rejected; and the token helpers delegate to storage. New `Flow` tests cover: a `client_credentials` provider exchanges `grant_type=client_credentials` with HTTP Basic auth, saves the token, and never contacts the authorization or registration endpoint; the requested scope is taken from PRM `scopes_supported`; and a standard `Provider` runs the authorization-code grant regardless of what its `client_metadata[:grant_types]` lists. A `Provider` test asserts `authorization_flow` is `:authorization_code`. Conformance: `auth/client-credentials-basic` now passes 7/7 with no failures. ## Breaking Changes None. `ClientCredentialsProvider` is a new class; the existing `Provider` keeps its required `redirect_uri` / `redirect_handler` / `callback_handler` arguments and its behaviour is unchanged. Existing interactive clients are unaffected.
118 lines
6.3 KiB
Ruby
118 lines
6.3 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
module MCP
|
|
class Client
|
|
module OAuth
|
|
# Pluggable OAuth client configuration for the OAuth 2.1 Authorization Code + PKCE flow,
|
|
# handed to `MCP::Client::HTTP` via the `oauth:` keyword.
|
|
# Inspired by the OAuthClientProvider in the TypeScript SDK and the httpx.Auth-based provider
|
|
# in the Python SDK. For the non-interactive machine-to-machine `client_credentials` grant,
|
|
# use `ClientCredentialsProvider` instead.
|
|
#
|
|
# Required keyword arguments:
|
|
# - `client_metadata` - Hash sent to the authorization server's Dynamic Client
|
|
# Registration endpoint. Must include at minimum `redirect_uris`,
|
|
# `grant_types`, `response_types`, and `token_endpoint_auth_method`.
|
|
# - `redirect_uri` - String: the redirect URI used for the authorization
|
|
# request. Must be one of `redirect_uris` in `client_metadata`.
|
|
# - `redirect_handler` - Callable invoked with the fully-built authorization
|
|
# URL (a `URI`). Implementations typically open the user's browser.
|
|
# - `callback_handler` - Callable invoked after `redirect_handler`. Returns
|
|
# `[code, state]` where `code` is the authorization code and `state` is
|
|
# the `state` parameter received on the redirect URI.
|
|
#
|
|
# Optional keyword arguments:
|
|
# - `scope` - String of space-separated scopes to request when the server's
|
|
# `WWW-Authenticate` does not specify one.
|
|
# - `storage` - Object responding to `tokens`, `save_tokens(tokens)`,
|
|
# `client_information`, and `save_client_information(info)`. Defaults to
|
|
# an `InMemoryStorage`.
|
|
# - `client_id_metadata_document_url` - URL where the client publishes its Client ID Metadata Document
|
|
# (`draft-ietf-oauth-client-id-metadata-document-00` and the MCP authorization specification).
|
|
# When the authorization server advertises `client_id_metadata_document_supported: true`,
|
|
# the SDK uses this URL as the OAuth `client_id` and skips Dynamic Client Registration.
|
|
# Spec-required: `https://` scheme, a non-root path, and no fragment, userinfo, or `.`/`..` segments.
|
|
# The SDK additionally refuses to send query strings (the draft marks them only SHOULD NOT include,
|
|
# but different encodings of the same query would yield different `client_id` strings for the same document).
|
|
# The document served at the URL is a separate JSON artifact from the `client_metadata` keyword:
|
|
# DCR `client_metadata` MUST NOT include `client_id`, while the CIMD document MUST include `client_id` set
|
|
# to the URL, `client_name`, and `redirect_uris` covering `redirect_uri`.
|
|
class Provider
|
|
include StorageBackedProvider
|
|
|
|
# Raised when `Provider#initialize` is called with a `redirect_uri` that
|
|
# is neither HTTPS nor a loopback `http://` URL, per the MCP
|
|
# authorization spec's Communication Security requirement.
|
|
class InsecureRedirectURIError < ArgumentError; end
|
|
|
|
# Raised when the `redirect_uri` argument is not listed in
|
|
# `client_metadata[:redirect_uris]` / `["redirect_uris"]`. Registering
|
|
# the URI with the authorization server but then sending a different
|
|
# one with the authorization request would be rejected by the AS at
|
|
# runtime; failing at construction surfaces the bug earlier.
|
|
class UnregisteredRedirectURIError < ArgumentError; end
|
|
|
|
# Raised when `client_id_metadata_document_url` is provided but does not meet
|
|
# the structural requirements for a Client ID Metadata Document URL:
|
|
# HTTPS, non-root path, and no fragment, query, userinfo, or `.`/`..` segments.
|
|
# The CIMD URL is sent to the authorization server as the OAuth `client_id`,
|
|
# so the same Communication Security guarantee that protects the redirect URI
|
|
# applies and the value must unambiguously identify the document.
|
|
class InvalidClientIDMetadataDocumentURLError < ArgumentError; end
|
|
|
|
attr_reader :client_metadata,
|
|
:redirect_uri,
|
|
:scope,
|
|
:storage,
|
|
:redirect_handler,
|
|
:callback_handler,
|
|
:client_id_metadata_document_url
|
|
|
|
def initialize(
|
|
client_metadata:,
|
|
redirect_uri:,
|
|
redirect_handler:,
|
|
callback_handler:,
|
|
scope: nil,
|
|
storage: nil,
|
|
client_id_metadata_document_url: nil
|
|
)
|
|
unless Discovery.secure_url?(redirect_uri)
|
|
raise InsecureRedirectURIError,
|
|
"redirect_uri #{redirect_uri.inspect} must use https or be a loopback http URL " \
|
|
"(localhost, 127.0.0.0/8, or ::1) per the MCP authorization Communication Security requirement."
|
|
end
|
|
|
|
registered = Array(client_metadata[:redirect_uris] || client_metadata["redirect_uris"])
|
|
unless registered.include?(redirect_uri)
|
|
raise UnregisteredRedirectURIError,
|
|
"redirect_uri #{redirect_uri.inspect} must be listed in client_metadata[:redirect_uris] " \
|
|
"(got #{registered.inspect}); otherwise the authorization server will reject the authorization request."
|
|
end
|
|
|
|
if client_id_metadata_document_url && !Discovery.client_id_metadata_document_url?(client_id_metadata_document_url)
|
|
raise InvalidClientIDMetadataDocumentURLError,
|
|
"client_id_metadata_document_url #{client_id_metadata_document_url.inspect} must be an https URL " \
|
|
"with a non-root path and no fragment, query, userinfo, or `.`/`..` segments, " \
|
|
"per the MCP authorization specification and `draft-ietf-oauth-client-id-metadata-document`."
|
|
end
|
|
|
|
@client_metadata = client_metadata
|
|
@redirect_uri = redirect_uri
|
|
@redirect_handler = redirect_handler
|
|
@callback_handler = callback_handler
|
|
@scope = scope
|
|
@storage = storage || InMemoryStorage.new
|
|
@client_id_metadata_document_url = client_id_metadata_document_url
|
|
end
|
|
|
|
# Identifies the OAuth flow this provider drives.
|
|
# `Flow` dispatches on this rather than inspecting `client_metadata[:grant_types]`,
|
|
# which is protocol metadata for the authorization server, not an SDK control signal.
|
|
def authorization_flow
|
|
:authorization_code
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|