meringue 1.2.0.dev5__tar.gz → 1.2.0.dev6__tar.gz

{meringue-1.2.0.dev5 → meringue-1.2.0.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: meringue
-Version: 1.2.0.dev5
+Version: 1.2.0.dev6
 Summary: A set of various functionality for a Django based web application.
 Project-URL: Documentation, https://dd.github.io/Meringue
 Project-URL: Repository, https://github.com/dd/Meringue

{meringue-1.2.0.dev5 → meringue-1.2.0.dev6}/meringue/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.2.0.dev5"
+__version__ = "1.2.0.dev6"
 """
 To update the version, use [hatch version](https://hatch.pypa.io/latest/version/#updating)
 

{meringue-1.2.0.dev5 → meringue-1.2.0.dev6}/meringue/protected/fields.py

@@ -4,20 +4,30 @@ from django.db.models.fields.files import FieldFile
 from django.db.models.fields.files import ImageField
 from django.db.models.fields.files import ImageFieldFile
 from django.urls import reverse
+try:
+    from django_hosts.resolvers import reverse as hosts_reverse
+except ImportError:
+    hosts_reverse = None
 
 
 class ProtectedFileMixin:
     @property
     def url(self):
         self._require_file()
-        result_url = reverse(
-            self.field.m_protected_view_name,
-            kwargs={
-                "contenttype_id": ContentType.objects.get_for_model(self.instance.__class__).id,
-                "field": self.field.name,
-                "pk": self.instance.pk,
-            },
-        )
+
+        reverse_kwargs = {
+            "cid": ContentType.objects.get_for_model(self.instance.__class__).id,
+            "field": self.field.name,
+            "pk": self.instance.pk,
+        }
+        if self.field.m_protected_host_name:
+            result_url = hosts_reverse(
+                self.field.m_protected_view_name,
+                kwargs=reverse_kwargs,
+                host=self.field.m_protected_host_name,
+            )
+        else:
+            result_url = reverse(self.field.m_protected_view_name, kwargs=reverse_kwargs)
         return result_url
 
     @property
@@ -44,9 +54,11 @@ class ProtectedFileField(FileField):
         upload_to="protected",
         storage=None,
         protected_view_name="meringue-protected-file",
+        protected_host_name=None,
         **kwargs,
     ):
         self.m_protected_view_name = protected_view_name
+        self.m_protected_host_name = protected_host_name
         super().__init__(verbose_name, name, upload_to, storage, **kwargs)
 
 
@@ -68,8 +80,10 @@ class ProtectedImageField(ImageField):
         width_field=None,
         height_field=None,
         protected_view_name="meringue-protected-file",
+        protected_host_name=None,
         **kwargs,
     ):
         kwargs.setdefault("upload_to", "protected")
         self.m_protected_view_name = protected_view_name
+        self.m_protected_host_name = protected_host_name
         super().__init__(verbose_name, name, width_field, height_field, **kwargs)

{meringue-1.2.0.dev5 → meringue-1.2.0.dev6}/meringue/protected/views.py

@@ -15,21 +15,18 @@ from meringue.protected.fields import ProtectedFieldFile
 from meringue.protected.fields import ProtectedImageFieldFile
 
 
-def protected_file_view(request, contenttype_id, field, pk):
+def protected_file_view(request, cid, field, pk):
     """
-    В продакшен моде вьха редиректит на урл файла, где нжинкс отдаёт этот файл
-    Защита работает за счёт параметра internal
-    https://nginx.org/en/docs/http/ngx_http_core_module.html#internal
-
-    ```conf
-    location /media/protected/ {
-        internal;
-        alias /home/rpl/rpl-2023-back/public/media/protected/;
-    }
-    ```
+    The view checks the user's access to view and serves the file.
+
+    If you enable the parameter
+    [PROTECTED_SERVE_WITH_NGINX][meringue.conf.default_settings.PROTECTED_SERVE_WITH_NGINX], the
+    file will not be served; instead, the response will contain the X-Accel-Redirect header
+    pointing to the original file. It is expected that nginx will return the file using the
+    [internal](https://nginx.org/en/docs/http/ngx_http_core_module.html#internal) parameter.
     """
 
-    contenttype = ContentType.objects.get(id=contenttype_id)
+    contenttype = ContentType.objects.get(id=cid)
 
     if not request.user.has_perm(f"{contenttype.app_label}.view_{contenttype.model}"):
         raise PermissionDenied()

{meringue-1.2.0.dev5 → meringue-1.2.0.dev6}/pyproject.toml

@@ -157,6 +157,7 @@ dependencies = [
 	"djangorestframework-simplejwt==5.3.1",
 	"drf-spectacular==0.26.4",
 	"pillow==10.3.0",
+	"django_hosts==5.2",
 ]
 [tool.hatch.envs.test.env-vars]
 DJANGO_SETTINGS_MODULE = "test_project.settings"
@@ -177,6 +178,7 @@ dependencies = [
 	"pycryptodome==3.20.0",
 	"drf-spectacular==0.26.4",
 	"pillow==10.3.0",
+	"django_hosts==5.2",
 ]
 [tool.hatch.envs.mtest.overrides]
 matrix.django.dependencies = [