vw_small

Hardened fork of Vaultwarden (https://github.com/dani-garcia/vaultwarden) with fewer features.
git clone https://git.philomathiclife.com/repos/vw_small
Log | Files | Refs | README

commit 18bc8331f9a27421b3913af4a8f070255cf3caba
parent 7d956c5117d858afd9b88fcf4c688a61fbb90135
Author: vpl <vpl@vpl.me>
Date:   Tue, 15 Oct 2019 21:19:49 +0200

Send email when preparing 2FA JsonError

Diffstat:
Msrc/api/core/two_factor/email.rs | 7+++++++
Msrc/api/identity.rs | 10++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/api/core/two_factor/email.rs b/src/api/core/two_factor/email.rs @@ -58,6 +58,13 @@ fn send_email_login(data: JsonUpcase<SendEmailLoginData>, conn: DbConn) -> Empty let type_ = TwoFactorType::Email as i32; let mut twofactor = TwoFactor::find_by_user_and_type(&user.uuid, type_, &conn)?; + prepare_send_token(&mut twofactor, &conn)?; + + Ok(()) +} + +/// Generate the token, save the data for later verification and send email to user +pub fn prepare_send_token(twofactor: &mut TwoFactor, conn: &DbConn) -> EmptyResult { let generated_token = generate_token(CONFIG.email_token_size())?; let mut twofactor_data = EmailTokenData::from_json(&twofactor.data)?; twofactor_data.set_token(generated_token); diff --git a/src/api/identity.rs b/src/api/identity.rs @@ -293,13 +293,19 @@ fn _json_err_twofactor(providers: &[i32], user_uuid: &str, conn: &DbConn) -> Api } Some(tf_type @ TwoFactorType::Email) => { - let twofactor = match TwoFactor::find_by_user_and_type(user_uuid, tf_type as i32, &conn) { + use crate::api::core::two_factor as _tf; + + let mut twofactor = match TwoFactor::find_by_user_and_type(user_uuid, tf_type as i32, &conn) { Some(tf) => tf, None => err!("No twofactor email registered"), }; - let email_data = EmailTokenData::from_json(&twofactor.data)?; + // Send email immediately if email is the only 2FA option + if providers.len() == 1 { + _tf::email::prepare_send_token(&mut twofactor, &conn)? + } + let email_data = EmailTokenData::from_json(&twofactor.data)?; result["TwoFactorProviders2"][provider.to_string()] = json!({ "Email": email::obscure_email(&email_data.email), })