Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
778be1f4a2 |
No files matched your search
Generated
+32
-46
@@ -31,13 +31,13 @@ checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470"
|
||||
|
||||
[[package]]
|
||||
name = "argon2"
|
||||
version = "0.5.3"
|
||||
version = "0.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072"
|
||||
checksum = "134c52ddac6d63c576bef8168db10c83c49c26444ecbc68060fef078925a901c"
|
||||
dependencies = [
|
||||
"base64ct",
|
||||
"blake2",
|
||||
"cpufeatures 0.2.17",
|
||||
"cpufeatures 0.3.1",
|
||||
"password-hash",
|
||||
]
|
||||
|
||||
@@ -143,11 +143,11 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "blake2"
|
||||
version = "0.10.6"
|
||||
version = "0.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
|
||||
checksum = "5b5d4d889834ee8ecfc0f8426ad30faf7cdcb10f741a8e6d7224d95325479f6f"
|
||||
dependencies = [
|
||||
"digest 0.10.7",
|
||||
"digest 0.11.3",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -216,7 +216,7 @@ checksum = "65c35e4b699c7e15ccbe7ee35c005e4fc0a278d22238a2857e6ce2dadeda1b06"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"cpufeatures 0.3.1",
|
||||
"rand_core 0.10.1",
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -364,7 +364,6 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
|
||||
dependencies = [
|
||||
"block-buffer 0.10.4",
|
||||
"crypto-common 0.1.7",
|
||||
"subtle",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -585,17 +584,6 @@ dependencies = [
|
||||
"version_check",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.2.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"wasi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.4.3"
|
||||
@@ -606,7 +594,7 @@ dependencies = [
|
||||
"js-sys",
|
||||
"libc",
|
||||
"r-efi",
|
||||
"rand_core 0.10.1",
|
||||
"rand_core",
|
||||
"wasm-bindgen",
|
||||
]
|
||||
|
||||
@@ -1180,13 +1168,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "password-hash"
|
||||
version = "0.5.0"
|
||||
version = "0.6.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166"
|
||||
checksum = "aab41826031698d6ffcd9cff78ef56ef998e39dc7e5067cdfebe373842d4723b"
|
||||
dependencies = [
|
||||
"base64ct",
|
||||
"rand_core 0.6.4",
|
||||
"subtle",
|
||||
"getrandom",
|
||||
"phc",
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1195,6 +1183,18 @@ version = "2.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
|
||||
|
||||
[[package]]
|
||||
name = "phc"
|
||||
version = "0.6.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "44dc769b75f93afdddd8c7fa12d685292ddeff1e66f7f0f3a234cf1818afe892"
|
||||
dependencies = [
|
||||
"base64ct",
|
||||
"ctutils",
|
||||
"getrandom",
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pin-project-lite"
|
||||
version = "0.2.17"
|
||||
@@ -1253,17 +1253,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "65c9fb96cbc91e3478eaae79a69fcd3f1ae4ad052e471fe6732fff548984b4af"
|
||||
dependencies = [
|
||||
"chacha20",
|
||||
"getrandom 0.4.3",
|
||||
"rand_core 0.10.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_core"
|
||||
version = "0.6.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
|
||||
dependencies = [
|
||||
"getrandom 0.2.17",
|
||||
"getrandom",
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1535,13 +1526,14 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "soaricarus_auth"
|
||||
version = "0.8.6"
|
||||
version = "0.8.7"
|
||||
dependencies = [
|
||||
"argon2",
|
||||
"axum",
|
||||
"http-body-util",
|
||||
"josekit",
|
||||
"openssl",
|
||||
"rand",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"sienvy",
|
||||
@@ -1774,12 +1766,6 @@ dependencies = [
|
||||
"unicode-properties",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "subtle"
|
||||
version = "2.6.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.119"
|
||||
@@ -1826,7 +1812,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
|
||||
dependencies = [
|
||||
"fastrand",
|
||||
"getrandom 0.4.3",
|
||||
"getrandom",
|
||||
"once_cell",
|
||||
"rustix",
|
||||
"windows-sys",
|
||||
@@ -2188,7 +2174,7 @@ version = "1.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4a0e2d11620c50695fe12bbbfde96b3477fe606e7284c22d505c12ce51214514"
|
||||
dependencies = [
|
||||
"getrandom 0.4.3",
|
||||
"getrandom",
|
||||
"js-sys",
|
||||
"serde_core",
|
||||
"wasm-bindgen",
|
||||
@@ -2374,7 +2360,7 @@ checksum = "1156b39d142a34b999c2310a50455e0cb3760bf7efad0122f796d813bee26ccb"
|
||||
dependencies = [
|
||||
"crc32fast",
|
||||
"flate2",
|
||||
"getrandom 0.4.3",
|
||||
"getrandom",
|
||||
"indexmap",
|
||||
"memchr",
|
||||
"nix",
|
||||
|
||||
+3
-2
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "soaricarus_auth"
|
||||
version = "0.8.6"
|
||||
version = "0.8.7"
|
||||
edition = "2024"
|
||||
rust-version = "1.95"
|
||||
license = "MIT"
|
||||
@@ -17,11 +17,12 @@ tower = { version = "0.5.3", features = ["full"] }
|
||||
tower-http = { version = "0.7.1", features = ["cors"] }
|
||||
sqlx = { version = "0.9.0", features = ["postgres", "runtime-tokio", "tls-native-tls", "time", "uuid"] }
|
||||
uuid = { version = "1.29.0", features = ["v4", "serde"] }
|
||||
argon2 = { version = "0.5.3", features = ["std"] }
|
||||
argon2 = { version = "0.6.0", features = ["alloc", "getrandom", "rand_core"] }
|
||||
time = { version = "0.3.55", features = ["macros", "serde"] }
|
||||
josekit = { version = "0.10.3" }
|
||||
utoipa = { version = "6.0.0", features = ["axum_extras", "uuid", "time"] }
|
||||
utoipa-swagger-ui = { version = "10.0.2", features = ["axum"] }
|
||||
rand = { version = "0.10.3" }
|
||||
simodels = { git = "ssh://git@git.kundeng.us/phoenix/simodels.git", tag = "v0.11.7" }
|
||||
sienvy = { git = "ssh://git@git.kundeng.us/phoenix/sienvy.git", tag = "v0.8.2" }
|
||||
|
||||
|
||||
@@ -344,7 +344,7 @@ pub mod endpoint {
|
||||
Ok(salt) => {
|
||||
let updated_salt_string = hashing::generate_salt().unwrap();
|
||||
let updated_salt = simodels::user::salt::Salt {
|
||||
salt: updated_salt_string.to_string(),
|
||||
salt: updated_salt_string.to_string().clone(),
|
||||
id: salt.id,
|
||||
};
|
||||
let updated_hashed_password = hashing::hash_password(
|
||||
|
||||
@@ -93,7 +93,7 @@ pub async fn register_user(
|
||||
let salt_string = hashing::generate_salt().unwrap();
|
||||
let mut salt = simodels::user::salt::Salt::default();
|
||||
let generated_salt = salt_string;
|
||||
salt.salt = generated_salt.to_string();
|
||||
salt.salt = generated_salt.to_string().clone();
|
||||
salt.id = repo::salt::insert(&pool, &salt).await.unwrap();
|
||||
user.salt_id = salt.id;
|
||||
let hashed_password =
|
||||
|
||||
+49
-23
@@ -1,17 +1,39 @@
|
||||
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 {
|
||||
pub raw: String,
|
||||
pub in_bytes: Vec<u8>,
|
||||
}
|
||||
|
||||
impl SaltString {
|
||||
pub fn generate() -> Result<SaltString, argon2::Error> {
|
||||
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)
|
||||
}
|
||||
|
||||
pub fn from_b64(s: &str) -> Result<SaltString, argon2::password_hash::Error> {
|
||||
let salt_string = SaltString {
|
||||
raw: (&s).to_string(),
|
||||
in_bytes: s.to_string().into_bytes(),
|
||||
};
|
||||
|
||||
Ok(salt_string)
|
||||
}
|
||||
|
||||
pub fn to_string(&self) -> &String {
|
||||
&self.raw
|
||||
}
|
||||
}
|
||||
|
||||
pub fn generate_salt() -> Result<SaltString, argon2::Error> {
|
||||
// Generate a random salt
|
||||
// SaltString::generate uses OsRng internally for cryptographic security
|
||||
Ok(SaltString::generate(&mut OsRng))
|
||||
SaltString::generate()
|
||||
}
|
||||
|
||||
pub fn get_salt(s: &str) -> Result<SaltString, argon2::password_hash::Error> {
|
||||
@@ -24,14 +46,11 @@ 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_with_salt(password_bytes, &salt.in_bytes)?
|
||||
.to_string())
|
||||
}
|
||||
|
||||
pub fn verify_password(
|
||||
@@ -49,7 +68,7 @@ pub fn verify_password(
|
||||
// This automatically uses the correct salt and parameters embedded in `parsed_hash`
|
||||
match Argon2::default().verify_password(password_bytes, &parsed_hash) {
|
||||
Ok(()) => Ok(true), // Passwords match
|
||||
Err(argon2::password_hash::Error::Password) => Ok(false), // Passwords don't match
|
||||
Err(argon2::password_hash::Error::PasswordInvalid) => Ok(false), // Passwords don't match
|
||||
Err(e) => Err(e), // Some other error occurred (e.g., invalid hash format)
|
||||
}
|
||||
}
|
||||
@@ -58,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);
|
||||
@@ -78,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) => {
|
||||
@@ -89,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