## 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.
87 lines
4.1 KiB
Ruby
87 lines
4.1 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
module MCP
|
|
class Client
|
|
module OAuth
|
|
# Shared token/credential persistence for the OAuth provider classes
|
|
# (`Provider` for the authorization-code flow, `ClientCredentialsProvider`
|
|
# for the client_credentials flow, and `CrossAppAccessProvider` for the jwt-bearer flow).
|
|
# The grants differ in how they authenticate, but all read and write the same two pieces of state
|
|
# through a `storage` object: the token response and the client information. This module supplies
|
|
# that delegation so the `Flow` orchestrator can treat any provider uniformly.
|
|
#
|
|
# Including classes must set `@storage` to an object responding to `tokens`,
|
|
# `save_tokens(tokens)`, `client_information`, and `save_client_information(info)`
|
|
# (see `InMemoryStorage`).
|
|
module StorageBackedProvider
|
|
# Optional `->(request) { true | false }` hook, called with an `AuthorizationRequest`.
|
|
# An MCP server names its own authorization server and the scopes to ask for, so this is where
|
|
# an embedding application sees both before the request is made and can decline to proceed.
|
|
# `nil` (the default) authorizes whatever the server asked for, which is the behavior every
|
|
# MCP SDK has today.
|
|
attr_reader :authorization_request_validator
|
|
|
|
# Optional Hash of String keys and values added to every token request the provider makes, for parameters
|
|
# the authorization server requires beyond the grant itself (RFC 6749 Section 8.2 leaves room for them;
|
|
# Auth0's `audience` is the usual one). `nil` (the default) adds nothing.
|
|
# Set through `frozen_token_request_params`, which refuses a key `Flow` sets itself or a wrongly shaped value
|
|
# with `Flow::InvalidTokenRequestParamsError`.
|
|
attr_reader :token_request_params
|
|
|
|
# Optional callable invoked with the `Faraday::Connection` the flow builds for its own requests,
|
|
# after the SDK's defaults and before its origin guard (see `Flow.build_http_client`), so an application can
|
|
# add middleware to discovery, registration, and token requests or swap their adapter. `nil` (the default)
|
|
# keeps the default connection. The transport's own connection and customizer block never serve these requests:
|
|
# they are bound to the MCP server URL and carry headers meant for that server.
|
|
attr_reader :http_client_customizer
|
|
|
|
def access_token
|
|
tokens&.dig("access_token") || tokens&.dig(:access_token)
|
|
end
|
|
|
|
def tokens
|
|
@storage.tokens
|
|
end
|
|
|
|
def save_tokens(tokens)
|
|
@storage.save_tokens(tokens)
|
|
end
|
|
|
|
def client_information
|
|
@storage.client_information
|
|
end
|
|
|
|
def save_client_information(info)
|
|
@storage.save_client_information(info)
|
|
end
|
|
|
|
def clear_tokens!
|
|
@storage.save_tokens(nil)
|
|
end
|
|
|
|
private
|
|
|
|
# Constructors call this before writing to `storage`, so a rejected provider leaves it untouched.
|
|
# The copy has its own frozen keys and values, so a later change to the caller's Hash, to a key,
|
|
# or to a value cannot alter what is sent to the token endpoint. Keys are copied explicitly
|
|
# because `Hash` copies and freezes only keys whose class is exactly `String`.
|
|
def frozen_token_request_params(params)
|
|
return if params.nil?
|
|
|
|
problem = Flow.token_request_params_problem(params)
|
|
raise Flow::InvalidTokenRequestParamsError, "token_request_params #{problem}" if problem
|
|
|
|
params.each_with_object({}) { |(key, value), copy| copy[key.dup.freeze] = value.dup.freeze }.freeze
|
|
end
|
|
|
|
# Returns `customizer` when it is `nil` or callable and raises otherwise, so a connection object passed
|
|
# in place of a callable fails at construction rather than at the first `401`.
|
|
def validated_http_client_customizer(customizer)
|
|
return customizer if customizer.nil? || customizer.respond_to?(:call)
|
|
|
|
raise ArgumentError, "http_client_customizer must respond to call (got #{customizer.class})."
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|