Spiegel von
https://github.com/dani-garcia/vaultwarden.git
synchronisiert 2024-11-22 05:10:29 +01:00
Duo: use the formatted db email (#4779)
Dieser Commit ist enthalten in:
Ursprung
529c39c6c5
Commit
f858523d92
2 geänderte Dateien mit 2 neuen und 4 gelöschten Zeilen
|
@ -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 {
|
||||||
|
|
|
@ -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(),
|
||||||
|
|
Laden …
In neuem Issue referenzieren