## Motivation and Context `ClientCredentialsProvider` builds a fixed `client_credentials` token request: `grant_type`, `scope`, `resource`, and the client authentication that `Flow#post_to_token_endpoint` adds. An authorization server that requires further parameters, such as Auth0's `audience`, cannot be used through `oauth:` at all, and giving up `oauth:` also gives up the bearer header and the 401-driven retry that the transport provides. RFC 6749 Section 8.2 allows extension parameters on the token request, and the TypeScript SDK lets a provider shape its token request through `prepareTokenRequest`. `ClientCredentialsProvider.new` now takes `token_request_params:`, a Hash of String keys and values added to every token request the provider makes, and `Flow#post_to_token_endpoint` reads the same name by duck typing, so a `Provider` or `CrossAppAccessProvider` subclass that defines the method gets the same treatment on its authorization code exchange, refresh, or `jwt-bearer` request. `Provider.new` and `CrossAppAccessProvider.new` take the same keyword, held by `StorageBackedProvider` like `authorization_request_validator`, so every bundled provider refuses a bad value before anything is stored. The parameters go underneath the flow's own, so the SDK's values always win, and a key the SDK sets itself (`Flow::RESERVED_TOKEN_REQUEST_PARAMS`) is refused rather than silently overridden: with `ArgumentError` from the constructor, before any `client_information` is written, and again with `ArgumentError` from the flow, before the token request is sent. Only Strings are accepted because `URI.encode_www_form` encodes other scalars and Arrays in ways the caller did not write, and the provider keeps a frozen copy so a later change to the caller's Hash cannot alter what is sent. A Hash comparing keys by identity is refused too, since two equal keys are two entries there, sent twice by a provider method or silently collapsed into one by the copy. The flow raises `ArgumentError` rather than `AuthorizationError` because `MCP::Client::HTTP` treats a failed refresh as a reason to run the interactive flow, which would then fail the same way after the user signed in. Both refusals raise `Flow::InvalidTokenRequestParamsError`, a subclass of `ArgumentError`, so a caller can tell them from an unknown keyword, and the copy duplicates keys as well as values, since `Hash` copies only keys whose class is exactly `String`. Fixes #554. ## How Has This Been Tested? New tests cover every token request the parameters can ride (the `client_credentials` grant under all three client authentication methods, the authorization code exchange, refresh, and `jwt-bearer`), both refusal boundaries (the constructors of all three providers, and the flow for a provider defining the method), and the transport surfacing a refused hook from a refresh attempt without starting the interactive flow. All of them fail against the previous library. ## Breaking Changes None. The keyword is optional and the hook is opt-in; a provider that does not define `token_request_params` sends the same requests as before.
155 lines
7.1 KiB
Ruby
155 lines
7.1 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
module MCP
|
|
class Client
|
|
module OAuth
|
|
# OAuth client configuration for the OAuth 2.1 `client_credentials` grant
|
|
# (machine-to-machine, no user and no browser redirect). Handed to
|
|
# `MCP::Client::HTTP` via the `oauth:` keyword, the same as `Provider`.
|
|
# The interactive Authorization Code flow lives in `Provider`;
|
|
# this class exists so a credentials-only client never has to supply
|
|
# the redirect arguments that grant has no use for, mirroring the dedicated
|
|
# `ClientCredentialsProvider` in the TypeScript SDK and
|
|
# `ClientCredentialsOAuthProvider` in the Python SDK.
|
|
#
|
|
# Required keyword arguments:
|
|
#
|
|
# - `client_id` - String identifying the pre-registered confidential client.
|
|
# - `client_secret` - String shared secret for the `client_secret_basic` /
|
|
# `client_secret_post` methods. The `client_credentials` grant is for
|
|
# confidential clients, so a credential is mandatory; with
|
|
# `private_key_jwt` the credential is the `private_key` instead.
|
|
#
|
|
# Optional keyword arguments:
|
|
#
|
|
# - `token_endpoint_auth_method` - `"client_secret_basic"` (default),
|
|
# `"client_secret_post"`, or `"private_key_jwt"` (RFC 7523 JWT client
|
|
# assertion, per the `io.modelcontextprotocol/oauth-client-credentials`
|
|
# extension / SEP-1046). `"none"` is rejected: an unauthenticated
|
|
# `client_credentials` request is meaningless.
|
|
# - `private_key` - PEM string (or `OpenSSL::PKey::PKey`) used to sign
|
|
# the JWT client assertion. Required with `private_key_jwt`.
|
|
# The key is held on the provider and never written to `storage`.
|
|
# - `signing_algorithm` - `"ES256"` or `"RS256"`. Required with
|
|
# `private_key_jwt`; there is no default, so a mismatch with
|
|
# the server's `token_endpoint_auth_signing_alg_values_supported` fails
|
|
# loudly at construction instead of as a 401 (the TypeScript and Python SDKs
|
|
# also take the algorithm as an explicit option).
|
|
# - `scope` - String of space-separated scopes to request when the server's
|
|
# `WWW-Authenticate` and the Protected Resource Metadata do not specify one.
|
|
# - `storage` - Object responding to `tokens`, `save_tokens(tokens)`, `client_information`,
|
|
# and `save_client_information(info)`. Defaults to an `InMemoryStorage`.
|
|
# The `client_id` / `client_secret` are written into it so the token exchange reads
|
|
# them through the same path as a pre-registered authorization-code client.
|
|
# - `token_request_params` - Hash of String keys and values added to every
|
|
# token request this provider makes, for parameters the authorization
|
|
# server requires beyond the grant itself (Auth0's `audience`, for example).
|
|
# A key in `Flow::RESERVED_TOKEN_REQUEST_PARAMS` raises `Flow::InvalidTokenRequestParamsError`.
|
|
# The Hash is copied and frozen. See `StorageBackedProvider#token_request_params`.
|
|
class ClientCredentialsProvider
|
|
include StorageBackedProvider
|
|
|
|
# Raised when the credentials required for the `client_credentials` grant are
|
|
# missing or the requested client authentication method cannot carry them.
|
|
class InvalidCredentialsError < ArgumentError; end
|
|
|
|
SUPPORTED_AUTH_METHODS = ["client_secret_basic", "client_secret_post", "private_key_jwt"].freeze
|
|
|
|
attr_reader :scope, :storage
|
|
|
|
def initialize(
|
|
client_id:,
|
|
client_secret: nil,
|
|
token_endpoint_auth_method: "client_secret_basic",
|
|
private_key: nil,
|
|
signing_algorithm: nil,
|
|
scope: nil,
|
|
storage: nil,
|
|
authorization_request_validator: nil,
|
|
token_request_params: nil
|
|
)
|
|
if blank?(client_id)
|
|
raise InvalidCredentialsError, "client_id is required for the client_credentials grant."
|
|
end
|
|
|
|
unless SUPPORTED_AUTH_METHODS.include?(token_endpoint_auth_method)
|
|
raise InvalidCredentialsError,
|
|
"token_endpoint_auth_method must be one of #{SUPPORTED_AUTH_METHODS.inspect} for the " \
|
|
"client_credentials grant (got #{token_endpoint_auth_method.inspect}); an unauthenticated " \
|
|
"client_credentials request is not allowed."
|
|
end
|
|
|
|
client_information = { "client_id" => client_id, "token_endpoint_auth_method" => token_endpoint_auth_method }
|
|
|
|
if token_endpoint_auth_method == "private_key_jwt"
|
|
validate_private_key_jwt_arguments!(
|
|
client_secret: client_secret,
|
|
private_key: private_key,
|
|
signing_algorithm: signing_algorithm,
|
|
)
|
|
|
|
# Fail fast on an unparseable key or a key/algorithm mismatch by
|
|
# signing a throwaway assertion now rather than at token time.
|
|
JWTClientAssertion.generate(
|
|
client_id: client_id,
|
|
audience: "urn:mcp:credential-validation",
|
|
private_key: private_key,
|
|
signing_algorithm: signing_algorithm,
|
|
)
|
|
else
|
|
if blank?(client_secret)
|
|
raise InvalidCredentialsError, "client_secret is required for the client_credentials grant with #{token_endpoint_auth_method}."
|
|
end
|
|
|
|
client_information["client_secret"] = client_secret
|
|
end
|
|
|
|
@client_id = client_id
|
|
@private_key = private_key
|
|
@signing_algorithm = signing_algorithm
|
|
@scope = scope
|
|
@storage = storage || InMemoryStorage.new
|
|
@authorization_request_validator = authorization_request_validator
|
|
@token_request_params = frozen_token_request_params(token_request_params)
|
|
@storage.save_client_information(client_information)
|
|
end
|
|
|
|
# See `Provider#authorization_flow`.
|
|
def authorization_flow
|
|
:client_credentials
|
|
end
|
|
|
|
# Returns a freshly signed RFC 7523 JWT client assertion for the `private_key_jwt` method.
|
|
# `audience` is the authorization server's issuer identifier. Called by `Flow#post_to_token_endpoint`.
|
|
def client_assertion(audience:)
|
|
JWTClientAssertion.generate(
|
|
client_id: @client_id,
|
|
audience: audience,
|
|
private_key: @private_key,
|
|
signing_algorithm: @signing_algorithm,
|
|
)
|
|
end
|
|
|
|
private
|
|
|
|
def validate_private_key_jwt_arguments!(client_secret:, private_key:, signing_algorithm:)
|
|
unless client_secret.nil?
|
|
raise InvalidCredentialsError, "client_secret must not be set with private_key_jwt; the private key is the credential."
|
|
end
|
|
|
|
if private_key.nil?
|
|
raise InvalidCredentialsError, "private_key is required for the client_credentials grant with private_key_jwt."
|
|
end
|
|
|
|
return unless blank?(signing_algorithm)
|
|
|
|
raise InvalidCredentialsError, "signing_algorithm is required with private_key_jwt (one of #{JWTClientAssertion::SUPPORTED_ALGORITHMS.inspect})."
|
|
end
|
|
|
|
def blank?(value)
|
|
value.nil? || (value.is_a?(String) && value.strip.empty?)
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|