diff --git a/.env.docker.sample b/.env.docker.sample index ffde663..5d67918 100644 --- a/.env.docker.sample +++ b/.env.docker.sample @@ -1,3 +1,8 @@ +APP_ENV=development +BACKEND_PORT=8001 +FRONTEND_URL=http://localhost:4200 +RUST_LOG=debug +ALLOWED_ORIGINS=https://soaricarus.com,https://www.soaricarus.com SECRET_KEY=refero34o8rfhfjn983thf39fhc943rf923n3h SERVICE_PASSPHRASE=iUOo1fxshf3y1tUGn1yU8l9raPApHCdinW0VdCHdRFEjqhR3Bf02aZzsKbLtaDFH POSTGRES_AUTH_USER=icarus_op diff --git a/.env.sample b/.env.sample index c00c477..1a544f7 100644 --- a/.env.sample +++ b/.env.sample @@ -1,3 +1,8 @@ +APP_ENV=development +BACKEND_PORT=8001 +FRONTEND_URL=http://localhost:4200 +RUST_LOG=debug +ALLOWED_ORIGINS=https://soaricarus.com,https://www.soaricarus.com SECRET_KEY=refero34o8rfhfjn983thf39fhc943rf923n3h SERVICE_PASSPHRASE=iUOo1fxshf3y1tUGn1yU8l9raPApHCdinW0VdCHdRFEjqhR3Bf02aZzsKbLtaDFH POSTGRES_AUTH_USER=icarus_op_test diff --git a/Cargo.lock b/Cargo.lock index 797ad69..c793376 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -627,6 +627,16 @@ dependencies = [ "hashbrown", ] +[[package]] +name = "hdrhistogram" +version = "7.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d" +dependencies = [ + "byteorder", + "num-traits", +] + [[package]] name = "heck" version = "0.5.0" @@ -749,7 +759,7 @@ dependencies = [ [[package]] name = "icarus_auth" -version = "0.5.0" +version = "0.5.1" dependencies = [ "argon2", "axum", @@ -766,6 +776,7 @@ dependencies = [ "time", "tokio", "tower", + "tower-http", "tracing-subscriber", "url", "utoipa", @@ -775,8 +786,8 @@ dependencies = [ [[package]] name = "icarus_envy" -version = "0.3.2" -source = "git+ssh://git@git.kundeng.us/phoenix/icarus_envy.git?tag=v0.3.2#d84a8144aedf02e1b459d67c4023a7e0833f89fd" +version = "0.3.5" +source = "git+ssh://git@git.kundeng.us/phoenix/icarus_envy.git?tag=v0.3.5-main-86c5050c7b-006#86c5050c7bd5164bc6e773fc404195023f7f7aaa" dependencies = [ "const_format", "dotenvy", @@ -2152,6 +2163,19 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-util" +version = "0.7.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + [[package]] name = "tower" version = "0.5.2" @@ -2160,14 +2184,32 @@ checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" dependencies = [ "futures-core", "futures-util", + "hdrhistogram", + "indexmap", "pin-project-lite", + "slab", "sync_wrapper", "tokio", + "tokio-util", "tower-layer", "tower-service", "tracing", ] +[[package]] +name = "tower-http" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" +dependencies = [ + "bitflags", + "bytes", + "http", + "pin-project-lite", + "tower-layer", + "tower-service", +] + [[package]] name = "tower-layer" version = "0.3.3" diff --git a/Cargo.toml b/Cargo.toml index fb785d1..081b602 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "icarus_auth" -version = "0.5.0" +version = "0.5.1" edition = "2024" rust-version = "1.88" @@ -10,7 +10,8 @@ serde = { version = "1.0.219", features = ["derive"] } serde_json = { version = "1.0.140" } tokio = { version = "1.45.1", features = ["rt-multi-thread"] } tracing-subscriber = { version = "0.3.19" } -tower = { version = "0.5.2" } +tower = { version = "0.5.2", features = ["full"] } +tower-http = { version = "0.6.6", features = ["cors"] } hyper = { version = "1.6.0" } sqlx = { version = "0.8.6", features = ["postgres", "runtime-tokio-native-tls", "time", "uuid"] } uuid = { version = "1.17.0", features = ["v4", "serde"] } @@ -21,7 +22,7 @@ josekit = { version = "0.10.3" } utoipa = { version = "5.4.0", features = ["axum_extras"] } utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] } icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.5.6" } -icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.3.2" } +icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.3.5-main-86c5050c7b-006" } [dev-dependencies] http-body-util = { version = "0.1.3" } diff --git a/docker-compose.yaml b/docker-compose.yaml index c6c0140..80d8100 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -9,7 +9,7 @@ services: container_name: icarus_auth # Optional: Give the container a specific name ports: # Map host port 8000 to container port 3000 (adjust as needed) - - "8000:3000" + - "8001:8001" env_file: - .env depends_on: diff --git a/src/config/mod.rs b/src/config/mod.rs index f34b535..7ca5adb 100644 --- a/src/config/mod.rs +++ b/src/config/mod.rs @@ -6,5 +6,5 @@ fn get_address() -> String { } fn get_port() -> String { - String::from("3000") + String::from("8001") } diff --git a/src/lib.rs b/src/lib.rs index fdc78b0..75c5de2 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,3 +1,4 @@ +// TODO: Get rid of this file and place the code in more appropriate places pub mod callers; pub mod config; pub mod hashing; diff --git a/src/main.rs b/src/main.rs index c13b7f6..0a290b1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -8,7 +8,7 @@ async fn main() { let app = init::app().await; - // run our app with hyper, listening globally on port 3000 + // run our app with hyper, listening globally on port 8001 let url = config::get_full(); let listener = tokio::net::TcpListener::bind(url).await.unwrap(); axum::serve(listener, app).await.unwrap(); @@ -45,6 +45,44 @@ mod init { )] struct ApiDoc; + mod cors { + pub async fn configure_cors() -> tower_http::cors::CorsLayer { + // Start building the CORS layer with common settings + let cors = tower_http::cors::CorsLayer::new() + .allow_methods([ + axum::http::Method::GET, + axum::http::Method::POST, + axum::http::Method::PUT, + axum::http::Method::DELETE, + ]) // Specify allowed methods:cite[2] + .allow_headers([ + axum::http::header::CONTENT_TYPE, + axum::http::header::AUTHORIZATION, + ]) // Specify allowed headers:cite[2] + .allow_credentials(true) // If you need to send cookies or authentication headers:cite[2] + .max_age(std::time::Duration::from_secs(3600)); // Cache the preflight response for 1 hour:cite[2] + + // Dynamically set the allowed origin based on the environment + match std::env::var(icarus_envy::keys::APP_ENV).as_deref() { + Ok("production") => { + let allowed_origins_env = icarus_envy::environment::get_allowed_origins().await; + let allowed_origins: Vec = allowed_origins_env + .split(",") + .map(|s| s.parse::().unwrap()) + .collect(); + cors.allow_origin(allowed_origins) + } + _ => { + // Development (default): Allow localhost origins + cors.allow_origin(vec![ + "http://localhost:4200".parse().unwrap(), + "http://127.0.0.1:4200".parse().unwrap(), + ]) + } + } + } + } + pub async fn routes() -> Router { // build our application with a route Router::new() @@ -72,6 +110,7 @@ mod init { callers::endpoints::REFRESH_TOKEN, post(callers::login::endpoint::refresh_token), ) + .layer(cors::configure_cors().await) } pub async fn app() -> Router {