From b214d3dc00c269d7987ace7f5522e2ff406eec03 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Tue, 20 Jun 2023 20:29:48 -0400 Subject: [PATCH] Adding current domain from settings to CORs. (#3231) --- .woodpecker.yml | 6 ++++-- docker/test_deploy.sh | 4 ++-- src/lib.rs | 9 +++++---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 9bdcbd6a..5134d588 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -164,7 +164,8 @@ pipeline: repo: dessalines/lemmy dockerfile: docker/Dockerfile platforms: linux/amd64 - build_args: RUST_RELEASE_MODE=release + build_args: + - RUST_RELEASE_MODE=release auto_tag: true when: event: tag @@ -176,7 +177,8 @@ pipeline: repo: dessalines/lemmy dockerfile: docker/Dockerfile platforms: linux/amd64 - build_args: RUST_RELEASE_MODE=release + build_args: + - RUST_RELEASE_MODE=release tag: dev when: event: cron diff --git a/docker/test_deploy.sh b/docker/test_deploy.sh index ff4eb5b9..8bf06f23 100755 --- a/docker/test_deploy.sh +++ b/docker/test_deploy.sh @@ -5,8 +5,8 @@ export COMPOSE_DOCKER_CLI_BUILD=1 export DOCKER_BUILDKIT=1 # Rebuilding dev docker -sudo docker build ../ -f . -t "dessalines/lemmy:dev" -sudo docker push "dessalines/lemmy:dev" +pushd .. +sudo docker build . -f docker/Dockerfile --build-arg RUST_RELEASE_MODE=release -t "dessalines/lemmy:dev" --platform=linux/amd64 --push # Run the playbook # pushd ../../../lemmy-ansible diff --git a/src/lib.rs b/src/lib.rs index 811b8fea..b76dd106 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -150,12 +150,13 @@ pub async fn start_lemmy_server() -> Result<(), LemmyError> { .build() .expect("configure federation"); - 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) + let cors_origin = std::env::var("LEMMY_CORS_ORIGIN").unwrap_or("http://localhost".into()); + Cors::default() + .allowed_origin(&cors_origin) + .allowed_origin(&settings.get_protocol_and_hostname()) }; App::new() -- 2.44.1