Skip to content

feat(auth): add token_endpoint_auth_method to OAuthClientConfig#648

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
alexhancock merged 8 commits into from
Feb 13, 2026
Merged

feat(auth): add token_endpoint_auth_method to OAuthClientConfig #648

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
faa5939
feat(auth): add token_endpoint_auth_method to OAuthClientConfig
Feb 9, 2026
c8e21de
refactor(auth): derive token_endpoint_auth_method from server metadata
Feb 9, 2026
ceb4437
refactor(auth): read token_endpoint_auth_methods_supported from addit…
Feb 9, 2026
0e4a777
feat(auth): prefer basic auth when both methods supported and improve…
Feb 10, 2026
40df135
style(auth): apply cargo fmt formatting
Feb 12, 2026
3964eaa
style(auth): apply nightly cargo fmt import grouping
Feb 13, 2026
777da69
chore: merge origin/main and resolve conflicts
Feb 13, 2026
0a431d5
revert: undo .gitignore change
Feb 13, 2026
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
142 changes: 138 additions & 4 deletions crates/rmcp/src/transport/auth.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use std::{collections::HashMap, sync::Arc, time::Duration};

use async_trait::async_trait;
use oauth2::{
AuthUrl, AuthorizationCode, ClientId, ClientSecret, CsrfToken, EmptyExtraTokenFields,
AuthType, AuthUrl, AuthorizationCode, ClientId, ClientSecret, CsrfToken, EmptyExtraTokenFields,
PkceCodeChallenge, PkceCodeVerifier, RedirectUrl, RefreshToken, RequestTokenError, Scope,
StandardTokenResponse, TokenResponse, TokenUrl,
basic::{BasicClient, BasicTokenType},
Expand DownExpand Up@@ -548,6 +548,23 @@ impl AuthorizationManager {
client_builder = client_builder.set_client_secret(ClientSecret::new(secret));
}

let uses_secret_post = metadata
.additional_fields
.get("token_endpoint_auth_methods_supported")
.and_then(|v| v.as_array())
.map(|arr| {
let has_basic = arr
.iter()
.any(|m| m.as_str() == Some("client_secret_basic"));
let has_post = arr.iter().any(|m| m.as_str() == Some("client_secret_post"));
has_post && !has_basic
})
.unwrap_or(false);

if uses_secret_post {
client_builder = client_builder.set_auth_type(AuthType::RequestBody);
}

self.oauth_client = Some(client_builder);
Ok(())
}
Expand DownExpand Up@@ -1770,14 +1787,14 @@ impl OAuthState {

#[cfg(test)]
mod tests {
use std::sync::Arc;
use std::{collections::HashMap, sync::Arc};

use oauth2::{CsrfToken, PkceCodeVerifier};
use oauth2::{AuthType, CsrfToken, PkceCodeVerifier};
use url::Url;

use super::{
AuthError, AuthorizationManager, AuthorizationMetadata, InMemoryStateStore,
ScopeUpgradeConfig, StateStore, StoredAuthorizationState, is_https_url,
OAuthClientConfig, ScopeUpgradeConfig, StateStore, StoredAuthorizationState, is_https_url,
};

// -- url helpers --
Expand DownExpand Up@@ -2263,6 +2280,123 @@ mod tests {
manager.set_state_store(TrackingStateStore::default());
}

/// Helper: create an AuthorizationManager with minimal metadata so
/// `configure_client` can be exercised without a live server.
async fn manager_with_metadata(
metadata_override: Option<AuthorizationMetadata>,
) -> AuthorizationManager {
let mut mgr = AuthorizationManager::new("http://localhost").await.unwrap();
mgr.set_metadata(metadata_override.unwrap_or(AuthorizationMetadata {
authorization_endpoint: "http://localhost/authorize".to_string(),
token_endpoint: "http://localhost/token".to_string(),
..Default::default()
}));
mgr
}

fn test_client_config() -> OAuthClientConfig {
OAuthClientConfig {
client_id: "my-client".to_string(),
client_secret: Some("my-secret".to_string()),
scopes: vec![],
redirect_uri: "http://localhost/callback".to_string(),
}
}

#[tokio::test]
async fn test_configure_client_uses_client_secret_post_from_metadata() {
let mut additional_fields = HashMap::new();
additional_fields.insert(
"token_endpoint_auth_methods_supported".to_string(),
serde_json::json!(["client_secret_post"]),
);
let meta = AuthorizationMetadata {
authorization_endpoint: "http://localhost/authorize".to_string(),
token_endpoint: "http://localhost/token".to_string(),
additional_fields,
..Default::default()
};
let mut mgr = manager_with_metadata(Some(meta)).await;
mgr.configure_client(test_client_config()).unwrap();
assert!(matches!(
mgr.oauth_client.as_ref().unwrap().auth_type(),
AuthType::RequestBody
));
}

#[tokio::test]
async fn test_configure_client_defaults_to_basic_auth() {
let mut mgr = manager_with_metadata(None).await;
mgr.configure_client(test_client_config()).unwrap();
assert!(matches!(
mgr.oauth_client.as_ref().unwrap().auth_type(),
AuthType::BasicAuth
));
}

#[tokio::test]
async fn test_configure_client_with_explicit_basic_in_metadata() {
let mut additional_fields = HashMap::new();
additional_fields.insert(
"token_endpoint_auth_methods_supported".to_string(),
serde_json::json!(["client_secret_basic"]),
);
let meta = AuthorizationMetadata {
authorization_endpoint: "http://localhost/authorize".to_string(),
token_endpoint: "http://localhost/token".to_string(),
additional_fields,
..Default::default()
};
let mut mgr = manager_with_metadata(Some(meta)).await;
mgr.configure_client(test_client_config()).unwrap();
assert!(matches!(
mgr.oauth_client.as_ref().unwrap().auth_type(),
AuthType::BasicAuth
));
}

#[tokio::test]
async fn test_configure_client_ignores_unsupported_auth_methods_in_metadata() {
let mut additional_fields = HashMap::new();
additional_fields.insert(
"token_endpoint_auth_methods_supported".to_string(),
serde_json::json!(["private_key_jwt"]),
);
let meta = AuthorizationMetadata {
authorization_endpoint: "http://localhost/authorize".to_string(),
token_endpoint: "http://localhost/token".to_string(),
additional_fields,
..Default::default()
};
let mut mgr = manager_with_metadata(Some(meta)).await;
// Unsupported method should fall through to default (basic auth)
mgr.configure_client(test_client_config()).unwrap();
assert!(matches!(
mgr.oauth_client.as_ref().unwrap().auth_type(),
AuthType::BasicAuth
));
}

#[tokio::test]
async fn test_configure_client_prefers_basic_when_both_methods_supported() {
let mut additional_fields = HashMap::new();
additional_fields.insert(
"token_endpoint_auth_methods_supported".to_string(),
serde_json::json!(["client_secret_post", "client_secret_basic"]),
);
let meta = AuthorizationMetadata {
authorization_endpoint: "http://localhost/authorize".to_string(),
token_endpoint: "http://localhost/token".to_string(),
additional_fields,
..Default::default()
};
let mut mgr = manager_with_metadata(Some(meta)).await;
mgr.configure_client(test_client_config()).unwrap();
assert!(matches!(
mgr.oauth_client.as_ref().unwrap().auth_type(),
AuthType::BasicAuth
));
}
// -- metadata deserialization --

#[test]
Expand Down
, '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" + '
feat(auth): add token_endpoint_auth_method to OAuthClientConfig by anara123 · Pull Request #648 · modelcontextprotocol/rust-sdk · GitHub
Skip to content
feat(auth): add token_endpoint_auth_method to OAuthClientConfig#648

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

alexhancock
merged 8 commits into

from

Feb 13, 2026
 Merged


feat(auth): add token_endpoint_auth_method to OAuthClientConfig
#648
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
faa5939

feat(auth): add token_endpoint_auth_method to OAuthClientConfig

Feb 9, 2026
c8e21de

refactor(auth): derive token_endpoint_auth_method from server metadata

Feb 9, 2026
ceb4437

refactor(auth): read token_endpoint_auth_methods_supported from addit…

Feb 9, 2026
0e4a777

feat(auth): prefer basic auth when both methods supported and improve…

Feb 10, 2026
40df135

style(auth): apply cargo fmt formatting

Feb 12, 2026
3964eaa

style(auth): apply nightly cargo fmt import grouping

Feb 13, 2026
777da69

chore: merge origin/main and resolve conflicts

Feb 13, 2026
0a431d5

revert: undo .gitignore change

Feb 13, 2026

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


142 changes: 138 additions & 4 deletions
crates/rmcp/src/transport/auth.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use std::{collections::HashMap, sync::Arc, time::Duration};

use async_trait::async_trait;
use oauth2::{
 AuthUrl, AuthorizationCode, ClientId, ClientSecret, CsrfToken, EmptyExtraTokenFields,
AuthType, AuthUrl, AuthorizationCode, ClientId, ClientSecret, CsrfToken, EmptyExtraTokenFields,
 PkceCodeChallenge, PkceCodeVerifier, RedirectUrl, RefreshToken, RequestTokenError, Scope,
 StandardTokenResponse, TokenResponse, TokenUrl,
 basic::{BasicClient, BasicTokenType},
Expand DownExpand Up@@ -548,6 +548,23 @@ impl AuthorizationManager {
 client_builder = client_builder.set_client_secret(ClientSecret::new(secret));
 }

 let uses_secret_post = metadata
 .additional_fields
 .get("token_endpoint_auth_methods_supported")
 .and_then(|v| v.as_array())
 .map(|arr| {
 let has_basic = arr
 .iter()
 .any(|m| m.as_str() == Some("client_secret_basic"));
 let has_post = arr.iter().any(|m| m.as_str() == Some("client_secret_post"));
 has_post && !has_basic
 })
 .unwrap_or(false);

 if uses_secret_post {
 client_builder = client_builder.set_auth_type(AuthType::RequestBody);
 }

 self.oauth_client = Some(client_builder);
 Ok(())
 }
Expand DownExpand Up@@ -1770,14 +1787,14 @@ impl OAuthState {

#[cfg(test)]
mod tests {
 use std::sync::Arc;
 use std::{collections::HashMap, sync::Arc};

 use oauth2::{CsrfToken, PkceCodeVerifier};
 use oauth2::{AuthType, CsrfToken, PkceCodeVerifier};
 use url::Url;

 use super::{
 AuthError, AuthorizationManager, AuthorizationMetadata, InMemoryStateStore,
 ScopeUpgradeConfig, StateStore, StoredAuthorizationState, is_https_url,
OAuthClientConfig, ScopeUpgradeConfig, StateStore, StoredAuthorizationState, is_https_url,
 };

 // -- url helpers --
Expand DownExpand Up@@ -2263,6 +2280,123 @@ mod tests {
 manager.set_state_store(TrackingStateStore::default());
 }

 /// Helper: create an AuthorizationManager with minimal metadata so
 /// `configure_client` can be exercised without a live server.
 async fn manager_with_metadata(
 metadata_override: Option<AuthorizationMetadata>,
 ) -> AuthorizationManager {
 let mut mgr = AuthorizationManager::new("http://localhost").await.unwrap();
 mgr.set_metadata(metadata_override.unwrap_or(AuthorizationMetadata {
 authorization_endpoint: "http://localhost/authorize".to_string(),
 token_endpoint: "http://localhost/token".to_string(),
 ..Default::default()
 }));
 mgr
 }

 fn test_client_config() -> OAuthClientConfig {
 OAuthClientConfig {
 client_id: "my-client".to_string(),
 client_secret: Some("my-secret".to_string()),
 scopes: vec![],
 redirect_uri: "http://localhost/callback".to_string(),
 }
 }

 #[tokio::test]
 async fn test_configure_client_uses_client_secret_post_from_metadata() {
 let mut additional_fields = HashMap::new();
 additional_fields.insert(
 "token_endpoint_auth_methods_supported".to_string(),
 serde_json::json!(["client_secret_post"]),
 );
 let meta = AuthorizationMetadata {
 authorization_endpoint: "http://localhost/authorize".to_string(),
 token_endpoint: "http://localhost/token".to_string(),
 additional_fields,
 ..Default::default()
 };
 let mut mgr = manager_with_metadata(Some(meta)).await;
 mgr.configure_client(test_client_config()).unwrap();
 assert!(matches!(
 mgr.oauth_client.as_ref().unwrap().auth_type(),
 AuthType::RequestBody
 ));
 }

 #[tokio::test]
 async fn test_configure_client_defaults_to_basic_auth() {
 let mut mgr = manager_with_metadata(None).await;
 mgr.configure_client(test_client_config()).unwrap();
 assert!(matches!(
 mgr.oauth_client.as_ref().unwrap().auth_type(),
 AuthType::BasicAuth
 ));
 }

 #[tokio::test]
 async fn test_configure_client_with_explicit_basic_in_metadata() {
 let mut additional_fields = HashMap::new();
 additional_fields.insert(
 "token_endpoint_auth_methods_supported".to_string(),
 serde_json::json!(["client_secret_basic"]),
 );
 let meta = AuthorizationMetadata {
 authorization_endpoint: "http://localhost/authorize".to_string(),
 token_endpoint: "http://localhost/token".to_string(),
 additional_fields,
 ..Default::default()
 };
 let mut mgr = manager_with_metadata(Some(meta)).await;
 mgr.configure_client(test_client_config()).unwrap();
 assert!(matches!(
 mgr.oauth_client.as_ref().unwrap().auth_type(),
 AuthType::BasicAuth
 ));
 }

 #[tokio::test]
 async fn test_configure_client_ignores_unsupported_auth_methods_in_metadata() {
 let mut additional_fields = HashMap::new();
 additional_fields.insert(
 "token_endpoint_auth_methods_supported".to_string(),
 serde_json::json!(["private_key_jwt"]),
 );
 let meta = AuthorizationMetadata {
 authorization_endpoint: "http://localhost/authorize".to_string(),
 token_endpoint: "http://localhost/token".to_string(),
 additional_fields,
 ..Default::default()
 };
 let mut mgr = manager_with_metadata(Some(meta)).await;
 // Unsupported method should fall through to default (basic auth)
 mgr.configure_client(test_client_config()).unwrap();
 assert!(matches!(
 mgr.oauth_client.as_ref().unwrap().auth_type(),
 AuthType::BasicAuth
 ));
 }

 #[tokio::test]
 async fn test_configure_client_prefers_basic_when_both_methods_supported() {
 let mut additional_fields = HashMap::new();
 additional_fields.insert(
 "token_endpoint_auth_methods_supported".to_string(),
 serde_json::json!(["client_secret_post", "client_secret_basic"]),
 );
 let meta = AuthorizationMetadata {
 authorization_endpoint: "http://localhost/authorize".to_string(),
 token_endpoint: "http://localhost/token".to_string(),
 additional_fields,
 ..Default::default()
 };
 let mut mgr = manager_with_metadata(Some(meta)).await;
 mgr.configure_client(test_client_config()).unwrap();
 assert!(matches!(
 mgr.oauth_client.as_ref().unwrap().auth_type(),
 AuthType::BasicAuth
 ));
 }
 // -- metadata deserialization --

 #[test]
Expand Down

, '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('^' + ".*" + '
feat(auth): add token_endpoint_auth_method to OAuthClientConfig by anara123 · Pull Request #648 · modelcontextprotocol/rust-sdk · GitHub
Skip to content
feat(auth): add token_endpoint_auth_method to OAuthClientConfig#648

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

alexhancock
merged 8 commits into

from

Feb 13, 2026
 Merged


feat(auth): add token_endpoint_auth_method to OAuthClientConfig
#648
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
faa5939

feat(auth): add token_endpoint_auth_method to OAuthClientConfig

Feb 9, 2026
c8e21de

refactor(auth): derive token_endpoint_auth_method from server metadata

Feb 9, 2026
ceb4437

refactor(auth): read token_endpoint_auth_methods_supported from addit…

Feb 9, 2026
0e4a777

feat(auth): prefer basic auth when both methods supported and improve…

Feb 10, 2026
40df135

style(auth): apply cargo fmt formatting

Feb 12, 2026
3964eaa

style(auth): apply nightly cargo fmt import grouping

Feb 13, 2026
777da69

chore: merge origin/main and resolve conflicts

Feb 13, 2026
0a431d5

revert: undo .gitignore change

Feb 13, 2026

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


142 changes: 138 additions & 4 deletions
crates/rmcp/src/transport/auth.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use std::{collections::HashMap, sync::Arc, time::Duration};

use async_trait::async_trait;
use oauth2::{
 AuthUrl, AuthorizationCode, ClientId, ClientSecret, CsrfToken, EmptyExtraTokenFields,
AuthType, AuthUrl, AuthorizationCode, ClientId, ClientSecret, CsrfToken, EmptyExtraTokenFields,
 PkceCodeChallenge, PkceCodeVerifier, RedirectUrl, RefreshToken, RequestTokenError, Scope,
 StandardTokenResponse, TokenResponse, TokenUrl,
 basic::{BasicClient, BasicTokenType},
Expand DownExpand Up@@ -548,6 +548,23 @@ impl AuthorizationManager {
 client_builder = client_builder.set_client_secret(ClientSecret::new(secret));
 }

 let uses_secret_post = metadata
 .additional_fields
 .get("token_endpoint_auth_methods_supported")
 .and_then(|v| v.as_array())
 .map(|arr| {
 let has_basic = arr
 .iter()
 .any(|m| m.as_str() == Some("client_secret_basic"));
 let has_post = arr.iter().any(|m| m.as_str() == Some("client_secret_post"));
 has_post && !has_basic
 })
 .unwrap_or(false);

 if uses_secret_post {
 client_builder = client_builder.set_auth_type(AuthType::RequestBody);
 }

 self.oauth_client = Some(client_builder);
 Ok(())
 }
Expand DownExpand Up@@ -1770,14 +1787,14 @@ impl OAuthState {

#[cfg(test)]
mod tests {
 use std::sync::Arc;
 use std::{collections::HashMap, sync::Arc};

 use oauth2::{CsrfToken, PkceCodeVerifier};
 use oauth2::{AuthType, CsrfToken, PkceCodeVerifier};
 use url::Url;

 use super::{
 AuthError, AuthorizationManager, AuthorizationMetadata, InMemoryStateStore,
 ScopeUpgradeConfig, StateStore, StoredAuthorizationState, is_https_url,
OAuthClientConfig, ScopeUpgradeConfig, StateStore, StoredAuthorizationState, is_https_url,
 };

 // -- url helpers --
Expand DownExpand Up@@ -2263,6 +2280,123 @@ mod tests {
 manager.set_state_store(TrackingStateStore::default());
 }

 /// Helper: create an AuthorizationManager with minimal metadata so
 /// `configure_client` can be exercised without a live server.
 async fn manager_with_metadata(
 metadata_override: Option<AuthorizationMetadata>,
 ) -> AuthorizationManager {
 let mut mgr = AuthorizationManager::new("http://localhost").await.unwrap();
 mgr.set_metadata(metadata_override.unwrap_or(AuthorizationMetadata {
 authorization_endpoint: "http://localhost/authorize".to_string(),
 token_endpoint: "http://localhost/token".to_string(),
 ..Default::default()
 }));
 mgr
 }

 fn test_client_config() -> OAuthClientConfig {
 OAuthClientConfig {
 client_id: "my-client".to_string(),
 client_secret: Some("my-secret".to_string()),
 scopes: vec![],
 redirect_uri: "http://localhost/callback".to_string(),
 }
 }

 #[tokio::test]
 async fn test_configure_client_uses_client_secret_post_from_metadata() {
 let mut additional_fields = HashMap::new();
 additional_fields.insert(
 "token_endpoint_auth_methods_supported".to_string(),
 serde_json::json!(["client_secret_post"]),
 );
 let meta = AuthorizationMetadata {
 authorization_endpoint: "http://localhost/authorize".to_string(),
 token_endpoint: "http://localhost/token".to_string(),
 additional_fields,
 ..Default::default()
 };
 let mut mgr = manager_with_metadata(Some(meta)).await;
 mgr.configure_client(test_client_config()).unwrap();
 assert!(matches!(
 mgr.oauth_client.as_ref().unwrap().auth_type(),
 AuthType::RequestBody
 ));
 }

 #[tokio::test]
 async fn test_configure_client_defaults_to_basic_auth() {
 let mut mgr = manager_with_metadata(None).await;
 mgr.configure_client(test_client_config()).unwrap();
 assert!(matches!(
 mgr.oauth_client.as_ref().unwrap().auth_type(),
 AuthType::BasicAuth
 ));
 }

 #[tokio::test]
 async fn test_configure_client_with_explicit_basic_in_metadata() {
 let mut additional_fields = HashMap::new();
 additional_fields.insert(
 "token_endpoint_auth_methods_supported".to_string(),
 serde_json::json!(["client_secret_basic"]),
 );
 let meta = AuthorizationMetadata {
 authorization_endpoint: "http://localhost/authorize".to_string(),
 token_endpoint: "http://localhost/token".to_string(),
 additional_fields,
 ..Default::default()
 };
 let mut mgr = manager_with_metadata(Some(meta)).await;
 mgr.configure_client(test_client_config()).unwrap();
 assert!(matches!(
 mgr.oauth_client.as_ref().unwrap().auth_type(),
 AuthType::BasicAuth
 ));
 }

 #[tokio::test]
 async fn test_configure_client_ignores_unsupported_auth_methods_in_metadata() {
 let mut additional_fields = HashMap::new();
 additional_fields.insert(
 "token_endpoint_auth_methods_supported".to_string(),
 serde_json::json!(["private_key_jwt"]),
 );
 let meta = AuthorizationMetadata {
 authorization_endpoint: "http://localhost/authorize".to_string(),
 token_endpoint: "http://localhost/token".to_string(),
 additional_fields,
 ..Default::default()
 };
 let mut mgr = manager_with_metadata(Some(meta)).await;
 // Unsupported method should fall through to default (basic auth)
 mgr.configure_client(test_client_config()).unwrap();
 assert!(matches!(
 mgr.oauth_client.as_ref().unwrap().auth_type(),
 AuthType::BasicAuth
 ));
 }

 #[tokio::test]
 async fn test_configure_client_prefers_basic_when_both_methods_supported() {
 let mut additional_fields = HashMap::new();
 additional_fields.insert(
 "token_endpoint_auth_methods_supported".to_string(),
 serde_json::json!(["client_secret_post", "client_secret_basic"]),
 );
 let meta = AuthorizationMetadata {
 authorization_endpoint: "http://localhost/authorize".to_string(),
 token_endpoint: "http://localhost/token".to_string(),
 additional_fields,
 ..Default::default()
 };
 let mut mgr = manager_with_metadata(Some(meta)).await;
 mgr.configure_client(test_client_config()).unwrap();
 assert!(matches!(
 mgr.oauth_client.as_ref().unwrap().auth_type(),
 AuthType::BasicAuth
 ));
 }
 // -- metadata deserialization --

 #[test]
Expand Down

, '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('^' + ".*" + '
feat(auth): add token_endpoint_auth_method to OAuthClientConfig by anara123 · Pull Request #648 · modelcontextprotocol/rust-sdk · GitHub
Skip to content
feat(auth): add token_endpoint_auth_method to OAuthClientConfig#648

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

alexhancock
merged 8 commits into

from

Feb 13, 2026
 Merged


feat(auth): add token_endpoint_auth_method to OAuthClientConfig
#648
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
faa5939

feat(auth): add token_endpoint_auth_method to OAuthClientConfig

Feb 9, 2026
c8e21de

refactor(auth): derive token_endpoint_auth_method from server metadata

Feb 9, 2026
ceb4437

refactor(auth): read token_endpoint_auth_methods_supported from addit…

Feb 9, 2026
0e4a777

feat(auth): prefer basic auth when both methods supported and improve…

Feb 10, 2026
40df135

style(auth): apply cargo fmt formatting

Feb 12, 2026
3964eaa

style(auth): apply nightly cargo fmt import grouping

Feb 13, 2026
777da69

chore: merge origin/main and resolve conflicts

Feb 13, 2026
0a431d5

revert: undo .gitignore change

Feb 13, 2026

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


142 changes: 138 additions & 4 deletions
crates/rmcp/src/transport/auth.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use std::{collections::HashMap, sync::Arc, time::Duration};

use async_trait::async_trait;
use oauth2::{
 AuthUrl, AuthorizationCode, ClientId, ClientSecret, CsrfToken, EmptyExtraTokenFields,
AuthType, AuthUrl, AuthorizationCode, ClientId, ClientSecret, CsrfToken, EmptyExtraTokenFields,
 PkceCodeChallenge, PkceCodeVerifier, RedirectUrl, RefreshToken, RequestTokenError, Scope,
 StandardTokenResponse, TokenResponse, TokenUrl,
 basic::{BasicClient, BasicTokenType},
Expand DownExpand Up@@ -548,6 +548,23 @@ impl AuthorizationManager {
 client_builder = client_builder.set_client_secret(ClientSecret::new(secret));
 }

 let uses_secret_post = metadata
 .additional_fields
 .get("token_endpoint_auth_methods_supported")
 .and_then(|v| v.as_array())
 .map(|arr| {
 let has_basic = arr
 .iter()
 .any(|m| m.as_str() == Some("client_secret_basic"));
 let has_post = arr.iter().any(|m| m.as_str() == Some("client_secret_post"));
 has_post && !has_basic
 })
 .unwrap_or(false);

 if uses_secret_post {
 client_builder = client_builder.set_auth_type(AuthType::RequestBody);
 }

 self.oauth_client = Some(client_builder);
 Ok(())
 }
Expand DownExpand Up@@ -1770,14 +1787,14 @@ impl OAuthState {

#[cfg(test)]
mod tests {
 use std::sync::Arc;
 use std::{collections::HashMap, sync::Arc};

 use oauth2::{CsrfToken, PkceCodeVerifier};
 use oauth2::{AuthType, CsrfToken, PkceCodeVerifier};
 use url::Url;

 use super::{
 AuthError, AuthorizationManager, AuthorizationMetadata, InMemoryStateStore,
 ScopeUpgradeConfig, StateStore, StoredAuthorizationState, is_https_url,
OAuthClientConfig, ScopeUpgradeConfig, StateStore, StoredAuthorizationState, is_https_url,
 };

 // -- url helpers --
Expand DownExpand Up@@ -2263,6 +2280,123 @@ mod tests {
 manager.set_state_store(TrackingStateStore::default());
 }

 /// Helper: create an AuthorizationManager with minimal metadata so
 /// `configure_client` can be exercised without a live server.
 async fn manager_with_metadata(
 metadata_override: Option<AuthorizationMetadata>,
 ) -> AuthorizationManager {
 let mut mgr = AuthorizationManager::new("http://localhost").await.unwrap();
 mgr.set_metadata(metadata_override.unwrap_or(AuthorizationMetadata {
 authorization_endpoint: "http://localhost/authorize".to_string(),
 token_endpoint: "http://localhost/token".to_string(),
 ..Default::default()
 }));
 mgr
 }

 fn test_client_config() -> OAuthClientConfig {
 OAuthClientConfig {
 client_id: "my-client".to_string(),
 client_secret: Some("my-secret".to_string()),
 scopes: vec![],
 redirect_uri: "http://localhost/callback".to_string(),
 }
 }

 #[tokio::test]
 async fn test_configure_client_uses_client_secret_post_from_metadata() {
 let mut additional_fields = HashMap::new();
 additional_fields.insert(
 "token_endpoint_auth_methods_supported".to_string(),
 serde_json::json!(["client_secret_post"]),
 );
 let meta = AuthorizationMetadata {
 authorization_endpoint: "http://localhost/authorize".to_string(),
 token_endpoint: "http://localhost/token".to_string(),
 additional_fields,
 ..Default::default()
 };
 let mut mgr = manager_with_metadata(Some(meta)).await;
 mgr.configure_client(test_client_config()).unwrap();
 assert!(matches!(
 mgr.oauth_client.as_ref().unwrap().auth_type(),
 AuthType::RequestBody
 ));
 }

 #[tokio::test]
 async fn test_configure_client_defaults_to_basic_auth() {
 let mut mgr = manager_with_metadata(None).await;
 mgr.configure_client(test_client_config()).unwrap();
 assert!(matches!(
 mgr.oauth_client.as_ref().unwrap().auth_type(),
 AuthType::BasicAuth
 ));
 }

 #[tokio::test]
 async fn test_configure_client_with_explicit_basic_in_metadata() {
 let mut additional_fields = HashMap::new();
 additional_fields.insert(
 "token_endpoint_auth_methods_supported".to_string(),
 serde_json::json!(["client_secret_basic"]),
 );
 let meta = AuthorizationMetadata {
 authorization_endpoint: "http://localhost/authorize".to_string(),
 token_endpoint: "http://localhost/token".to_string(),
 additional_fields,
 ..Default::default()
 };
 let mut mgr = manager_with_metadata(Some(meta)).await;
 mgr.configure_client(test_client_config()).unwrap();
 assert!(matches!(
 mgr.oauth_client.as_ref().unwrap().auth_type(),
 AuthType::BasicAuth
 ));
 }

 #[tokio::test]
 async fn test_configure_client_ignores_unsupported_auth_methods_in_metadata() {
 let mut additional_fields = HashMap::new();
 additional_fields.insert(
 "token_endpoint_auth_methods_supported".to_string(),
 serde_json::json!(["private_key_jwt"]),
 );
 let meta = AuthorizationMetadata {
 authorization_endpoint: "http://localhost/authorize".to_string(),
 token_endpoint: "http://localhost/token".to_string(),
 additional_fields,
 ..Default::default()
 };
 let mut mgr = manager_with_metadata(Some(meta)).await;
 // Unsupported method should fall through to default (basic auth)
 mgr.configure_client(test_client_config()).unwrap();
 assert!(matches!(
 mgr.oauth_client.as_ref().unwrap().auth_type(),
 AuthType::BasicAuth
 ));
 }

 #[tokio::test]
 async fn test_configure_client_prefers_basic_when_both_methods_supported() {
 let mut additional_fields = HashMap::new();
 additional_fields.insert(
 "token_endpoint_auth_methods_supported".to_string(),
 serde_json::json!(["client_secret_post", "client_secret_basic"]),
 );
 let meta = AuthorizationMetadata {
 authorization_endpoint: "http://localhost/authorize".to_string(),
 token_endpoint: "http://localhost/token".to_string(),
 additional_fields,
 ..Default::default()
 };
 let mut mgr = manager_with_metadata(Some(meta)).await;
 mgr.configure_client(test_client_config()).unwrap();
 assert!(matches!(
 mgr.oauth_client.as_ref().unwrap().auth_type(),
 AuthType::BasicAuth
 ));
 }
 // -- metadata deserialization --

 #[test]
Expand Down

, '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" + '
feat(auth): add token_endpoint_auth_method to OAuthClientConfig by anara123 · Pull Request #648 · modelcontextprotocol/rust-sdk · GitHub
Skip to content
feat(auth): add token_endpoint_auth_method to OAuthClientConfig#648

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

alexhancock
merged 8 commits into

from

Feb 13, 2026
 Merged


feat(auth): add token_endpoint_auth_method to OAuthClientConfig
#648
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
faa5939

feat(auth): add token_endpoint_auth_method to OAuthClientConfig

Feb 9, 2026
c8e21de

refactor(auth): derive token_endpoint_auth_method from server metadata

Feb 9, 2026
ceb4437

refactor(auth): read token_endpoint_auth_methods_supported from addit…

Feb 9, 2026
0e4a777

feat(auth): prefer basic auth when both methods supported and improve…

Feb 10, 2026
40df135

style(auth): apply cargo fmt formatting

Feb 12, 2026
3964eaa

style(auth): apply nightly cargo fmt import grouping

Feb 13, 2026
777da69

chore: merge origin/main and resolve conflicts

Feb 13, 2026
0a431d5

revert: undo .gitignore change

Feb 13, 2026

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


142 changes: 138 additions & 4 deletions
crates/rmcp/src/transport/auth.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use std::{collections::HashMap, sync::Arc, time::Duration};

use async_trait::async_trait;
use oauth2::{
 AuthUrl, AuthorizationCode, ClientId, ClientSecret, CsrfToken, EmptyExtraTokenFields,
AuthType, AuthUrl, AuthorizationCode, ClientId, ClientSecret, CsrfToken, EmptyExtraTokenFields,
 PkceCodeChallenge, PkceCodeVerifier, RedirectUrl, RefreshToken, RequestTokenError, Scope,
 StandardTokenResponse, TokenResponse, TokenUrl,
 basic::{BasicClient, BasicTokenType},
Expand DownExpand Up@@ -548,6 +548,23 @@ impl AuthorizationManager {
 client_builder = client_builder.set_client_secret(ClientSecret::new(secret));
 }

 let uses_secret_post = metadata
 .additional_fields
 .get("token_endpoint_auth_methods_supported")
 .and_then(|v| v.as_array())
 .map(|arr| {
 let has_basic = arr
 .iter()
 .any(|m| m.as_str() == Some("client_secret_basic"));
 let has_post = arr.iter().any(|m| m.as_str() == Some("client_secret_post"));
 has_post && !has_basic
 })
 .unwrap_or(false);

 if uses_secret_post {
 client_builder = client_builder.set_auth_type(AuthType::RequestBody);
 }

 self.oauth_client = Some(client_builder);
 Ok(())
 }
Expand DownExpand Up@@ -1770,14 +1787,14 @@ impl OAuthState {

#[cfg(test)]
mod tests {
 use std::sync::Arc;
 use std::{collections::HashMap, sync::Arc};

 use oauth2::{CsrfToken, PkceCodeVerifier};
 use oauth2::{AuthType, CsrfToken, PkceCodeVerifier};
 use url::Url;

 use super::{
 AuthError, AuthorizationManager, AuthorizationMetadata, InMemoryStateStore,
 ScopeUpgradeConfig, StateStore, StoredAuthorizationState, is_https_url,
OAuthClientConfig, ScopeUpgradeConfig, StateStore, StoredAuthorizationState, is_https_url,
 };

 // -- url helpers --
Expand DownExpand Up@@ -2263,6 +2280,123 @@ mod tests {
 manager.set_state_store(TrackingStateStore::default());
 }

 /// Helper: create an AuthorizationManager with minimal metadata so
 /// `configure_client` can be exercised without a live server.
 async fn manager_with_metadata(
 metadata_override: Option<AuthorizationMetadata>,
 ) -> AuthorizationManager {
 let mut mgr = AuthorizationManager::new("http://localhost").await.unwrap();
 mgr.set_metadata(metadata_override.unwrap_or(AuthorizationMetadata {
 authorization_endpoint: "http://localhost/authorize".to_string(),
 token_endpoint: "http://localhost/token".to_string(),
 ..Default::default()
 }));
 mgr
 }

 fn test_client_config() -> OAuthClientConfig {
 OAuthClientConfig {
 client_id: "my-client".to_string(),
 client_secret: Some("my-secret".to_string()),
 scopes: vec![],
 redirect_uri: "http://localhost/callback".to_string(),
 }
 }

 #[tokio::test]
 async fn test_configure_client_uses_client_secret_post_from_metadata() {
 let mut additional_fields = HashMap::new();
 additional_fields.insert(
 "token_endpoint_auth_methods_supported".to_string(),
 serde_json::json!(["client_secret_post"]),
 );
 let meta = AuthorizationMetadata {
 authorization_endpoint: "http://localhost/authorize".to_string(),
 token_endpoint: "http://localhost/token".to_string(),
 additional_fields,
 ..Default::default()
 };
 let mut mgr = manager_with_metadata(Some(meta)).await;
 mgr.configure_client(test_client_config()).unwrap();
 assert!(matches!(
 mgr.oauth_client.as_ref().unwrap().auth_type(),
 AuthType::RequestBody
 ));
 }

 #[tokio::test]
 async fn test_configure_client_defaults_to_basic_auth() {
 let mut mgr = manager_with_metadata(None).await;
 mgr.configure_client(test_client_config()).unwrap();
 assert!(matches!(
 mgr.oauth_client.as_ref().unwrap().auth_type(),
 AuthType::BasicAuth
 ));
 }

 #[tokio::test]
 async fn test_configure_client_with_explicit_basic_in_metadata() {
 let mut additional_fields = HashMap::new();
 additional_fields.insert(
 "token_endpoint_auth_methods_supported".to_string(),
 serde_json::json!(["client_secret_basic"]),
 );
 let meta = AuthorizationMetadata {
 authorization_endpoint: "http://localhost/authorize".to_string(),
 token_endpoint: "http://localhost/token".to_string(),
 additional_fields,
 ..Default::default()
 };
 let mut mgr = manager_with_metadata(Some(meta)).await;
 mgr.configure_client(test_client_config()).unwrap();
 assert!(matches!(
 mgr.oauth_client.as_ref().unwrap().auth_type(),
 AuthType::BasicAuth
 ));
 }

 #[tokio::test]
 async fn test_configure_client_ignores_unsupported_auth_methods_in_metadata() {
 let mut additional_fields = HashMap::new();
 additional_fields.insert(
 "token_endpoint_auth_methods_supported".to_string(),
 serde_json::json!(["private_key_jwt"]),
 );
 let meta = AuthorizationMetadata {
 authorization_endpoint: "http://localhost/authorize".to_string(),
 token_endpoint: "http://localhost/token".to_string(),
 additional_fields,
 ..Default::default()
 };
 let mut mgr = manager_with_metadata(Some(meta)).await;
 // Unsupported method should fall through to default (basic auth)
 mgr.configure_client(test_client_config()).unwrap();
 assert!(matches!(
 mgr.oauth_client.as_ref().unwrap().auth_type(),
 AuthType::BasicAuth
 ));
 }

 #[tokio::test]
 async fn test_configure_client_prefers_basic_when_both_methods_supported() {
 let mut additional_fields = HashMap::new();
 additional_fields.insert(
 "token_endpoint_auth_methods_supported".to_string(),
 serde_json::json!(["client_secret_post", "client_secret_basic"]),
 );
 let meta = AuthorizationMetadata {
 authorization_endpoint: "http://localhost/authorize".to_string(),
 token_endpoint: "http://localhost/token".to_string(),
 additional_fields,
 ..Default::default()
 };
 let mut mgr = manager_with_metadata(Some(meta)).await;
 mgr.configure_client(test_client_config()).unwrap();
 assert!(matches!(
 mgr.oauth_client.as_ref().unwrap().auth_type(),
 AuthType::BasicAuth
 ));
 }
 // -- metadata deserialization --

 #[test]
Expand Down

, '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('^' + ".*" + '
feat(auth): add token_endpoint_auth_method to OAuthClientConfig by anara123 · Pull Request #648 · modelcontextprotocol/rust-sdk · GitHub
Skip to content
feat(auth): add token_endpoint_auth_method to OAuthClientConfig#648

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

alexhancock
merged 8 commits into

from

Feb 13, 2026
 Merged


feat(auth): add token_endpoint_auth_method to OAuthClientConfig
#648
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
faa5939

feat(auth): add token_endpoint_auth_method to OAuthClientConfig

Feb 9, 2026
c8e21de

refactor(auth): derive token_endpoint_auth_method from server metadata

Feb 9, 2026
ceb4437

refactor(auth): read token_endpoint_auth_methods_supported from addit…

Feb 9, 2026
0e4a777

feat(auth): prefer basic auth when both methods supported and improve…

Feb 10, 2026
40df135

style(auth): apply cargo fmt formatting

Feb 12, 2026
3964eaa

style(auth): apply nightly cargo fmt import grouping

Feb 13, 2026
777da69

chore: merge origin/main and resolve conflicts

Feb 13, 2026
0a431d5

revert: undo .gitignore change

Feb 13, 2026

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


142 changes: 138 additions & 4 deletions
crates/rmcp/src/transport/auth.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use std::{collections::HashMap, sync::Arc, time::Duration};

use async_trait::async_trait;
use oauth2::{
 AuthUrl, AuthorizationCode, ClientId, ClientSecret, CsrfToken, EmptyExtraTokenFields,
AuthType, AuthUrl, AuthorizationCode, ClientId, ClientSecret, CsrfToken, EmptyExtraTokenFields,
 PkceCodeChallenge, PkceCodeVerifier, RedirectUrl, RefreshToken, RequestTokenError, Scope,
 StandardTokenResponse, TokenResponse, TokenUrl,
 basic::{BasicClient, BasicTokenType},
Expand DownExpand Up@@ -548,6 +548,23 @@ impl AuthorizationManager {
 client_builder = client_builder.set_client_secret(ClientSecret::new(secret));
 }

 let uses_secret_post = metadata
 .additional_fields
 .get("token_endpoint_auth_methods_supported")
 .and_then(|v| v.as_array())
 .map(|arr| {
 let has_basic = arr
 .iter()
 .any(|m| m.as_str() == Some("client_secret_basic"));
 let has_post = arr.iter().any(|m| m.as_str() == Some("client_secret_post"));
 has_post && !has_basic
 })
 .unwrap_or(false);

 if uses_secret_post {
 client_builder = client_builder.set_auth_type(AuthType::RequestBody);
 }

 self.oauth_client = Some(client_builder);
 Ok(())
 }
Expand DownExpand Up@@ -1770,14 +1787,14 @@ impl OAuthState {

#[cfg(test)]
mod tests {
 use std::sync::Arc;
 use std::{collections::HashMap, sync::Arc};

 use oauth2::{CsrfToken, PkceCodeVerifier};
 use oauth2::{AuthType, CsrfToken, PkceCodeVerifier};
 use url::Url;

 use super::{
 AuthError, AuthorizationManager, AuthorizationMetadata, InMemoryStateStore,
 ScopeUpgradeConfig, StateStore, StoredAuthorizationState, is_https_url,
OAuthClientConfig, ScopeUpgradeConfig, StateStore, StoredAuthorizationState, is_https_url,
 };

 // -- url helpers --
Expand DownExpand Up@@ -2263,6 +2280,123 @@ mod tests {
 manager.set_state_store(TrackingStateStore::default());
 }

 /// Helper: create an AuthorizationManager with minimal metadata so
 /// `configure_client` can be exercised without a live server.
 async fn manager_with_metadata(
 metadata_override: Option<AuthorizationMetadata>,
 ) -> AuthorizationManager {
 let mut mgr = AuthorizationManager::new("http://localhost").await.unwrap();
 mgr.set_metadata(metadata_override.unwrap_or(AuthorizationMetadata {
 authorization_endpoint: "http://localhost/authorize".to_string(),
 token_endpoint: "http://localhost/token".to_string(),
 ..Default::default()
 }));
 mgr
 }

 fn test_client_config() -> OAuthClientConfig {
 OAuthClientConfig {
 client_id: "my-client".to_string(),
 client_secret: Some("my-secret".to_string()),
 scopes: vec![],
 redirect_uri: "http://localhost/callback".to_string(),
 }
 }

 #[tokio::test]
 async fn test_configure_client_uses_client_secret_post_from_metadata() {
 let mut additional_fields = HashMap::new();
 additional_fields.insert(
 "token_endpoint_auth_methods_supported".to_string(),
 serde_json::json!(["client_secret_post"]),
 );
 let meta = AuthorizationMetadata {
 authorization_endpoint: "http://localhost/authorize".to_string(),
 token_endpoint: "http://localhost/token".to_string(),
 additional_fields,
 ..Default::default()
 };
 let mut mgr = manager_with_metadata(Some(meta)).await;
 mgr.configure_client(test_client_config()).unwrap();
 assert!(matches!(
 mgr.oauth_client.as_ref().unwrap().auth_type(),
 AuthType::RequestBody
 ));
 }

 #[tokio::test]
 async fn test_configure_client_defaults_to_basic_auth() {
 let mut mgr = manager_with_metadata(None).await;
 mgr.configure_client(test_client_config()).unwrap();
 assert!(matches!(
 mgr.oauth_client.as_ref().unwrap().auth_type(),
 AuthType::BasicAuth
 ));
 }

 #[tokio::test]
 async fn test_configure_client_with_explicit_basic_in_metadata() {
 let mut additional_fields = HashMap::new();
 additional_fields.insert(
 "token_endpoint_auth_methods_supported".to_string(),
 serde_json::json!(["client_secret_basic"]),
 );
 let meta = AuthorizationMetadata {
 authorization_endpoint: "http://localhost/authorize".to_string(),
 token_endpoint: "http://localhost/token".to_string(),
 additional_fields,
 ..Default::default()
 };
 let mut mgr = manager_with_metadata(Some(meta)).await;
 mgr.configure_client(test_client_config()).unwrap();
 assert!(matches!(
 mgr.oauth_client.as_ref().unwrap().auth_type(),
 AuthType::BasicAuth
 ));
 }

 #[tokio::test]
 async fn test_configure_client_ignores_unsupported_auth_methods_in_metadata() {
 let mut additional_fields = HashMap::new();
 additional_fields.insert(
 "token_endpoint_auth_methods_supported".to_string(),
 serde_json::json!(["private_key_jwt"]),
 );
 let meta = AuthorizationMetadata {
 authorization_endpoint: "http://localhost/authorize".to_string(),
 token_endpoint: "http://localhost/token".to_string(),
 additional_fields,
 ..Default::default()
 };
 let mut mgr = manager_with_metadata(Some(meta)).await;
 // Unsupported method should fall through to default (basic auth)
 mgr.configure_client(test_client_config()).unwrap();
 assert!(matches!(
 mgr.oauth_client.as_ref().unwrap().auth_type(),
 AuthType::BasicAuth
 ));
 }

 #[tokio::test]
 async fn test_configure_client_prefers_basic_when_both_methods_supported() {
 let mut additional_fields = HashMap::new();
 additional_fields.insert(
 "token_endpoint_auth_methods_supported".to_string(),
 serde_json::json!(["client_secret_post", "client_secret_basic"]),
 );
 let meta = AuthorizationMetadata {
 authorization_endpoint: "http://localhost/authorize".to_string(),
 token_endpoint: "http://localhost/token".to_string(),
 additional_fields,
 ..Default::default()
 };
 let mut mgr = manager_with_metadata(Some(meta)).await;
 mgr.configure_client(test_client_config()).unwrap();
 assert!(matches!(
 mgr.oauth_client.as_ref().unwrap().auth_type(),
 AuthType::BasicAuth
 ));
 }
 // -- metadata deserialization --

 #[test]
Expand Down

, '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); }
})();
})();
feat(auth): add token_endpoint_auth_method to OAuthClientConfig by anara123 · Pull Request #648 · modelcontextprotocol/rust-sdk · GitHub
Skip to content
feat(auth): add token_endpoint_auth_method to OAuthClientConfig#648

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

alexhancock
merged 8 commits into

from

Feb 13, 2026
 Merged


feat(auth): add token_endpoint_auth_method to OAuthClientConfig
#648
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
faa5939

feat(auth): add token_endpoint_auth_method to OAuthClientConfig

Feb 9, 2026
c8e21de

refactor(auth): derive token_endpoint_auth_method from server metadata

Feb 9, 2026
ceb4437

refactor(auth): read token_endpoint_auth_methods_supported from addit…

Feb 9, 2026
0e4a777

feat(auth): prefer basic auth when both methods supported and improve…

Feb 10, 2026
40df135

style(auth): apply cargo fmt formatting

Feb 12, 2026
3964eaa

style(auth): apply nightly cargo fmt import grouping

Feb 13, 2026
777da69

chore: merge origin/main and resolve conflicts

Feb 13, 2026
0a431d5

revert: undo .gitignore change

Feb 13, 2026

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


142 changes: 138 additions & 4 deletions
crates/rmcp/src/transport/auth.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use std::{collections::HashMap, sync::Arc, time::Duration};

use async_trait::async_trait;
use oauth2::{
 AuthUrl, AuthorizationCode, ClientId, ClientSecret, CsrfToken, EmptyExtraTokenFields,
AuthType, AuthUrl, AuthorizationCode, ClientId, ClientSecret, CsrfToken, EmptyExtraTokenFields,
 PkceCodeChallenge, PkceCodeVerifier, RedirectUrl, RefreshToken, RequestTokenError, Scope,
 StandardTokenResponse, TokenResponse, TokenUrl,
 basic::{BasicClient, BasicTokenType},
Expand DownExpand Up@@ -548,6 +548,23 @@ impl AuthorizationManager {
 client_builder = client_builder.set_client_secret(ClientSecret::new(secret));
 }

 let uses_secret_post = metadata
 .additional_fields
 .get("token_endpoint_auth_methods_supported")
 .and_then(|v| v.as_array())
 .map(|arr| {
 let has_basic = arr
 .iter()
 .any(|m| m.as_str() == Some("client_secret_basic"));
 let has_post = arr.iter().any(|m| m.as_str() == Some("client_secret_post"));
 has_post && !has_basic
 })
 .unwrap_or(false);

 if uses_secret_post {
 client_builder = client_builder.set_auth_type(AuthType::RequestBody);
 }

 self.oauth_client = Some(client_builder);
 Ok(())
 }
Expand DownExpand Up@@ -1770,14 +1787,14 @@ impl OAuthState {

#[cfg(test)]
mod tests {
 use std::sync::Arc;
 use std::{collections::HashMap, sync::Arc};

 use oauth2::{CsrfToken, PkceCodeVerifier};
 use oauth2::{AuthType, CsrfToken, PkceCodeVerifier};
 use url::Url;

 use super::{
 AuthError, AuthorizationManager, AuthorizationMetadata, InMemoryStateStore,
 ScopeUpgradeConfig, StateStore, StoredAuthorizationState, is_https_url,
OAuthClientConfig, ScopeUpgradeConfig, StateStore, StoredAuthorizationState, is_https_url,
 };

 // -- url helpers --
Expand DownExpand Up@@ -2263,6 +2280,123 @@ mod tests {
 manager.set_state_store(TrackingStateStore::default());
 }

 /// Helper: create an AuthorizationManager with minimal metadata so
 /// `configure_client` can be exercised without a live server.
 async fn manager_with_metadata(
 metadata_override: Option<AuthorizationMetadata>,
 ) -> AuthorizationManager {
 let mut mgr = AuthorizationManager::new("http://localhost").await.unwrap();
 mgr.set_metadata(metadata_override.unwrap_or(AuthorizationMetadata {
 authorization_endpoint: "http://localhost/authorize".to_string(),
 token_endpoint: "http://localhost/token".to_string(),
 ..Default::default()
 }));
 mgr
 }

 fn test_client_config() -> OAuthClientConfig {
 OAuthClientConfig {
 client_id: "my-client".to_string(),
 client_secret: Some("my-secret".to_string()),
 scopes: vec![],
 redirect_uri: "http://localhost/callback".to_string(),
 }
 }

 #[tokio::test]
 async fn test_configure_client_uses_client_secret_post_from_metadata() {
 let mut additional_fields = HashMap::new();
 additional_fields.insert(
 "token_endpoint_auth_methods_supported".to_string(),
 serde_json::json!(["client_secret_post"]),
 );
 let meta = AuthorizationMetadata {
 authorization_endpoint: "http://localhost/authorize".to_string(),
 token_endpoint: "http://localhost/token".to_string(),
 additional_fields,
 ..Default::default()
 };
 let mut mgr = manager_with_metadata(Some(meta)).await;
 mgr.configure_client(test_client_config()).unwrap();
 assert!(matches!(
 mgr.oauth_client.as_ref().unwrap().auth_type(),
 AuthType::RequestBody
 ));
 }

 #[tokio::test]
 async fn test_configure_client_defaults_to_basic_auth() {
 let mut mgr = manager_with_metadata(None).await;
 mgr.configure_client(test_client_config()).unwrap();
 assert!(matches!(
 mgr.oauth_client.as_ref().unwrap().auth_type(),
 AuthType::BasicAuth
 ));
 }

 #[tokio::test]
 async fn test_configure_client_with_explicit_basic_in_metadata() {
 let mut additional_fields = HashMap::new();
 additional_fields.insert(
 "token_endpoint_auth_methods_supported".to_string(),
 serde_json::json!(["client_secret_basic"]),
 );
 let meta = AuthorizationMetadata {
 authorization_endpoint: "http://localhost/authorize".to_string(),
 token_endpoint: "http://localhost/token".to_string(),
 additional_fields,
 ..Default::default()
 };
 let mut mgr = manager_with_metadata(Some(meta)).await;
 mgr.configure_client(test_client_config()).unwrap();
 assert!(matches!(
 mgr.oauth_client.as_ref().unwrap().auth_type(),
 AuthType::BasicAuth
 ));
 }

 #[tokio::test]
 async fn test_configure_client_ignores_unsupported_auth_methods_in_metadata() {
 let mut additional_fields = HashMap::new();
 additional_fields.insert(
 "token_endpoint_auth_methods_supported".to_string(),
 serde_json::json!(["private_key_jwt"]),
 );
 let meta = AuthorizationMetadata {
 authorization_endpoint: "http://localhost/authorize".to_string(),
 token_endpoint: "http://localhost/token".to_string(),
 additional_fields,
 ..Default::default()
 };
 let mut mgr = manager_with_metadata(Some(meta)).await;
 // Unsupported method should fall through to default (basic auth)
 mgr.configure_client(test_client_config()).unwrap();
 assert!(matches!(
 mgr.oauth_client.as_ref().unwrap().auth_type(),
 AuthType::BasicAuth
 ));
 }

 #[tokio::test]
 async fn test_configure_client_prefers_basic_when_both_methods_supported() {
 let mut additional_fields = HashMap::new();
 additional_fields.insert(
 "token_endpoint_auth_methods_supported".to_string(),
 serde_json::json!(["client_secret_post", "client_secret_basic"]),
 );
 let meta = AuthorizationMetadata {
 authorization_endpoint: "http://localhost/authorize".to_string(),
 token_endpoint: "http://localhost/token".to_string(),
 additional_fields,
 ..Default::default()
 };
 let mut mgr = manager_with_metadata(Some(meta)).await;
 mgr.configure_client(test_client_config()).unwrap();
 assert!(matches!(
 mgr.oauth_client.as_ref().unwrap().auth_type(),
 AuthType::BasicAuth
 ));
 }
 // -- metadata deserialization --

 #[test]
Expand Down