Skip to content

fix: improve error logging and remove token secret from logs #685

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

Open
DaleSeo wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −5
Open

fix: improve error logging and remove token secret from logs #685

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions crates/rmcp/src/transport/auth.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,6 +992,9 @@ impl AuthorizationManager {
}
}

// When expiry info is unavailable (e.g., credentials stored before
// token_received_at was tracked), skip the expiry check and return
// the token as-is.
Ok(creds.access_token().secret().to_string())
}

Expand All @@ -1005,8 +1008,8 @@ impl AuthorizationManager {
tracing::info!("Refreshed access token.");
Ok(new_creds.access_token().secret().to_string())
}
Err(AuthError::AuthorizationRequired | AuthError::TokenRefreshFailed(_)) => {
tracing::warn!("Token refresh not possible, re-authorization required.");
Err(e @ (AuthError::AuthorizationRequired | AuthError::TokenRefreshFailed(_))) => {
tracing::warn!(error = %e, "Token refresh not possible, re-authorization required.");
Err(AuthError::AuthorizationRequired)
}
Err(e) => Err(e),
Expand All @@ -1030,7 +1033,7 @@ impl AuthorizationManager {
let refresh_token = current_credentials.refresh_token().ok_or_else(|| {
AuthError::TokenRefreshFailed("No refresh token available".to_string())
})?;
debug!("refresh token: {:?}", refresh_token);
debug!("refresh token present, attempting refresh");

let token_result = oauth_client
.exchange_refresh_token(&RefreshToken::new(refresh_token.secret().to_string()))
Expand Down Expand Up @@ -2680,6 +2683,8 @@ mod tests {

// -- get_access_token --

use super::{OAuthTokenResponse, StoredCredentials};

fn make_token_response(access_token: &str, expires_in_secs: Option<u64>) -> OAuthTokenResponse {
use oauth2::{AccessToken, EmptyExtraTokenFields, basic::BasicTokenType};
let mut resp = OAuthTokenResponse::new(
Expand All @@ -2693,8 +2698,6 @@ mod tests {
resp
}

use super::{OAuthTokenResponse, StoredCredentials};

#[tokio::test]
async fn get_access_token_returns_error_when_no_credentials() {
let manager = AuthorizationManager::new("http://localhost").await.unwrap();
Expand Down