From 641cc361a2a33d15e0e2810e2829913f919459e7 Mon Sep 17 00:00:00 2001 From: MerlinScheurer Date: Sun, 26 Jan 2025 20:22:52 +0100 Subject: [PATCH 1/3] Fix add port to TA_HOST parsing for cors --- backend/common/src/helper.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/backend/common/src/helper.py b/backend/common/src/helper.py index 3a487e63..b7140886 100644 --- a/backend/common/src/helper.py +++ b/backend/common/src/helper.py @@ -218,7 +218,13 @@ def ta_host_parser(ta_host: str) -> tuple[list[str], list[str]]: parsed = urlparse(host_clean) allowed_hosts.append(f"{parsed.hostname}") - csrf_trusted_origins.append(f"{parsed.scheme}://{parsed.hostname}") + + cors_url = f"{parsed.scheme}://{parsed.hostname}" + + if parsed.port: + cors_url = f"{cors_url}:{parsed.port}" + + csrf_trusted_origins.append(cors_url) return allowed_hosts, csrf_trusted_origins From a4978f5ae97b695ab64c61894ba9343d9afb2e39 Mon Sep 17 00:00:00 2001 From: MerlinScheurer Date: Sun, 26 Jan 2025 20:30:29 +0100 Subject: [PATCH 2/3] fix pre-commit - black --- backend/common/src/helper.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/backend/common/src/helper.py b/backend/common/src/helper.py index b7140886..90b9e068 100644 --- a/backend/common/src/helper.py +++ b/backend/common/src/helper.py @@ -218,9 +218,8 @@ def ta_host_parser(ta_host: str) -> tuple[list[str], list[str]]: parsed = urlparse(host_clean) allowed_hosts.append(f"{parsed.hostname}") - cors_url = f"{parsed.scheme}://{parsed.hostname}" - + if parsed.port: cors_url = f"{cors_url}:{parsed.port}" From 73bd3924885a278af3879988d84d03f48df71788 Mon Sep 17 00:00:00 2001 From: Simon Date: Mon, 27 Jan 2025 16:36:19 +0700 Subject: [PATCH 3/3] parse unix connection string for redis socket --- backend/task/celery.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/backend/task/celery.py b/backend/task/celery.py index b7af1ba0..68e36559 100644 --- a/backend/task/celery.py +++ b/backend/task/celery.py @@ -5,12 +5,21 @@ import os from celery import Celery from common.src.env_settings import EnvironmentSettings + +def con_parser(): + """allow for unix socket parsing""" + redis_con = EnvironmentSettings.REDIS_CON + if redis_con.startswith("unix://"): + redis_con = EnvironmentSettings.REDIS_CON.replace( + "unix://", "redis+socket://", 1 + ) + + return redis_con + + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings") app = Celery( - "tasks", - broker=EnvironmentSettings.REDIS_CON, - backend=EnvironmentSettings.REDIS_CON, - result_extended=True, + "tasks", broker=con_parser(), backend=con_parser(), result_extended=True ) app.config_from_object( "django.conf:settings", namespace=EnvironmentSettings.REDIS_NAME_SPACE