refactor: make oauth discovery reactive#1052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaleSeo merged 1 commit into from
Jul 27, 2026
Merged

refactor: make oauth discovery reactive #1052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 82 additions & 28 deletions conformance/src/bin/client.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -195,25 +195,73 @@ const REDIRECT_URI: &str = "http://localhost:3000/callback";
const SCOPE_STEP_UP_INITIAL_SCOPES: &[&str] = &["mcp:basic"];
const SCOPE_STEP_UP_ESCALATED_SCOPES: &[&str] = &["mcp:basic", "mcp:write"];

/// Perform the headless OAuth authorization-code flow.
/// Attempt the real connection unauthenticated and return the server's
/// `WWW-Authenticate` challenge from the 401 — the reactive discovery
/// trigger.
///
/// 1. Discover metadata, register (or use CIMD), get auth URL
/// 2. Fetch the auth URL with redirect:manual → extract code from Location header
/// 3. Exchange code for token
/// 4. Return an `AuthClient` wrapping `reqwest::Client`
/// `None` (server accepted the unauthenticated connection, which is then
/// closed cleanly) is a legitimate outcome, not an error: the scope-step-up
/// and scope-retry-limit mocks allow unauthenticated `initialize` and only
/// enforce authorization on tool calls.
async fn initialize_challenge(
server_url: &str,
lifecycle: ClientLifecycleMode,
) -> anyhow::Result<Option<String>> {
let transport = StreamableHttpClientTransport::from_uri(server_url);
match BasicClientHandler
.serve_with_lifecycle(transport, lifecycle)
.await
{
Ok(client) => {
client.cancel().await.ok();
Ok(None)
}
Err(error) => match error.auth_challenge() {
Some(challenge) => Ok(Some(challenge.to_string())),
None => Err(error.into()),
},
}
}

fn with_optional_challenge(
request: AuthorizationRequest,
challenge: Option<String>,
) -> AuthorizationRequest {
match challenge {
Some(challenge) => request.with_challenge(challenge),
None => request,
}
}

/// Perform the headless OAuth authorization-code flow, reactively:
///
/// 1. Attempt the real connection; take the 401's WWW-Authenticate challenge
/// 2. Discover from the challenge, register (or use CIMD), get auth URL
/// 3. Fetch the auth URL with redirect:manual → extract code from Location header
/// 4. Exchange code for token
/// 5. Return an `AuthClient` wrapping `reqwest::Client`
async fn perform_oauth_flow(
server_url: &str,
_ctx: &ConformanceContext,
) -> anyhow::Result<AuthClient<reqwest::Client>> {
// Always the discover lifecycle here (not `conformance_lifecycle()`):
// this flow serves `run_auth_client`, whose 2026-07-28 auth mocks require
// the per-request MCP-Protocol-Version negotiation.
let challenge = initialize_challenge(
server_url,
ClientLifecycleMode::Discover {
preferred_versions: preferred_protocol_versions(),
},
)
.await?;
let mut oauth = OAuthState::new(server_url, None).await?;

// Discover + register + get auth URL
let request = AuthorizationRequest::new(REDIRECT_URI)
.with_client_name("conformance-client")
.with_client_metadata_url(CIMD_CLIENT_METADATA_URL);
oauth
.start_authorization(
AuthorizationRequest::new(REDIRECT_URI)
.with_client_name("conformance-client")
.with_client_metadata_url(CIMD_CLIENT_METADATA_URL),
)
.start_authorization(with_optional_challenge(request, challenge))
.await?;

let auth_url = oauth.get_authorization_url().await?;
Expand DownExpand Up@@ -255,14 +303,14 @@ async fn perform_oauth_flow_preregistered(
client_id: &str,
client_secret: &str,
) -> anyhow::Result<AuthClient<reqwest::Client>> {
let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;
let mut oauth = OAuthState::new(server_url, None).await?;

let request = AuthorizationRequest::new(REDIRECT_URI)
.with_preregistered_client(client_id)
.with_client_secret(client_secret);
oauth
.start_authorization(
AuthorizationRequest::new(REDIRECT_URI)
.with_preregistered_client(client_id)
.with_client_secret(client_secret),
)
.start_authorization(with_optional_challenge(request, challenge))
.await?;

let auth_url = oauth.get_authorization_url().await?;
Expand DownExpand Up@@ -325,14 +373,14 @@ async fn run_auth_scope_step_up_client(
server_url: &str,
_ctx: &ConformanceContext,
) -> anyhow::Result<()> {
let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;
let mut oauth = OAuthState::new(server_url, None).await?;
let request = AuthorizationRequest::new(REDIRECT_URI)
.with_scopes(SCOPE_STEP_UP_INITIAL_SCOPES.iter().copied())
.with_client_name("conformance-client")
.with_client_metadata_url(CIMD_CLIENT_METADATA_URL);
oauth
.start_authorization(
AuthorizationRequest::new(REDIRECT_URI)
.with_scopes(SCOPE_STEP_UP_INITIAL_SCOPES.iter().copied())
.with_client_name("conformance-client")
.with_client_metadata_url(CIMD_CLIENT_METADATA_URL),
)
.start_authorization(with_optional_challenge(request, challenge))
.await?;

let auth_url = oauth.get_authorization_url().await?;
Expand DownExpand Up@@ -427,15 +475,15 @@ async fn run_auth_scope_retry_limit_client(
) -> anyhow::Result<()> {
let max_retries = 3u32;
let mut attempt = 0u32;
let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;

loop {
let mut oauth = OAuthState::new(server_url, None).await?;
let request = AuthorizationRequest::new(REDIRECT_URI)
.with_client_name("conformance-client")
.with_client_metadata_url(CIMD_CLIENT_METADATA_URL);
oauth
.start_authorization(
AuthorizationRequest::new(REDIRECT_URI)
.with_client_name("conformance-client")
.with_client_metadata_url(CIMD_CLIENT_METADATA_URL),
)
.start_authorization(with_optional_challenge(request, challenge.clone()))
.await?;
let auth_url = oauth.get_authorization_url().await?;
let callback = headless_authorize(&auth_url).await?;
Expand DownExpand Up@@ -509,7 +557,10 @@ async fn migration_token(
return Ok(manager.get_access_token().await?);
}

let resolution = manager.resolve_metadata().await?;
let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;
let resolution = manager
.resolve_metadata_from_challenge(challenge.as_deref())
.await?;
manager.set_metadata(resolution.metadata);
manager
.register_client("conformance-client", REDIRECT_URI, &[])
Expand DownExpand Up@@ -609,7 +660,10 @@ async fn run_client_credentials_basic(
.unwrap_or("conformance-test-secret");

let mut manager = AuthorizationManager::new(server_url).await?;
let resolution = manager.resolve_metadata().await?;
let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;
let resolution = manager
.resolve_metadata_from_challenge(challenge.as_deref())
.await?;
let token_endpoint = resolution.metadata.token_endpoint.clone();
manager.set_metadata(resolution.metadata);

Expand Down
25 changes: 25 additions & 0 deletions crates/rmcp/src/service/client.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -86,6 +86,31 @@ impl ClientInitializeError {
context: context.into(),
}
}

/// The `WWW-Authenticate` challenge from the 401/403 the transport hit
/// during initialization, if that is why initialization failed.
///
/// This is the trigger of the reactive OAuth flow: feed the challenge to
/// `AuthorizationRequest::with_challenge` to authorize, then reconnect.
#[cfg(feature = "transport-streamable-http-client")]
pub fn auth_challenge(&self) -> Option<&str> {
use crate::transport::streamable_http_client::{AuthRequiredError, InsufficientScopeError};

let Self::TransportError { error, .. } = self else {
return None;
};
let mut source: Option<&(dyn std::error::Error + 'static)> = Some(error.error.as_ref());
while let Some(current) = source {
if let Some(auth_required) = current.downcast_ref::<AuthRequiredError>() {
return Some(&auth_required.www_authenticate_header);
}
if let Some(insufficient_scope) = current.downcast_ref::<InsufficientScopeError>() {
return Some(&insufficient_scope.www_authenticate_header);
}
source = current.source();
}
None
}
}

/// Helper function to get the next message from the stream
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
refactor: make oauth discovery reactive#1052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

DaleSeo
merged 1 commit into

from

Jul 27, 2026
 Merged


refactor: make oauth discovery reactive
#1052
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


110 changes: 82 additions & 28 deletions
conformance/src/bin/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -195,25 +195,73 @@ const REDIRECT_URI: &str = "http://localhost:3000/callback";
const SCOPE_STEP_UP_INITIAL_SCOPES: &[&str] = &["mcp:basic"];
const SCOPE_STEP_UP_ESCALATED_SCOPES: &[&str] = &["mcp:basic", "mcp:write"];

/// Perform the headless OAuth authorization-code flow.
/// Attempt the real connection unauthenticated and return the server's
/// `WWW-Authenticate` challenge from the 401 — the reactive discovery
/// trigger.
///
/// 1. Discover metadata, register (or use CIMD), get auth URL
/// 2. Fetch the auth URL with redirect:manual → extract code from Location header
/// 3. Exchange code for token
/// 4. Return an `AuthClient` wrapping `reqwest::Client`
/// `None` (server accepted the unauthenticated connection, which is then
/// closed cleanly) is a legitimate outcome, not an error: the scope-step-up
/// and scope-retry-limit mocks allow unauthenticated `initialize` and only
/// enforce authorization on tool calls.
async fn initialize_challenge(
 server_url: &str,
 lifecycle: ClientLifecycleMode,
) -> anyhow::Result<Option<String>> {
 let transport = StreamableHttpClientTransport::from_uri(server_url);
 match BasicClientHandler
 .serve_with_lifecycle(transport, lifecycle)
 .await
 {
 Ok(client) => {
 client.cancel().await.ok();
 Ok(None)
 }
 Err(error) => match error.auth_challenge() {
 Some(challenge) => Ok(Some(challenge.to_string())),
 None => Err(error.into()),
 },
 }
}

fn with_optional_challenge(
 request: AuthorizationRequest,
 challenge: Option<String>,
) -> AuthorizationRequest {
 match challenge {
 Some(challenge) => request.with_challenge(challenge),
 None => request,
 }
}

/// Perform the headless OAuth authorization-code flow, reactively:
///
/// 1. Attempt the real connection; take the 401's WWW-Authenticate challenge
/// 2. Discover from the challenge, register (or use CIMD), get auth URL
/// 3. Fetch the auth URL with redirect:manual → extract code from Location header
/// 4. Exchange code for token
/// 5. Return an `AuthClient` wrapping `reqwest::Client`
async fn perform_oauth_flow(
 server_url: &str,
 _ctx: &ConformanceContext,
) -> anyhow::Result<AuthClient<reqwest::Client>> {
 // Always the discover lifecycle here (not `conformance_lifecycle()`):
 // this flow serves `run_auth_client`, whose 2026-07-28 auth mocks require
 // the per-request MCP-Protocol-Version negotiation.
 let challenge = initialize_challenge(
 server_url,
 ClientLifecycleMode::Discover {
 preferred_versions: preferred_protocol_versions(),
 },
 )
 .await?;
 let mut oauth = OAuthState::new(server_url, None).await?;

 // Discover + register + get auth URL
 let request = AuthorizationRequest::new(REDIRECT_URI)
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL);
 oauth
 .start_authorization(
 AuthorizationRequest::new(REDIRECT_URI)
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL),
 )
 .start_authorization(with_optional_challenge(request, challenge))
 .await?;

 let auth_url = oauth.get_authorization_url().await?;
Expand DownExpand Up@@ -255,14 +303,14 @@ async fn perform_oauth_flow_preregistered(
 client_id: &str,
 client_secret: &str,
) -> anyhow::Result<AuthClient<reqwest::Client>> {
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;
 let mut oauth = OAuthState::new(server_url, None).await?;

 let request = AuthorizationRequest::new(REDIRECT_URI)
 .with_preregistered_client(client_id)
 .with_client_secret(client_secret);
 oauth
 .start_authorization(
 AuthorizationRequest::new(REDIRECT_URI)
 .with_preregistered_client(client_id)
 .with_client_secret(client_secret),
 )
 .start_authorization(with_optional_challenge(request, challenge))
 .await?;

 let auth_url = oauth.get_authorization_url().await?;
Expand DownExpand Up@@ -325,14 +373,14 @@ async fn run_auth_scope_step_up_client(
 server_url: &str,
 _ctx: &ConformanceContext,
) -> anyhow::Result<()> {
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;
 let mut oauth = OAuthState::new(server_url, None).await?;
 let request = AuthorizationRequest::new(REDIRECT_URI)
 .with_scopes(SCOPE_STEP_UP_INITIAL_SCOPES.iter().copied())
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL);
 oauth
 .start_authorization(
 AuthorizationRequest::new(REDIRECT_URI)
 .with_scopes(SCOPE_STEP_UP_INITIAL_SCOPES.iter().copied())
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL),
 )
 .start_authorization(with_optional_challenge(request, challenge))
 .await?;

 let auth_url = oauth.get_authorization_url().await?;
Expand DownExpand Up@@ -427,15 +475,15 @@ async fn run_auth_scope_retry_limit_client(
) -> anyhow::Result<()> {
 let max_retries = 3u32;
 let mut attempt = 0u32;
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;

 loop {
 let mut oauth = OAuthState::new(server_url, None).await?;
 let request = AuthorizationRequest::new(REDIRECT_URI)
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL);
 oauth
 .start_authorization(
 AuthorizationRequest::new(REDIRECT_URI)
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL),
 )
 .start_authorization(with_optional_challenge(request, challenge.clone()))
 .await?;
 let auth_url = oauth.get_authorization_url().await?;
 let callback = headless_authorize(&auth_url).await?;
Expand DownExpand Up@@ -509,7 +557,10 @@ async fn migration_token(
 return Ok(manager.get_access_token().await?);
 }

 let resolution = manager.resolve_metadata().await?;
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;
 let resolution = manager
 .resolve_metadata_from_challenge(challenge.as_deref())
 .await?;
 manager.set_metadata(resolution.metadata);
 manager
 .register_client("conformance-client", REDIRECT_URI, &[])
Expand DownExpand Up@@ -609,7 +660,10 @@ async fn run_client_credentials_basic(
 .unwrap_or("conformance-test-secret");

 let mut manager = AuthorizationManager::new(server_url).await?;
 let resolution = manager.resolve_metadata().await?;
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;
 let resolution = manager
 .resolve_metadata_from_challenge(challenge.as_deref())
 .await?;
 let token_endpoint = resolution.metadata.token_endpoint.clone();
 manager.set_metadata(resolution.metadata);

Expand Down

25 changes: 25 additions & 0 deletions
crates/rmcp/src/service/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,6 +86,31 @@ impl ClientInitializeError {
 context: context.into(),
 }
 }

 /// The `WWW-Authenticate` challenge from the 401/403 the transport hit
 /// during initialization, if that is why initialization failed.
 ///
 /// This is the trigger of the reactive OAuth flow: feed the challenge to
 /// `AuthorizationRequest::with_challenge` to authorize, then reconnect.
 #[cfg(feature = "transport-streamable-http-client")]
 pub fn auth_challenge(&self) -> Option<&str> {
 use crate::transport::streamable_http_client::{AuthRequiredError, InsufficientScopeError};

 let Self::TransportError { error, .. } = self else {
 return None;
 };
 let mut source: Option<&(dyn std::error::Error + 'static)> = Some(error.error.as_ref());
 while let Some(current) = source {
 if let Some(auth_required) = current.downcast_ref::<AuthRequiredError>() {
 return Some(&auth_required.www_authenticate_header);
 }
 if let Some(insufficient_scope) = current.downcast_ref::<InsufficientScopeError>() {
 return Some(&insufficient_scope.www_authenticate_header);
 }
 source = current.source();
 }
 None
 }
}

/// Helper function to get the next message from the stream
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor: make oauth discovery reactive#1052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

DaleSeo
merged 1 commit into

from

Jul 27, 2026
 Merged


refactor: make oauth discovery reactive
#1052
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


110 changes: 82 additions & 28 deletions
conformance/src/bin/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -195,25 +195,73 @@ const REDIRECT_URI: &str = "http://localhost:3000/callback";
const SCOPE_STEP_UP_INITIAL_SCOPES: &[&str] = &["mcp:basic"];
const SCOPE_STEP_UP_ESCALATED_SCOPES: &[&str] = &["mcp:basic", "mcp:write"];

/// Perform the headless OAuth authorization-code flow.
/// Attempt the real connection unauthenticated and return the server's
/// `WWW-Authenticate` challenge from the 401 — the reactive discovery
/// trigger.
///
/// 1. Discover metadata, register (or use CIMD), get auth URL
/// 2. Fetch the auth URL with redirect:manual → extract code from Location header
/// 3. Exchange code for token
/// 4. Return an `AuthClient` wrapping `reqwest::Client`
/// `None` (server accepted the unauthenticated connection, which is then
/// closed cleanly) is a legitimate outcome, not an error: the scope-step-up
/// and scope-retry-limit mocks allow unauthenticated `initialize` and only
/// enforce authorization on tool calls.
async fn initialize_challenge(
 server_url: &str,
 lifecycle: ClientLifecycleMode,
) -> anyhow::Result<Option<String>> {
 let transport = StreamableHttpClientTransport::from_uri(server_url);
 match BasicClientHandler
 .serve_with_lifecycle(transport, lifecycle)
 .await
 {
 Ok(client) => {
 client.cancel().await.ok();
 Ok(None)
 }
 Err(error) => match error.auth_challenge() {
 Some(challenge) => Ok(Some(challenge.to_string())),
 None => Err(error.into()),
 },
 }
}

fn with_optional_challenge(
 request: AuthorizationRequest,
 challenge: Option<String>,
) -> AuthorizationRequest {
 match challenge {
 Some(challenge) => request.with_challenge(challenge),
 None => request,
 }
}

/// Perform the headless OAuth authorization-code flow, reactively:
///
/// 1. Attempt the real connection; take the 401's WWW-Authenticate challenge
/// 2. Discover from the challenge, register (or use CIMD), get auth URL
/// 3. Fetch the auth URL with redirect:manual → extract code from Location header
/// 4. Exchange code for token
/// 5. Return an `AuthClient` wrapping `reqwest::Client`
async fn perform_oauth_flow(
 server_url: &str,
 _ctx: &ConformanceContext,
) -> anyhow::Result<AuthClient<reqwest::Client>> {
 // Always the discover lifecycle here (not `conformance_lifecycle()`):
 // this flow serves `run_auth_client`, whose 2026-07-28 auth mocks require
 // the per-request MCP-Protocol-Version negotiation.
 let challenge = initialize_challenge(
 server_url,
 ClientLifecycleMode::Discover {
 preferred_versions: preferred_protocol_versions(),
 },
 )
 .await?;
 let mut oauth = OAuthState::new(server_url, None).await?;

 // Discover + register + get auth URL
 let request = AuthorizationRequest::new(REDIRECT_URI)
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL);
 oauth
 .start_authorization(
 AuthorizationRequest::new(REDIRECT_URI)
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL),
 )
 .start_authorization(with_optional_challenge(request, challenge))
 .await?;

 let auth_url = oauth.get_authorization_url().await?;
Expand DownExpand Up@@ -255,14 +303,14 @@ async fn perform_oauth_flow_preregistered(
 client_id: &str,
 client_secret: &str,
) -> anyhow::Result<AuthClient<reqwest::Client>> {
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;
 let mut oauth = OAuthState::new(server_url, None).await?;

 let request = AuthorizationRequest::new(REDIRECT_URI)
 .with_preregistered_client(client_id)
 .with_client_secret(client_secret);
 oauth
 .start_authorization(
 AuthorizationRequest::new(REDIRECT_URI)
 .with_preregistered_client(client_id)
 .with_client_secret(client_secret),
 )
 .start_authorization(with_optional_challenge(request, challenge))
 .await?;

 let auth_url = oauth.get_authorization_url().await?;
Expand DownExpand Up@@ -325,14 +373,14 @@ async fn run_auth_scope_step_up_client(
 server_url: &str,
 _ctx: &ConformanceContext,
) -> anyhow::Result<()> {
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;
 let mut oauth = OAuthState::new(server_url, None).await?;
 let request = AuthorizationRequest::new(REDIRECT_URI)
 .with_scopes(SCOPE_STEP_UP_INITIAL_SCOPES.iter().copied())
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL);
 oauth
 .start_authorization(
 AuthorizationRequest::new(REDIRECT_URI)
 .with_scopes(SCOPE_STEP_UP_INITIAL_SCOPES.iter().copied())
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL),
 )
 .start_authorization(with_optional_challenge(request, challenge))
 .await?;

 let auth_url = oauth.get_authorization_url().await?;
Expand DownExpand Up@@ -427,15 +475,15 @@ async fn run_auth_scope_retry_limit_client(
) -> anyhow::Result<()> {
 let max_retries = 3u32;
 let mut attempt = 0u32;
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;

 loop {
 let mut oauth = OAuthState::new(server_url, None).await?;
 let request = AuthorizationRequest::new(REDIRECT_URI)
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL);
 oauth
 .start_authorization(
 AuthorizationRequest::new(REDIRECT_URI)
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL),
 )
 .start_authorization(with_optional_challenge(request, challenge.clone()))
 .await?;
 let auth_url = oauth.get_authorization_url().await?;
 let callback = headless_authorize(&auth_url).await?;
Expand DownExpand Up@@ -509,7 +557,10 @@ async fn migration_token(
 return Ok(manager.get_access_token().await?);
 }

 let resolution = manager.resolve_metadata().await?;
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;
 let resolution = manager
 .resolve_metadata_from_challenge(challenge.as_deref())
 .await?;
 manager.set_metadata(resolution.metadata);
 manager
 .register_client("conformance-client", REDIRECT_URI, &[])
Expand DownExpand Up@@ -609,7 +660,10 @@ async fn run_client_credentials_basic(
 .unwrap_or("conformance-test-secret");

 let mut manager = AuthorizationManager::new(server_url).await?;
 let resolution = manager.resolve_metadata().await?;
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;
 let resolution = manager
 .resolve_metadata_from_challenge(challenge.as_deref())
 .await?;
 let token_endpoint = resolution.metadata.token_endpoint.clone();
 manager.set_metadata(resolution.metadata);

Expand Down

25 changes: 25 additions & 0 deletions
crates/rmcp/src/service/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,6 +86,31 @@ impl ClientInitializeError {
 context: context.into(),
 }
 }

 /// The `WWW-Authenticate` challenge from the 401/403 the transport hit
 /// during initialization, if that is why initialization failed.
 ///
 /// This is the trigger of the reactive OAuth flow: feed the challenge to
 /// `AuthorizationRequest::with_challenge` to authorize, then reconnect.
 #[cfg(feature = "transport-streamable-http-client")]
 pub fn auth_challenge(&self) -> Option<&str> {
 use crate::transport::streamable_http_client::{AuthRequiredError, InsufficientScopeError};

 let Self::TransportError { error, .. } = self else {
 return None;
 };
 let mut source: Option<&(dyn std::error::Error + 'static)> = Some(error.error.as_ref());
 while let Some(current) = source {
 if let Some(auth_required) = current.downcast_ref::<AuthRequiredError>() {
 return Some(&auth_required.www_authenticate_header);
 }
 if let Some(insufficient_scope) = current.downcast_ref::<InsufficientScopeError>() {
 return Some(&insufficient_scope.www_authenticate_header);
 }
 source = current.source();
 }
 None
 }
}

/// Helper function to get the next message from the stream
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor: make oauth discovery reactive#1052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

DaleSeo
merged 1 commit into

from

Jul 27, 2026
 Merged


refactor: make oauth discovery reactive
#1052
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


110 changes: 82 additions & 28 deletions
conformance/src/bin/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -195,25 +195,73 @@ const REDIRECT_URI: &str = "http://localhost:3000/callback";
const SCOPE_STEP_UP_INITIAL_SCOPES: &[&str] = &["mcp:basic"];
const SCOPE_STEP_UP_ESCALATED_SCOPES: &[&str] = &["mcp:basic", "mcp:write"];

/// Perform the headless OAuth authorization-code flow.
/// Attempt the real connection unauthenticated and return the server's
/// `WWW-Authenticate` challenge from the 401 — the reactive discovery
/// trigger.
///
/// 1. Discover metadata, register (or use CIMD), get auth URL
/// 2. Fetch the auth URL with redirect:manual → extract code from Location header
/// 3. Exchange code for token
/// 4. Return an `AuthClient` wrapping `reqwest::Client`
/// `None` (server accepted the unauthenticated connection, which is then
/// closed cleanly) is a legitimate outcome, not an error: the scope-step-up
/// and scope-retry-limit mocks allow unauthenticated `initialize` and only
/// enforce authorization on tool calls.
async fn initialize_challenge(
 server_url: &str,
 lifecycle: ClientLifecycleMode,
) -> anyhow::Result<Option<String>> {
 let transport = StreamableHttpClientTransport::from_uri(server_url);
 match BasicClientHandler
 .serve_with_lifecycle(transport, lifecycle)
 .await
 {
 Ok(client) => {
 client.cancel().await.ok();
 Ok(None)
 }
 Err(error) => match error.auth_challenge() {
 Some(challenge) => Ok(Some(challenge.to_string())),
 None => Err(error.into()),
 },
 }
}

fn with_optional_challenge(
 request: AuthorizationRequest,
 challenge: Option<String>,
) -> AuthorizationRequest {
 match challenge {
 Some(challenge) => request.with_challenge(challenge),
 None => request,
 }
}

/// Perform the headless OAuth authorization-code flow, reactively:
///
/// 1. Attempt the real connection; take the 401's WWW-Authenticate challenge
/// 2. Discover from the challenge, register (or use CIMD), get auth URL
/// 3. Fetch the auth URL with redirect:manual → extract code from Location header
/// 4. Exchange code for token
/// 5. Return an `AuthClient` wrapping `reqwest::Client`
async fn perform_oauth_flow(
 server_url: &str,
 _ctx: &ConformanceContext,
) -> anyhow::Result<AuthClient<reqwest::Client>> {
 // Always the discover lifecycle here (not `conformance_lifecycle()`):
 // this flow serves `run_auth_client`, whose 2026-07-28 auth mocks require
 // the per-request MCP-Protocol-Version negotiation.
 let challenge = initialize_challenge(
 server_url,
 ClientLifecycleMode::Discover {
 preferred_versions: preferred_protocol_versions(),
 },
 )
 .await?;
 let mut oauth = OAuthState::new(server_url, None).await?;

 // Discover + register + get auth URL
 let request = AuthorizationRequest::new(REDIRECT_URI)
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL);
 oauth
 .start_authorization(
 AuthorizationRequest::new(REDIRECT_URI)
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL),
 )
 .start_authorization(with_optional_challenge(request, challenge))
 .await?;

 let auth_url = oauth.get_authorization_url().await?;
Expand DownExpand Up@@ -255,14 +303,14 @@ async fn perform_oauth_flow_preregistered(
 client_id: &str,
 client_secret: &str,
) -> anyhow::Result<AuthClient<reqwest::Client>> {
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;
 let mut oauth = OAuthState::new(server_url, None).await?;

 let request = AuthorizationRequest::new(REDIRECT_URI)
 .with_preregistered_client(client_id)
 .with_client_secret(client_secret);
 oauth
 .start_authorization(
 AuthorizationRequest::new(REDIRECT_URI)
 .with_preregistered_client(client_id)
 .with_client_secret(client_secret),
 )
 .start_authorization(with_optional_challenge(request, challenge))
 .await?;

 let auth_url = oauth.get_authorization_url().await?;
Expand DownExpand Up@@ -325,14 +373,14 @@ async fn run_auth_scope_step_up_client(
 server_url: &str,
 _ctx: &ConformanceContext,
) -> anyhow::Result<()> {
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;
 let mut oauth = OAuthState::new(server_url, None).await?;
 let request = AuthorizationRequest::new(REDIRECT_URI)
 .with_scopes(SCOPE_STEP_UP_INITIAL_SCOPES.iter().copied())
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL);
 oauth
 .start_authorization(
 AuthorizationRequest::new(REDIRECT_URI)
 .with_scopes(SCOPE_STEP_UP_INITIAL_SCOPES.iter().copied())
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL),
 )
 .start_authorization(with_optional_challenge(request, challenge))
 .await?;

 let auth_url = oauth.get_authorization_url().await?;
Expand DownExpand Up@@ -427,15 +475,15 @@ async fn run_auth_scope_retry_limit_client(
) -> anyhow::Result<()> {
 let max_retries = 3u32;
 let mut attempt = 0u32;
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;

 loop {
 let mut oauth = OAuthState::new(server_url, None).await?;
 let request = AuthorizationRequest::new(REDIRECT_URI)
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL);
 oauth
 .start_authorization(
 AuthorizationRequest::new(REDIRECT_URI)
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL),
 )
 .start_authorization(with_optional_challenge(request, challenge.clone()))
 .await?;
 let auth_url = oauth.get_authorization_url().await?;
 let callback = headless_authorize(&auth_url).await?;
Expand DownExpand Up@@ -509,7 +557,10 @@ async fn migration_token(
 return Ok(manager.get_access_token().await?);
 }

 let resolution = manager.resolve_metadata().await?;
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;
 let resolution = manager
 .resolve_metadata_from_challenge(challenge.as_deref())
 .await?;
 manager.set_metadata(resolution.metadata);
 manager
 .register_client("conformance-client", REDIRECT_URI, &[])
Expand DownExpand Up@@ -609,7 +660,10 @@ async fn run_client_credentials_basic(
 .unwrap_or("conformance-test-secret");

 let mut manager = AuthorizationManager::new(server_url).await?;
 let resolution = manager.resolve_metadata().await?;
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;
 let resolution = manager
 .resolve_metadata_from_challenge(challenge.as_deref())
 .await?;
 let token_endpoint = resolution.metadata.token_endpoint.clone();
 manager.set_metadata(resolution.metadata);

Expand Down

25 changes: 25 additions & 0 deletions
crates/rmcp/src/service/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,6 +86,31 @@ impl ClientInitializeError {
 context: context.into(),
 }
 }

 /// The `WWW-Authenticate` challenge from the 401/403 the transport hit
 /// during initialization, if that is why initialization failed.
 ///
 /// This is the trigger of the reactive OAuth flow: feed the challenge to
 /// `AuthorizationRequest::with_challenge` to authorize, then reconnect.
 #[cfg(feature = "transport-streamable-http-client")]
 pub fn auth_challenge(&self) -> Option<&str> {
 use crate::transport::streamable_http_client::{AuthRequiredError, InsufficientScopeError};

 let Self::TransportError { error, .. } = self else {
 return None;
 };
 let mut source: Option<&(dyn std::error::Error + 'static)> = Some(error.error.as_ref());
 while let Some(current) = source {
 if let Some(auth_required) = current.downcast_ref::<AuthRequiredError>() {
 return Some(&auth_required.www_authenticate_header);
 }
 if let Some(insufficient_scope) = current.downcast_ref::<InsufficientScopeError>() {
 return Some(&insufficient_scope.www_authenticate_header);
 }
 source = current.source();
 }
 None
 }
}

/// Helper function to get the next message from the stream
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
refactor: make oauth discovery reactive#1052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

DaleSeo
merged 1 commit into

from

Jul 27, 2026
 Merged


refactor: make oauth discovery reactive
#1052
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


110 changes: 82 additions & 28 deletions
conformance/src/bin/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -195,25 +195,73 @@ const REDIRECT_URI: &str = "http://localhost:3000/callback";
const SCOPE_STEP_UP_INITIAL_SCOPES: &[&str] = &["mcp:basic"];
const SCOPE_STEP_UP_ESCALATED_SCOPES: &[&str] = &["mcp:basic", "mcp:write"];

/// Perform the headless OAuth authorization-code flow.
/// Attempt the real connection unauthenticated and return the server's
/// `WWW-Authenticate` challenge from the 401 — the reactive discovery
/// trigger.
///
/// 1. Discover metadata, register (or use CIMD), get auth URL
/// 2. Fetch the auth URL with redirect:manual → extract code from Location header
/// 3. Exchange code for token
/// 4. Return an `AuthClient` wrapping `reqwest::Client`
/// `None` (server accepted the unauthenticated connection, which is then
/// closed cleanly) is a legitimate outcome, not an error: the scope-step-up
/// and scope-retry-limit mocks allow unauthenticated `initialize` and only
/// enforce authorization on tool calls.
async fn initialize_challenge(
 server_url: &str,
 lifecycle: ClientLifecycleMode,
) -> anyhow::Result<Option<String>> {
 let transport = StreamableHttpClientTransport::from_uri(server_url);
 match BasicClientHandler
 .serve_with_lifecycle(transport, lifecycle)
 .await
 {
 Ok(client) => {
 client.cancel().await.ok();
 Ok(None)
 }
 Err(error) => match error.auth_challenge() {
 Some(challenge) => Ok(Some(challenge.to_string())),
 None => Err(error.into()),
 },
 }
}

fn with_optional_challenge(
 request: AuthorizationRequest,
 challenge: Option<String>,
) -> AuthorizationRequest {
 match challenge {
 Some(challenge) => request.with_challenge(challenge),
 None => request,
 }
}

/// Perform the headless OAuth authorization-code flow, reactively:
///
/// 1. Attempt the real connection; take the 401's WWW-Authenticate challenge
/// 2. Discover from the challenge, register (or use CIMD), get auth URL
/// 3. Fetch the auth URL with redirect:manual → extract code from Location header
/// 4. Exchange code for token
/// 5. Return an `AuthClient` wrapping `reqwest::Client`
async fn perform_oauth_flow(
 server_url: &str,
 _ctx: &ConformanceContext,
) -> anyhow::Result<AuthClient<reqwest::Client>> {
 // Always the discover lifecycle here (not `conformance_lifecycle()`):
 // this flow serves `run_auth_client`, whose 2026-07-28 auth mocks require
 // the per-request MCP-Protocol-Version negotiation.
 let challenge = initialize_challenge(
 server_url,
 ClientLifecycleMode::Discover {
 preferred_versions: preferred_protocol_versions(),
 },
 )
 .await?;
 let mut oauth = OAuthState::new(server_url, None).await?;

 // Discover + register + get auth URL
 let request = AuthorizationRequest::new(REDIRECT_URI)
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL);
 oauth
 .start_authorization(
 AuthorizationRequest::new(REDIRECT_URI)
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL),
 )
 .start_authorization(with_optional_challenge(request, challenge))
 .await?;

 let auth_url = oauth.get_authorization_url().await?;
Expand DownExpand Up@@ -255,14 +303,14 @@ async fn perform_oauth_flow_preregistered(
 client_id: &str,
 client_secret: &str,
) -> anyhow::Result<AuthClient<reqwest::Client>> {
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;
 let mut oauth = OAuthState::new(server_url, None).await?;

 let request = AuthorizationRequest::new(REDIRECT_URI)
 .with_preregistered_client(client_id)
 .with_client_secret(client_secret);
 oauth
 .start_authorization(
 AuthorizationRequest::new(REDIRECT_URI)
 .with_preregistered_client(client_id)
 .with_client_secret(client_secret),
 )
 .start_authorization(with_optional_challenge(request, challenge))
 .await?;

 let auth_url = oauth.get_authorization_url().await?;
Expand DownExpand Up@@ -325,14 +373,14 @@ async fn run_auth_scope_step_up_client(
 server_url: &str,
 _ctx: &ConformanceContext,
) -> anyhow::Result<()> {
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;
 let mut oauth = OAuthState::new(server_url, None).await?;
 let request = AuthorizationRequest::new(REDIRECT_URI)
 .with_scopes(SCOPE_STEP_UP_INITIAL_SCOPES.iter().copied())
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL);
 oauth
 .start_authorization(
 AuthorizationRequest::new(REDIRECT_URI)
 .with_scopes(SCOPE_STEP_UP_INITIAL_SCOPES.iter().copied())
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL),
 )
 .start_authorization(with_optional_challenge(request, challenge))
 .await?;

 let auth_url = oauth.get_authorization_url().await?;
Expand DownExpand Up@@ -427,15 +475,15 @@ async fn run_auth_scope_retry_limit_client(
) -> anyhow::Result<()> {
 let max_retries = 3u32;
 let mut attempt = 0u32;
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;

 loop {
 let mut oauth = OAuthState::new(server_url, None).await?;
 let request = AuthorizationRequest::new(REDIRECT_URI)
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL);
 oauth
 .start_authorization(
 AuthorizationRequest::new(REDIRECT_URI)
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL),
 )
 .start_authorization(with_optional_challenge(request, challenge.clone()))
 .await?;
 let auth_url = oauth.get_authorization_url().await?;
 let callback = headless_authorize(&auth_url).await?;
Expand DownExpand Up@@ -509,7 +557,10 @@ async fn migration_token(
 return Ok(manager.get_access_token().await?);
 }

 let resolution = manager.resolve_metadata().await?;
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;
 let resolution = manager
 .resolve_metadata_from_challenge(challenge.as_deref())
 .await?;
 manager.set_metadata(resolution.metadata);
 manager
 .register_client("conformance-client", REDIRECT_URI, &[])
Expand DownExpand Up@@ -609,7 +660,10 @@ async fn run_client_credentials_basic(
 .unwrap_or("conformance-test-secret");

 let mut manager = AuthorizationManager::new(server_url).await?;
 let resolution = manager.resolve_metadata().await?;
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;
 let resolution = manager
 .resolve_metadata_from_challenge(challenge.as_deref())
 .await?;
 let token_endpoint = resolution.metadata.token_endpoint.clone();
 manager.set_metadata(resolution.metadata);

Expand Down

25 changes: 25 additions & 0 deletions
crates/rmcp/src/service/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,6 +86,31 @@ impl ClientInitializeError {
 context: context.into(),
 }
 }

 /// The `WWW-Authenticate` challenge from the 401/403 the transport hit
 /// during initialization, if that is why initialization failed.
 ///
 /// This is the trigger of the reactive OAuth flow: feed the challenge to
 /// `AuthorizationRequest::with_challenge` to authorize, then reconnect.
 #[cfg(feature = "transport-streamable-http-client")]
 pub fn auth_challenge(&self) -> Option<&str> {
 use crate::transport::streamable_http_client::{AuthRequiredError, InsufficientScopeError};

 let Self::TransportError { error, .. } = self else {
 return None;
 };
 let mut source: Option<&(dyn std::error::Error + 'static)> = Some(error.error.as_ref());
 while let Some(current) = source {
 if let Some(auth_required) = current.downcast_ref::<AuthRequiredError>() {
 return Some(&auth_required.www_authenticate_header);
 }
 if let Some(insufficient_scope) = current.downcast_ref::<InsufficientScopeError>() {
 return Some(&insufficient_scope.www_authenticate_header);
 }
 source = current.source();
 }
 None
 }
}

/// Helper function to get the next message from the stream
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor: make oauth discovery reactive#1052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

DaleSeo
merged 1 commit into

from

Jul 27, 2026
 Merged


refactor: make oauth discovery reactive
#1052
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


110 changes: 82 additions & 28 deletions
conformance/src/bin/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -195,25 +195,73 @@ const REDIRECT_URI: &str = "http://localhost:3000/callback";
const SCOPE_STEP_UP_INITIAL_SCOPES: &[&str] = &["mcp:basic"];
const SCOPE_STEP_UP_ESCALATED_SCOPES: &[&str] = &["mcp:basic", "mcp:write"];

/// Perform the headless OAuth authorization-code flow.
/// Attempt the real connection unauthenticated and return the server's
/// `WWW-Authenticate` challenge from the 401 — the reactive discovery
/// trigger.
///
/// 1. Discover metadata, register (or use CIMD), get auth URL
/// 2. Fetch the auth URL with redirect:manual → extract code from Location header
/// 3. Exchange code for token
/// 4. Return an `AuthClient` wrapping `reqwest::Client`
/// `None` (server accepted the unauthenticated connection, which is then
/// closed cleanly) is a legitimate outcome, not an error: the scope-step-up
/// and scope-retry-limit mocks allow unauthenticated `initialize` and only
/// enforce authorization on tool calls.
async fn initialize_challenge(
 server_url: &str,
 lifecycle: ClientLifecycleMode,
) -> anyhow::Result<Option<String>> {
 let transport = StreamableHttpClientTransport::from_uri(server_url);
 match BasicClientHandler
 .serve_with_lifecycle(transport, lifecycle)
 .await
 {
 Ok(client) => {
 client.cancel().await.ok();
 Ok(None)
 }
 Err(error) => match error.auth_challenge() {
 Some(challenge) => Ok(Some(challenge.to_string())),
 None => Err(error.into()),
 },
 }
}

fn with_optional_challenge(
 request: AuthorizationRequest,
 challenge: Option<String>,
) -> AuthorizationRequest {
 match challenge {
 Some(challenge) => request.with_challenge(challenge),
 None => request,
 }
}

/// Perform the headless OAuth authorization-code flow, reactively:
///
/// 1. Attempt the real connection; take the 401's WWW-Authenticate challenge
/// 2. Discover from the challenge, register (or use CIMD), get auth URL
/// 3. Fetch the auth URL with redirect:manual → extract code from Location header
/// 4. Exchange code for token
/// 5. Return an `AuthClient` wrapping `reqwest::Client`
async fn perform_oauth_flow(
 server_url: &str,
 _ctx: &ConformanceContext,
) -> anyhow::Result<AuthClient<reqwest::Client>> {
 // Always the discover lifecycle here (not `conformance_lifecycle()`):
 // this flow serves `run_auth_client`, whose 2026-07-28 auth mocks require
 // the per-request MCP-Protocol-Version negotiation.
 let challenge = initialize_challenge(
 server_url,
 ClientLifecycleMode::Discover {
 preferred_versions: preferred_protocol_versions(),
 },
 )
 .await?;
 let mut oauth = OAuthState::new(server_url, None).await?;

 // Discover + register + get auth URL
 let request = AuthorizationRequest::new(REDIRECT_URI)
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL);
 oauth
 .start_authorization(
 AuthorizationRequest::new(REDIRECT_URI)
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL),
 )
 .start_authorization(with_optional_challenge(request, challenge))
 .await?;

 let auth_url = oauth.get_authorization_url().await?;
Expand DownExpand Up@@ -255,14 +303,14 @@ async fn perform_oauth_flow_preregistered(
 client_id: &str,
 client_secret: &str,
) -> anyhow::Result<AuthClient<reqwest::Client>> {
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;
 let mut oauth = OAuthState::new(server_url, None).await?;

 let request = AuthorizationRequest::new(REDIRECT_URI)
 .with_preregistered_client(client_id)
 .with_client_secret(client_secret);
 oauth
 .start_authorization(
 AuthorizationRequest::new(REDIRECT_URI)
 .with_preregistered_client(client_id)
 .with_client_secret(client_secret),
 )
 .start_authorization(with_optional_challenge(request, challenge))
 .await?;

 let auth_url = oauth.get_authorization_url().await?;
Expand DownExpand Up@@ -325,14 +373,14 @@ async fn run_auth_scope_step_up_client(
 server_url: &str,
 _ctx: &ConformanceContext,
) -> anyhow::Result<()> {
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;
 let mut oauth = OAuthState::new(server_url, None).await?;
 let request = AuthorizationRequest::new(REDIRECT_URI)
 .with_scopes(SCOPE_STEP_UP_INITIAL_SCOPES.iter().copied())
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL);
 oauth
 .start_authorization(
 AuthorizationRequest::new(REDIRECT_URI)
 .with_scopes(SCOPE_STEP_UP_INITIAL_SCOPES.iter().copied())
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL),
 )
 .start_authorization(with_optional_challenge(request, challenge))
 .await?;

 let auth_url = oauth.get_authorization_url().await?;
Expand DownExpand Up@@ -427,15 +475,15 @@ async fn run_auth_scope_retry_limit_client(
) -> anyhow::Result<()> {
 let max_retries = 3u32;
 let mut attempt = 0u32;
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;

 loop {
 let mut oauth = OAuthState::new(server_url, None).await?;
 let request = AuthorizationRequest::new(REDIRECT_URI)
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL);
 oauth
 .start_authorization(
 AuthorizationRequest::new(REDIRECT_URI)
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL),
 )
 .start_authorization(with_optional_challenge(request, challenge.clone()))
 .await?;
 let auth_url = oauth.get_authorization_url().await?;
 let callback = headless_authorize(&auth_url).await?;
Expand DownExpand Up@@ -509,7 +557,10 @@ async fn migration_token(
 return Ok(manager.get_access_token().await?);
 }

 let resolution = manager.resolve_metadata().await?;
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;
 let resolution = manager
 .resolve_metadata_from_challenge(challenge.as_deref())
 .await?;
 manager.set_metadata(resolution.metadata);
 manager
 .register_client("conformance-client", REDIRECT_URI, &[])
Expand DownExpand Up@@ -609,7 +660,10 @@ async fn run_client_credentials_basic(
 .unwrap_or("conformance-test-secret");

 let mut manager = AuthorizationManager::new(server_url).await?;
 let resolution = manager.resolve_metadata().await?;
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;
 let resolution = manager
 .resolve_metadata_from_challenge(challenge.as_deref())
 .await?;
 let token_endpoint = resolution.metadata.token_endpoint.clone();
 manager.set_metadata(resolution.metadata);

Expand Down

25 changes: 25 additions & 0 deletions
crates/rmcp/src/service/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,6 +86,31 @@ impl ClientInitializeError {
 context: context.into(),
 }
 }

 /// The `WWW-Authenticate` challenge from the 401/403 the transport hit
 /// during initialization, if that is why initialization failed.
 ///
 /// This is the trigger of the reactive OAuth flow: feed the challenge to
 /// `AuthorizationRequest::with_challenge` to authorize, then reconnect.
 #[cfg(feature = "transport-streamable-http-client")]
 pub fn auth_challenge(&self) -> Option<&str> {
 use crate::transport::streamable_http_client::{AuthRequiredError, InsufficientScopeError};

 let Self::TransportError { error, .. } = self else {
 return None;
 };
 let mut source: Option<&(dyn std::error::Error + 'static)> = Some(error.error.as_ref());
 while let Some(current) = source {
 if let Some(auth_required) = current.downcast_ref::<AuthRequiredError>() {
 return Some(&auth_required.www_authenticate_header);
 }
 if let Some(insufficient_scope) = current.downcast_ref::<InsufficientScopeError>() {
 return Some(&insufficient_scope.www_authenticate_header);
 }
 source = current.source();
 }
 None
 }
}

/// Helper function to get the next message from the stream
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor: make oauth discovery reactive#1052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

DaleSeo
merged 1 commit into

from

Jul 27, 2026
 Merged


refactor: make oauth discovery reactive
#1052
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


110 changes: 82 additions & 28 deletions
conformance/src/bin/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -195,25 +195,73 @@ const REDIRECT_URI: &str = "http://localhost:3000/callback";
const SCOPE_STEP_UP_INITIAL_SCOPES: &[&str] = &["mcp:basic"];
const SCOPE_STEP_UP_ESCALATED_SCOPES: &[&str] = &["mcp:basic", "mcp:write"];

/// Perform the headless OAuth authorization-code flow.
/// Attempt the real connection unauthenticated and return the server's
/// `WWW-Authenticate` challenge from the 401 — the reactive discovery
/// trigger.
///
/// 1. Discover metadata, register (or use CIMD), get auth URL
/// 2. Fetch the auth URL with redirect:manual → extract code from Location header
/// 3. Exchange code for token
/// 4. Return an `AuthClient` wrapping `reqwest::Client`
/// `None` (server accepted the unauthenticated connection, which is then
/// closed cleanly) is a legitimate outcome, not an error: the scope-step-up
/// and scope-retry-limit mocks allow unauthenticated `initialize` and only
/// enforce authorization on tool calls.
async fn initialize_challenge(
 server_url: &str,
 lifecycle: ClientLifecycleMode,
) -> anyhow::Result<Option<String>> {
 let transport = StreamableHttpClientTransport::from_uri(server_url);
 match BasicClientHandler
 .serve_with_lifecycle(transport, lifecycle)
 .await
 {
 Ok(client) => {
 client.cancel().await.ok();
 Ok(None)
 }
 Err(error) => match error.auth_challenge() {
 Some(challenge) => Ok(Some(challenge.to_string())),
 None => Err(error.into()),
 },
 }
}

fn with_optional_challenge(
 request: AuthorizationRequest,
 challenge: Option<String>,
) -> AuthorizationRequest {
 match challenge {
 Some(challenge) => request.with_challenge(challenge),
 None => request,
 }
}

/// Perform the headless OAuth authorization-code flow, reactively:
///
/// 1. Attempt the real connection; take the 401's WWW-Authenticate challenge
/// 2. Discover from the challenge, register (or use CIMD), get auth URL
/// 3. Fetch the auth URL with redirect:manual → extract code from Location header
/// 4. Exchange code for token
/// 5. Return an `AuthClient` wrapping `reqwest::Client`
async fn perform_oauth_flow(
 server_url: &str,
 _ctx: &ConformanceContext,
) -> anyhow::Result<AuthClient<reqwest::Client>> {
 // Always the discover lifecycle here (not `conformance_lifecycle()`):
 // this flow serves `run_auth_client`, whose 2026-07-28 auth mocks require
 // the per-request MCP-Protocol-Version negotiation.
 let challenge = initialize_challenge(
 server_url,
 ClientLifecycleMode::Discover {
 preferred_versions: preferred_protocol_versions(),
 },
 )
 .await?;
 let mut oauth = OAuthState::new(server_url, None).await?;

 // Discover + register + get auth URL
 let request = AuthorizationRequest::new(REDIRECT_URI)
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL);
 oauth
 .start_authorization(
 AuthorizationRequest::new(REDIRECT_URI)
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL),
 )
 .start_authorization(with_optional_challenge(request, challenge))
 .await?;

 let auth_url = oauth.get_authorization_url().await?;
Expand DownExpand Up@@ -255,14 +303,14 @@ async fn perform_oauth_flow_preregistered(
 client_id: &str,
 client_secret: &str,
) -> anyhow::Result<AuthClient<reqwest::Client>> {
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;
 let mut oauth = OAuthState::new(server_url, None).await?;

 let request = AuthorizationRequest::new(REDIRECT_URI)
 .with_preregistered_client(client_id)
 .with_client_secret(client_secret);
 oauth
 .start_authorization(
 AuthorizationRequest::new(REDIRECT_URI)
 .with_preregistered_client(client_id)
 .with_client_secret(client_secret),
 )
 .start_authorization(with_optional_challenge(request, challenge))
 .await?;

 let auth_url = oauth.get_authorization_url().await?;
Expand DownExpand Up@@ -325,14 +373,14 @@ async fn run_auth_scope_step_up_client(
 server_url: &str,
 _ctx: &ConformanceContext,
) -> anyhow::Result<()> {
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;
 let mut oauth = OAuthState::new(server_url, None).await?;
 let request = AuthorizationRequest::new(REDIRECT_URI)
 .with_scopes(SCOPE_STEP_UP_INITIAL_SCOPES.iter().copied())
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL);
 oauth
 .start_authorization(
 AuthorizationRequest::new(REDIRECT_URI)
 .with_scopes(SCOPE_STEP_UP_INITIAL_SCOPES.iter().copied())
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL),
 )
 .start_authorization(with_optional_challenge(request, challenge))
 .await?;

 let auth_url = oauth.get_authorization_url().await?;
Expand DownExpand Up@@ -427,15 +475,15 @@ async fn run_auth_scope_retry_limit_client(
) -> anyhow::Result<()> {
 let max_retries = 3u32;
 let mut attempt = 0u32;
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;

 loop {
 let mut oauth = OAuthState::new(server_url, None).await?;
 let request = AuthorizationRequest::new(REDIRECT_URI)
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL);
 oauth
 .start_authorization(
 AuthorizationRequest::new(REDIRECT_URI)
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL),
 )
 .start_authorization(with_optional_challenge(request, challenge.clone()))
 .await?;
 let auth_url = oauth.get_authorization_url().await?;
 let callback = headless_authorize(&auth_url).await?;
Expand DownExpand Up@@ -509,7 +557,10 @@ async fn migration_token(
 return Ok(manager.get_access_token().await?);
 }

 let resolution = manager.resolve_metadata().await?;
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;
 let resolution = manager
 .resolve_metadata_from_challenge(challenge.as_deref())
 .await?;
 manager.set_metadata(resolution.metadata);
 manager
 .register_client("conformance-client", REDIRECT_URI, &[])
Expand DownExpand Up@@ -609,7 +660,10 @@ async fn run_client_credentials_basic(
 .unwrap_or("conformance-test-secret");

 let mut manager = AuthorizationManager::new(server_url).await?;
 let resolution = manager.resolve_metadata().await?;
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;
 let resolution = manager
 .resolve_metadata_from_challenge(challenge.as_deref())
 .await?;
 let token_endpoint = resolution.metadata.token_endpoint.clone();
 manager.set_metadata(resolution.metadata);

Expand Down

25 changes: 25 additions & 0 deletions
crates/rmcp/src/service/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,6 +86,31 @@ impl ClientInitializeError {
 context: context.into(),
 }
 }

 /// The `WWW-Authenticate` challenge from the 401/403 the transport hit
 /// during initialization, if that is why initialization failed.
 ///
 /// This is the trigger of the reactive OAuth flow: feed the challenge to
 /// `AuthorizationRequest::with_challenge` to authorize, then reconnect.
 #[cfg(feature = "transport-streamable-http-client")]
 pub fn auth_challenge(&self) -> Option<&str> {
 use crate::transport::streamable_http_client::{AuthRequiredError, InsufficientScopeError};

 let Self::TransportError { error, .. } = self else {
 return None;
 };
 let mut source: Option<&(dyn std::error::Error + 'static)> = Some(error.error.as_ref());
 while let Some(current) = source {
 if let Some(auth_required) = current.downcast_ref::<AuthRequiredError>() {
 return Some(&auth_required.www_authenticate_header);
 }
 if let Some(insufficient_scope) = current.downcast_ref::<InsufficientScopeError>() {
 return Some(&insufficient_scope.www_authenticate_header);
 }
 source = current.source();
 }
 None
 }
}

/// Helper function to get the next message from the stream
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
refactor: make oauth discovery reactive#1052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

DaleSeo
merged 1 commit into

from

Jul 27, 2026
 Merged


refactor: make oauth discovery reactive
#1052
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


110 changes: 82 additions & 28 deletions
conformance/src/bin/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -195,25 +195,73 @@ const REDIRECT_URI: &str = "http://localhost:3000/callback";
const SCOPE_STEP_UP_INITIAL_SCOPES: &[&str] = &["mcp:basic"];
const SCOPE_STEP_UP_ESCALATED_SCOPES: &[&str] = &["mcp:basic", "mcp:write"];

/// Perform the headless OAuth authorization-code flow.
/// Attempt the real connection unauthenticated and return the server's
/// `WWW-Authenticate` challenge from the 401 — the reactive discovery
/// trigger.
///
/// 1. Discover metadata, register (or use CIMD), get auth URL
/// 2. Fetch the auth URL with redirect:manual → extract code from Location header
/// 3. Exchange code for token
/// 4. Return an `AuthClient` wrapping `reqwest::Client`
/// `None` (server accepted the unauthenticated connection, which is then
/// closed cleanly) is a legitimate outcome, not an error: the scope-step-up
/// and scope-retry-limit mocks allow unauthenticated `initialize` and only
/// enforce authorization on tool calls.
async fn initialize_challenge(
 server_url: &str,
 lifecycle: ClientLifecycleMode,
) -> anyhow::Result<Option<String>> {
 let transport = StreamableHttpClientTransport::from_uri(server_url);
 match BasicClientHandler
 .serve_with_lifecycle(transport, lifecycle)
 .await
 {
 Ok(client) => {
 client.cancel().await.ok();
 Ok(None)
 }
 Err(error) => match error.auth_challenge() {
 Some(challenge) => Ok(Some(challenge.to_string())),
 None => Err(error.into()),
 },
 }
}

fn with_optional_challenge(
 request: AuthorizationRequest,
 challenge: Option<String>,
) -> AuthorizationRequest {
 match challenge {
 Some(challenge) => request.with_challenge(challenge),
 None => request,
 }
}

/// Perform the headless OAuth authorization-code flow, reactively:
///
/// 1. Attempt the real connection; take the 401's WWW-Authenticate challenge
/// 2. Discover from the challenge, register (or use CIMD), get auth URL
/// 3. Fetch the auth URL with redirect:manual → extract code from Location header
/// 4. Exchange code for token
/// 5. Return an `AuthClient` wrapping `reqwest::Client`
async fn perform_oauth_flow(
 server_url: &str,
 _ctx: &ConformanceContext,
) -> anyhow::Result<AuthClient<reqwest::Client>> {
 // Always the discover lifecycle here (not `conformance_lifecycle()`):
 // this flow serves `run_auth_client`, whose 2026-07-28 auth mocks require
 // the per-request MCP-Protocol-Version negotiation.
 let challenge = initialize_challenge(
 server_url,
 ClientLifecycleMode::Discover {
 preferred_versions: preferred_protocol_versions(),
 },
 )
 .await?;
 let mut oauth = OAuthState::new(server_url, None).await?;

 // Discover + register + get auth URL
 let request = AuthorizationRequest::new(REDIRECT_URI)
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL);
 oauth
 .start_authorization(
 AuthorizationRequest::new(REDIRECT_URI)
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL),
 )
 .start_authorization(with_optional_challenge(request, challenge))
 .await?;

 let auth_url = oauth.get_authorization_url().await?;
Expand DownExpand Up@@ -255,14 +303,14 @@ async fn perform_oauth_flow_preregistered(
 client_id: &str,
 client_secret: &str,
) -> anyhow::Result<AuthClient<reqwest::Client>> {
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;
 let mut oauth = OAuthState::new(server_url, None).await?;

 let request = AuthorizationRequest::new(REDIRECT_URI)
 .with_preregistered_client(client_id)
 .with_client_secret(client_secret);
 oauth
 .start_authorization(
 AuthorizationRequest::new(REDIRECT_URI)
 .with_preregistered_client(client_id)
 .with_client_secret(client_secret),
 )
 .start_authorization(with_optional_challenge(request, challenge))
 .await?;

 let auth_url = oauth.get_authorization_url().await?;
Expand DownExpand Up@@ -325,14 +373,14 @@ async fn run_auth_scope_step_up_client(
 server_url: &str,
 _ctx: &ConformanceContext,
) -> anyhow::Result<()> {
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;
 let mut oauth = OAuthState::new(server_url, None).await?;
 let request = AuthorizationRequest::new(REDIRECT_URI)
 .with_scopes(SCOPE_STEP_UP_INITIAL_SCOPES.iter().copied())
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL);
 oauth
 .start_authorization(
 AuthorizationRequest::new(REDIRECT_URI)
 .with_scopes(SCOPE_STEP_UP_INITIAL_SCOPES.iter().copied())
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL),
 )
 .start_authorization(with_optional_challenge(request, challenge))
 .await?;

 let auth_url = oauth.get_authorization_url().await?;
Expand DownExpand Up@@ -427,15 +475,15 @@ async fn run_auth_scope_retry_limit_client(
) -> anyhow::Result<()> {
 let max_retries = 3u32;
 let mut attempt = 0u32;
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;

 loop {
 let mut oauth = OAuthState::new(server_url, None).await?;
 let request = AuthorizationRequest::new(REDIRECT_URI)
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL);
 oauth
 .start_authorization(
 AuthorizationRequest::new(REDIRECT_URI)
 .with_client_name("conformance-client")
 .with_client_metadata_url(CIMD_CLIENT_METADATA_URL),
 )
 .start_authorization(with_optional_challenge(request, challenge.clone()))
 .await?;
 let auth_url = oauth.get_authorization_url().await?;
 let callback = headless_authorize(&auth_url).await?;
Expand DownExpand Up@@ -509,7 +557,10 @@ async fn migration_token(
 return Ok(manager.get_access_token().await?);
 }

 let resolution = manager.resolve_metadata().await?;
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;
 let resolution = manager
 .resolve_metadata_from_challenge(challenge.as_deref())
 .await?;
 manager.set_metadata(resolution.metadata);
 manager
 .register_client("conformance-client", REDIRECT_URI, &[])
Expand DownExpand Up@@ -609,7 +660,10 @@ async fn run_client_credentials_basic(
 .unwrap_or("conformance-test-secret");

 let mut manager = AuthorizationManager::new(server_url).await?;
 let resolution = manager.resolve_metadata().await?;
 let challenge = initialize_challenge(server_url, conformance_lifecycle()).await?;
 let resolution = manager
 .resolve_metadata_from_challenge(challenge.as_deref())
 .await?;
 let token_endpoint = resolution.metadata.token_endpoint.clone();
 manager.set_metadata(resolution.metadata);

Expand Down

25 changes: 25 additions & 0 deletions
crates/rmcp/src/service/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,6 +86,31 @@ impl ClientInitializeError {
 context: context.into(),
 }
 }

 /// The `WWW-Authenticate` challenge from the 401/403 the transport hit
 /// during initialization, if that is why initialization failed.
 ///
 /// This is the trigger of the reactive OAuth flow: feed the challenge to
 /// `AuthorizationRequest::with_challenge` to authorize, then reconnect.
 #[cfg(feature = "transport-streamable-http-client")]
 pub fn auth_challenge(&self) -> Option<&str> {
 use crate::transport::streamable_http_client::{AuthRequiredError, InsufficientScopeError};

 let Self::TransportError { error, .. } = self else {
 return None;
 };
 let mut source: Option<&(dyn std::error::Error + 'static)> = Some(error.error.as_ref());
 while let Some(current) = source {
 if let Some(auth_required) = current.downcast_ref::<AuthRequiredError>() {
 return Some(&auth_required.www_authenticate_header);
 }
 if let Some(insufficient_scope) = current.downcast_ref::<InsufficientScopeError>() {
 return Some(&insufficient_scope.www_authenticate_header);
 }
 source = current.source();
 }
 None
 }
}

/// Helper function to get the next message from the stream
Expand Down
Loading