Merge pull request #31 from MaziniiX/main

fix csrf list
basilelt · Jun 21, 2024 · 98ac9f5 · 98ac9f5
2 parents df65bfe + 053106c
commit 98ac9f5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/Django_Frontend/monprojet/monprojet/settings.py b/Django_Frontend/monprojet/monprojet/settings.py
@@ -47,7 +47,7 @@
 if ENVIRONMENT == 'development' or ENVIRONMENT == 'test':
     ALLOWED_HOSTS = ['*']
 else:
-    ALLOWED_HOSTS = "api" + os.getenv('DOMAIN')
+    ALLOWED_HOSTS = [os.getenv('DOMAIN')]
 
 # Application definition
 
@@ -71,8 +71,8 @@
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 ]
 
-if ENVIRONMENT == 'production':
-    CSRF_TRUSTED_ORIGINS = os.getenv('DJANGO_ORIGIN').split(',')
+if ENVIRONMENT != 'development':
+    CSRF_TRUSTED_ORIGINS = ["https://" + os.getenv('DOMAIN')]
 
 ROOT_URLCONF = 'monprojet.urls'
 

diff --git a/Django_api/airline/airline/settings.py b/Django_api/airline/airline/settings.py
@@ -39,7 +39,7 @@
 if ENVIRONMENT == 'development' or ENVIRONMENT == 'test':
     ALLOWED_HOSTS = ['*']
 else:
-    ALLOWED_HOSTS = "api" + os.getenv('DOMAIN')
+    ALLOWED_HOSTS = ["api" + os.getenv('DOMAIN')]
 
 
 
@@ -68,8 +68,8 @@
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 ]
 
-if ENVIRONMENT == 'production':
-    CSRF_TRUSTED_ORIGINS = "https://api." + os.getenv('DOMAIN')
+if ENVIRONMENT != 'development':
+    CSRF_TRUSTED_ORIGINS = ["https://api." + os.getenv('DOMAIN')]
 
 ROOT_URLCONF = 'airline.urls'
 

diff --git a/Docker-test/docker-compose.yml b/Docker-test/docker-compose.yml
@@ -56,6 +56,7 @@ services:
       context: ../
       dockerfile: ./Docker-test/API/Dockerfile
     environment:
+      DOMAIN: ${DOMAIN}
       DJANGO_ENVIRONMENT: ${DJANGO_ENVIRONMENT}
       DJANGO_DB_NAME: ${POSTGRES_DB}
       DJANGO_DB_USER: ${POSTGRES_USER}
@@ -83,6 +84,7 @@ services:
       context: ../
       dockerfile: ./Docker-test/Frontend/Django/Dockerfile
     environment:
+      DOMAIN: ${DOMAIN}
       DJANGO_ENVIRONMENT: ${DJANGO_ENVIRONMENT}
       DJANGO_DB_NAME: ${POSTGRES_DB}
       DJANGO_DB_USER: ${POSTGRES_USER}