## Motivation and Context `MCP::Client::OAuth::Flow` takes an `http_client_factory:`, but `MCP::Client::HTTP` builds the flow itself and passes none, so an application using `oauth:` could not add middleware to the requests the flow makes: Protected Resource Metadata and authorization server metadata discovery, dynamic client registration, and every token request. The block that customizes the transport's Faraday connection does not help, because that connection is bound to the MCP server URL and carries the `headers:` meant for that server, and the authorization server is a different origin. The TypeScript SDK hands the transport's `fetch` to `auth()` and the Python SDK sends the provider's requests through the transport's httpx client, so both let an application instrument these requests; this SDK did not. (#558) Providers now take `http_client_customizer:`, a callable invoked with the Faraday connection the flow builds for its own requests, next to the other callables a provider already holds. It runs after the SDK's defaults (`Accept: application/json`, no redirect following) and between two middlewares of the SDK's own: `Flow::RequestedURLStamp`, registered before the customizer is invoked, records the URL the flow asked for on the request environment, and `Flow::RequestedOriginGuard`, registered last, sees what the customizer's middleware did to the request after that record. A request that would leave that origin, by following a redirect or rewriting the URL, or that arrives without the record, is refused with `Flow::DestinationMismatchError` before it reaches the adapter. The record lives on the environment rather than in `env.request.context`, which stays the application's to fill or replace. The error is an `ArgumentError` rather than an `AuthorizationError` so neither discovery nor the transport's refresh fallback can absorb a configuration mistake. The boundary resembles the one the Python SDK keeps for its own requests, which follows a redirect only within the origin; this flow follows none itself. `Flow.build_http_client` assembles that connection and `Flow.new(http_client_factory:)` keeps replacing it whole. Following done inside an adapter cannot be seen by any guard, so the documentation keeps that, `Accept-Encoding`, and `raise_error` off the list of things a customizer may add, and notes that a recording middleware sees client credentials and tokens. Fixes #558. ## How Has This Been Tested? New tests in `test/mcp/client/oauth/flow_test.rb`, `test/mcp/client/oauth/http_oauth_test.rb`, and the three provider test files. Against the library before this change, every one of them fails, on the unknown keyword or on the missing reader. ## Breaking Changes None. The customizer is opt-in, and the guard cannot fire on the SDK's own middleware-free connection.
112 lines
4.7 KiB
Ruby
112 lines
4.7 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
|
|
|
|
bounded = BoundedBody.new
|
|
|
|
response = begin
|
|
raw_response = http_client.post(token_endpoint) do |req|
|
|
req.headers["Content-Type"] = "application/x-www-form-urlencoded"
|
|
req.headers["Accept"] = "application/json"
|
|
req.options.on_data = bounded.on_data
|
|
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
|
|
|
|
bounded.response_for(raw_response)
|
|
rescue BoundedBody::TooLargeError => e
|
|
raise ExchangeError, "#{e.message}."
|
|
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
|
|
|
|
# `Accept-Encoding` is deliberately left unset, for the same reason as `Flow.build_http_client`:
|
|
# claiming that header turns Net::HTTP's `decode_content` off and would move `BoundedBody`'s cap
|
|
# onto compressed bytes.
|
|
def default_http_client
|
|
require "faraday"
|
|
|
|
Faraday.new do |faraday|
|
|
faraday.headers["Accept"] = "application/json"
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|