altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

ci: allow override of csrf_trusted_origins

Browse source
This commit is contained in:
Jennifer Richards 2024-04-12 17:17:25 -03:00 committed by Nicolas Giard
parent e99286f400
commit 39d2199a74
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
helm/settings_local.py
View file

@ -14,6 +14,11 @@ def _remove_whitespace_and_b64decode(s):
return b64decode("".join(s.split())) return b64decode("".join(s.split()))
def _multiline_to_list(s):
"""Helper to split at newlines and conver to list"""
return [item.strip() for item in s.split("\n")]
# Default to "development". Production _must_ set DATATRACKER_SERVER_MODE="production" in the env! # Default to "development". Production _must_ set DATATRACKER_SERVER_MODE="production" in the env!
SERVER_MODE = os.environ.get("DATATRACKER_SERVER_MODE", "development") SERVER_MODE = os.environ.get("DATATRACKER_SERVER_MODE", "development")
@ -78,7 +83,7 @@ DEBUG = os.environ.get("DATATRACKER_DEBUG", "false").lower() == "true"
# DATATRACKER_ALLOWED_HOSTS env var is a comma-separated list of allowed hosts # DATATRACKER_ALLOWED_HOSTS env var is a comma-separated list of allowed hosts
_allowed_hosts_str = os.environ.get("DATATRACKER_ALLOWED_HOSTS", None) _allowed_hosts_str = os.environ.get("DATATRACKER_ALLOWED_HOSTS", None)
if _allowed_hosts_str is not None: if _allowed_hosts_str is not None:
ALLOWED_HOSTS = [h.strip() for h in _allowed_hosts_str.split("\n")] ALLOWED_HOSTS = _multiline_to_list(_allowed_hosts_str)
DATABASES = { DATABASES = {
"default": { "default": {
@ -92,9 +97,9 @@ DATABASES = {
} }
# DATATRACKER_ADMINS is a newline-delimited list of addresses parseable by email.utils.parseaddr # DATATRACKER_ADMINS is a newline-delimited list of addresses parseable by email.utils.parseaddr
_ADMINS = os.environ.get("DATATRACKER_ADMINS", None) _admins_str = os.environ.get("DATATRACKER_ADMINS", None)
if _ADMINS is not None: if _admins_str is not None:
ADMINS = [parseaddr(admin) for admin in _ADMINS.split("\n")] ADMINS = [parseaddr(admin) for admin in _multiline_to_list(_admins_str)]
else: else:
raise RuntimeError("DATATRACKER_ADMINS must be set") raise RuntimeError("DATATRACKER_ADMINS must be set")
@ -250,3 +255,7 @@ CACHES = {
}, },
}, },
} }
_csrf_trusted_origins_str = os.environ.get("DATATRACKER_CSRF_TRUSTED_ORIGINS")
if _csrf_trusted_origins_str is not None:
CSRF_TRUSTED_ORIGINS = _multiline_to_list(_csrf_trusted_origins_str)

4
helm/values.yaml
View file

@ -657,3 +657,7 @@ env:
CELERY_PASSWORD: "this-is-a-secret" # secret CELERY_PASSWORD: "this-is-a-secret" # secret
DATATRACKER_APP_API_TOKENS_JSON: "{}" # secret DATATRACKER_APP_API_TOKENS_JSON: "{}" # secret
# use this to override default - one entry per line
# DATATRACKER_CSRF_TRUSTED_ORIGINS: |-
# https://datatracker.staging.ietf.org