OAuth discovery drops explicit default ports from advertised issuer identifiers

オープン
  • 何か問題がありますか？
#1,420 コメント 2 件 リアクション 0 件 担当者 1 名 GitHub で見る

メンテナーはふだん 2 日以内に返信

@gocamille がすでに取り組んでいます。

2026年10月31日 から。

評価

この issue はまだ評価されていません。

説明

bug P1 ready for work T-security T-transport

Summary

OAuth discovery rejects internally consistent metadata when the advertised authorization-server issuer contains an explicit default port, such as https://auth.example.com:443/tenant1.

The original identifier is parsed into a Url, which removes :443. The serialized URL is then used as the expected issuer, while AuthorizationMetadata.issuer retains the original JSON string.

Reproduced against main at c742b5536724ec376b14b7ddcbbd024b7d6ae163 (rmcp 3.8.0). The same code is present at 98a54789b80110ad210495c4ad845c89e1980471, the rmcp revision pinned by Codex 0.166.0.

Reproduction with simulated metadata

Using the existing RecordingOAuthHttpClient test helper, return these responses during AuthorizationManager::resolve_metadata():

  1. An initial 401 for the MCP resource https://mcp.example.com/.
  2. Protected resource metadata:
{
  "resource": "https://mcp.example.com/",
  "authorization_servers": ["https://auth.example.com:443/tenant1"]
}
  1. Authorization-server metadata:
{
  "issuer": "https://auth.example.com:443/tenant1",
  "authorization_endpoint": "https://auth.example.com/tenant1/authorize",
  "token_endpoint": "https://auth.example.com/tenant1/token"
}

No real OAuth credentials or external service are needed.

Expected: discovery accepts the metadata because its issuer exactly matches the identifier advertised by protected resource metadata.

Actual:

Authorization server issuer mismatch: expected https://auth.example.com/tenant1, received https://auth.example.com:443/tenant1

Root cause

In crates/rmcp/src/transport/auth.rs, authorization_metadata_from_resource_metadata() parses the candidate with Url::parse(candidate), then calls:

.try_discover_oauth_server(&candidate_url, Some(candidate_url.as_str()))

candidate_url.as_str() has already lost the explicit default port. Parsing is appropriate for transport, but its normalized output no longer represents the original OAuth identifier.

This also creates an asymmetric check: an advertised issuer containing :443 can incorrectly match metadata that omits it, because the expected value has been normalized first.

Relation to #1144 / #1145

#1145 preserves the issuer through discovery to address the trailing-slash problem in #1144, but retains the parsed URL representation. That preserves a tenant's trailing slash while still losing an explicit default port and host casing.

I did not find an existing issue specifically covering this default-port case. #1268 concerns HTTP Origin validation and is a separate problem.

Proposed approach

Preserve the advertised absolute issuer string for identity validation, separately from the parsed URL used to construct discovery requests. Keep the existing resolved-URL behavior for legacy relative references.

The fix should not normalize both issuers or treat identifiers with and without :443 as interchangeable. RFC 8414 sections 3.3 and 4 require validation against the original issuer identifier.

Local validation and question

A local candidate fix has mocked regression coverage for matching and mismatched default ports, nonstandard ports, host casing, tenant paths and trailing slashes, including the complete metadata discovery path. A before/after comparison of OAuth and HTTP tests found no new failures; full upstream CI has not been run.

Would preserving the original advertised identifier be an appropriate follow-up to #1145 before submitting a PR?

AI assistance was used for the investigation and local regression tests. All examples above use fictional domains and tenants.

主要言語
Rust
スター
4.1k
フォーク
694
平均マージ
3日 14時間
マージ済み PR（30日）
39

環境構築

Codespaces で開く

このプロジェクトの開発コンテナを、あなたの GitHub アカウントでブラウザ上に起動します。

はじめの一歩

  1. issue を最後まで読み、次にプロジェクトのコントリビューションガイドを読みます。
  2. 着手することを issue にコメントします — 二人が同じ作業をするのを防げます。
  3. リポジトリをフォークし、ブランチを切って変更します。
  4. issue 番号を参照したプルリクエストを送ります。

modelcontextprotocol/rust-sdk のほかの issue

modelcontextprotocol/rust-sdk の issue をすべて見る

似ている issue

Rust の issue をもっと見る

新しい issue をメールで受け取る

初心者向けの GitHub issue を短くまとめたダイジェスト。