Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: make ALLOWED_HOSTS configurable through YAML

Browse Source
This commit is contained in:
Muhammad Arslan Abdul Rauf
2025-09-15 21:06:03 +05:00
parent 430aed041d
commit b39e6ff20e
2 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cms/envs/production.py
View File

@@ -89,6 +89,7 @@ with codecs.open(CONFIG_FILE, encoding='utf-8') as f:
'EVENT_BUS_PRODUCER_CONFIG', 'EVENT_BUS_PRODUCER_CONFIG',
'DEFAULT_FILE_STORAGE', 'DEFAULT_FILE_STORAGE',
'STATICFILES_STORAGE', 'STATICFILES_STORAGE',
'ALLOWED_HOSTS',
] ]
}) })
@@ -139,11 +140,19 @@ if STATIC_ROOT_BASE:
DATA_DIR = path(DATA_DIR) DATA_DIR = path(DATA_DIR)
ALLOWED_HOSTS = [ # Configure ALLOWED_HOSTS based on YAML configuration
# TODO: bbeggs remove this before prod, temp fix to get load testing running # If ALLOWED_HOSTS is explicitly set in YAML, use that; otherwise include "*" as fallback
"*", if 'ALLOWED_HOSTS' in _YAML_TOKENS:
CMS_BASE, # User has explicitly configured ALLOWED_HOSTS in YAML
] ALLOWED_HOSTS = _YAML_TOKENS['ALLOWED_HOSTS']
else:
# Default behavior: include wildcard and CMS_BASE
ALLOWED_HOSTS = [
"*",
]
if CMS_BASE and CMS_BASE not in ALLOWED_HOSTS:
ALLOWED_HOSTS.append(CMS_BASE)
# Cache used for location mapping -- called many times with the same key/value # Cache used for location mapping -- called many times with the same key/value
# in a given request. # in a given request.

19
lms/envs/production.py
View File

@@ -84,6 +84,7 @@ with codecs.open(CONFIG_FILE, encoding='utf-8') as f:
'EVENT_BUS_PRODUCER_CONFIG', 'EVENT_BUS_PRODUCER_CONFIG',
'DEFAULT_FILE_STORAGE', 'DEFAULT_FILE_STORAGE',
'STATICFILES_STORAGE', 'STATICFILES_STORAGE',
'ALLOWED_HOSTS',
] ]
}) })
@@ -141,10 +142,20 @@ SESSION_COOKIE_SAMESITE = DCS_SESSION_COOKIE_SAMESITE
for feature, value in _YAML_TOKENS.get('FEATURES', {}).items(): for feature, value in _YAML_TOKENS.get('FEATURES', {}).items():
FEATURES[feature] = value FEATURES[feature] = value
ALLOWED_HOSTS = [ # Configure ALLOWED_HOSTS based on YAML configuration
"*", # If ALLOWED_HOSTS is explicitly set in YAML, use that; otherwise include "*" as fallback
_YAML_TOKENS.get('LMS_BASE'), if 'ALLOWED_HOSTS' in _YAML_TOKENS:
] # User has explicitly configured ALLOWED_HOSTS in YAML
ALLOWED_HOSTS = _YAML_TOKENS['ALLOWED_HOSTS']
else:
# Default behavior: include wildcard and LMS_BASE
ALLOWED_HOSTS = [
"*",
]
LMS_BASE = _YAML_TOKENS.get('LMS_BASE')
if LMS_BASE and LMS_BASE not in ALLOWED_HOSTS:
ALLOWED_HOSTS.append(LMS_BASE)
# Cache used for location mapping -- called many times with the same key/value # Cache used for location mapping -- called many times with the same key/value
# in a given request. # in a given request.