Compare commits
3 Commits
130e7cc25e
...
7881a865ae
Author | SHA1 | Date | |
---|---|---|---|
7881a865ae
|
|||
8a9bcce8f2
|
|||
a89415178d
|
2
Cargo.lock
generated
2
Cargo.lock
generated
@@ -759,7 +759,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "icarus_auth"
|
name = "icarus_auth"
|
||||||
version = "0.5.1"
|
version = "0.5.2"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"argon2",
|
"argon2",
|
||||||
"axum",
|
"axum",
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "icarus_auth"
|
name = "icarus_auth"
|
||||||
version = "0.5.1"
|
version = "0.5.2"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
rust-version = "1.88"
|
rust-version = "1.88"
|
||||||
|
|
||||||
|
@@ -96,7 +96,7 @@ pub mod endpoint {
|
|||||||
Ok(user) => {
|
Ok(user) => {
|
||||||
if hashing::verify_password(&payload.password, user.password.clone()).unwrap() {
|
if hashing::verify_password(&payload.password, user.password.clone()).unwrap() {
|
||||||
// Create token
|
// Create token
|
||||||
let key = icarus_envy::environment::get_secret_key().await;
|
let key = icarus_envy::environment::get_secret_key().await.value;
|
||||||
let (token_literal, duration) =
|
let (token_literal, duration) =
|
||||||
token_stuff::create_token(&key, &user.id).unwrap();
|
token_stuff::create_token(&key, &user.id).unwrap();
|
||||||
|
|
||||||
@@ -155,7 +155,7 @@ pub mod endpoint {
|
|||||||
|
|
||||||
match repo::service::valid_passphrase(&pool, &payload.passphrase).await {
|
match repo::service::valid_passphrase(&pool, &payload.passphrase).await {
|
||||||
Ok((id, _passphrase, _date_created)) => {
|
Ok((id, _passphrase, _date_created)) => {
|
||||||
let key = icarus_envy::environment::get_secret_key().await;
|
let key = icarus_envy::environment::get_secret_key().await.value;
|
||||||
let (token_literal, duration) =
|
let (token_literal, duration) =
|
||||||
token_stuff::create_service_token(&key, &id).unwrap();
|
token_stuff::create_service_token(&key, &id).unwrap();
|
||||||
|
|
||||||
@@ -207,7 +207,7 @@ pub mod endpoint {
|
|||||||
axum::Json<response::refresh_token::Response>,
|
axum::Json<response::refresh_token::Response>,
|
||||||
) {
|
) {
|
||||||
let mut response = response::refresh_token::Response::default();
|
let mut response = response::refresh_token::Response::default();
|
||||||
let key = icarus_envy::environment::get_secret_key().await;
|
let key = icarus_envy::environment::get_secret_key().await.value;
|
||||||
|
|
||||||
if token_stuff::verify_token(&key, &payload.access_token) {
|
if token_stuff::verify_token(&key, &payload.access_token) {
|
||||||
let token_type = token_stuff::get_token_type(&key, &payload.access_token).unwrap();
|
let token_type = token_stuff::get_token_type(&key, &payload.access_token).unwrap();
|
||||||
|
@@ -16,7 +16,7 @@ pub mod db {
|
|||||||
use crate::connection_settings;
|
use crate::connection_settings;
|
||||||
|
|
||||||
pub async fn create_pool() -> Result<sqlx::PgPool, sqlx::Error> {
|
pub async fn create_pool() -> Result<sqlx::PgPool, sqlx::Error> {
|
||||||
let database_url = icarus_envy::environment::get_db_url().await;
|
let database_url = icarus_envy::environment::get_db_url().await.value;
|
||||||
println!("Database url: {database_url}");
|
println!("Database url: {database_url}");
|
||||||
|
|
||||||
PgPoolOptions::new()
|
PgPoolOptions::new()
|
||||||
|
20
src/main.rs
20
src/main.rs
@@ -66,11 +66,21 @@ mod init {
|
|||||||
match std::env::var(icarus_envy::keys::APP_ENV).as_deref() {
|
match std::env::var(icarus_envy::keys::APP_ENV).as_deref() {
|
||||||
Ok("production") => {
|
Ok("production") => {
|
||||||
let allowed_origins_env = icarus_envy::environment::get_allowed_origins().await;
|
let allowed_origins_env = icarus_envy::environment::get_allowed_origins().await;
|
||||||
let allowed_origins: Vec<axum::http::HeaderValue> = allowed_origins_env
|
match icarus_envy::utility::delimitize(&allowed_origins_env) {
|
||||||
.split(",")
|
Ok(alwd) => {
|
||||||
.map(|s| s.parse::<axum::http::HeaderValue>().unwrap())
|
let allowed_origins: Vec<axum::http::HeaderValue> = alwd
|
||||||
.collect();
|
.into_iter()
|
||||||
cors.allow_origin(allowed_origins)
|
.map(|s| s.parse::<axum::http::HeaderValue>().unwrap())
|
||||||
|
.collect();
|
||||||
|
cors.allow_origin(allowed_origins)
|
||||||
|
}
|
||||||
|
Err(err) => {
|
||||||
|
eprintln!(
|
||||||
|
"Could not parse out allowed origins from env: Error: {err:?}"
|
||||||
|
);
|
||||||
|
std::process::exit(-1);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
_ => {
|
_ => {
|
||||||
// Development (default): Allow localhost origins
|
// Development (default): Allow localhost origins
|
||||||
|
@@ -124,7 +124,9 @@ mod tests {
|
|||||||
#[test]
|
#[test]
|
||||||
fn test_tokenize() {
|
fn test_tokenize() {
|
||||||
let rt = tokio::runtime::Runtime::new().unwrap();
|
let rt = tokio::runtime::Runtime::new().unwrap();
|
||||||
let special_key = rt.block_on(icarus_envy::environment::get_secret_key());
|
let special_key = rt
|
||||||
|
.block_on(icarus_envy::environment::get_secret_key())
|
||||||
|
.value;
|
||||||
let id = uuid::Uuid::new_v4();
|
let id = uuid::Uuid::new_v4();
|
||||||
match create_token(&special_key, &id) {
|
match create_token(&special_key, &id) {
|
||||||
Ok((token, _duration)) => {
|
Ok((token, _duration)) => {
|
||||||
|
Reference in New Issue
Block a user