diff --git a/bin/update_openapi_schema b/bin/update-openapi-schema similarity index 100% rename from bin/update_openapi_schema rename to bin/update-openapi-schema diff --git a/src/backend/meet/settings.py b/src/backend/meet/settings.py index d59dc233..96a53ea5 100755 --- a/src/backend/meet/settings.py +++ b/src/backend/meet/settings.py @@ -12,6 +12,7 @@ https://docs.djangoproject.com/en/3.1/ref/settings/ import json import os +from socket import gethostbyname, gethostname from django.utils.translation import gettext_lazy as _ @@ -514,7 +515,11 @@ class Production(Base): """ # Security - ALLOWED_HOSTS = values.ListValue(None) + ALLOWED_HOSTS = [ + *values.ListValue([], environ_name="ALLOWED_HOSTS"), + gethostbyname(gethostname()), + ] + CSRF_TRUSTED_ORIGINS = values.ListValue([]) SECURE_BROWSER_XSS_FILTER = True SECURE_CONTENT_TYPE_NOSNIFF = True diff --git a/src/helm/env.d/dev/values.meet.yaml.gotmpl b/src/helm/env.d/dev/values.meet.yaml.gotmpl index 03a21dd7..46519b41 100644 --- a/src/helm/env.d/dev/values.meet.yaml.gotmpl +++ b/src/helm/env.d/dev/values.meet.yaml.gotmpl @@ -8,7 +8,7 @@ backend: envVars: DJANGO_CSRF_TRUSTED_ORIGINS: https://meet.127.0.0.1.nip.io,http://meet.127.0.0.1.nip.io DJANGO_CONFIGURATION: Production - DJANGO_ALLOWED_HOSTS: "*" + DJANGO_ALLOWED_HOSTS: meet.127.0.0.1.nip.io DJANGO_SECRET_KEY: {{ .Values.djangoSecretKey }} DJANGO_SETTINGS_MODULE: meet.settings DJANGO_SILENCED_SYSTEM_CHECKS: security.W004, security.W008 diff --git a/src/helm/env.d/preprod/values.meet.yaml.gotmpl b/src/helm/env.d/preprod/values.meet.yaml.gotmpl index 80804cdd..5bada2d6 100644 --- a/src/helm/env.d/preprod/values.meet.yaml.gotmpl +++ b/src/helm/env.d/preprod/values.meet.yaml.gotmpl @@ -10,7 +10,7 @@ backend: envVars: DJANGO_CSRF_TRUSTED_ORIGINS: http://meet-preprod.beta.numerique.gouv.fr,https://meet-preprod.beta.numerique.gouv.fr DJANGO_CONFIGURATION: Production - DJANGO_ALLOWED_HOSTS: "*" + DJANGO_ALLOWED_HOSTS: meet-preprod.beta.numerique.gouv.fr DJANGO_SUPERUSER_EMAIL: secretKeyRef: name: backend diff --git a/src/helm/env.d/production/values.meet.yaml.gotmpl b/src/helm/env.d/production/values.meet.yaml.gotmpl index b16ca097..a2d30e2d 100644 --- a/src/helm/env.d/production/values.meet.yaml.gotmpl +++ b/src/helm/env.d/production/values.meet.yaml.gotmpl @@ -10,7 +10,7 @@ backend: envVars: DJANGO_CSRF_TRUSTED_ORIGINS: https://meet.numerique.gouv.fr DJANGO_CONFIGURATION: Production - DJANGO_ALLOWED_HOSTS: "*" + DJANGO_ALLOWED_HOSTS: meet.numerique.gouv.fr DJANGO_SECRET_KEY: secretKeyRef: name: backend diff --git a/src/helm/env.d/staging/values.meet.yaml.gotmpl b/src/helm/env.d/staging/values.meet.yaml.gotmpl index 7dcaa71c..18a3e243 100644 --- a/src/helm/env.d/staging/values.meet.yaml.gotmpl +++ b/src/helm/env.d/staging/values.meet.yaml.gotmpl @@ -10,7 +10,7 @@ backend: envVars: DJANGO_CSRF_TRUSTED_ORIGINS: http://meet-staging.beta.numerique.gouv.fr,https://meet-staging.beta.numerique.gouv.fr DJANGO_CONFIGURATION: Production - DJANGO_ALLOWED_HOSTS: "*" + DJANGO_ALLOWED_HOSTS: meet-staging.beta.numerique.gouv.fr DJANGO_SECRET_KEY: secretKeyRef: name: backend