Skip to content

Make sure to consume the device grant to avoid replays #3656

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
merged 1 commit into from
Dec 11, 2024
Merged

Make sure to consume the device grant to avoid replays #3656

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
19 changes: 18 additions & 1 deletion crates/handlers/src/oauth2/token.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,11 @@ async fn device_code_grant(
// Start the session
let mut session = repo
.oauth2_session()
.add_from_browser_session(rng, clock, client, &browser_session, grant.scope)
.add_from_browser_session(rng, clock, client, &browser_session, grant.scope.clone())
.await?;

repo.oauth2_device_code_grant()
.exchange(clock, grant, &session)
.await?;

// XXX: should we get the user agent from the device code grant instead?
Expand Down Expand Up @@ -1348,6 +1352,19 @@ mod tests {
// We asked for the openid scope, so we should have an ID token
assert!(response.id_token.is_some());

// Calling it again should fail
let request =
Request::post(mas_router::OAuth2TokenEndpoint::PATH).form(serde_json::json!({
"grant_type": "urn:ietf:params:oauth:grant-type:device_code",
"device_code": grant.device_code,
"client_id": client_id,
}));
let response = state.request(request).await;
response.assert_status(StatusCode::BAD_REQUEST);

let ClientError { error, .. } = response.json();
assert_eq!(error, ClientErrorCode::InvalidGrant);

// Do another grant and make it expire
let request = Request::post(mas_router::OAuth2DeviceAuthorizationEndpoint::PATH).form(
serde_json::json!({
Expand Down
Loading