octoleo/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2024-11-11 16:15:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sirux88-refactoring-user-setpassword'

Browse Source
This commit is contained in:
Daniel García 2023-01-24 19:46:35 +01:00
commit 0eba7a88fa
No known key found for this signature in database
GPG Key ID: FC8A7D14C3CD543A
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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.client_kdf_type = client_kdf_type;
} }
user.set_password(&data.MasterPasswordHash, None); user.set_password(&data.MasterPasswordHash, &data.Key, None);
user.akey = data.Key;
user.password_hint = password_hint; user.password_hint = password_hint;
// Add extra fields if present // Add extra fields if present
@ -318,9 +317,10 @@ async fn post_password(
user.set_password( user.set_password(
&data.NewMasterPasswordHash, &data.NewMasterPasswordHash,
&data.Key,
Some(vec![String::from("post_rotatekey"), String::from("get_contacts"), String::from("get_public_keys")]), 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; let save_result = user.save(&mut conn).await;
nt.send_user_update(UpdateType::LogOut, &user).await; nt.send_user_update(UpdateType::LogOut, &user).await;
@ -350,8 +350,7 @@ async fn post_kdf(data: JsonUpcase<ChangeKdfData>, headers: Headers, mut conn: D
user.client_kdf_iter = data.KdfIterations; user.client_kdf_iter = data.KdfIterations;
user.client_kdf_type = data.Kdf; user.client_kdf_type = data.Kdf;
user.set_password(&data.NewMasterPasswordHash, None); user.set_password(&data.NewMasterPasswordHash, &data.Key, None);
user.akey = data.Key;
let save_result = user.save(&mut conn).await; let save_result = user.save(&mut conn).await;
nt.send_user_update(UpdateType::LogOut, &user).await; nt.send_user_update(UpdateType::LogOut, &user).await;
@ -560,8 +559,8 @@ async fn post_email(
user.email_new = None; user.email_new = None;
user.email_new_token = None; user.email_new_token = None;
user.set_password(&data.NewMasterPasswordHash, None); user.set_password(&data.NewMasterPasswordHash, &data.Key, None);
user.akey = data.Key;
let save_result = user.save(&mut conn).await; let save_result = user.save(&mut conn).await;
nt.send_user_update(UpdateType::LogOut, &user).await; nt.send_user_update(UpdateType::LogOut, &user).await;

5
src/api/core/emergency_access.rs
View File

@ -644,7 +644,7 @@ async fn password_emergency_access(
let data: EmergencyAccessPasswordData = data.into_inner().data; let data: EmergencyAccessPasswordData = data.into_inner().data;
let new_master_password_hash = &data.NewMasterPasswordHash; let new_master_password_hash = &data.NewMasterPasswordHash;
let key = data.Key; let key = &data.Key;
let requesting_user = headers.user; let requesting_user = headers.user;
let emergency_access = match EmergencyAccess::find_by_uuid(&emer_id, &mut conn).await { let emergency_access = match EmergencyAccess::find_by_uuid(&emer_id, &mut conn).await {
@ -662,8 +662,7 @@ async fn password_emergency_access(
}; };
// change grantor_user password // change grantor_user password
grantor_user.set_password(new_master_password_hash, None); grantor_user.set_password(new_master_password_hash, key, None);
grantor_user.akey = key;
grantor_user.save(&mut conn).await?; grantor_user.save(&mut conn).await?;
// Disable TwoFactor providers since they will otherwise block logins // Disable TwoFactor providers since they will otherwise block logins

5
src/db/models/user.rs
View File

@ -147,17 +147,18 @@ impl User {
/// # Arguments /// # Arguments
/// ///
/// * `password` - A str which contains a hashed version of the users master password. /// * `password` - A str which contains a hashed version of the users master password.
/// * `new_key` - A String which contains the new aKey value of the users master password.
/// * `allow_next_route` - A Option<Vec<String>> with the function names of the next allowed (rocket) routes. /// * `allow_next_route` - A Option<Vec<String>> with the function names of the next allowed (rocket) routes.
/// These routes are able to use the previous stamp id for the next 2 minutes. /// These routes are able to use the previous stamp id for the next 2 minutes.
/// After these 2 minutes this stamp will expire. /// After these 2 minutes this stamp will expire.
/// ///
pub fn set_password(&mut self, password: &str, allow_next_route: Option<Vec<String>>) { pub fn set_password(&mut self, password: &str, new_key: &str, allow_next_route: Option<Vec<String>>) {
self.password_hash = crypto::hash_password(password.as_bytes(), &self.salt, self.password_iterations as u32); self.password_hash = crypto::hash_password(password.as_bytes(), &self.salt, self.password_iterations as u32);
if let Some(route) = allow_next_route { if let Some(route) = allow_next_route {
self.set_stamp_exception(route); self.set_stamp_exception(route);
} }
self.akey = String::from(new_key);
self.reset_security_stamp() self.reset_security_stamp()
} }