mirrors/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-05-09 04:30:09 +03:00
Code Issues Projects Releases Packages Wiki Activity

include key into user.set_password

Browse source
This commit is contained in:
sirux88 2023-01-14 10:16:03 +01:00 • committed by Daniel García
parent 2d8c8e18f7
commit cc91ac6cc0
No known key found for this signature in database
GPG key ID: FC8A7D14C3CD543A
4 changed files with 21 additions and 12 deletions
src/api/core
accounts.rs

13
src/api/core/accounts.rs
View file

@ -161,8 +161,7 @@ pub async fn _register(data: JsonUpcase<RegisterData>, mut conn: DbConn) -> Json
user.client_kdf_type = client_kdf_type;
}
user.set_password(&data.MasterPasswordHash, true, None);
user.akey = data.Key;
user.set_password(&data.MasterPasswordHash, Some(data.Key), true, None);
user.password_hint = password_hint;
// Add extra fields if present
@ -318,10 +317,11 @@ async fn post_password(
user.set_password(
&data.NewMasterPasswordHash,
Some(data.Key),
true,
Some(vec![String::from("post_rotatekey"), String::from("get_contacts"), String::from("get_public_keys")]),
);
user.akey = data.Key;
let save_result = user.save(&mut conn).await;
nt.send_user_update(UpdateType::LogOut, &user).await;
@ -355,8 +355,7 @@ async fn post_kdf(data: JsonUpcase<ChangeKdfData>, headers: Headers, mut conn: D
user.client_kdf_iter = data.KdfIterations;
user.client_kdf_type = data.Kdf;
user.set_password(&data.NewMasterPasswordHash, true, None);
user.akey = data.Key;
user.set_password(&data.NewMasterPasswordHash, Some(data.Key), true, None);
let save_result = user.save(&mut conn).await;
nt.send_user_update(UpdateType::LogOut, &user).await;
@ -565,8 +564,8 @@ async fn post_email(
user.email_new = None;
user.email_new_token = None;
user.set_password(&data.NewMasterPasswordHash, true, None);
user.akey = data.Key;
user.set_password(&data.NewMasterPasswordHash, Some(data.Key), true, None);
let save_result = user.save(&mut conn).await;
nt.send_user_update(UpdateType::LogOut, &user).await;