django-pfx 1.7.6.dev9__tar.gz → 1.7.6.dev13__tar.gz

{django_pfx-1.7.6.dev9 → django_pfx-1.7.6.dev13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.7.6.dev9
+Version: 1.7.6.dev13
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com

{django_pfx-1.7.6.dev9 → django_pfx-1.7.6.dev13}/django_pfx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.7.6.dev9
+Version: 1.7.6.dev13
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com

{django_pfx-1.7.6.dev9 → django_pfx-1.7.6.dev13}/django_pfx.egg-info/SOURCES.txt

@@ -250,6 +250,7 @@ tests/tests/test_user_websocket.py
 tests/tests/test_version_check.py
 tests/tests/test_view_decorators.py
 tests/tests/test_view_fields.py
+tests/tests/test_ws_cookie_middleware.py
 tests_base_user/__init__.py
 tests_base_user/urls.py
 tests_base_user/views.py

{django_pfx-1.7.6.dev9 → django_pfx-1.7.6.dev13}/django_pfx.egg-info/scm_file_list.json

@@ -241,6 +241,7 @@
     "tests/tests/test_version_check.py",
     "tests/tests/test_view_decorators.py",
     "tests/tests/test_view_fields.py",
+    "tests/tests/test_ws_cookie_middleware.py",
     "tests/urls.py",
     "tests/views.py",
     "tests_base_user/__init__.py",

django_pfx-1.7.6.dev13/django_pfx.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "1.7.5",
+  "distance": 13,
+  "node": "ge2688ed2e503d5fd499e73d8edb4fd9f28499922",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-09-24"
+}

{django_pfx-1.7.6.dev9 → django_pfx-1.7.6.dev13}/pfx/pfxcore/locale/fr/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-08-12 16:15+0200\n"
+"POT-Creation-Date: 2026-09-24 07:09+0200\n"
 "PO-Revision-Date: 2021-06-22 23:31+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -206,8 +206,8 @@ msgid ""
 "You’re receiving this email because you requested an authentication code at "
 "%(site_name)s."
 msgstr ""
-"Vous recevez cet e-mail parce que vous avez demandé un code d’authentification "
-"sur %(site_name)s."
+"Vous recevez cet e-mail parce que vous avez demandé un code "
+"d’authentification sur %(site_name)s."
 
 #: templates/registration/otp_code_email.txt:4
 msgid "Authentication code:"
@@ -323,7 +323,7 @@ msgstr ""
 msgid "Invalid value for {filter} filter"
 msgstr "Valeur invalide pour le filtre {filter}"
 
-#: views/media_rest_view_mixin.py:37 views/media_rest_view_mixin.py:125
+#: views/media_rest_view_mixin.py:38 views/media_rest_view_mixin.py:126
 msgid "Unexpected storage error"
 msgstr "Erreur de stockage inattendue"
 

django_pfx-1.7.6.dev13/pfx/pfxcore/middleware/ws_cookie_authentication_middleware.py

@@ -0,0 +1,60 @@
+import logging
+
+from django.contrib.auth.models import AnonymousUser
+from django.core.exceptions import ImproperlyConfigured
+from django.http import parse_cookie
+
+from pfx.pfxcore.middleware.authentication import JWTTokenDecodeMixin
+
+logger = logging.getLogger(__name__)
+
+try:
+    from channels.db import database_sync_to_async
+    from channels.middleware import BaseMiddleware
+except ImportError as e:
+    # Channels is only needed by the projects serving websockets, but
+    # naming any middleware of `pfx.pfxcore.middleware` makes Django
+    # import the whole package: this module has to stay importable
+    # without it. The error is raised when the middleware is used.
+    CHANNELS_IMPORT_ERROR = e
+    database_sync_to_async = None
+    BaseMiddleware = object
+else:
+    CHANNELS_IMPORT_ERROR = None
+
+
+class WSCookieAuthenticationMiddleware(JWTTokenDecodeMixin, BaseMiddleware):
+    def __init__(self, *args, **kwargs):
+        if CHANNELS_IMPORT_ERROR:
+            raise ImproperlyConfigured(
+                f'Missing channels: {CHANNELS_IMPORT_ERROR}\n'
+                "PFX CONFIGURATION ERROR: You have to install channels "
+                "to use [pfx.pfxcore.middleware."
+                f"{self.__class__.__name__}]:\n"
+                "pip install channels\n"
+                "(and a websocket server, for instance with "
+                "`pip install channels[daphne]`)"
+            ) from CHANNELS_IMPORT_ERROR
+        super().__init__(*args, **kwargs)
+
+    async def __call__(self, scope, receive, send):
+        if scope.get("user") is not None:
+            return await super().__call__(scope, receive, send)
+
+        headers = dict(scope.get("headers", []))
+        cookies = {}
+        if b"cookie" in headers:
+            cookies = parse_cookie(headers[b"cookie"].decode())
+
+        key = cookies.get("token")
+        if key:
+            try:
+                user, __, __ = await database_sync_to_async(
+                    self.decode_jwt)(key)
+            except Exception as e:
+                logger.exception(e, exc_info=True)
+                user = AnonymousUser()
+        else:
+            user = AnonymousUser()
+        scope['user'] = user
+        return await super().__call__(scope, receive, send)

{django_pfx-1.7.6.dev9 → django_pfx-1.7.6.dev13}/pfx/pfxcore/views/media_rest_view_mixin.py

@@ -3,6 +3,7 @@ import logging
 from django.core.exceptions import FieldDoesNotExist
 from django.http import FileResponse, HttpResponse
 from django.shortcuts import redirect
+from django.utils.http import content_disposition_header
 from django.utils.translation import gettext_lazy as _
 
 from pfx.pfxcore.decorator import rest_api
@@ -42,8 +43,8 @@ def get_media_field_response(obj, field, request):
         inline = get_bool(request.GET, "inline")
         if settings.STORAGE_LOCAL_X_ACCEL_REDIRECT:
             response = HttpResponse()
-            response["Content-Disposition"] = (
-                f"{"inline" if inline else "attachment"}; filename={filename}")
+            response["Content-Disposition"] = content_disposition_header(
+                not inline, filename)
             response["Content-Type"] = attr.get('content-type', '')
             response['X-Accel-Redirect'] = (
                 f"/filestore/{attr.get('key')}")

{django_pfx-1.7.6.dev9 → django_pfx-1.7.6.dev13}/tests/tests/__init__.py

@@ -39,3 +39,4 @@ from .test_user_queryset import TestUserQuerySet
 from .test_user_websocket import TestUserWebsocket
 from .test_view_decorators import ViewDecoratorTest
 from .test_view_fields import ViewFieldTest
+from .test_ws_cookie_middleware import TestWSCookieMiddleware

{django_pfx-1.7.6.dev9 → django_pfx-1.7.6.dev13}/tests/tests/basic_api_test.py

@@ -840,6 +840,41 @@ class BasicAPITest(TestAssertMixin, TestCase):
         self.assertJE(response, 'local_file', None)
         self.assertFalse(Path(f'/tmp/django-pfx-filestore/{key2}').exists())
 
+    def test_get_file_content_disposition(self):
+        """The file name must survive both local serving paths.
+
+        The name holds "…", outside latin-1: written by hand into the
+        X-Accel header, it made Django MIME-encode the whole value
+        (`=?utf-8?q?…?=`), which browsers cannot read, so "inline" was
+        lost. The ";" would also have cut the unquoted name short.
+        FileResponse is checked too, as both paths must agree.
+        """
+        response = self.client.post('/api/books', dict(
+            name="Test Book",
+            author=self.author1.pk,
+            pub_date='2000-01-01',
+            local_file=dict(
+                name='Crédit; école[…].txt',
+                base64='data:text/plain;charset=utf-8;'
+                'base64,VGVzdCBjb250ZW50')))
+        self.assertRC(response, 200)
+        url = f"/api/books/{self.get_val(response, 'pk')}/local_file"
+        name = (
+            "filename*=utf-8''"
+            "Cr%C3%A9dit%3B%20%C3%A9cole%5B%E2%80%A6%5D.txt")
+
+        for x_accel in (True, False):
+            with override_settings(STORAGE_LOCAL_X_ACCEL_REDIRECT=x_accel):
+                response = self.client.get(url)
+                self.assertRC(response, 200)
+                self.assertEqual(
+                    response['Content-Disposition'], f"attachment; {name}")
+
+                response = self.client.get(f"{url}?inline=true")
+                self.assertRC(response, 200)
+                self.assertEqual(
+                    response['Content-Disposition'], f"inline; {name}")
+
     def test_create_null_values(self):
         response = self.client.post(
             '/api/books', dict(

{django_pfx-1.7.6.dev9 → django_pfx-1.7.6.dev13}/tests/tests/test_user_job_api.py

@@ -353,7 +353,7 @@ class TestUserJobApi(TestAssertMixin, TestCase):
             self.assertRC(response, 200)
             self.assertEqual(
                 response.headers['Content-Disposition'],
-                "attachment; filename=test.txt")
+                'attachment; filename="test.txt"')
             self.assertEqual(
                 response.headers['X-Accel-Redirect'],
                 f"/filestore/{att.file['key']}")

django_pfx-1.7.6.dev13/tests/tests/test_ws_cookie_middleware.py

@@ -0,0 +1,30 @@
+import logging
+from unittest.mock import patch
+
+from django.core.exceptions import ImproperlyConfigured
+from django.test import TestCase
+
+from pfx.pfxcore.middleware import WSCookieAuthenticationMiddleware
+from pfx.pfxcore.middleware import ws_cookie_authentication_middleware as mod
+
+logger = logging.getLogger(__name__)
+
+
+class TestWSCookieMiddleware(TestCase):
+    """Channels is an optional dependency: naming any middleware of
+    `pfx.pfxcore.middleware` makes Django import the whole package, so a
+    project serving no websocket must not need it installed."""
+
+    def test_module_is_importable_without_channels(self):
+        # The module is already imported: reaching this point at all
+        # means the package did not require channels at import time.
+        self.assertIsNone(mod.CHANNELS_IMPORT_ERROR)
+
+    def test_middleware_reports_the_missing_dependency(self):
+        error = ImportError("No module named 'channels'")
+        with patch.object(mod, 'CHANNELS_IMPORT_ERROR', error):
+            with self.assertRaises(ImproperlyConfigured) as ctx:
+                WSCookieAuthenticationMiddleware(lambda *a: None)
+        message = str(ctx.exception)
+        self.assertIn("No module named 'channels'", message)
+        self.assertIn('pip install channels', message)

django_pfx-1.7.6.dev9/django_pfx.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "1.7.5",
-  "distance": 9,
-  "node": "g7626d2f586fb8dbaa121ce3d2676a0e0c185f7fe",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-09-01"
-}

django_pfx-1.7.6.dev9/pfx/pfxcore/middleware/ws_cookie_authentication_middleware.py

@@ -1,35 +0,0 @@
-import logging
-
-from django.contrib.auth.models import AnonymousUser
-from django.http import parse_cookie
-
-from channels.db import database_sync_to_async
-from channels.middleware import BaseMiddleware
-
-from pfx.pfxcore.middleware.authentication import JWTTokenDecodeMixin
-
-logger = logging.getLogger(__name__)
-
-
-class WSCookieAuthenticationMiddleware(JWTTokenDecodeMixin, BaseMiddleware):
-    async def __call__(self, scope, receive, send):
-        if scope.get("user") is not None:
-            return await super().__call__(scope, receive, send)
-
-        headers = dict(scope.get("headers", []))
-        cookies = {}
-        if b"cookie" in headers:
-            cookies = parse_cookie(headers[b"cookie"].decode())
-
-        key = cookies.get("token")
-        if key:
-            try:
-                user, __, __ = await database_sync_to_async(
-                    self.decode_jwt)(key)
-            except Exception as e:
-                logger.exception(e, exc_info=True)
-                user = AnonymousUser()
-        else:
-            user = AnonymousUser()
-        scope['user'] = user
-        return await super().__call__(scope, receive, send)