## Motivation and Context The MCP `io.modelcontextprotocol/oauth-client-credentials` extension (SEP-1046, modelcontextprotocol/modelcontextprotocol#1046) specifies two client authentication methods for the `client_credentials` grant: `client_secret_basic` and the RECOMMENDED `private_key_jwt` (RFC 7523 Section 2.2 JWT client assertion). The previous commit added the grant with secret-based authentication; this adds the JWT method, which is what the `auth/client-credentials-jwt` conformance scenario exercises. This mirrors the merged implementations in the TypeScript SDK (`PrivateKeyJwtProvider`, typescript-sdk#1157) and the Python SDK (`PrivateKeyJWTOAuthProvider` / `SignedJWTParameters`, python-sdk#1663), adapted to this SDK's provider design: - New `MCP::Client::OAuth::JWTClientAssertion` builds the RFC 7523 compact JWS with openssl, keeping the SDK free of a JWT gem dependency (the TypeScript and Python SDKs use jose and PyJWT). Claims follow SEP-1046: `iss` and `sub` carry the client_id, `aud` carries the authorization server's issuer identifier, plus `exp` (300-second lifetime, matching both SDKs), `iat`, and a unique `jti`. ES256 and RS256 are supported; ES256 signatures are converted from OpenSSL's ASN.1 DER form to the raw 64-byte `r || s` encoding JWS requires (RFC 7518 Section 3.4). - `ClientCredentialsProvider` accepts `token_endpoint_auth_method: "private_key_jwt"` with `private_key:` (PEM string or `OpenSSL::PKey::PKey`) and a required `signing_algorithm:` (no default, so an algorithm mismatch with the server's `token_endpoint_auth_signing_alg_values_supported` fails loudly at construction; both reference SDKs also take the algorithm explicitly). The key stays on the provider and is never written to `storage`; a throwaway assertion is signed at construction to fail fast on an unparseable key or a key/algorithm mismatch. - `Flow#post_to_token_endpoint` sends `client_assertion_type` and a freshly signed `client_assertion` for `private_key_jwt`, using the `ensure_issuer_matches!`-validated issuer as the audience, and omits `client_id` from the body per SEP-1046 (identity travels in the assertion's claims). - The conformance client builds a `private_key_jwt` provider when the harness injects `private_key_pem`, defaulting the algorithm to ES256 like the TypeScript and Python conformance clients, and `auth/client-credentials-jwt` is removed from `conformance/expected_failures.yml`. Scope notes: only ES256 and RS256 are supported for now (the TypeScript and Python SDKs accept whatever their JWT libraries support); adding further algorithms is additive. There is also no injection point yet for externally signed assertions (the TypeScript SDK's `StaticPrivateKeyJwtProvider` and the Python SDK's `assertion_provider` callback cover KMS/HSM-held keys); that is a separate follow-up. ## How Has This Been Tested? New `test/mcp/client/oauth/jwt_client_assertion_test.rb` covers the JWS construction: header and RFC 7523 claims, unpadded base64url segments, ES256 signature round-trip verification (raw -> DER -> `OpenSSL::PKey::EC#verify`), RS256 verification, PEM and parsed-key input, lifetime override, unique `jti` per assertion, and rejection of unsupported algorithms, key/algorithm mismatches (including a P-384 key with ES256), unparseable PEM, and public-only keys. New tests in `test/mcp/client/oauth/client_credentials_provider_test.rb` cover the provider surface: `private_key_jwt` construction, the key and secret never reaching `client_information`, required `private_key` / `signing_algorithm`, rejection of a simultaneous `client_secret`, fail-fast on key/algorithm mismatch, and `client_assertion(audience:)` producing a JWT with the expected claims. A new test in `test/mcp/client/oauth/flow_test.rb` runs the full grant against WebMock stubs and asserts the token request carries `grant_type=client_credentials`, the RFC 7523 `client_assertion_type`, an assertion whose `iss`/`sub` are the client_id and whose `aud` is the issuer, the RFC 8707 `resource`, and neither `client_id` nor any secret in the body or headers. `bundle exec rake` passes; the `auth/client-credentials-jwt` conformance scenario passes 7/7 checks and the baseline check passes with its expected-failure entry removed. ## Breaking Changes None. `client_secret:` becomes optional on `ClientCredentialsProvider` only in the signature; it is still required for the secret-based methods, and all existing construction paths behave unchanged.
166 lines
6.3 KiB
Ruby
166 lines
6.3 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require "test_helper"
|
|
require "mcp/client/oauth"
|
|
|
|
module MCP
|
|
class Client
|
|
module OAuth
|
|
class ClientCredentialsProviderTest < Minitest::Test
|
|
def test_initialize_stores_credentials_as_client_information
|
|
provider = ClientCredentialsProvider.new(client_id: "cc-client", client_secret: "cc-secret")
|
|
|
|
info = provider.client_information
|
|
assert_equal("cc-client", info["client_id"])
|
|
assert_equal("cc-secret", info["client_secret"])
|
|
assert_equal("client_secret_basic", info["token_endpoint_auth_method"])
|
|
end
|
|
|
|
def test_authorization_flow_is_client_credentials
|
|
provider = ClientCredentialsProvider.new(client_id: "cc-client", client_secret: "cc-secret")
|
|
|
|
assert_equal(:client_credentials, provider.authorization_flow)
|
|
end
|
|
|
|
def test_initialize_accepts_client_secret_post
|
|
provider = ClientCredentialsProvider.new(
|
|
client_id: "cc-client",
|
|
client_secret: "cc-secret",
|
|
token_endpoint_auth_method: "client_secret_post",
|
|
)
|
|
|
|
assert_equal("client_secret_post", provider.client_information["token_endpoint_auth_method"])
|
|
end
|
|
|
|
def test_initialize_rejects_missing_client_id
|
|
["", " ", nil].each do |value|
|
|
assert_raises(ClientCredentialsProvider::InvalidCredentialsError, "should reject #{value.inspect}") do
|
|
ClientCredentialsProvider.new(client_id: value, client_secret: "cc-secret")
|
|
end
|
|
end
|
|
end
|
|
|
|
def test_initialize_rejects_missing_client_secret
|
|
# The client_credentials grant is for confidential clients, so a credential is mandatory.
|
|
["", " ", nil].each do |value|
|
|
assert_raises(ClientCredentialsProvider::InvalidCredentialsError, "should reject #{value.inspect}") do
|
|
ClientCredentialsProvider.new(client_id: "cc-client", client_secret: value)
|
|
end
|
|
end
|
|
end
|
|
|
|
def test_initialize_rejects_none_auth_method
|
|
# An unauthenticated client_credentials request is meaningless.
|
|
assert_raises(ClientCredentialsProvider::InvalidCredentialsError) do
|
|
ClientCredentialsProvider.new(
|
|
client_id: "cc-client",
|
|
client_secret: "cc-secret",
|
|
token_endpoint_auth_method: "none",
|
|
)
|
|
end
|
|
end
|
|
|
|
def test_token_helpers_delegate_to_storage
|
|
provider = ClientCredentialsProvider.new(client_id: "cc-client", client_secret: "cc-secret")
|
|
provider.save_tokens("access_token" => "cc-token")
|
|
|
|
assert_equal("cc-token", provider.access_token)
|
|
provider.clear_tokens!
|
|
assert_nil(provider.tokens)
|
|
end
|
|
|
|
# `OpenSSL::PKey::EC.generate` only exists from the openssl gem 2.2 (Ruby 3.0),
|
|
# while `EC#generate_key` raises on openssl 3.0+ where PKey objects are immutable,
|
|
# so branch on availability to keep CI green on every supported Ruby.
|
|
def generate_es256_key
|
|
if OpenSSL::PKey::EC.respond_to?(:generate)
|
|
OpenSSL::PKey::EC.generate("prime256v1")
|
|
else
|
|
OpenSSL::PKey::EC.new("prime256v1").tap(&:generate_key)
|
|
end
|
|
end
|
|
|
|
def private_key_jwt_provider(key: generate_es256_key)
|
|
ClientCredentialsProvider.new(
|
|
client_id: "cc-client",
|
|
token_endpoint_auth_method: "private_key_jwt",
|
|
private_key: key,
|
|
signing_algorithm: "ES256",
|
|
)
|
|
end
|
|
|
|
def test_initialize_accepts_private_key_jwt
|
|
provider = private_key_jwt_provider
|
|
|
|
info = provider.client_information
|
|
assert_equal("cc-client", info["client_id"])
|
|
assert_equal("private_key_jwt", info["token_endpoint_auth_method"])
|
|
end
|
|
|
|
def test_initialize_private_key_jwt_does_not_persist_the_key_or_a_secret
|
|
# The PEM must never reach a (potentially persistent) storage backend.
|
|
provider = private_key_jwt_provider
|
|
|
|
info = provider.client_information
|
|
refute(info.key?("client_secret"))
|
|
refute(info.values.any? { |value| value.to_s.include?("PRIVATE KEY") })
|
|
end
|
|
|
|
def test_initialize_private_key_jwt_requires_private_key
|
|
assert_raises(ClientCredentialsProvider::InvalidCredentialsError) do
|
|
ClientCredentialsProvider.new(
|
|
client_id: "cc-client",
|
|
token_endpoint_auth_method: "private_key_jwt",
|
|
signing_algorithm: "ES256",
|
|
)
|
|
end
|
|
end
|
|
|
|
def test_initialize_private_key_jwt_requires_signing_algorithm
|
|
assert_raises(ClientCredentialsProvider::InvalidCredentialsError) do
|
|
ClientCredentialsProvider.new(
|
|
client_id: "cc-client",
|
|
token_endpoint_auth_method: "private_key_jwt",
|
|
private_key: generate_es256_key,
|
|
)
|
|
end
|
|
end
|
|
|
|
def test_initialize_private_key_jwt_rejects_client_secret
|
|
assert_raises(ClientCredentialsProvider::InvalidCredentialsError) do
|
|
ClientCredentialsProvider.new(
|
|
client_id: "cc-client",
|
|
client_secret: "cc-secret",
|
|
token_endpoint_auth_method: "private_key_jwt",
|
|
private_key: generate_es256_key,
|
|
signing_algorithm: "ES256",
|
|
)
|
|
end
|
|
end
|
|
|
|
def test_initialize_private_key_jwt_fails_fast_on_key_algorithm_mismatch
|
|
assert_raises(JWTClientAssertion::InvalidKeyError) do
|
|
ClientCredentialsProvider.new(
|
|
client_id: "cc-client",
|
|
token_endpoint_auth_method: "private_key_jwt",
|
|
private_key: OpenSSL::PKey::RSA.new(2048),
|
|
signing_algorithm: "ES256",
|
|
)
|
|
end
|
|
end
|
|
|
|
def test_client_assertion_returns_signed_jwt_for_the_audience
|
|
provider = private_key_jwt_provider
|
|
|
|
assertion = provider.client_assertion(audience: "https://auth.example.com")
|
|
payload_segment = assertion.split(".")[1]
|
|
claims = JSON.parse(Base64.urlsafe_decode64(payload_segment + "=" * (-payload_segment.length % 4)))
|
|
|
|
assert_equal("cc-client", claims["iss"])
|
|
assert_equal("cc-client", claims["sub"])
|
|
assert_equal("https://auth.example.com", claims["aud"])
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|