diff --git a/src/hashing/mod.rs b/src/hashing/mod.rs index 46b1881..ef657ed 100644 --- a/src/hashing/mod.rs +++ b/src/hashing/mod.rs @@ -8,6 +8,8 @@ use argon2::{ }, }; +use rand::distr::SampleString; + pub struct SaltString { pub raw: String, pub in_bytes: Vec @@ -15,11 +17,27 @@ pub struct SaltString { impl SaltString { pub fn generate() -> Result { - Err(argon2::Error::SaltTooLong) + let mut rng = rand::rng(); + let s = rand::distr::Alphanumeric.sample_string(&mut rng, 20); + let salt_string = SaltString { + raw: (&s).to_string(), + in_bytes: s.into_bytes() + }; + + Ok(salt_string) + + // Err(argon2::Error::SaltTooLong) } pub fn from_b64(s: &str) -> Result { - Err(argon2::password_hash::Error::SaltInvalid) + let salt_string = SaltString { + raw: (&s).to_string(), + in_bytes: s.to_string().into_bytes(), + }; + + Ok(salt_string) + + // Err(argon2::password_hash::Error::SaltInvalid) } pub fn to_string(&self) -> String {