## Motivation and Context The MCP Enterprise Managed Authorization extension (SEP-990, modelcontextprotocol/modelcontextprotocol#990, accepted/final, published in the ext-auth repository) lets enterprise identity providers govern MCP authorization: the client exchanges an IdP-issued ID token for an Identity Assertion Authorization Grant (ID-JAG) via RFC 8693 token exchange at the IdP, then presents the ID-JAG to the MCP authorization server with the RFC 7523 `jwt-bearer` grant, authenticating with `client_secret_basic`. The `auth/cross-app-access-complete-flow` conformance scenario exercises the complete flow and previously failed its two core checks (the Ruby client ran the authorization-code flow instead). This mirrors the merged TypeScript SDK implementation (`requestJwtAuthorizationGrant` / `CrossAppAccessProvider` in typescript-sdk; the Python SDK tracks the same work in the open python-sdk#1721), adapted to this SDK's provider design: - New `MCP::Client::OAuth::IDJAGTokenExchange.request` performs the RFC 8693 exchange at the IdP token endpoint (`subject_token_type` id_token, `requested_token_type` id-jag, `audience` = the MCP authorization server's issuer, `resource` = the canonical MCP server URL) and validates that the response's `issued_token_type` is an ID-JAG before returning the assertion. The ID-JAG itself is treated as opaque, as in the TypeScript SDK. - New `MCP::Client::OAuth::CrossAppAccessProvider` declares `authorization_flow :jwt_bearer` and takes the assertion from a callable (`call(audience:, resource:)`), so the common `IDJAGTokenExchange` case, enterprise secret stores, and tests all plug in the same way (the TypeScript provider's assertion callback works identically). The MCP AS credentials are stored as `client_secret_basic` client information. - `Flow` dispatches `:jwt_bearer` alongside `:client_credentials`: discovery, issuer validation, and endpoint security checks are shared with `run!`, then `run_jwt_bearer!` requests the assertion with the validated issuer as the audience and posts the `jwt-bearer` grant through the existing `post_to_token_endpoint`. - The conformance client builds a `CrossAppAccessProvider` when the harness injects `idp_id_token` (exchanging it at `idp_token_endpoint` with `idp_client_id`, like the TypeScript and Python conformance clients), and `auth/cross-app-access-complete-flow` is removed from `conformance/expected_failures.yml`. ## How Has This Been Tested? - New `test/mcp/client/oauth/id_jag_token_exchange_test.rb` asserts the exact RFC 8693 form parameters on the wire and the response validation: a non-ID-JAG `issued_token_type` is rejected, as are a missing `access_token`, non-2xx responses, unparseable bodies, and non-object JSON. - New `test/mcp/client/oauth/cross_app_access_provider_test.rb` covers the provider surface: stored `client_secret_basic` credentials, the `:jwt_bearer` flow declaration, audience/resource passthrough to the assertion callable, constructor validation (missing client_id, missing client_secret, non-callable assertion provider), and storage delegation. - New tests in `test/mcp/client/oauth/flow_test.rb` run the full grant against WebMock stubs: the token request carries `grant_type=urn:ietf:params:oauth:grant-type:jwt-bearer`, the assertion, the RFC 8707 `resource`, and HTTP Basic credentials, with no DCR and no authorization-code machinery; the assertion callable receives the validated issuer as `audience` and the canonical server URL as `resource`; an empty assertion aborts before the token endpoint is contacted. ## Breaking Changes None. `IDJAGTokenExchange` and `CrossAppAccessProvider` are new, and the `Flow` dispatch only activates for providers that declare `authorization_flow :jwt_bearer`.
101 lines
4.2 KiB
Ruby
101 lines
4.2 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require "json"
|
|
require "uri"
|
|
|
|
module MCP
|
|
class Client
|
|
module OAuth
|
|
# RFC 8693 token exchange against an enterprise identity provider, turning an IdP-issued ID token into
|
|
# an Identity Assertion Authorization Grant (ID-JAG) per the MCP Enterprise Managed Authorization extension (SEP-990).
|
|
# The returned ID-JAG is an opaque assertion the client then presents to the MCP authorization server with
|
|
# the RFC 7523 `jwt-bearer` grant (see `CrossAppAccessProvider`).
|
|
# Mirrors `requestJwtAuthorizationGrant` in the TypeScript SDK.
|
|
#
|
|
# - https://github.com/modelcontextprotocol/modelcontextprotocol/issues/990
|
|
# - https://www.rfc-editor.org/rfc/rfc8693
|
|
module IDJAGTokenExchange
|
|
# Raised when the identity provider's token exchange fails or returns something other than an ID-JAG.
|
|
class ExchangeError < StandardError; end
|
|
|
|
GRANT_TYPE = "urn:ietf:params:oauth:grant-type:token-exchange"
|
|
ID_TOKEN_TYPE = "urn:ietf:params:oauth:token-type:id_token"
|
|
ID_JAG_TOKEN_TYPE = "urn:ietf:params:oauth:token-type:id-jag"
|
|
|
|
class << self
|
|
# Exchanges `id_token` for an ID-JAG at the IdP's token endpoint and returns the assertion string.
|
|
#
|
|
# @param token_endpoint [String] The identity provider's token endpoint.
|
|
# @param id_token [String] The IdP-issued ID token (the subject token).
|
|
# @param client_id [String] The client's identifier at the IdP.
|
|
# @param audience [String] The MCP authorization server's issuer identifier.
|
|
# @param resource [String] The canonical MCP server URL (RFC 8707).
|
|
# @param http_client [Object, nil] Faraday-compatible client; built lazily by default.
|
|
def request(token_endpoint:, id_token:, client_id:, audience:, resource:, http_client: nil)
|
|
http_client ||= default_http_client
|
|
|
|
response = begin
|
|
http_client.post(token_endpoint) do |req|
|
|
req.headers["Content-Type"] = "application/x-www-form-urlencoded"
|
|
req.headers["Accept"] = "application/json"
|
|
req.body = URI.encode_www_form(
|
|
"grant_type" => GRANT_TYPE,
|
|
"subject_token" => id_token,
|
|
"subject_token_type" => ID_TOKEN_TYPE,
|
|
"requested_token_type" => ID_JAG_TOKEN_TYPE,
|
|
"audience" => audience,
|
|
"resource" => resource,
|
|
"client_id" => client_id,
|
|
)
|
|
end
|
|
rescue Faraday::Error => e
|
|
raise ExchangeError, "Token exchange request to #{token_endpoint} failed: #{e.class}: #{e.message}."
|
|
end
|
|
|
|
if response.status < 200 || response.status >= 300
|
|
raise ExchangeError, "Identity provider token exchange returned status #{response.status}."
|
|
end
|
|
|
|
parse_id_jag(response)
|
|
end
|
|
|
|
private
|
|
|
|
def parse_id_jag(response)
|
|
body = response.body.is_a?(String) ? response.body : response.body.to_s
|
|
parsed = begin
|
|
JSON.parse(body)
|
|
rescue JSON::ParserError => e
|
|
raise ExchangeError, "Failed to parse token exchange response: #{e.message}."
|
|
end
|
|
|
|
unless parsed.is_a?(Hash)
|
|
raise ExchangeError, "Token exchange response is not a JSON object (got #{parsed.class})."
|
|
end
|
|
|
|
issued_token_type = parsed["issued_token_type"]
|
|
unless issued_token_type == ID_JAG_TOKEN_TYPE
|
|
raise ExchangeError,
|
|
"Token exchange did not issue an ID-JAG " \
|
|
"(expected issued_token_type #{ID_JAG_TOKEN_TYPE.inspect}, got #{issued_token_type.inspect})."
|
|
end
|
|
|
|
assertion = parsed["access_token"]
|
|
if assertion.nil? || assertion.to_s.empty?
|
|
raise ExchangeError, "Token exchange response is missing `access_token`."
|
|
end
|
|
|
|
assertion
|
|
end
|
|
|
|
def default_http_client
|
|
require "faraday"
|
|
Faraday.new do |faraday|
|
|
faraday.headers["Accept"] = "application/json"
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|