## 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.
193 lines
8.3 KiB
Ruby
193 lines
8.3 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require "test_helper"
|
|
require "mcp/client/oauth"
|
|
|
|
module MCP
|
|
class Client
|
|
module OAuth
|
|
class ProviderTest < Minitest::Test
|
|
# Builds a complete Provider argument hash whose `client_metadata`
|
|
# registers the same `redirect_uri` that is being asserted on.
|
|
# The registered-URI check in `Provider#initialize` requires the two to
|
|
# match, so accept-path tests need them paired.
|
|
def args_for(redirect_uri)
|
|
{
|
|
client_metadata: {
|
|
redirect_uris: [redirect_uri],
|
|
grant_types: ["authorization_code"],
|
|
response_types: ["code"],
|
|
token_endpoint_auth_method: "none",
|
|
},
|
|
redirect_uri: redirect_uri,
|
|
redirect_handler: ->(_url) {},
|
|
callback_handler: -> { ["code", "state"] },
|
|
}
|
|
end
|
|
|
|
def test_initialize_accepts_https_redirect_uri
|
|
provider = Provider.new(**args_for("https://app.example.com/callback"))
|
|
|
|
assert_equal("https://app.example.com/callback", provider.redirect_uri)
|
|
end
|
|
|
|
def test_initialize_accepts_loopback_http_redirect_uri
|
|
["http://localhost/callback", "http://127.0.0.1:3000/cb", "http://[::1]/cb"].each do |uri|
|
|
provider = Provider.new(**args_for(uri))
|
|
assert_equal(uri, provider.redirect_uri)
|
|
end
|
|
end
|
|
|
|
def test_initialize_rejects_non_loopback_http_redirect_uri
|
|
# Communication Security: a non-loopback `http://` redirect URI would
|
|
# let an attacker steal the authorization code from a network sniffer,
|
|
# so the provider must refuse to construct.
|
|
assert_raises(Provider::InsecureRedirectURIError) do
|
|
Provider.new(**args_for("http://app.example.com/callback"))
|
|
end
|
|
end
|
|
|
|
def test_initialize_rejects_non_http_scheme_redirect_uri
|
|
assert_raises(Provider::InsecureRedirectURIError) do
|
|
Provider.new(**args_for("ftp://app.example.com/callback"))
|
|
end
|
|
end
|
|
|
|
def test_initialize_rejects_hostname_tricks_that_resemble_loopback
|
|
["http://127.attacker.com/cb", "http://127.0.0.1.evil.com/cb", "http://foo.localhost/cb"].each do |uri|
|
|
assert_raises(Provider::InsecureRedirectURIError, "should reject #{uri}") do
|
|
Provider.new(**args_for(uri))
|
|
end
|
|
end
|
|
end
|
|
|
|
def test_initialize_rejects_redirect_uri_not_listed_in_client_metadata
|
|
# Per the OAuth Dynamic Client Registration response, the AS will
|
|
# bind the client_id to a specific set of redirect_uris and reject any
|
|
# authorization request that uses something else. Detect that mismatch
|
|
# at Provider construction so the failure surfaces immediately.
|
|
args = args_for("http://localhost:0/callback")
|
|
args[:redirect_uri] = "http://localhost:0/different"
|
|
|
|
assert_raises(Provider::UnregisteredRedirectURIError) do
|
|
Provider.new(**args)
|
|
end
|
|
end
|
|
|
|
def test_initialize_accepts_redirect_uri_with_string_keys_in_client_metadata
|
|
# `client_metadata` is hand-built by callers, so accept either symbol
|
|
# or string keys for `redirect_uris`.
|
|
args = args_for("http://localhost:0/callback")
|
|
args[:client_metadata] = { "redirect_uris" => ["http://localhost:0/callback"] }
|
|
|
|
provider = Provider.new(**args)
|
|
assert_equal("http://localhost:0/callback", provider.redirect_uri)
|
|
end
|
|
|
|
def test_initialize_defaults_client_id_metadata_document_url_to_nil
|
|
provider = Provider.new(**args_for("http://localhost:0/callback"))
|
|
|
|
assert_nil(provider.client_id_metadata_document_url)
|
|
end
|
|
|
|
def test_initialize_accepts_https_client_id_metadata_document_url
|
|
args = args_for("http://localhost:0/callback").merge(
|
|
client_id_metadata_document_url: "https://app.example.com/client-metadata.json",
|
|
)
|
|
|
|
provider = Provider.new(**args)
|
|
assert_equal(
|
|
"https://app.example.com/client-metadata.json",
|
|
provider.client_id_metadata_document_url,
|
|
)
|
|
end
|
|
|
|
def test_initialize_rejects_http_client_id_metadata_document_url
|
|
# The loopback `http` carve-out used for discovery does not extend to the CIMD URL:
|
|
# the URL is sent to the AS as the OAuth `client_id` and travels off-loopback,
|
|
# so MCP requires `https`.
|
|
["http://localhost:8080/client-metadata.json", "http://app.example.com/cm"].each do |uri|
|
|
args = args_for("http://localhost:0/callback").merge(client_id_metadata_document_url: uri)
|
|
assert_raises(Provider::InvalidClientIDMetadataDocumentURLError, "should reject #{uri}") do
|
|
Provider.new(**args)
|
|
end
|
|
end
|
|
end
|
|
|
|
def test_initialize_rejects_non_https_scheme_client_id_metadata_document_url
|
|
["ftp://app.example.com/cm", "file:///cm", "foo://bar/cm"].each do |uri|
|
|
args = args_for("http://localhost:0/callback").merge(client_id_metadata_document_url: uri)
|
|
assert_raises(Provider::InvalidClientIDMetadataDocumentURLError, "should reject #{uri}") do
|
|
Provider.new(**args)
|
|
end
|
|
end
|
|
end
|
|
|
|
def test_initialize_rejects_client_id_metadata_document_url_without_path
|
|
# The CIMD document is a discrete resource, not the origin.
|
|
# A bare origin or root-path URL would let two different deployments at
|
|
# the same origin shadow each other under one `client_id`.
|
|
["https://app.example.com", "https://app.example.com/"].each do |uri|
|
|
args = args_for("http://localhost:0/callback").merge(client_id_metadata_document_url: uri)
|
|
assert_raises(Provider::InvalidClientIDMetadataDocumentURLError, "should reject #{uri}") do
|
|
Provider.new(**args)
|
|
end
|
|
end
|
|
end
|
|
|
|
def test_initialize_rejects_client_id_metadata_document_url_with_fragment
|
|
# A fragment is never sent to the server; embedding one in the `client_id` value
|
|
# would make the OAuth `client_id` and the URL the AS dereferences point at different artifacts.
|
|
args = args_for("http://localhost:0/callback").merge(
|
|
client_id_metadata_document_url: "https://app.example.com/cm#frag",
|
|
)
|
|
assert_raises(Provider::InvalidClientIDMetadataDocumentURLError) do
|
|
Provider.new(**args)
|
|
end
|
|
end
|
|
|
|
def test_initialize_rejects_client_id_metadata_document_url_with_query
|
|
args = args_for("http://localhost:0/callback").merge(
|
|
client_id_metadata_document_url: "https://app.example.com/cm?x=1",
|
|
)
|
|
assert_raises(Provider::InvalidClientIDMetadataDocumentURLError) do
|
|
Provider.new(**args)
|
|
end
|
|
end
|
|
|
|
def test_initialize_rejects_client_id_metadata_document_url_with_userinfo
|
|
# Embedding credentials in the `client_id` leaks them to every AS
|
|
# log line and to the conformance audit trail.
|
|
args = args_for("http://localhost:0/callback").merge(
|
|
client_id_metadata_document_url: "https://user:pass@app.example.com/cm",
|
|
)
|
|
assert_raises(Provider::InvalidClientIDMetadataDocumentURLError) do
|
|
Provider.new(**args)
|
|
end
|
|
end
|
|
|
|
def test_initialize_rejects_client_id_metadata_document_url_with_dot_segments
|
|
# `https://x/a/./b` and `https://x/a/b` are RFC 3986 equivalent,
|
|
# so accepting both would let one client publish under two `client_id` values.
|
|
# Reject `.`/`..` (including percent-encoded `.`).
|
|
[
|
|
"https://app.example.com/./cm",
|
|
"https://app.example.com/a/../cm",
|
|
"https://app.example.com/%2E/cm",
|
|
].each do |uri|
|
|
args = args_for("http://localhost:0/callback").merge(client_id_metadata_document_url: uri)
|
|
assert_raises(Provider::InvalidClientIDMetadataDocumentURLError, "should reject #{uri}") do
|
|
Provider.new(**args)
|
|
end
|
|
end
|
|
end
|
|
|
|
def test_authorization_flow_is_authorization_code
|
|
provider = Provider.new(**args_for("https://app.example.com/callback"))
|
|
|
|
assert_equal(:authorization_code, provider.authorization_flow)
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|