refactor: use django-presigned-url package

alexandria/core/models.py

@@ -6,6 +6,7 @@
 from pathlib import Path
 from tempfile import NamedTemporaryFile
 
+from rest_framework_json_api.relations import reverse
 import tika.language
 import tika.parser
 from django.conf import settings
@@ -24,7 +25,7 @@
 from manabi.token import Key, Token
 from preview_generator.manager import PreviewManager
 
-from alexandria.core.presign_urls import make_signature_components
+from django_presigned_url.presign_urls import make_presigned_url
 from alexandria.storages.fields import DynamicStorageFileField
 
 log = logging.getLogger(__name__)
@@ -358,13 +359,7 @@ def get_download_url(self, request):
         if not request:
             return None
 
-        url, expires, signature = make_signature_components(
-            str(self.pk),
-            request.get_host(),
-            scheme=request.META.get("wsgi.url_scheme", "http"),
-        )
-
-        return f"{url}?expires={expires}&signature={signature}"
+        return make_presigned_url(reverse("file-download", args=[self.pk]), request)
 
     class Meta:
         ordering = ["-created_at"]

alexandria/core/views.py

@@ -6,6 +6,7 @@
 from operator import or_
 from os.path import splitext
 from tempfile import NamedTemporaryFile
+from rest_framework_json_api.relations import reverse
 
 import requests
 from django.conf import settings
@@ -51,7 +52,7 @@
     MarkFilterSet,
     TagFilterSet,
 )
-from .presign_urls import verify_signed_components
+from django_presigned_url.presign_urls import verify_presigned_request
 
 log = logging.getLogger(__name__)
 
@@ -241,14 +242,7 @@ def multi(self, request, **kwargs):
     @permission_classes([AllowAny])
     @action(methods=["get"], detail=True)
     def download(self, request, pk=None):
-        if token_sig := request.query_params.get("signature"):
-            verify_signed_components(
-                pk,
-                request.get_host(),
-                expires=int(request.query_params.get("expires")),
-                scheme=request.META.get("wsgi.url_scheme", "http"),
-                token_sig=token_sig,
-            )
+        if verify_presigned_request(reverse("file-download", args=[pk]), request):
             obj = models.File.objects.get(pk=pk)
 
             return FileResponse(