Fix

Author: trueleo

server/src/handlers/http/rbac.rs

@@ -65,15 +65,15 @@ pub async fn reset_password(username: web::Path<String>) -> Result<impl Responde
         return Err(RBACError::UserDoesNotExist);
     }
     // get new password for this user
-    let PassCode { password, hashcode } = User::gen_new_password();
+    let PassCode { password, hash } = User::gen_new_password();
     // update parseable.json first
     let mut metadata = get_metadata().await?;
     if let Some(user) = metadata
         .users
         .iter_mut()
         .find(|user| user.username == username)
     {
-        user.password = hashcode.clone();
+        user.password_hash = hash.clone();
     } else {
         // should be unreachable given state is always consistent
         return Err(RBACError::UserDoesNotExist);
@@ -86,7 +86,7 @@ pub async fn reset_password(username: web::Path<String>) -> Result<impl Responde
         .unwrap()
         .get_mut(&username)
         .expect("checked that user exists in map")
-        .password = hashcode;
+        .password_hash = hash;
 
     Ok(password)
 }

server/src/rbac/user.rs

@@ -30,19 +30,19 @@ use crate::option::CONFIG;
 #[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub struct User {
     pub username: String,
-    pub password: String,
+    pub password_hash: String,
     // fill this
     pub role: Vec<()>,
 }
 
 impl User {
     // create a new User and return self with password generated for said user.
     pub fn create_new(username: String) -> (Self, String) {
-        let PassCode { password, hashcode } = Self::gen_new_password();
+        let PassCode { password, hash } = Self::gen_new_password();
         (
             Self {
                 username,
-                password: hashcode,
+                password_hash: hash,
                 role: Vec::new(),
             },
             password,
@@ -53,7 +53,7 @@ impl User {
     // $<id>[$v=<version>][$<param>=<value>(,<param>=<value>)*][$<salt>[$<hash>]]
     // ref https://github.com/P-H-C/phc-string-format/blob/master/phc-sf-spec.md#specification
     pub fn verify(&self, password: &str) -> bool {
-        let parsed_hash = PasswordHash::new(&self.password).unwrap();
+        let parsed_hash = PasswordHash::new(&self.password_hash).unwrap();
         Argon2::default()
             .verify_password(password.as_bytes(), &parsed_hash)
             .is_ok()
@@ -62,8 +62,8 @@ impl User {
     // gen new password
     pub fn gen_new_password() -> PassCode {
         let password = Alphanumeric.sample_string(&mut rand::thread_rng(), 16);
-        let hashcode = gen_hash(&password);
-        PassCode { password, hashcode }
+        let hash = gen_hash(&password);
+        PassCode { password, hash }
     }
 }
 
@@ -89,7 +89,7 @@ impl UserMap {
 
 pub struct PassCode {
     pub password: String,
-    pub hashcode: String,
+    pub hash: String,
 }
 
 pub fn get_admin_user() -> User {
@@ -99,7 +99,7 @@ pub fn get_admin_user() -> User {
 
     User {
         username,
-        password: hashcode,
+        password_hash: hashcode,
         role: Vec::new(),
     }
 }