From caaec248db3a0d6938b80c9f44de5e3f22aa0356 Mon Sep 17 00:00:00 2001 From: KD Date: Fri, 10 Oct 2025 16:33:15 -0400 Subject: [PATCH] CORS support (#183) * Changes to same .env file * Updated sample env files * icarus_envy version bump * Adding CORS * Added other urls * Code formatting * Changed allowed urls * Modified docker compose. Port changes * Changed port * Cleanup * Version bump --- .env.docker.sample | 5 ++++ .env.sample | 5 ++++ Cargo.lock | 6 ++--- Cargo.toml | 4 ++-- docker-compose.yaml | 4 ++-- src/main.rs | 57 +++++++++++++++++++++++++++++++++++---------- 6 files changed, 62 insertions(+), 19 deletions(-) diff --git a/.env.docker.sample b/.env.docker.sample index 33ebf08..c448c30 100644 --- a/.env.docker.sample +++ b/.env.docker.sample @@ -1,3 +1,8 @@ +APP_ENV=development +BACKEND_PORT=8000 +FRONTEND_URL=http://localhost:4200 +RUST_LOG=debug +ALLOWED_ORIGINS=https://soaricarus.com,https://www.soaricarus.com SECRET_MAIN_KEY=refero34o8rfhfjn983thf39fhc943rf923n3h ROOT_DIRECTORY=/home/icarus/mydata POSTGRES_MAIN_USER=icarus diff --git a/.env.sample b/.env.sample index 9b60f0e..f53ca9a 100644 --- a/.env.sample +++ b/.env.sample @@ -1,3 +1,8 @@ +APP_ENV=development +BACKEND_PORT=8000 +FRONTEND_URL=http://localhost:4200 +RUST_LOG=debug +ALLOWED_ORIGINS=https://soaricarus.com,https://www.soaricarus.com SECRET_MAIN_KEY=refero34o8rfhfjn983thf39fhc943rf923n3h ROOT_DIRECTORY=/home/icarus/mydata POSTGRES_MAIN_USER=icarus diff --git a/Cargo.lock b/Cargo.lock index 756d04b..85333b8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -840,7 +840,7 @@ dependencies = [ [[package]] name = "icarus" -version = "0.2.0" +version = "0.2.1" dependencies = [ "axum", "axum-extra", @@ -872,8 +872,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", diff --git a/Cargo.toml b/Cargo.toml index b1891d5..5a52206 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "icarus" -version = "0.2.0" +version = "0.2.1" edition = "2024" rust-version = "1.88" @@ -27,7 +27,7 @@ utoipa = { version = "5.4.0", features = ["axum_extras"] } utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] } icarus_meta = { git = "ssh://git@git.kundeng.us/phoenix/icarus_meta.git", tag = "v0.3.0" } 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] common-multipart-rfc7578 = { version = "0.7.0" } diff --git a/docker-compose.yaml b/docker-compose.yaml index 7a952eb..7636657 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -10,7 +10,7 @@ services: ports: # Map host port 8000 to container port 3000 (adjust as needed) # Format: "HOST_PORT:CONTAINER_PORT" - - "8000:3000" + - "8000:8000" env_file: - .env depends_on: @@ -29,7 +29,7 @@ services: container_name: auth_api restart: unless-stopped ports: - - "8001:3000" # Map host port 8000 to container port 8000 (adjust container port based on your app's EXPOSE in Dockerfile) + - "8001:8001" # Map host port 8000 to container port 8000 (adjust container port based on your app's EXPOSE in Dockerfile) # environment: # Environment variables your API needs, e.g., database connection # Add other necessary environment variables diff --git a/src/main.rs b/src/main.rs index 369894f..1e39cdd 100644 --- a/src/main.rs +++ b/src/main.rs @@ -45,16 +45,12 @@ async fn main() { } pub mod init { - use axum::routing::{delete, get, patch, post}; use std::time::Duration; + + use axum::routing::{delete, get, patch, post}; use tower_http::timeout::TimeoutLayer; use utoipa::OpenApi; - use axum::http::{ - HeaderValue, Method, - header::{ACCEPT, AUTHORIZATION, CONTENT_TYPE}, - }; - use crate::callers::coverart as coverart_caller; use crate::callers::metadata as metadata_caller; use crate::callers::song as song_caller; @@ -65,6 +61,46 @@ pub mod init { use song_caller::endpoint as song_endpoints; use song_caller::response as song_responses; + mod cors { + pub async fn configure_cors() -> tower_http::cors::CorsLayer { + 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") => { + // In production, allow only your specific, trusted origins + 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:8000".parse().unwrap(), + "http://127.0.0.1:8000".parse().unwrap(), + "http://localhost:4200".parse().unwrap(), + "http://127.0.0.1:4200".parse().unwrap(), + ]) + } + } + } + } + #[derive(utoipa::OpenApi)] #[openapi( paths(song_endpoints::queue_song, song_endpoints::link_user_id, song_endpoints::fetch_queue_song, song_endpoints::download_flac, @@ -226,6 +262,7 @@ pub mod init { crate::callers::endpoints::GETALLSONGS, get(crate::callers::song::endpoint::get_all_songs), ) + .layer(cors::configure_cors().await) } pub async fn app() -> axum::Router { @@ -235,11 +272,7 @@ pub mod init { // TODO: Look into handling this. Seems redundant to run migrations multiple times crate::db::migrations(&pool).await; - let cors = tower_http::cors::CorsLayer::new() - .allow_origin("http://localhost:3000".parse::().unwrap()) - .allow_methods([Method::GET, Method::POST, Method::PATCH, Method::DELETE]) - .allow_credentials(true) - .allow_headers([AUTHORIZATION, ACCEPT, CONTENT_TYPE]); + let cors = cors::configure_cors().await; routes() .await @@ -265,7 +298,7 @@ fn get_address() -> String { // TODO: Move elsewhere fn get_port() -> String { - String::from("3000") + String::from("8000") } // TODO: Move elsewhere