From b37c30ffae6da10b5e6c7c5855f399239d06dba2 Mon Sep 17 00:00:00 2001 From: Nutomic Date: Tue, 20 Jun 2023 17:19:03 +0200 Subject: [PATCH] Move cors default to source code (#3219) --- docker/docker-compose.yml | 2 -- src/lib.rs | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 74323d98c..b3b3b8b38 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -50,8 +50,6 @@ services: - lemmyexternalproxy restart: always environment: - # set this to the public origin that requests will come from - - LEMMY_CORS_ORIGIN=http://localhost - RUST_LOG="warn,lemmy_server=debug,lemmy_api=debug,lemmy_api_common=debug,lemmy_api_crud=debug,lemmy_apub=debug,lemmy_db_schema=debug,lemmy_db_views=debug,lemmy_db_views_actor=debug,lemmy_db_views_moderator=debug,lemmy_routes=debug,lemmy_utils=debug,lemmy_websocket=debug" - RUST_BACKTRACE=full volumes: diff --git a/src/lib.rs b/src/lib.rs index d8d367fb3..811b8fea3 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -150,9 +150,9 @@ pub async fn start_lemmy_server() -> Result<(), LemmyError> { .build() .expect("configure federation"); - let cors_origin = std::env::var("LEMMY_CORS_ORIGIN").unwrap_or_default(); + let cors_origin = std::env::var("LEMMY_CORS_ORIGIN").unwrap_or("http://localhost".into()); - let cors_config = if cfg!(debug_assertions) { + let cors_config = if !cfg!(debug_assertions) { Cors::permissive() } else { Cors::default().allowed_origin(&cors_origin)