From e19f71fd1c4dae25971c5eb00a5e8ac88971f201 Mon Sep 17 00:00:00 2001 From: phoenix Date: Mon, 7 Apr 2025 12:27:21 -0400 Subject: [PATCH 1/4] Simplifying code --- src/callers/login.rs | 77 ++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 39 deletions(-) diff --git a/src/callers/login.rs b/src/callers/login.rs index 66286ee..4724a88 100644 --- a/src/callers/login.rs +++ b/src/callers/login.rs @@ -49,53 +49,52 @@ pub mod endpoint { }; // Check if user exists - match repo::user::exists(&pool, &usr.username).await { - Ok(exists) => { - if !exists { - return not_found("Not Found").await; - } - } - Err(err) => { - return not_found(&err.to_string()).await; - } - }; + // match repo::user::exists(&pool, &usr.username).await { + match repo::user::get(&pool, &usr.username).await { + Ok(user) => { + let salt = repo::salt::get(&pool, &user.salt_id).await.unwrap(); + let salt_str = hashing::get_salt(&salt.salt).unwrap(); - let user = repo::user::get(&pool, &usr.username).await.unwrap(); - let salt = repo::salt::get(&pool, &user.salt_id).await.unwrap(); - let salt_str = hashing::get_salt(&salt.salt).unwrap(); + // Check if password is correct + match hashing::hash_password(&usr.password, &salt_str) { + Ok(hash_password) => { + if hashing::verify_password(&usr.password, hash_password.clone()).unwrap() { + // Create token + let key = token_stuff::get_key().unwrap(); + let (token_literal, duration) = + token_stuff::create_token(&key).unwrap(); - // Check if password is correct - match hashing::hash_password(&usr.password, &salt_str) { - Ok(hash_password) => { - if hashing::verify_password(&usr.password, hash_password.clone()).unwrap() { - // Create token - let key = token_stuff::get_key().unwrap(); - let (token_literal, duration) = token_stuff::create_token(&key).unwrap(); - - if token_stuff::verify_token(&key, &token_literal) { - ( - StatusCode::OK, - Json(response::Response { - message: String::from("Successful"), - data: vec![icarus_models::login_result::LoginResult { - id: user.id, - username: user.username, - token: token_literal, - token_type: String::from(token_stuff::TOKENTYPE), - expiration: duration, - }], - }), - ) - } else { - return not_found("Could not verify password").await; + if token_stuff::verify_token(&key, &token_literal) { + ( + StatusCode::OK, + Json(response::Response { + message: String::from("Successful"), + data: vec![icarus_models::login_result::LoginResult { + id: user.id, + username: user.username, + token: token_literal, + token_type: String::from(token_stuff::TOKENTYPE), + expiration: duration, + }], + }), + ) + } else { + return not_found("Could not verify password").await; + } + } else { + return not_found("Error Hashing").await; + } + } + Err(err) => { + return not_found(&err.to_string()).await; } - } else { - return not_found("Error Hashing").await; } } Err(err) => { return not_found(&err.to_string()).await; } } + + // let user = repo::user::get(&pool, &usr.username).await.unwrap(); } } -- 2.43.0 From 7cac6d5aae9ff8b0ab673533dcec1879f21ed623 Mon Sep 17 00:00:00 2001 From: phoenix Date: Mon, 7 Apr 2025 12:31:58 -0400 Subject: [PATCH 2/4] Code refactor --- src/callers/login.rs | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/callers/login.rs b/src/callers/login.rs index 4724a88..76a4272 100644 --- a/src/callers/login.rs +++ b/src/callers/login.rs @@ -42,23 +42,19 @@ pub mod endpoint { axum::Extension(pool): axum::Extension, Json(payload): Json, ) -> (StatusCode, Json) { - let usr = icarus_models::user::User { - username: payload.username, - password: payload.password, - ..Default::default() - }; - // Check if user exists - // match repo::user::exists(&pool, &usr.username).await { - match repo::user::get(&pool, &usr.username).await { + match repo::user::get(&pool, &payload.username).await { Ok(user) => { let salt = repo::salt::get(&pool, &user.salt_id).await.unwrap(); let salt_str = hashing::get_salt(&salt.salt).unwrap(); + let unhashed_password = payload.password; // Check if password is correct - match hashing::hash_password(&usr.password, &salt_str) { + match hashing::hash_password(&unhashed_password, &salt_str) { Ok(hash_password) => { - if hashing::verify_password(&usr.password, hash_password.clone()).unwrap() { + if hashing::verify_password(&unhashed_password, hash_password.clone()) + .unwrap() + { // Create token let key = token_stuff::get_key().unwrap(); let (token_literal, duration) = @@ -94,7 +90,5 @@ pub mod endpoint { return not_found(&err.to_string()).await; } } - - // let user = repo::user::get(&pool, &usr.username).await.unwrap(); } } -- 2.43.0 From 8ddc2f73c4f80f93613d65eba0cc5a549ddf85d7 Mon Sep 17 00:00:00 2001 From: phoenix Date: Mon, 7 Apr 2025 13:11:49 -0400 Subject: [PATCH 3/4] Using functions for setting times on tokens --- src/token_stuff/mod.rs | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/src/token_stuff/mod.rs b/src/token_stuff/mod.rs index 2771dec..31ca615 100644 --- a/src/token_stuff/mod.rs +++ b/src/token_stuff/mod.rs @@ -18,11 +18,28 @@ pub fn get_key() -> Result { Ok(key) } -pub fn get_expiration() -> time::Result { +pub fn get_issued() -> time::Result { let now = time::OffsetDateTime::now_utc(); - let epoch = time::OffsetDateTime::UNIX_EPOCH; - let since_the_epoch = now - epoch; - Ok(since_the_epoch) + // let epoch = time::OffsetDateTime::UNIX_EPOCH; + // let since_the_epoch = now - epoch; + // Ok(since_the_epoch) + Ok(now) +} + +pub fn get_expiration(issued: &time::OffsetDateTime) -> Result { + let duration_expire = time::Duration::hours(4); + let expiration = *issued + duration_expire; + Ok(expiration) +} + +mod util { + // use std::time; + pub fn time_to_std_time( + provided_time: &time::OffsetDateTime, + ) -> Result { + let converted = std::time::SystemTime::from(*provided_time); + Ok(converted) + } } pub fn create_token(provided_key: &String) -> Result<(String, i64), josekit::JoseError> { @@ -33,13 +50,19 @@ pub fn create_token(provided_key: &String) -> Result<(String, i64), josekit::Jos payload.set_subject(MESSAGE); payload.set_issuer(ISSUER); payload.set_audience(vec![AUDIENCE]); - match get_expiration() { - Ok(duration) => { + match get_issued() { + Ok(issued) => { + /* let expire = duration.whole_seconds(); let _ = payload.set_claim( - "expiration", + "issued", Some(serde_json::to_value(expire.to_string()).unwrap()), ); + */ + let expire = get_expiration(&issued).unwrap(); + // payload.set_issued_at(std::time::Duration::try_from(duration).unwrap()); + payload.set_issued_at(&util::time_to_std_time(&issued).unwrap()); + payload.set_expires_at(&util::time_to_std_time(&expire).unwrap()); let key: String = if provided_key.is_empty() { get_key().unwrap() @@ -47,6 +70,8 @@ pub fn create_token(provided_key: &String) -> Result<(String, i64), josekit::Jos provided_key.to_owned() }; + let duration = expire - time::OffsetDateTime::UNIX_EPOCH; + let signer = Hs256.signer_from_bytes(key.as_bytes()).unwrap(); Ok(( josekit::jwt::encode_with_signer(&payload, &header, &signer).unwrap(), -- 2.43.0 From 90db1a97fb09f17d45f92a39ba8abf18c2cc810b Mon Sep 17 00:00:00 2001 From: phoenix Date: Mon, 7 Apr 2025 13:16:21 -0400 Subject: [PATCH 4/4] Code cleanup --- src/token_stuff/mod.rs | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/src/token_stuff/mod.rs b/src/token_stuff/mod.rs index 31ca615..d189a2d 100644 --- a/src/token_stuff/mod.rs +++ b/src/token_stuff/mod.rs @@ -19,21 +19,15 @@ pub fn get_key() -> Result { } pub fn get_issued() -> time::Result { - let now = time::OffsetDateTime::now_utc(); - // let epoch = time::OffsetDateTime::UNIX_EPOCH; - // let since_the_epoch = now - epoch; - // Ok(since_the_epoch) - Ok(now) + Ok(time::OffsetDateTime::now_utc()) } pub fn get_expiration(issued: &time::OffsetDateTime) -> Result { let duration_expire = time::Duration::hours(4); - let expiration = *issued + duration_expire; - Ok(expiration) + Ok(*issued + duration_expire) } mod util { - // use std::time; pub fn time_to_std_time( provided_time: &time::OffsetDateTime, ) -> Result { @@ -52,15 +46,7 @@ pub fn create_token(provided_key: &String) -> Result<(String, i64), josekit::Jos payload.set_audience(vec![AUDIENCE]); match get_issued() { Ok(issued) => { - /* - let expire = duration.whole_seconds(); - let _ = payload.set_claim( - "issued", - Some(serde_json::to_value(expire.to_string()).unwrap()), - ); - */ let expire = get_expiration(&issued).unwrap(); - // payload.set_issued_at(std::time::Duration::try_from(duration).unwrap()); payload.set_issued_at(&util::time_to_std_time(&issued).unwrap()); payload.set_expires_at(&util::time_to_std_time(&expire).unwrap()); @@ -70,12 +56,10 @@ pub fn create_token(provided_key: &String) -> Result<(String, i64), josekit::Jos provided_key.to_owned() }; - let duration = expire - time::OffsetDateTime::UNIX_EPOCH; - let signer = Hs256.signer_from_bytes(key.as_bytes()).unwrap(); Ok(( josekit::jwt::encode_with_signer(&payload, &header, &signer).unwrap(), - duration.whole_seconds(), + (expire - time::OffsetDateTime::UNIX_EPOCH).whole_seconds(), )) } Err(e) => Err(josekit::JoseError::InvalidClaim(e.into())), -- 2.43.0