From 68fbb766ddcda4b3b54f7623175e276e29465c9b Mon Sep 17 00:00:00 2001 From: gecBurton Date: Tue, 15 Oct 2024 10:10:46 +0100 Subject: [PATCH] just guessing at this stage --- .../redbox_app/redbox_core/views/chat_views.py | 1 + django_app/redbox_app/settings.py | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/django_app/redbox_app/redbox_core/views/chat_views.py b/django_app/redbox_app/redbox_core/views/chat_views.py index 9f3c0802f..c319a7f4a 100644 --- a/django_app/redbox_app/redbox_core/views/chat_views.py +++ b/django_app/redbox_app/redbox_core/views/chat_views.py @@ -33,6 +33,7 @@ def get(self, request: HttpRequest, chat_id: uuid.UUID | None = None) -> HttpRes if current_chat.user != request.user: return redirect(reverse("chats")) messages = ChatMessage.get_messages_ordered_by_citation_priority(chat_id) + endpoint = URL.build( scheme=settings.WEBSOCKET_SCHEME, host="localhost" if settings.ENVIRONMENT.is_test else request.META["SERVER_NAME"], diff --git a/django_app/redbox_app/settings.py b/django_app/redbox_app/settings.py index 64c93b416..603884b05 100644 --- a/django_app/redbox_app/settings.py +++ b/django_app/redbox_app/settings.py @@ -5,6 +5,7 @@ from urllib.parse import urlparse import environ +import requests import sentry_sdk from django.urls import reverse_lazy from dotenv import load_dotenv @@ -13,7 +14,7 @@ from storages.backends import s3boto3 from yarl import URL -from redbox_app.setting_enums import LOCAL_HOSTS, Classification, Environment +from redbox_app.setting_enums import Classification, Environment load_dotenv() @@ -202,9 +203,17 @@ "eu-assets.i.posthog.com", ] -if ENVIRONMENT.is_test: - for host in LOCAL_HOSTS: - CSP_CONNECT_SRC.append(f"{WEBSOCKET_SCHEME}://{host}:*/ws/chat/") + +def get_public_ip(): + response = requests.get("http://checkip.amazonaws.com", timeout=5) + response.raise_for_status() + return response.text.strip() + + +another_host = "localhost" if ENVIRONMENT.is_test else get_public_ip + +CSP_CONNECT_SRC.append(f"{WEBSOCKET_SCHEME}://{another_host}/ws/chat/") +CSP_CONNECT_SRC.append(f"{WEBSOCKET_SCHEME}://{another_host}") # https://pypi.org/project/django-permissions-policy/