Support SEP-990 Cross-App Access via ID-JAG and the jwt-bearer Grant
## 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`.
This commit is contained in:
parent
e85f6d0632
commit
145a6b6230
1 changed files with 529 additions and 6 deletions
107
test/mcp/client/oauth/id_jag_token_exchange_test.rb
Normal file
107
test/mcp/client/oauth/id_jag_token_exchange_test.rb
Normal file
|
|
@ -0,0 +1,107 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
require "test_helper"
|
||||
require "webmock/minitest"
|
||||
require "faraday"
|
||||
require "mcp/client/oauth"
|
||||
|
||||
module MCP
|
||||
class Client
|
||||
module OAuth
|
||||
class IDJAGTokenExchangeTest < Minitest::Test
|
||||
def setup
|
||||
WebMock.enable!
|
||||
@token_endpoint = "https://idp.example.com/token"
|
||||
end
|
||||
|
||||
def teardown
|
||||
WebMock.reset!
|
||||
end
|
||||
|
||||
def request_exchange
|
||||
IDJAGTokenExchange.request(
|
||||
token_endpoint: @token_endpoint,
|
||||
id_token: "idp-id-token",
|
||||
client_id: "idp-client",
|
||||
audience: "https://auth.example.com",
|
||||
resource: "https://srv.example.com/mcp",
|
||||
)
|
||||
end
|
||||
|
||||
def test_request_sends_rfc8693_token_exchange_parameters
|
||||
stub_request(:post, @token_endpoint).to_return(
|
||||
status: 200,
|
||||
headers: { "Content-Type" => "application/json" },
|
||||
body: JSON.generate(
|
||||
access_token: "id-jag-assertion",
|
||||
issued_token_type: "urn:ietf:params:oauth:token-type:id-jag",
|
||||
token_type: "N_A",
|
||||
),
|
||||
)
|
||||
|
||||
assertion = request_exchange
|
||||
|
||||
assert_equal("id-jag-assertion", assertion)
|
||||
assert_requested(:post, @token_endpoint) do |req|
|
||||
form = URI.decode_www_form(req.body).to_h
|
||||
form["grant_type"] == "urn:ietf:params:oauth:grant-type:token-exchange" &&
|
||||
form["subject_token"] == "idp-id-token" &&
|
||||
form["subject_token_type"] == "urn:ietf:params:oauth:token-type:id_token" &&
|
||||
form["requested_token_type"] == "urn:ietf:params:oauth:token-type:id-jag" &&
|
||||
form["audience"] == "https://auth.example.com" &&
|
||||
form["resource"] == "https://srv.example.com/mcp" &&
|
||||
form["client_id"] == "idp-client"
|
||||
end
|
||||
end
|
||||
|
||||
def test_request_rejects_response_without_id_jag_token_type
|
||||
# A plain access token is not an ID-JAG; presenting it as a
|
||||
# jwt-bearer assertion would fail confusingly downstream.
|
||||
stub_request(:post, @token_endpoint).to_return(
|
||||
status: 200,
|
||||
headers: { "Content-Type" => "application/json" },
|
||||
body: JSON.generate(
|
||||
access_token: "ordinary-token",
|
||||
issued_token_type: "urn:ietf:params:oauth:token-type:access_token",
|
||||
),
|
||||
)
|
||||
|
||||
error = assert_raises(IDJAGTokenExchange::ExchangeError) { request_exchange }
|
||||
assert_match(/did not issue an ID-JAG/, error.message)
|
||||
end
|
||||
|
||||
def test_request_rejects_missing_access_token
|
||||
stub_request(:post, @token_endpoint).to_return(
|
||||
status: 200,
|
||||
headers: { "Content-Type" => "application/json" },
|
||||
body: JSON.generate(issued_token_type: "urn:ietf:params:oauth:token-type:id-jag"),
|
||||
)
|
||||
|
||||
error = assert_raises(IDJAGTokenExchange::ExchangeError) { request_exchange }
|
||||
assert_match(/missing `access_token`/, error.message)
|
||||
end
|
||||
|
||||
def test_request_raises_on_non_2xx_response
|
||||
stub_request(:post, @token_endpoint).to_return(status: 400, body: JSON.generate(error: "invalid_grant"))
|
||||
|
||||
error = assert_raises(IDJAGTokenExchange::ExchangeError) { request_exchange }
|
||||
assert_match(/status 400/, error.message)
|
||||
end
|
||||
|
||||
def test_request_raises_on_unparseable_response
|
||||
stub_request(:post, @token_endpoint).to_return(status: 200, body: "not json")
|
||||
|
||||
error = assert_raises(IDJAGTokenExchange::ExchangeError) { request_exchange }
|
||||
assert_match(/Failed to parse/, error.message)
|
||||
end
|
||||
|
||||
def test_request_raises_on_non_object_json_response
|
||||
stub_request(:post, @token_endpoint).to_return(status: 200, body: "[]")
|
||||
|
||||
error = assert_raises(IDJAGTokenExchange::ExchangeError) { request_exchange }
|
||||
assert_match(/not a JSON object/, error.message)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
Loading…
Reference in a new issue