Develop

.github/workflows/cicd.yml

@@ -13,12 +13,11 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     strategy:
       matrix:
         django-version:
-          - '2.2'
           - '3.2'
           - '4.2'
 
@@ -29,7 +28,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version: '3.10'
 
       - name: Install Test Dependencies
         run: |
@@ -52,7 +51,7 @@ jobs:
   build:
     needs: test
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout Repo
@@ -61,7 +60,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version: '3.10'
 
       - name: Set up tags
         id: tags

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:20.04 as django-container
+FROM ubuntu:22.04 as django-container
 WORKDIR /app/
 ENV PYTHONUNBUFFERED 1
 ENV TZ America/Los_Angeles
@@ -23,7 +23,7 @@ RUN apt-get update -y && \
   openssl \
   pkg-config \
   python-setuptools \
-  python3.8-dev \
+  python3.10-dev \
   python3-venv \
   python3-pip \
   sqlite3 \

project/base_settings/common.py

@@ -12,6 +12,8 @@
         os.getenv('HOSTNAME'),                          # Internal hostname
         socket.gethostbyname(os.getenv('HOSTNAME')),    # IP
     ]
+    # Apps that support multiple external hostnames will need to extend this list
+    CSRF_TRUSTED_ORIGINS = ['https://' + os.getenv('CLUSTER_CNAME')]
 
 if os.getenv('ENV', 'localdev') == 'localdev':
     SECRET_KEY = os.getenv('DJANGO_SECRET', get_random_secret_key())

project/mail/backends.py

@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from django.core.mail.backends.smtp import EmailBackend as SMTPBackend

scripts/call_command.py

@@ -1,4 +1,4 @@
-# Copyright 2021 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import django

scripts/management_command.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright 2021 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from call_command import CallCommand

scripts/management_daemon.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright 2021 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from call_command import CallCommand

tests/test_settings/test_common.py

@@ -26,6 +26,12 @@ def test_notlocaldev_without_django_secret(self):
         with SettingLoader('project.base_settings', ENV='notlocaldev') as base_settings:
             self.assertIsNone(base_settings.SECRET_KEY)
 
+class TestAllowedHosts(TestCase):
+    def test_allowed_hosts(self):
+        with SettingLoader('project.base_settings', ENV='notlocaldev', CLUSTER_CNAME='test.edu', HOSTNAME='1.2.3.4') as base_settings:
+            self.assertEqual(base_settings.ALLOWED_HOSTS, ['test.edu', '1.2.3.4', '1.2.3.4'])
+            self.assertEqual(base_settings.CSRF_TRUSTED_ORIGINS, ['https://test.edu'])
+
 class TestInstalledApps(TestCase):
     def test_contains_required_apps(self):
         with SettingLoader('project.base_settings') as base_settings: