dbca-utils 2.1.5__tar.gz → 2.2.0__tar.gz

{dbca_utils-2.1.5 → dbca_utils-2.2.0}/PKG-INFO

@@ -1,31 +1,29 @@
 Metadata-Version: 2.4
 Name: dbca-utils
-Version: 2.1.5
+Version: 2.2.0
 Summary: Utilities for DBCA Django apps
 Author-Email: Rocky Chen <rocky.chen@dbca.wa.gov.au>, Ashley Felton <ashley.felton@dbca.wa.gov.au>
 License-Expression: Apache-2.0
 Classifier: Framework :: Django
-Classifier: Framework :: Django :: 4.2
-Classifier: Framework :: Django :: 5.0
 Classifier: Framework :: Django :: 5.2
+Classifier: Framework :: Django :: 6.0
 Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Project-URL: Homepage, https://github.com/dbca-wa/dbca-utils
 Project-URL: Repository, https://github.com/dbca-wa/dbca-utils.git
-Project-URL: Changelog, https://github.com/dbca-wa/dbca-utils/blob/master/CHANGELOG.md
+Project-URL: Changelog, https://github.com/dbca-wa/dbca-utils/blob/main/CHANGELOG.md
 Project-URL: GitHub, https://github.com/dbca-wa/dbca-utils
-Requires-Python: <4.0,>=3.10
-Requires-Dist: django<6,>=4.2
-Requires-Dist: markupsafe==3.0.3
+Requires-Python: <4.0,>=3.12
+Requires-Dist: django<6.2,>=5.2
+Requires-Dist: markupsafe>=3.0.3
 Description-Content-Type: text/markdown
 
 # Overview
@@ -34,8 +32,8 @@ DBCA Django utility classes and functions.
 
 ## Requirements
 
-- Python 3.10 or later
-- Django 4.2 or later
+- Python 3.12 or later
+- Django 5.2 or later
 
 ## Development
 

{dbca_utils-2.1.5 → dbca_utils-2.2.0}/README.md

@@ -4,8 +4,8 @@ DBCA Django utility classes and functions.
 
 ## Requirements
 
-- Python 3.10 or later
-- Django 4.2 or later
+- Python 3.12 or later
+- Django 5.2 or later
 
 ## Development
 

{dbca_utils-2.1.5 → dbca_utils-2.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dbca-utils"
-version = "2.1.5"
+version = "2.2.0"
 description = "Utilities for DBCA Django apps"
 authors = [
     { name = "Rocky Chen", email = "rocky.chen@dbca.wa.gov.au" },
@@ -10,39 +10,37 @@ readme = "README.md"
 license = "Apache-2.0"
 classifiers = [
     "Framework :: Django",
-    "Framework :: Django :: 4.2",
-    "Framework :: Django :: 5.0",
     "Framework :: Django :: 5.2",
+    "Framework :: Django :: 6.0",
     "Environment :: Web Environment",
     "Intended Audience :: Developers",
     "Development Status :: 5 - Production/Stable",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Topic :: Software Development :: Libraries",
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
-requires-python = ">=3.10,<4.0"
+requires-python = ">=3.12,<4.0"
 dependencies = [
-    "django>=4.2,<6",
-    "markupsafe==3.0.3",
+    "django>=5.2,<6.2",
+    "markupsafe>=3.0.3",
 ]
 
 [project.urls]
 Homepage = "https://github.com/dbca-wa/dbca-utils"
 Repository = "https://github.com/dbca-wa/dbca-utils.git"
-Changelog = "https://github.com/dbca-wa/dbca-utils/blob/master/CHANGELOG.md"
+Changelog = "https://github.com/dbca-wa/dbca-utils/blob/main/CHANGELOG.md"
 GitHub = "https://github.com/dbca-wa/dbca-utils"
 
 [dependency-groups]
 dev = [
-    "pytest-django>=4.11.1",
+    "pytest-django>=4.12.0",
     "pytest-sugar>=1.1.1",
-    "tox>=4.31.0",
-    "tox-uv>=1.29.0",
+    "tox>=4.53.0",
+    "tox-uv>=1.35.0",
 ]
 
 [build-system]

{dbca_utils-2.1.5 → dbca_utils-2.2.0}/src/dbca_utils/middleware.py

@@ -116,7 +116,7 @@ class SSOLoginMiddleware(MiddlewareMixin):
         # Security check: if the logged-in request user's email does not match the email
         # returned from Auth2, invalidate the current request session and force a new session
         # using the returned SSO values.
-        if request.user.is_authenticated and request.user.email != request.META["HTTP_X_EMAIL"]:
+        if request.user.is_authenticated and request.user.email != request.META.get("HTTP_X_EMAIL", ""):
             logout(request)
 
         # Request user is not authenticated locally: obtain user attributes from the request.META dict
@@ -128,7 +128,7 @@ class SSOLoginMiddleware(MiddlewareMixin):
                 "last_name": "HTTP_X_LAST_NAME",
                 "first_name": "HTTP_X_FIRST_NAME",
             }
-            attributes = {"email": "", "username": ""}
+            attributes = {"username": ""}
 
             for key, meta_value in attributemap.items():
                 if meta_value in request.META:
@@ -147,11 +147,15 @@ class SSOLoginMiddleware(MiddlewareMixin):
             # a list of strings, or a single string.
             if hasattr(settings, "ALLOWED_EMAIL_SUFFIXES") and settings.ALLOWED_EMAIL_SUFFIXES:
                 if isinstance(settings.ALLOWED_EMAIL_SUFFIXES, str):
-                    allowed_email_suffixes = list(settings.ALLOWED_EMAIL_SUFFIXES)
+                    # If configured as a string, ALLOWED_EMAIL_SUFFIXES must be a comma-separated list (single-item list is OK).
+                    allowed_email_suffixes = settings.ALLOWED_EMAIL_SUFFIXES.split(",")
                 else:
                     allowed_email_suffixes = settings.ALLOWED_EMAIL_SUFFIXES
+                # Validation: allowed_email_suffixes must be a list of strings.
+                if not (isinstance(allowed_email_suffixes, list) and all(isinstance(x, str) for x in allowed_email_suffixes)):
+                    raise ValueError("ALLOWED_EMAIL_SUFFIXES must be a list of strings")
                 # If the user email suffix is not in the allowed list, return a 404 response.
-                if not any([attributes["email"].lower().endswith(suffix) for suffix in allowed_email_suffixes]):
+                if not any([attributes["email"].lower().endswith(suffix.lower().strip()) for suffix in allowed_email_suffixes]):
                     return http.HttpResponseForbidden()
 
             # Check for an existing User instance.