From 575e578029ccea93639bcd417aebe14b5acd01e8 Mon Sep 17 00:00:00 2001 From: UsamaSadiq Date: Tue, 3 Oct 2023 16:25:20 +0500 Subject: [PATCH 1/4] fix: add conditional trusted origins update --- registrar/settings/production.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/registrar/settings/production.py b/registrar/settings/production.py index 3ac51fa2c..95ca1cc5b 100644 --- a/registrar/settings/production.py +++ b/registrar/settings/production.py @@ -1,4 +1,5 @@ from os import environ +import django import yaml from registrar.settings.base import * @@ -53,3 +54,6 @@ CELERY_BROKER_HOSTNAME, CELERY_BROKER_VHOST ) + +if django.VERSION[0] >= 4: # for greater than django 3.2 use schemes. + CSRF_TRUSTED_ORIGINS = CSRF_TRUSTED_ORIGINS_WITH_SCHEME From 96eb2ba380a8d752f150767e5b6be05a914ab819 Mon Sep 17 00:00:00 2001 From: UsamaSadiq Date: Tue, 3 Oct 2023 18:18:41 +0500 Subject: [PATCH 2/4] fix: add default base setting --- registrar/settings/base.py | 1 + 1 file changed, 1 insertion(+) diff --git a/registrar/settings/base.py b/registrar/settings/base.py index 571092e36..2a9d4404b 100644 --- a/registrar/settings/base.py +++ b/registrar/settings/base.py @@ -325,6 +325,7 @@ SESSION_EXPIRE_AT_BROWSER_CLOSE = False STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.StaticFilesStorage' CSRF_TRUSTED_ORIGINS = [] +CSRF_TRUSTED_ORIGINS_WITH_SCHEME = [] # temporary setting for Django 4.2 support CACHES = { 'default': { 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache', From 867bd5b18bd6b810405ca35aca59285d04edc581 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Fri, 6 Oct 2023 17:39:45 +0500 Subject: [PATCH 3/4] chore: Update base.py --- registrar/settings/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/registrar/settings/base.py b/registrar/settings/base.py index 2a9d4404b..16ad0cba6 100644 --- a/registrar/settings/base.py +++ b/registrar/settings/base.py @@ -325,7 +325,7 @@ SESSION_EXPIRE_AT_BROWSER_CLOSE = False STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.StaticFilesStorage' CSRF_TRUSTED_ORIGINS = [] -CSRF_TRUSTED_ORIGINS_WITH_SCHEME = [] # temporary setting for Django 4.2 support +CSRF_TRUSTED_ORIGINS_WITH_SCHEMES = [] # temporary setting for Django 4.2 support CACHES = { 'default': { 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache', From fba55862c341c5bceecadafa08647920ad82c672 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Fri, 6 Oct 2023 17:40:13 +0500 Subject: [PATCH 4/4] chore: Update production.py --- registrar/settings/production.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/registrar/settings/production.py b/registrar/settings/production.py index 95ca1cc5b..874e8c29e 100644 --- a/registrar/settings/production.py +++ b/registrar/settings/production.py @@ -56,4 +56,4 @@ ) if django.VERSION[0] >= 4: # for greater than django 3.2 use schemes. - CSRF_TRUSTED_ORIGINS = CSRF_TRUSTED_ORIGINS_WITH_SCHEME + CSRF_TRUSTED_ORIGINS = CSRF_TRUSTED_ORIGINS_WITH_SCHEMES