valknar/llmx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MCP] Fix the bearer token authorization header (#4846)

Browse Source 
`http_config.auth_header` automatically added `Bearer `. By adding it
ourselves, we were sending `Bearer Bearer <token>`.

I confirmed that the GitHub MCP initialization 400s before and works
now.

I also optimized the oauth flow to not check the keyring if you
explicitly pass in a bearer token.
This commit is contained in:
Gabriel Peal
2025-10-06 14:41:16 -07:00
committed by GitHub
parent 7e3a272b29
commit d73055c5b1
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
codex-rs/rmcp-client/src/rmcp_client.rs
View File

@@ -120,14 +120,17 @@ impl RmcpClient {
url: &str, url: &str,
bearer_token: Option<String>, bearer_token: Option<String>,
) -> Result<Self> { ) -> Result<Self> {
let initial_tokens = match load_oauth_tokens(server_name, url) { let initial_oauth_tokens = match bearer_token {
Ok(tokens) => tokens, Some(_) => None,
Err(err) => { None => match load_oauth_tokens(server_name, url) {
warn!("failed to read tokens for server `{server_name}`: {err}"); Ok(tokens) => tokens,
None Err(err) => {
} warn!("failed to read tokens for server `{server_name}`: {err}");
None
}
},
}; };
let transport = if let Some(initial_tokens) = initial_tokens.clone() { let transport = if let Some(initial_tokens) = initial_oauth_tokens.clone() {
let (transport, oauth_persistor) = let (transport, oauth_persistor) =
create_oauth_transport_and_runtime(server_name, url, initial_tokens).await?; create_oauth_transport_and_runtime(server_name, url, initial_tokens).await?;
PendingTransport::StreamableHttpWithOAuth { PendingTransport::StreamableHttpWithOAuth {
@@ -137,7 +140,7 @@ impl RmcpClient {
} else { } else {
let mut http_config = StreamableHttpClientTransportConfig::with_uri(url.to_string()); let mut http_config = StreamableHttpClientTransportConfig::with_uri(url.to_string());
if let Some(bearer_token) = bearer_token { if let Some(bearer_token) = bearer_token {
http_config = http_config.auth_header(format!("Bearer {bearer_token}")); http_config = http_config.auth_header(bearer_token);
} }
let transport = StreamableHttpClientTransport::from_config(http_config); let transport = StreamableHttpClientTransport::from_config(http_config);