Bump argon2 #12
+13
-30
@@ -1,13 +1,4 @@
|
||||
use argon2::{
|
||||
Argon2, // The Argon2 algorithm struct
|
||||
PasswordVerifier,
|
||||
password_hash::{
|
||||
PasswordHasher,
|
||||
// SaltString,
|
||||
// rand_core::OsRng, // Secure random number generator
|
||||
},
|
||||
};
|
||||
|
||||
use argon2::{Argon2, PasswordVerifier, password_hash::PasswordHasher};
|
||||
use rand::distr::SampleString;
|
||||
|
||||
pub struct SaltString {
|
||||
@@ -25,8 +16,6 @@ impl SaltString {
|
||||
};
|
||||
|
||||
Ok(salt_string)
|
||||
|
||||
// Err(argon2::Error::SaltTooLong)
|
||||
}
|
||||
|
||||
pub fn from_b64(s: &str) -> Result<SaltString, argon2::password_hash::Error> {
|
||||
@@ -36,20 +25,14 @@ impl SaltString {
|
||||
};
|
||||
|
||||
Ok(salt_string)
|
||||
|
||||
// Err(argon2::password_hash::Error::SaltInvalid)
|
||||
}
|
||||
|
||||
pub fn to_string(&self) -> &String {
|
||||
&self.raw
|
||||
}
|
||||
|
||||
// pub fn final_string
|
||||
}
|
||||
|
||||
pub fn generate_salt() -> Result<SaltString, argon2::Error> {
|
||||
// Generate a random salt
|
||||
// SaltString::generate uses OsRng internally for cryptographic security
|
||||
SaltString::generate()
|
||||
}
|
||||
|
||||
@@ -63,15 +46,8 @@ pub fn hash_password(
|
||||
) -> Result<String, argon2::password_hash::Error> {
|
||||
let password_bytes = password.as_bytes();
|
||||
|
||||
// Create an Argon2 instance with default parameters (recommended)
|
||||
// You could customize parameters here if needed, but defaults are strong
|
||||
let argon2 = Argon2::default();
|
||||
|
||||
// Hash the password with the salt
|
||||
// The output is a PasswordHash string format that includes algorithm, version,
|
||||
// parameters, salt, and the hash itself.
|
||||
// Ok(argon2.hash_password(password_bytes, salt)?.to_string())
|
||||
// Ok(argon2.hash_password(password_bytes)?.to_string())
|
||||
Ok(argon2
|
||||
.hash_password_with_salt(password_bytes, &salt.in_bytes)?
|
||||
.to_string())
|
||||
@@ -101,10 +77,15 @@ pub fn verify_password(
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
pub const TEST_PASSWORD: &str = "somethingrandom";
|
||||
pub const TEST_WRONG_PASSWORD: &str = "Differentanotherlevel";
|
||||
|
||||
#[test]
|
||||
fn test_hash_password() {
|
||||
let some_password = String::from("somethingrandom");
|
||||
match hash_password(&some_password, &generate_salt().unwrap()) {
|
||||
let some_password = String::from(TEST_PASSWORD);
|
||||
let salt = generate_salt().unwrap();
|
||||
|
||||
match hash_password(&some_password, &salt) {
|
||||
Ok(p) => match verify_password(&some_password, p.clone()) {
|
||||
Ok(res) => {
|
||||
assert_eq!(res, true);
|
||||
@@ -121,8 +102,10 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn test_wrong_password() {
|
||||
let some_password = String::from("somethingrandom");
|
||||
match hash_password(&some_password, &generate_salt().unwrap()) {
|
||||
let some_password = String::from(TEST_PASSWORD);
|
||||
let salt = generate_salt().unwrap();
|
||||
|
||||
match hash_password(&some_password, &salt) {
|
||||
Ok(p) => {
|
||||
match verify_password(&some_password, p.clone()) {
|
||||
Ok(res) => {
|
||||
@@ -132,7 +115,7 @@ mod tests {
|
||||
assert!(false, "Error: {:?}", err.to_string());
|
||||
}
|
||||
}
|
||||
let wrong_password = String::from("Differentanotherlevel");
|
||||
let wrong_password = String::from(TEST_WRONG_PASSWORD);
|
||||
let result = verify_password(&wrong_password, p.clone()).unwrap();
|
||||
assert_eq!(false, result, "Passwords should not match");
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user