MirrorHub/bitwarden_rs
0
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden synced 2024-12-16 18:43:45 +01:00
Code Issues Releases Wiki Activity

Duo: use the formatted db email (#4779)

Browse source
This commit is contained in:
Timshel 2024-07-25 20:25:44 +02:00 committed by GitHub
parent 529c39c6c5
commit f858523d92
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/api/core/two_factor/duo_oidc.rs
View file

@ -423,8 +423,6 @@ pub async fn validate_duo_login(
device_identifier: &str, device_identifier: &str,
conn: &mut DbConn, conn: &mut DbConn,
) -> EmptyResult { ) -> EmptyResult {
let email = &email.to_lowercase();
// Result supplied to us by clients in the form "<authz code>|<state>" // Result supplied to us by clients in the form "<authz code>|<state>"
let split: Vec<&str> = two_factor_token.split('|').collect(); let split: Vec<&str> = two_factor_token.split('|').collect();
if split.len() != 2 { if split.len() != 2 {

4
src/api/identity.rs
View file

@ -524,12 +524,12 @@ async fn twofactor_auth(
match CONFIG.duo_use_iframe() { match CONFIG.duo_use_iframe() {
true => { true => {
// Legacy iframe prompt flow // Legacy iframe prompt flow
duo::validate_duo_login(data.username.as_ref().unwrap().trim(), twofactor_code, conn).await? duo::validate_duo_login(&user.email, twofactor_code, conn).await?
} }
false => { false => {
// OIDC based flow // OIDC based flow
duo_oidc::validate_duo_login( duo_oidc::validate_duo_login(
data.username.as_ref().unwrap().trim(), &user.email,
twofactor_code, twofactor_code,
data.client_id.as_ref().unwrap(), data.client_id.as_ref().unwrap(),
data.device_identifier.as_ref().unwrap(), data.device_identifier.as_ref().unwrap(),