Skip to content

fix: verify mfa status during openid authorization #641

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
t-aleksander merged 2 commits into from
Jun 11, 2024
Merged

fix: verify mfa status during openid authorization #641

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99807dd
check if user has mfa enabled during openid flow
t-aleksander Jun 11, 2024
f714fc1
add comments
t-aleksander Jun 11, 2024
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
18 changes: 17 additions & 1 deletion src/handlers/openid_flow.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ use crate::{
auth::{AccessUserInfo, SessionInfo},
db::{
models::{auth_code::AuthCode, oauth2client::OAuth2Client},
DbPool, OAuth2AuthorizedApp, OAuth2Token, Session, User,
DbPool, OAuth2AuthorizedApp, OAuth2Token, Session, SessionState, User,
},
error::WebError,
handlers::{mail::send_new_device_ocid_login_email, SIGN_IN_COOKIE_NAME},
Expand Down Expand Up @@ -402,6 +402,22 @@ pub async fn authorization(
let _result = session.delete(&appstate.pool).await;
login_redirect(&data, private_cookies).await
} else {
let user = User::find_by_id(&appstate.pool, session.user_id)
.await?
.ok_or(WebError::Authorization("User not found".into()))?;

// Session exists even if user hasn't completed MFA verification yet,
// thus we need to check if MFA is enabled and the verification is done.
if user.mfa_enabled
&& session.state != SessionState::MultiFactorVerified
{
info!(
"MFA not verified for user id {}, redirecting to login",
session.user_id
);
return login_redirect(&data, private_cookies).await;
}

// If session is present check if app is in user authorized apps.
// If yes return auth code and state else redirect to consent form.
if let Some(app) =
Expand Down