diff --git a/src/auth/mod.rs b/src/auth/mod.rs index 0912de0..6272bf2 100644 --- a/src/auth/mod.rs +++ b/src/auth/mod.rs @@ -262,6 +262,18 @@ async fn refresh_request( if !resp.status().is_success() { let status = resp.status(); let body = resp.text().await.unwrap_or_default(); + // Identity refuses a refresh token with `invalid_grant` when the token + // was revoked or expired, or when the account's security stamp changed + // after the grant (password, email, MFA, or session revocation). The + // stored login cannot recover from that, so tell the user what to do. + if serde_json::from_str::(&body) + .is_ok_and(|error| error.error == "invalid_grant") + { + bail!( + "{identity_url} no longer accepts the stored login (it was revoked or expired, \ + or the account's security settings changed) — run `semctl auth login`" + ); + } bail!("refresh {status}: {body}"); } let mut raw: TokenResponse = resp.json().await.context("parse refresh response")?; diff --git a/src/auth/tests.rs b/src/auth/tests.rs index 243a233..c9ad7c8 100644 --- a/src/auth/tests.rs +++ b/src/auth/tests.rs @@ -14,6 +14,7 @@ async fn token_server( if discover { responses.push(( "GET /.well-known/oauth-protected-resource ", + "200 OK", serde_json::json!({ "authorization_servers": [&url] }), )); } @@ -21,9 +22,25 @@ async fn token_server( if let Some(replacement) = replacement { token["refresh_token"] = replacement.into(); } - responses.push(("POST /connect/token ", token)); - let task = tokio::spawn(async move { - for (method, response) in responses { + responses.push(("POST /connect/token ", "200 OK", token)); + (url, serve(listener, responses)) +} + +/// One token endpoint that refuses the grant with an OAuth error body. +async fn token_error_server(error: &str) -> (String, tokio::task::JoinHandle<()>) { + let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap(); + let url = format!("http://{}", listener.local_addr().unwrap()); + let body = serde_json::json!({ "error": error, "error_description": "refused" }); + let responses = vec![("POST /connect/token ", "400 Bad Request", body)]; + (url, serve(listener, responses)) +} + +fn serve( + listener: tokio::net::TcpListener, + responses: Vec<(&'static str, &'static str, serde_json::Value)>, +) -> tokio::task::JoinHandle<()> { + tokio::spawn(async move { + for (method, status, response) in responses { let (mut stream, _) = listener.accept().await.unwrap(); let mut request = Vec::new(); let mut buffer = [0_u8; 1024]; @@ -38,13 +55,12 @@ async fn token_server( assert!(String::from_utf8_lossy(&request).starts_with(method)); let body = response.to_string(); let message = format!( - "HTTP/1.1 200 OK\r\nContent-Type: application/json\r\nContent-Length: {}\r\nConnection: close\r\n\r\n{body}", + "HTTP/1.1 {status}\r\nContent-Type: application/json\r\nContent-Length: {}\r\nConnection: close\r\n\r\n{body}", body.len() ); stream.write_all(message.as_bytes()).await.unwrap(); } - }); - (url, task) + }) } fn request_complete(request: &[u8]) -> bool { @@ -91,3 +107,29 @@ async fn refresh_replaces_the_previous_refresh_token_when_rotated() { assert_eq!(tokens.refresh_token.as_deref(), Some("rotated-refresh")); server.await.unwrap(); } + +#[tokio::test] +async fn refresh_asks_for_a_new_login_when_identity_refuses_the_grant() { + let (url, server) = token_error_server("invalid_grant").await; + let error = refresh(&http_client(), &url, "revoked-refresh") + .await + .err() + .unwrap() + .to_string(); + assert!(error.contains("run `semctl auth login`"), "{error}"); + assert!(!error.contains("revoked-refresh"), "{error}"); + server.await.unwrap(); +} + +#[tokio::test] +async fn refresh_reports_other_token_errors_verbatim() { + let (url, server) = token_error_server("invalid_client").await; + let error = refresh(&http_client(), &url, "previous-refresh") + .await + .err() + .unwrap() + .to_string(); + assert!(error.starts_with("refresh 400 Bad Request"), "{error}"); + assert!(error.contains("invalid_client"), "{error}"); + server.await.unwrap(); +}