vaultwarden
/
vaultwarden-alternativa-bitwarden
mirror of https://github.com/dani-garcia/vaultwarden.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3390 from BlackDex/fix-abort-pw-reset-on-mail-error 

Fix abort on pw reset mail error
This commit is contained in:
Daniel García 2023-04-02 15:19:53 +02:00 committed by GitHub
parent 525e6bb65a 2cda54ceff
commit 15dd05c78d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/core/organizations.rs
View File

@ -2694,7 +2694,7 @@ async fn put_reset_password(
None => err!("User to reset isn't member of required organization"), None => err!("User to reset isn't member of required organization"),
}; };
let mut user = match User::find_by_uuid(&org_user.user_uuid, &mut conn).await { let user = match User::find_by_uuid(&org_user.user_uuid, &mut conn).await {
Some(user) => user, Some(user) => user,
None => err!("User not found"), None => err!("User not found"),
}; };
@ -2711,11 +2711,12 @@ async fn put_reset_password(
// Sending email before resetting password to ensure working email configuration and the resulting // Sending email before resetting password to ensure working email configuration and the resulting
// user notification. Also this might add some protection against security flaws and misuse // user notification. Also this might add some protection against security flaws and misuse
if let Err(e) = mail::send_admin_reset_password(&user.email, &user.name, &org.name).await { if let Err(e) = mail::send_admin_reset_password(&user.email, &user.name, &org.name).await {
error!("Error sending user reset password email: {:#?}", e); err!(format!("Error sending user reset password email: {e:#?}"));
} }
let reset_request = data.into_inner().data; let reset_request = data.into_inner().data;
let mut user = user;
user.set_password(reset_request.NewMasterPasswordHash.as_str(), Some(reset_request.Key), true, None); user.set_password(reset_request.NewMasterPasswordHash.as_str(), Some(reset_request.Key), true, None);
user.save(&mut conn).await?; user.save(&mut conn).await?;
@ -2759,12 +2760,15 @@ async fn get_reset_password_details(
check_reset_password_applicable_and_permissions(&org_id, &org_user_id, &headers, &mut conn).await?; check_reset_password_applicable_and_permissions(&org_id, &org_user_id, &headers, &mut conn).await?;
// https://github.com/bitwarden/server/blob/3b50ccb9f804efaacdc46bed5b60e5b28eddefcf/src/Api/Models/Response/Organizations/OrganizationUserResponseModel.cs#L111
Ok(Json(json!({ Ok(Json(json!({
"Object": "organizationUserResetPasswordDetails", "Object": "organizationUserResetPasswordDetails",
"Kdf":user.client_kdf_type, "Kdf":user.client_kdf_type,
"KdfIterations":user.client_kdf_iter, "KdfIterations":user.client_kdf_iter,
"KdfMemory":user.client_kdf_memory,
"KdfParallelism":user.client_kdf_parallelism,
"ResetPasswordKey":org_user.reset_password_key, "ResetPasswordKey":org_user.reset_password_key,
"EncryptedPrivateKey":org.private_key , "EncryptedPrivateKey":org.private_key,
}))) })))
} }