Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions crates/rmcp/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ tokio-util = { version = "0.7" }
pin-project-lite = "0.2"
pastey = { version = "0.2.0", optional = true }
# oauth2 support
oauth2 = { version = "5.0", optional = true, default-features = false, features = ["reqwest"] }
oauth2 = { version = "5.0", optional = true, default-features = false }

# for auto generate schema
schemars = { version = "1.0", optional = true, features = ["chrono04"] }
Expand All@@ -35,7 +35,7 @@ schemars = { version = "1.0", optional = true, features = ["chrono04"] }
base64 = { version = "0.22", optional = true }

# for HTTP client
reqwest = { version = "0.12", default-features = false, features = [
reqwest = { version = "0.13.2", default-features = false, features = [
"json",
"stream",
], optional = true }
Expand DownExpand Up@@ -84,9 +84,9 @@ elicitation = ["dep:url"]
# reqwest http client
__reqwest = ["dep:reqwest"]

reqwest = ["__reqwest", "reqwest?/rustls-tls"]
reqwest = ["__reqwest", "reqwest?/rustls"]

reqwest-tls-no-provider = ["__reqwest", "reqwest?/rustls-tls-no-provider"]
reqwest-tls-no-provider = ["__reqwest", "reqwest?/rustls-no-provider"]

reqwest-native-tls = ["__reqwest", "reqwest?/native-tls"]

Expand Down
44 changes: 39 additions & 5 deletions crates/rmcp/src/transport/auth.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,10 @@ use std::{collections::HashMap, sync::Arc, time::Duration};

use async_trait::async_trait;
use oauth2::{
AuthType, AuthUrl, AuthorizationCode, ClientId, ClientSecret, CsrfToken, EmptyExtraTokenFields,
PkceCodeChallenge, PkceCodeVerifier, RedirectUrl, RefreshToken, RequestTokenError, Scope,
StandardTokenResponse, TokenResponse, TokenUrl,
AsyncHttpClient, AuthType, AuthUrl, AuthorizationCode, ClientId, ClientSecret, CsrfToken,
EmptyExtraTokenFields, HttpClientError, HttpRequest, HttpResponse, PkceCodeChallenge,
PkceCodeVerifier, RedirectUrl, RefreshToken, RequestTokenError, Scope, StandardTokenResponse,
TokenResponse, TokenUrl,
basic::{BasicClient, BasicTokenType},
};
use reqwest::{
Expand All@@ -18,6 +19,39 @@ use tracing::{debug, error, warn};

use crate::transport::common::http_header::HEADER_MCP_PROTOCOL_VERSION;

/// Owned wrapper around [`reqwest::Client`] that implements [`AsyncHttpClient`] for oauth2.
struct OAuthReqwestClient(HttpClient);

impl<'c> AsyncHttpClient<'c> for OAuthReqwestClient {
type Error = HttpClientError<reqwest::Error>;

type Future = std::pin::Pin<
Box<dyn std::future::Future<Output = Result<HttpResponse, Self::Error>> + Send + Sync + 'c>,
>;

fn call(&'c self, request: HttpRequest) -> Self::Future {
Box::pin(async move {
let response = self
.0
.execute(request.try_into().map_err(Box::new)?)
.await
.map_err(Box::new)?;

let mut builder = oauth2::http::Response::builder()
.status(response.status())
.version(response.version());

for (name, value) in response.headers().iter() {
builder = builder.header(name, value);
}

builder
.body(response.bytes().await.map_err(Box::new)?.to_vec())
.map_err(HttpClientError::Http)
})
}
}

const DEFAULT_EXCHANGE_URL: &str = "http://localhost";

/// Stored credentials for OAuth2 authorization
Expand DownExpand Up@@ -872,7 +906,7 @@ impl AuthorizationManager {
.exchange_code(AuthorizationCode::new(code.to_string()))
.set_pkce_verifier(pkce_verifier)
.add_extra_param("resource", self.base_url.to_string())
.request_async(&http_client)
.request_async(&OAuthReqwestClient(http_client))
.await
{
Ok(token) => token,
Expand DownExpand Up@@ -961,7 +995,7 @@ impl AuthorizationManager {

let token_result = oauth_client
.exchange_refresh_token(&RefreshToken::new(refresh_token.secret().to_string()))
.request_async(&self.http_client)
.request_async(&OAuthReqwestClient(self.http_client.clone()))
.await
.map_err(|e| AuthError::TokenRefreshFailed(e.to_string()))?;

Expand Down
2 changes: 1 addition & 1 deletion examples/clients/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ anyhow = "1.0"
url = "2.4"
tower = "0.5"
axum = "0.8"
reqwest = "0.12"
reqwest = "0.13.2"
clap = { version = "4.0", features = ["derive"] }

[[example]]
Expand Down
2 changes: 1 addition & 1 deletion examples/servers/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ futures = "0.3"
rand = { version = "0.10", features = ["std"] }
axum = { version = "0.8", features = ["macros"] }
schemars = "1.0"
reqwest = { version = "0.12", features = ["json"] }
reqwest = { version = "0.13.2", features = ["json"] }
chrono = "0.4"
uuid = { version = "1.6", features = ["v4", "serde"] }
serde_urlencoded = "0.7"
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-chat-client/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ publish = false
tokio = { version = "1", features = ["full"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
reqwest = { version = "0.12", features = ["json"] }
reqwest = { version = "0.13.2", features = ["json"] }
anyhow = "1.0"
thiserror = "2.0"
async-trait = "0.1"
Expand Down
2 changes: 1 addition & 1 deletion examples/transport/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ schemars = { version = "1.0", optional = true }
hyper = { version = "1", features = ["client", "server", "http1"] }
hyper-util = { version = "0.1", features = ["tokio"] }
tokio-tungstenite = "0.28.0"
reqwest = { version = "0.12" }
reqwest = { version = "0.13.2" }
pin-project-lite = "0.2"

[[example]]
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" + '
Upgrade reqwest to 0.13.2 by DaleSeo · Pull Request #669 · modelcontextprotocol/rust-sdk · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions crates/rmcp/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ tokio-util = { version = "0.7" }
pin-project-lite = "0.2"
pastey = { version = "0.2.0", optional = true }
# oauth2 support
oauth2 = { version = "5.0", optional = true, default-features = false, features = ["reqwest"] }
oauth2 = { version = "5.0", optional = true, default-features = false }

# for auto generate schema
schemars = { version = "1.0", optional = true, features = ["chrono04"] }
Expand All@@ -35,7 +35,7 @@ schemars = { version = "1.0", optional = true, features = ["chrono04"] }
base64 = { version = "0.22", optional = true }

# for HTTP client
reqwest = { version = "0.12", default-features = false, features = [
reqwest = { version = "0.13.2", default-features = false, features = [
"json",
"stream",
], optional = true }
Expand DownExpand Up@@ -84,9 +84,9 @@ elicitation = ["dep:url"]
# reqwest http client
__reqwest = ["dep:reqwest"]

reqwest = ["__reqwest", "reqwest?/rustls-tls"]
reqwest = ["__reqwest", "reqwest?/rustls"]

reqwest-tls-no-provider = ["__reqwest", "reqwest?/rustls-tls-no-provider"]
reqwest-tls-no-provider = ["__reqwest", "reqwest?/rustls-no-provider"]

reqwest-native-tls = ["__reqwest", "reqwest?/native-tls"]

Expand Down
44 changes: 39 additions & 5 deletions crates/rmcp/src/transport/auth.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,10 @@ use std::{collections::HashMap, sync::Arc, time::Duration};

use async_trait::async_trait;
use oauth2::{
AuthType, AuthUrl, AuthorizationCode, ClientId, ClientSecret, CsrfToken, EmptyExtraTokenFields,
PkceCodeChallenge, PkceCodeVerifier, RedirectUrl, RefreshToken, RequestTokenError, Scope,
StandardTokenResponse, TokenResponse, TokenUrl,
AsyncHttpClient, AuthType, AuthUrl, AuthorizationCode, ClientId, ClientSecret, CsrfToken,
EmptyExtraTokenFields, HttpClientError, HttpRequest, HttpResponse, PkceCodeChallenge,
PkceCodeVerifier, RedirectUrl, RefreshToken, RequestTokenError, Scope, StandardTokenResponse,
TokenResponse, TokenUrl,
basic::{BasicClient, BasicTokenType},
};
use reqwest::{
Expand All@@ -18,6 +19,39 @@ use tracing::{debug, error, warn};

use crate::transport::common::http_header::HEADER_MCP_PROTOCOL_VERSION;

/// Owned wrapper around [`reqwest::Client`] that implements [`AsyncHttpClient`] for oauth2.
struct OAuthReqwestClient(HttpClient);

impl<'c> AsyncHttpClient<'c> for OAuthReqwestClient {
type Error = HttpClientError<reqwest::Error>;

type Future = std::pin::Pin<
Box<dyn std::future::Future<Output = Result<HttpResponse, Self::Error>> + Send + Sync + 'c>,
>;

fn call(&'c self, request: HttpRequest) -> Self::Future {
Box::pin(async move {
let response = self
.0
.execute(request.try_into().map_err(Box::new)?)
.await
.map_err(Box::new)?;

let mut builder = oauth2::http::Response::builder()
.status(response.status())
.version(response.version());

for (name, value) in response.headers().iter() {
builder = builder.header(name, value);
}

builder
.body(response.bytes().await.map_err(Box::new)?.to_vec())
.map_err(HttpClientError::Http)
})
}
}

const DEFAULT_EXCHANGE_URL: &str = "http://localhost";

/// Stored credentials for OAuth2 authorization
Expand DownExpand Up@@ -872,7 +906,7 @@ impl AuthorizationManager {
.exchange_code(AuthorizationCode::new(code.to_string()))
.set_pkce_verifier(pkce_verifier)
.add_extra_param("resource", self.base_url.to_string())
.request_async(&http_client)
.request_async(&OAuthReqwestClient(http_client))
.await
{
Ok(token) => token,
Expand DownExpand Up@@ -961,7 +995,7 @@ impl AuthorizationManager {

let token_result = oauth_client
.exchange_refresh_token(&RefreshToken::new(refresh_token.secret().to_string()))
.request_async(&self.http_client)
.request_async(&OAuthReqwestClient(self.http_client.clone()))
.await
.map_err(|e| AuthError::TokenRefreshFailed(e.to_string()))?;

Expand Down
2 changes: 1 addition & 1 deletion examples/clients/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ anyhow = "1.0"
url = "2.4"
tower = "0.5"
axum = "0.8"
reqwest = "0.12"
reqwest = "0.13.2"
clap = { version = "4.0", features = ["derive"] }

[[example]]
Expand Down
2 changes: 1 addition & 1 deletion examples/servers/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ futures = "0.3"
rand = { version = "0.10", features = ["std"] }
axum = { version = "0.8", features = ["macros"] }
schemars = "1.0"
reqwest = { version = "0.12", features = ["json"] }
reqwest = { version = "0.13.2", features = ["json"] }
chrono = "0.4"
uuid = { version = "1.6", features = ["v4", "serde"] }
serde_urlencoded = "0.7"
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-chat-client/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ publish = false
tokio = { version = "1", features = ["full"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
reqwest = { version = "0.12", features = ["json"] }
reqwest = { version = "0.13.2", features = ["json"] }
anyhow = "1.0"
thiserror = "2.0"
async-trait = "0.1"
Expand Down
2 changes: 1 addition & 1 deletion examples/transport/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ schemars = { version = "1.0", optional = true }
hyper = { version = "1", features = ["client", "server", "http1"] }
hyper-util = { version = "0.1", features = ["tokio"] }
tokio-tungstenite = "0.28.0"
reqwest = { version = "0.12" }
reqwest = { version = "0.13.2" }
pin-project-lite = "0.2"

[[example]]
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('^' + ".*" + ' Upgrade reqwest to 0.13.2 by DaleSeo · Pull Request #669 · modelcontextprotocol/rust-sdk · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions crates/rmcp/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ tokio-util = { version = "0.7" }
pin-project-lite = "0.2"
pastey = { version = "0.2.0", optional = true }
# oauth2 support
oauth2 = { version = "5.0", optional = true, default-features = false, features = ["reqwest"] }
oauth2 = { version = "5.0", optional = true, default-features = false }

# for auto generate schema
schemars = { version = "1.0", optional = true, features = ["chrono04"] }
Expand All@@ -35,7 +35,7 @@ schemars = { version = "1.0", optional = true, features = ["chrono04"] }
base64 = { version = "0.22", optional = true }

# for HTTP client
reqwest = { version = "0.12", default-features = false, features = [
reqwest = { version = "0.13.2", default-features = false, features = [
"json",
"stream",
], optional = true }
Expand DownExpand Up@@ -84,9 +84,9 @@ elicitation = ["dep:url"]
# reqwest http client
__reqwest = ["dep:reqwest"]

reqwest = ["__reqwest", "reqwest?/rustls-tls"]
reqwest = ["__reqwest", "reqwest?/rustls"]

reqwest-tls-no-provider = ["__reqwest", "reqwest?/rustls-tls-no-provider"]
reqwest-tls-no-provider = ["__reqwest", "reqwest?/rustls-no-provider"]

reqwest-native-tls = ["__reqwest", "reqwest?/native-tls"]

Expand Down
44 changes: 39 additions & 5 deletions crates/rmcp/src/transport/auth.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,10 @@ use std::{collections::HashMap, sync::Arc, time::Duration};

use async_trait::async_trait;
use oauth2::{
AuthType, AuthUrl, AuthorizationCode, ClientId, ClientSecret, CsrfToken, EmptyExtraTokenFields,
PkceCodeChallenge, PkceCodeVerifier, RedirectUrl, RefreshToken, RequestTokenError, Scope,
StandardTokenResponse, TokenResponse, TokenUrl,
AsyncHttpClient, AuthType, AuthUrl, AuthorizationCode, ClientId, ClientSecret, CsrfToken,
EmptyExtraTokenFields, HttpClientError, HttpRequest, HttpResponse, PkceCodeChallenge,
PkceCodeVerifier, RedirectUrl, RefreshToken, RequestTokenError, Scope, StandardTokenResponse,
TokenResponse, TokenUrl,
basic::{BasicClient, BasicTokenType},
};
use reqwest::{
Expand All@@ -18,6 +19,39 @@ use tracing::{debug, error, warn};

use crate::transport::common::http_header::HEADER_MCP_PROTOCOL_VERSION;

/// Owned wrapper around [`reqwest::Client`] that implements [`AsyncHttpClient`] for oauth2.
struct OAuthReqwestClient(HttpClient);

impl<'c> AsyncHttpClient<'c> for OAuthReqwestClient {
type Error = HttpClientError<reqwest::Error>;

type Future = std::pin::Pin<
Box<dyn std::future::Future<Output = Result<HttpResponse, Self::Error>> + Send + Sync + 'c>,
>;

fn call(&'c self, request: HttpRequest) -> Self::Future {
Box::pin(async move {
let response = self
.0
.execute(request.try_into().map_err(Box::new)?)
.await
.map_err(Box::new)?;

let mut builder = oauth2::http::Response::builder()
.status(response.status())
.version(response.version());

for (name, value) in response.headers().iter() {
builder = builder.header(name, value);
}

builder
.body(response.bytes().await.map_err(Box::new)?.to_vec())
.map_err(HttpClientError::Http)
})
}
}

const DEFAULT_EXCHANGE_URL: &str = "http://localhost";

/// Stored credentials for OAuth2 authorization
Expand DownExpand Up@@ -872,7 +906,7 @@ impl AuthorizationManager {
.exchange_code(AuthorizationCode::new(code.to_string()))
.set_pkce_verifier(pkce_verifier)
.add_extra_param("resource", self.base_url.to_string())
.request_async(&http_client)
.request_async(&OAuthReqwestClient(http_client))
.await
{
Ok(token) => token,
Expand DownExpand Up@@ -961,7 +995,7 @@ impl AuthorizationManager {

let token_result = oauth_client
.exchange_refresh_token(&RefreshToken::new(refresh_token.secret().to_string()))
.request_async(&self.http_client)
.request_async(&OAuthReqwestClient(self.http_client.clone()))
.await
.map_err(|e| AuthError::TokenRefreshFailed(e.to_string()))?;

Expand Down
2 changes: 1 addition & 1 deletion examples/clients/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ anyhow = "1.0"
url = "2.4"
tower = "0.5"
axum = "0.8"
reqwest = "0.12"
reqwest = "0.13.2"
clap = { version = "4.0", features = ["derive"] }

[[example]]
Expand Down
2 changes: 1 addition & 1 deletion examples/servers/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ futures = "0.3"
rand = { version = "0.10", features = ["std"] }
axum = { version = "0.8", features = ["macros"] }
schemars = "1.0"
reqwest = { version = "0.12", features = ["json"] }
reqwest = { version = "0.13.2", features = ["json"] }
chrono = "0.4"
uuid = { version = "1.6", features = ["v4", "serde"] }
serde_urlencoded = "0.7"
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-chat-client/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ publish = false
tokio = { version = "1", features = ["full"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
reqwest = { version = "0.12", features = ["json"] }
reqwest = { version = "0.13.2", features = ["json"] }
anyhow = "1.0"
thiserror = "2.0"
async-trait = "0.1"
Expand Down
2 changes: 1 addition & 1 deletion examples/transport/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ schemars = { version = "1.0", optional = true }
hyper = { version = "1", features = ["client", "server", "http1"] }
hyper-util = { version = "0.1", features = ["tokio"] }
tokio-tungstenite = "0.28.0"
reqwest = { version = "0.12" }
reqwest = { version = "0.13.2" }
pin-project-lite = "0.2"

[[example]]
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('^' + ".*" + ' Upgrade reqwest to 0.13.2 by DaleSeo · Pull Request #669 · modelcontextprotocol/rust-sdk · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions crates/rmcp/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ tokio-util = { version = "0.7" }
pin-project-lite = "0.2"
pastey = { version = "0.2.0", optional = true }
# oauth2 support
oauth2 = { version = "5.0", optional = true, default-features = false, features = ["reqwest"] }
oauth2 = { version = "5.0", optional = true, default-features = false }

# for auto generate schema
schemars = { version = "1.0", optional = true, features = ["chrono04"] }
Expand All@@ -35,7 +35,7 @@ schemars = { version = "1.0", optional = true, features = ["chrono04"] }
base64 = { version = "0.22", optional = true }

# for HTTP client
reqwest = { version = "0.12", default-features = false, features = [
reqwest = { version = "0.13.2", default-features = false, features = [
"json",
"stream",
], optional = true }
Expand DownExpand Up@@ -84,9 +84,9 @@ elicitation = ["dep:url"]
# reqwest http client
__reqwest = ["dep:reqwest"]

reqwest = ["__reqwest", "reqwest?/rustls-tls"]
reqwest = ["__reqwest", "reqwest?/rustls"]

reqwest-tls-no-provider = ["__reqwest", "reqwest?/rustls-tls-no-provider"]
reqwest-tls-no-provider = ["__reqwest", "reqwest?/rustls-no-provider"]

reqwest-native-tls = ["__reqwest", "reqwest?/native-tls"]

Expand Down
44 changes: 39 additions & 5 deletions crates/rmcp/src/transport/auth.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,10 @@ use std::{collections::HashMap, sync::Arc, time::Duration};

use async_trait::async_trait;
use oauth2::{
AuthType, AuthUrl, AuthorizationCode, ClientId, ClientSecret, CsrfToken, EmptyExtraTokenFields,
PkceCodeChallenge, PkceCodeVerifier, RedirectUrl, RefreshToken, RequestTokenError, Scope,
StandardTokenResponse, TokenResponse, TokenUrl,
AsyncHttpClient, AuthType, AuthUrl, AuthorizationCode, ClientId, ClientSecret, CsrfToken,
EmptyExtraTokenFields, HttpClientError, HttpRequest, HttpResponse, PkceCodeChallenge,
PkceCodeVerifier, RedirectUrl, RefreshToken, RequestTokenError, Scope, StandardTokenResponse,
TokenResponse, TokenUrl,
basic::{BasicClient, BasicTokenType},
};
use reqwest::{
Expand All@@ -18,6 +19,39 @@ use tracing::{debug, error, warn};

use crate::transport::common::http_header::HEADER_MCP_PROTOCOL_VERSION;

/// Owned wrapper around [`reqwest::Client`] that implements [`AsyncHttpClient`] for oauth2.
struct OAuthReqwestClient(HttpClient);

impl<'c> AsyncHttpClient<'c> for OAuthReqwestClient {
type Error = HttpClientError<reqwest::Error>;

type Future = std::pin::Pin<
Box<dyn std::future::Future<Output = Result<HttpResponse, Self::Error>> + Send + Sync + 'c>,
>;

fn call(&'c self, request: HttpRequest) -> Self::Future {
Box::pin(async move {
let response = self
.0
.execute(request.try_into().map_err(Box::new)?)
.await
.map_err(Box::new)?;

let mut builder = oauth2::http::Response::builder()
.status(response.status())
.version(response.version());

for (name, value) in response.headers().iter() {
builder = builder.header(name, value);
}

builder
.body(response.bytes().await.map_err(Box::new)?.to_vec())
.map_err(HttpClientError::Http)
})
}
}

const DEFAULT_EXCHANGE_URL: &str = "http://localhost";

/// Stored credentials for OAuth2 authorization
Expand DownExpand Up@@ -872,7 +906,7 @@ impl AuthorizationManager {
.exchange_code(AuthorizationCode::new(code.to_string()))
.set_pkce_verifier(pkce_verifier)
.add_extra_param("resource", self.base_url.to_string())
.request_async(&http_client)
.request_async(&OAuthReqwestClient(http_client))
.await
{
Ok(token) => token,
Expand DownExpand Up@@ -961,7 +995,7 @@ impl AuthorizationManager {

let token_result = oauth_client
.exchange_refresh_token(&RefreshToken::new(refresh_token.secret().to_string()))
.request_async(&self.http_client)
.request_async(&OAuthReqwestClient(self.http_client.clone()))
.await
.map_err(|e| AuthError::TokenRefreshFailed(e.to_string()))?;

Expand Down
2 changes: 1 addition & 1 deletion examples/clients/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ anyhow = "1.0"
url = "2.4"
tower = "0.5"
axum = "0.8"
reqwest = "0.12"
reqwest = "0.13.2"
clap = { version = "4.0", features = ["derive"] }

[[example]]
Expand Down
2 changes: 1 addition & 1 deletion examples/servers/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ futures = "0.3"
rand = { version = "0.10", features = ["std"] }
axum = { version = "0.8", features = ["macros"] }
schemars = "1.0"
reqwest = { version = "0.12", features = ["json"] }
reqwest = { version = "0.13.2", features = ["json"] }
chrono = "0.4"
uuid = { version = "1.6", features = ["v4", "serde"] }
serde_urlencoded = "0.7"
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-chat-client/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ publish = false
tokio = { version = "1", features = ["full"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
reqwest = { version = "0.12", features = ["json"] }
reqwest = { version = "0.13.2", features = ["json"] }
anyhow = "1.0"
thiserror = "2.0"
async-trait = "0.1"
Expand Down
2 changes: 1 addition & 1 deletion examples/transport/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ schemars = { version = "1.0", optional = true }
hyper = { version = "1", features = ["client", "server", "http1"] }
hyper-util = { version = "0.1", features = ["tokio"] }
tokio-tungstenite = "0.28.0"
reqwest = { version = "0.12" }
reqwest = { version = "0.13.2" }
pin-project-lite = "0.2"

[[example]]
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" + ' Upgrade reqwest to 0.13.2 by DaleSeo · Pull Request #669 · modelcontextprotocol/rust-sdk · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions crates/rmcp/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ tokio-util = { version = "0.7" }
pin-project-lite = "0.2"
pastey = { version = "0.2.0", optional = true }
# oauth2 support
oauth2 = { version = "5.0", optional = true, default-features = false, features = ["reqwest"] }
oauth2 = { version = "5.0", optional = true, default-features = false }

# for auto generate schema
schemars = { version = "1.0", optional = true, features = ["chrono04"] }
Expand All@@ -35,7 +35,7 @@ schemars = { version = "1.0", optional = true, features = ["chrono04"] }
base64 = { version = "0.22", optional = true }

# for HTTP client
reqwest = { version = "0.12", default-features = false, features = [
reqwest = { version = "0.13.2", default-features = false, features = [
"json",
"stream",
], optional = true }
Expand DownExpand Up@@ -84,9 +84,9 @@ elicitation = ["dep:url"]
# reqwest http client
__reqwest = ["dep:reqwest"]

reqwest = ["__reqwest", "reqwest?/rustls-tls"]
reqwest = ["__reqwest", "reqwest?/rustls"]

reqwest-tls-no-provider = ["__reqwest", "reqwest?/rustls-tls-no-provider"]
reqwest-tls-no-provider = ["__reqwest", "reqwest?/rustls-no-provider"]

reqwest-native-tls = ["__reqwest", "reqwest?/native-tls"]

Expand Down
44 changes: 39 additions & 5 deletions crates/rmcp/src/transport/auth.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,10 @@ use std::{collections::HashMap, sync::Arc, time::Duration};

use async_trait::async_trait;
use oauth2::{
AuthType, AuthUrl, AuthorizationCode, ClientId, ClientSecret, CsrfToken, EmptyExtraTokenFields,
PkceCodeChallenge, PkceCodeVerifier, RedirectUrl, RefreshToken, RequestTokenError, Scope,
StandardTokenResponse, TokenResponse, TokenUrl,
AsyncHttpClient, AuthType, AuthUrl, AuthorizationCode, ClientId, ClientSecret, CsrfToken,
EmptyExtraTokenFields, HttpClientError, HttpRequest, HttpResponse, PkceCodeChallenge,
PkceCodeVerifier, RedirectUrl, RefreshToken, RequestTokenError, Scope, StandardTokenResponse,
TokenResponse, TokenUrl,
basic::{BasicClient, BasicTokenType},
};
use reqwest::{
Expand All@@ -18,6 +19,39 @@ use tracing::{debug, error, warn};

use crate::transport::common::http_header::HEADER_MCP_PROTOCOL_VERSION;

/// Owned wrapper around [`reqwest::Client`] that implements [`AsyncHttpClient`] for oauth2.
struct OAuthReqwestClient(HttpClient);

impl<'c> AsyncHttpClient<'c> for OAuthReqwestClient {
type Error = HttpClientError<reqwest::Error>;

type Future = std::pin::Pin<
Box<dyn std::future::Future<Output = Result<HttpResponse, Self::Error>> + Send + Sync + 'c>,
>;

fn call(&'c self, request: HttpRequest) -> Self::Future {
Box::pin(async move {
let response = self
.0
.execute(request.try_into().map_err(Box::new)?)
.await
.map_err(Box::new)?;

let mut builder = oauth2::http::Response::builder()
.status(response.status())
.version(response.version());

for (name, value) in response.headers().iter() {
builder = builder.header(name, value);
}

builder
.body(response.bytes().await.map_err(Box::new)?.to_vec())
.map_err(HttpClientError::Http)
})
}
}

const DEFAULT_EXCHANGE_URL: &str = "http://localhost";

/// Stored credentials for OAuth2 authorization
Expand DownExpand Up@@ -872,7 +906,7 @@ impl AuthorizationManager {
.exchange_code(AuthorizationCode::new(code.to_string()))
.set_pkce_verifier(pkce_verifier)
.add_extra_param("resource", self.base_url.to_string())
.request_async(&http_client)
.request_async(&OAuthReqwestClient(http_client))
.await
{
Ok(token) => token,
Expand DownExpand Up@@ -961,7 +995,7 @@ impl AuthorizationManager {

let token_result = oauth_client
.exchange_refresh_token(&RefreshToken::new(refresh_token.secret().to_string()))
.request_async(&self.http_client)
.request_async(&OAuthReqwestClient(self.http_client.clone()))
.await
.map_err(|e| AuthError::TokenRefreshFailed(e.to_string()))?;

Expand Down
2 changes: 1 addition & 1 deletion examples/clients/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ anyhow = "1.0"
url = "2.4"
tower = "0.5"
axum = "0.8"
reqwest = "0.12"
reqwest = "0.13.2"
clap = { version = "4.0", features = ["derive"] }

[[example]]
Expand Down
2 changes: 1 addition & 1 deletion examples/servers/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ futures = "0.3"
rand = { version = "0.10", features = ["std"] }
axum = { version = "0.8", features = ["macros"] }
schemars = "1.0"
reqwest = { version = "0.12", features = ["json"] }
reqwest = { version = "0.13.2", features = ["json"] }
chrono = "0.4"
uuid = { version = "1.6", features = ["v4", "serde"] }
serde_urlencoded = "0.7"
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-chat-client/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ publish = false
tokio = { version = "1", features = ["full"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
reqwest = { version = "0.12", features = ["json"] }
reqwest = { version = "0.13.2", features = ["json"] }
anyhow = "1.0"
thiserror = "2.0"
async-trait = "0.1"
Expand Down
2 changes: 1 addition & 1 deletion examples/transport/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ schemars = { version = "1.0", optional = true }
hyper = { version = "1", features = ["client", "server", "http1"] }
hyper-util = { version = "0.1", features = ["tokio"] }
tokio-tungstenite = "0.28.0"
reqwest = { version = "0.12" }
reqwest = { version = "0.13.2" }
pin-project-lite = "0.2"

[[example]]
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('^' + ".*" + ' Upgrade reqwest to 0.13.2 by DaleSeo · Pull Request #669 · modelcontextprotocol/rust-sdk · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions crates/rmcp/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ tokio-util = { version = "0.7" }
pin-project-lite = "0.2"
pastey = { version = "0.2.0", optional = true }
# oauth2 support
oauth2 = { version = "5.0", optional = true, default-features = false, features = ["reqwest"] }
oauth2 = { version = "5.0", optional = true, default-features = false }

# for auto generate schema
schemars = { version = "1.0", optional = true, features = ["chrono04"] }
Expand All@@ -35,7 +35,7 @@ schemars = { version = "1.0", optional = true, features = ["chrono04"] }
base64 = { version = "0.22", optional = true }

# for HTTP client
reqwest = { version = "0.12", default-features = false, features = [
reqwest = { version = "0.13.2", default-features = false, features = [
"json",
"stream",
], optional = true }
Expand DownExpand Up@@ -84,9 +84,9 @@ elicitation = ["dep:url"]
# reqwest http client
__reqwest = ["dep:reqwest"]

reqwest = ["__reqwest", "reqwest?/rustls-tls"]
reqwest = ["__reqwest", "reqwest?/rustls"]

reqwest-tls-no-provider = ["__reqwest", "reqwest?/rustls-tls-no-provider"]
reqwest-tls-no-provider = ["__reqwest", "reqwest?/rustls-no-provider"]

reqwest-native-tls = ["__reqwest", "reqwest?/native-tls"]

Expand Down
44 changes: 39 additions & 5 deletions crates/rmcp/src/transport/auth.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,10 @@ use std::{collections::HashMap, sync::Arc, time::Duration};

use async_trait::async_trait;
use oauth2::{
AuthType, AuthUrl, AuthorizationCode, ClientId, ClientSecret, CsrfToken, EmptyExtraTokenFields,
PkceCodeChallenge, PkceCodeVerifier, RedirectUrl, RefreshToken, RequestTokenError, Scope,
StandardTokenResponse, TokenResponse, TokenUrl,
AsyncHttpClient, AuthType, AuthUrl, AuthorizationCode, ClientId, ClientSecret, CsrfToken,
EmptyExtraTokenFields, HttpClientError, HttpRequest, HttpResponse, PkceCodeChallenge,
PkceCodeVerifier, RedirectUrl, RefreshToken, RequestTokenError, Scope, StandardTokenResponse,
TokenResponse, TokenUrl,
basic::{BasicClient, BasicTokenType},
};
use reqwest::{
Expand All@@ -18,6 +19,39 @@ use tracing::{debug, error, warn};

use crate::transport::common::http_header::HEADER_MCP_PROTOCOL_VERSION;

/// Owned wrapper around [`reqwest::Client`] that implements [`AsyncHttpClient`] for oauth2.
struct OAuthReqwestClient(HttpClient);

impl<'c> AsyncHttpClient<'c> for OAuthReqwestClient {
type Error = HttpClientError<reqwest::Error>;

type Future = std::pin::Pin<
Box<dyn std::future::Future<Output = Result<HttpResponse, Self::Error>> + Send + Sync + 'c>,
>;

fn call(&'c self, request: HttpRequest) -> Self::Future {
Box::pin(async move {
let response = self
.0
.execute(request.try_into().map_err(Box::new)?)
.await
.map_err(Box::new)?;

let mut builder = oauth2::http::Response::builder()
.status(response.status())
.version(response.version());

for (name, value) in response.headers().iter() {
builder = builder.header(name, value);
}

builder
.body(response.bytes().await.map_err(Box::new)?.to_vec())
.map_err(HttpClientError::Http)
})
}
}

const DEFAULT_EXCHANGE_URL: &str = "http://localhost";

/// Stored credentials for OAuth2 authorization
Expand DownExpand Up@@ -872,7 +906,7 @@ impl AuthorizationManager {
.exchange_code(AuthorizationCode::new(code.to_string()))
.set_pkce_verifier(pkce_verifier)
.add_extra_param("resource", self.base_url.to_string())
.request_async(&http_client)
.request_async(&OAuthReqwestClient(http_client))
.await
{
Ok(token) => token,
Expand DownExpand Up@@ -961,7 +995,7 @@ impl AuthorizationManager {

let token_result = oauth_client
.exchange_refresh_token(&RefreshToken::new(refresh_token.secret().to_string()))
.request_async(&self.http_client)
.request_async(&OAuthReqwestClient(self.http_client.clone()))
.await
.map_err(|e| AuthError::TokenRefreshFailed(e.to_string()))?;

Expand Down
2 changes: 1 addition & 1 deletion examples/clients/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ anyhow = "1.0"
url = "2.4"
tower = "0.5"
axum = "0.8"
reqwest = "0.12"
reqwest = "0.13.2"
clap = { version = "4.0", features = ["derive"] }

[[example]]
Expand Down
2 changes: 1 addition & 1 deletion examples/servers/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ futures = "0.3"
rand = { version = "0.10", features = ["std"] }
axum = { version = "0.8", features = ["macros"] }
schemars = "1.0"
reqwest = { version = "0.12", features = ["json"] }
reqwest = { version = "0.13.2", features = ["json"] }
chrono = "0.4"
uuid = { version = "1.6", features = ["v4", "serde"] }
serde_urlencoded = "0.7"
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-chat-client/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ publish = false
tokio = { version = "1", features = ["full"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
reqwest = { version = "0.12", features = ["json"] }
reqwest = { version = "0.13.2", features = ["json"] }
anyhow = "1.0"
thiserror = "2.0"
async-trait = "0.1"
Expand Down
2 changes: 1 addition & 1 deletion examples/transport/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ schemars = { version = "1.0", optional = true }
hyper = { version = "1", features = ["client", "server", "http1"] }
hyper-util = { version = "0.1", features = ["tokio"] }
tokio-tungstenite = "0.28.0"
reqwest = { version = "0.12" }
reqwest = { version = "0.13.2" }
pin-project-lite = "0.2"

[[example]]
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); } })(); })(); Upgrade reqwest to 0.13.2 by DaleSeo · Pull Request #669 · modelcontextprotocol/rust-sdk · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions crates/rmcp/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ tokio-util = { version = "0.7" }
pin-project-lite = "0.2"
pastey = { version = "0.2.0", optional = true }
# oauth2 support
oauth2 = { version = "5.0", optional = true, default-features = false, features = ["reqwest"] }
oauth2 = { version = "5.0", optional = true, default-features = false }

# for auto generate schema
schemars = { version = "1.0", optional = true, features = ["chrono04"] }
Expand All@@ -35,7 +35,7 @@ schemars = { version = "1.0", optional = true, features = ["chrono04"] }
base64 = { version = "0.22", optional = true }

# for HTTP client
reqwest = { version = "0.12", default-features = false, features = [
reqwest = { version = "0.13.2", default-features = false, features = [
"json",
"stream",
], optional = true }
Expand DownExpand Up@@ -84,9 +84,9 @@ elicitation = ["dep:url"]
# reqwest http client
__reqwest = ["dep:reqwest"]

reqwest = ["__reqwest", "reqwest?/rustls-tls"]
reqwest = ["__reqwest", "reqwest?/rustls"]

reqwest-tls-no-provider = ["__reqwest", "reqwest?/rustls-tls-no-provider"]
reqwest-tls-no-provider = ["__reqwest", "reqwest?/rustls-no-provider"]

reqwest-native-tls = ["__reqwest", "reqwest?/native-tls"]

Expand Down
44 changes: 39 additions & 5 deletions crates/rmcp/src/transport/auth.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,10 @@ use std::{collections::HashMap, sync::Arc, time::Duration};

use async_trait::async_trait;
use oauth2::{
AuthType, AuthUrl, AuthorizationCode, ClientId, ClientSecret, CsrfToken, EmptyExtraTokenFields,
PkceCodeChallenge, PkceCodeVerifier, RedirectUrl, RefreshToken, RequestTokenError, Scope,
StandardTokenResponse, TokenResponse, TokenUrl,
AsyncHttpClient, AuthType, AuthUrl, AuthorizationCode, ClientId, ClientSecret, CsrfToken,
EmptyExtraTokenFields, HttpClientError, HttpRequest, HttpResponse, PkceCodeChallenge,
PkceCodeVerifier, RedirectUrl, RefreshToken, RequestTokenError, Scope, StandardTokenResponse,
TokenResponse, TokenUrl,
basic::{BasicClient, BasicTokenType},
};
use reqwest::{
Expand All@@ -18,6 +19,39 @@ use tracing::{debug, error, warn};

use crate::transport::common::http_header::HEADER_MCP_PROTOCOL_VERSION;

/// Owned wrapper around [`reqwest::Client`] that implements [`AsyncHttpClient`] for oauth2.
struct OAuthReqwestClient(HttpClient);

impl<'c> AsyncHttpClient<'c> for OAuthReqwestClient {
type Error = HttpClientError<reqwest::Error>;

type Future = std::pin::Pin<
Box<dyn std::future::Future<Output = Result<HttpResponse, Self::Error>> + Send + Sync + 'c>,
>;

fn call(&'c self, request: HttpRequest) -> Self::Future {
Box::pin(async move {
let response = self
.0
.execute(request.try_into().map_err(Box::new)?)
.await
.map_err(Box::new)?;

let mut builder = oauth2::http::Response::builder()
.status(response.status())
.version(response.version());

for (name, value) in response.headers().iter() {
builder = builder.header(name, value);
}

builder
.body(response.bytes().await.map_err(Box::new)?.to_vec())
.map_err(HttpClientError::Http)
})
}
}

const DEFAULT_EXCHANGE_URL: &str = "http://localhost";

/// Stored credentials for OAuth2 authorization
Expand DownExpand Up@@ -872,7 +906,7 @@ impl AuthorizationManager {
.exchange_code(AuthorizationCode::new(code.to_string()))
.set_pkce_verifier(pkce_verifier)
.add_extra_param("resource", self.base_url.to_string())
.request_async(&http_client)
.request_async(&OAuthReqwestClient(http_client))
.await
{
Ok(token) => token,
Expand DownExpand Up@@ -961,7 +995,7 @@ impl AuthorizationManager {

let token_result = oauth_client
.exchange_refresh_token(&RefreshToken::new(refresh_token.secret().to_string()))
.request_async(&self.http_client)
.request_async(&OAuthReqwestClient(self.http_client.clone()))
.await
.map_err(|e| AuthError::TokenRefreshFailed(e.to_string()))?;

Expand Down
2 changes: 1 addition & 1 deletion examples/clients/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ anyhow = "1.0"
url = "2.4"
tower = "0.5"
axum = "0.8"
reqwest = "0.12"
reqwest = "0.13.2"
clap = { version = "4.0", features = ["derive"] }

[[example]]
Expand Down
2 changes: 1 addition & 1 deletion examples/servers/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ futures = "0.3"
rand = { version = "0.10", features = ["std"] }
axum = { version = "0.8", features = ["macros"] }
schemars = "1.0"
reqwest = { version = "0.12", features = ["json"] }
reqwest = { version = "0.13.2", features = ["json"] }
chrono = "0.4"
uuid = { version = "1.6", features = ["v4", "serde"] }
serde_urlencoded = "0.7"
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-chat-client/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ publish = false
tokio = { version = "1", features = ["full"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
reqwest = { version = "0.12", features = ["json"] }
reqwest = { version = "0.13.2", features = ["json"] }
anyhow = "1.0"
thiserror = "2.0"
async-trait = "0.1"
Expand Down
2 changes: 1 addition & 1 deletion examples/transport/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ schemars = { version = "1.0", optional = true }
hyper = { version = "1", features = ["client", "server", "http1"] }
hyper-util = { version = "0.1", features = ["tokio"] }
tokio-tungstenite = "0.28.0"
reqwest = { version = "0.12" }
reqwest = { version = "0.13.2" }
pin-project-lite = "0.2"

[[example]]
Expand Down