From e7d5c17ff7943cae63ed57e07e1ff40e47666413 Mon Sep 17 00:00:00 2001 From: Daniel Date: Wed, 7 Aug 2024 23:45:41 +0300 Subject: [PATCH] Fix mail::send_incomplete_2fa_login panic issue (#4792) - fixes https://github.com/dani-garcia/vaultwarden/issues/4528 --- src/api/core/two_factor/mod.rs | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/api/core/two_factor/mod.rs b/src/api/core/two_factor/mod.rs index 2dd88a64..86443a5e 100644 --- a/src/api/core/two_factor/mod.rs +++ b/src/api/core/two_factor/mod.rs @@ -269,10 +269,18 @@ pub async fn send_incomplete_2fa_notifications(pool: DbPool) { "User {} did not complete a 2FA login within the configured time limit. IP: {}", user.email, login.ip_address ); - mail::send_incomplete_2fa_login(&user.email, &login.ip_address, &login.login_time, &login.device_name) + match mail::send_incomplete_2fa_login(&user.email, &login.ip_address, &login.login_time, &login.device_name) .await - .expect("Error sending incomplete 2FA email"); - login.delete(&mut conn).await.expect("Error deleting incomplete 2FA record"); + { + Ok(_) => { + if let Err(e) = login.delete(&mut conn).await { + error!("Error deleting incomplete 2FA record: {e:#?}"); + } + } + Err(e) => { + error!("Error sending incomplete 2FA email: {e:#?}"); + } + } } }