|
|
@ -742,7 +742,7 @@ async fn twofactor_auth( |
|
|
|
|
|
|
|
|
TwoFactorIncomplete::mark_incomplete(&user.uuid, &device.uuid, &device.name, device.atype, ip, conn).await?; |
|
|
TwoFactorIncomplete::mark_incomplete(&user.uuid, &device.uuid, &device.name, device.atype, ip, conn).await?; |
|
|
|
|
|
|
|
|
let twofactor_ids: Vec<_> = twofactors |
|
|
let mut twofactor_ids: Vec<_> = twofactors |
|
|
.iter() |
|
|
.iter() |
|
|
.filter_map(|tf| { |
|
|
.filter_map(|tf| { |
|
|
let provider_type = TwoFactorType::from_i32(tf.atype)?; |
|
|
let provider_type = TwoFactorType::from_i32(tf.atype)?; |
|
|
@ -753,6 +753,18 @@ async fn twofactor_auth( |
|
|
err!("No enabled and usable two factor providers are available for this account") |
|
|
err!("No enabled and usable two factor providers are available for this account") |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// Add TwoFactorTypes which are not stored as a record but might be enabled
|
|
|
|
|
|
// Since these types could also be not valid, we do some custom checks here
|
|
|
|
|
|
twofactor_ids.extend( |
|
|
|
|
|
[ |
|
|
|
|
|
(!CONFIG.disable_2fa_remember() && device.twofactor_remember.is_some()) |
|
|
|
|
|
.then_some(TwoFactorType::Remember as i32), |
|
|
|
|
|
user.totp_recover.is_some().then_some(TwoFactorType::RecoveryCode as i32), |
|
|
|
|
|
] |
|
|
|
|
|
.into_iter() |
|
|
|
|
|
.flatten(), |
|
|
|
|
|
); |
|
|
|
|
|
|
|
|
let selected_id = data.two_factor_provider.unwrap_or(twofactor_ids[0]); // If we aren't given a two factor provider, assume the first one
|
|
|
let selected_id = data.two_factor_provider.unwrap_or(twofactor_ids[0]); // If we aren't given a two factor provider, assume the first one
|
|
|
if !twofactor_ids.contains(&selected_id) { |
|
|
if !twofactor_ids.contains(&selected_id) { |
|
|
err_json!( |
|
|
err_json!( |
|
|
|
Mathijs van Veluw
1 day ago
GitHub