Feature: sharelink bundles (#11682)

src/documents/admin.py

@@ -13,6 +13,7 @@ from documents.models import PaperlessTask
 from documents.models import SavedView
 from documents.models import SavedViewFilterRule
 from documents.models import ShareLink
+from documents.models import ShareLinkBundle
 from documents.models import StoragePath
 from documents.models import Tag
 from documents.tasks import update_document_parent_tags
@@ -184,6 +185,22 @@ class ShareLinksAdmin(GuardedModelAdmin):
         return super().get_queryset(request).select_related("document__correspondent")
 
 
+class ShareLinkBundleAdmin(GuardedModelAdmin):
+    list_display = ("created", "status", "expiration", "owner", "slug")
+    list_filter = ("status", "created", "expiration", "owner")
+    search_fields = ("slug",)
+
+    def get_queryset(self, request):  # pragma: no cover
+        return (
+            super()
+            .get_queryset(request)
+            .select_related("owner")
+            .prefetch_related(
+                "documents",
+            )
+        )
+
+
 class CustomFieldsAdmin(GuardedModelAdmin):
     fields = ("name", "created", "data_type")
     readonly_fields = ("created", "data_type")
@@ -215,6 +232,7 @@ admin.site.register(StoragePath, StoragePathAdmin)
 admin.site.register(PaperlessTask, TaskAdmin)
 admin.site.register(Note, NotesAdmin)
 admin.site.register(ShareLink, ShareLinksAdmin)
+admin.site.register(ShareLinkBundle, ShareLinkBundleAdmin)
 admin.site.register(CustomField, CustomFieldsAdmin)
 admin.site.register(CustomFieldInstance, CustomFieldInstancesAdmin)
 

src/documents/filters.py

@@ -39,6 +39,7 @@ from documents.models import Document
 from documents.models import DocumentType
 from documents.models import PaperlessTask
 from documents.models import ShareLink
+from documents.models import ShareLinkBundle
 from documents.models import StoragePath
 from documents.models import Tag
 
@@ -796,6 +797,29 @@ class ShareLinkFilterSet(FilterSet):
         }
 
 
+class ShareLinkBundleFilterSet(FilterSet):
+    documents = Filter(method="filter_documents")
+
+    class Meta:
+        model = ShareLinkBundle
+        fields = {
+            "created": DATETIME_KWARGS,
+            "expiration": DATETIME_KWARGS,
+            "status": ["exact"],
+        }
+
+    def filter_documents(self, queryset, name, value):
+        ids = []
+        if value:
+            try:
+                ids = [int(item) for item in value.split(",") if item]
+            except ValueError:
+                return queryset.none()
+        if not ids:
+            return queryset
+        return queryset.filter(documents__in=ids).distinct()
+
+
 class PaperlessTaskFilterSet(FilterSet):
     acknowledged = BooleanFilter(
         label="Acknowledged",

src/documents/migrations/0008_sharelinkbundle.py

@@ -0,0 +1,177 @@
+# Generated by Django 5.2.9 on 2026-01-27 01:09
+
+import django.db.models.deletion
+import django.db.models.functions.text
+import django.utils.timezone
+from django.conf import settings
+from django.contrib.auth.management import create_permissions
+from django.contrib.auth.models import Group
+from django.contrib.auth.models import Permission
+from django.contrib.auth.models import User
+from django.db import migrations
+from django.db import models
+
+
+def grant_share_link_bundle_permissions(apps, schema_editor):
+    # Ensure newly introduced permissions are created for all apps
+    for app_config in apps.get_app_configs():
+        app_config.models_module = True
+        create_permissions(app_config, apps=apps, verbosity=0)
+        app_config.models_module = None
+
+    add_document_perm = Permission.objects.filter(codename="add_document").first()
+    share_bundle_permissions = Permission.objects.filter(
+        codename__contains="sharelinkbundle",
+    )
+
+    users = User.objects.filter(user_permissions=add_document_perm).distinct()
+    for user in users:
+        user.user_permissions.add(*share_bundle_permissions)
+
+    groups = Group.objects.filter(permissions=add_document_perm).distinct()
+    for group in groups:
+        group.permissions.add(*share_bundle_permissions)
+
+
+def revoke_share_link_bundle_permissions(apps, schema_editor):
+    share_bundle_permissions = Permission.objects.filter(
+        codename__contains="sharelinkbundle",
+    )
+    for user in User.objects.all():
+        user.user_permissions.remove(*share_bundle_permissions)
+    for group in Group.objects.all():
+        group.permissions.remove(*share_bundle_permissions)
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("documents", "0007_document_content_length"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="ShareLinkBundle",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "created",
+                    models.DateTimeField(
+                        blank=True,
+                        db_index=True,
+                        default=django.utils.timezone.now,
+                        editable=False,
+                        verbose_name="created",
+                    ),
+                ),
+                (
+                    "expiration",
+                    models.DateTimeField(
+                        blank=True,
+                        db_index=True,
+                        null=True,
+                        verbose_name="expiration",
+                    ),
+                ),
+                (
+                    "slug",
+                    models.SlugField(
+                        blank=True,
+                        editable=False,
+                        unique=True,
+                        verbose_name="slug",
+                    ),
+                ),
+                (
+                    "file_version",
+                    models.CharField(
+                        choices=[("archive", "Archive"), ("original", "Original")],
+                        default="archive",
+                        max_length=50,
+                    ),
+                ),
+                (
+                    "status",
+                    models.CharField(
+                        choices=[
+                            ("pending", "Pending"),
+                            ("processing", "Processing"),
+                            ("ready", "Ready"),
+                            ("failed", "Failed"),
+                        ],
+                        default="pending",
+                        max_length=50,
+                    ),
+                ),
+                (
+                    "size_bytes",
+                    models.PositiveIntegerField(
+                        blank=True,
+                        null=True,
+                        verbose_name="size (bytes)",
+                    ),
+                ),
+                (
+                    "last_error",
+                    models.JSONField(
+                        blank=True,
+                        null=True,
+                        default=None,
+                        verbose_name="last error",
+                    ),
+                ),
+                (
+                    "file_path",
+                    models.CharField(
+                        blank=True,
+                        max_length=512,
+                        verbose_name="file path",
+                    ),
+                ),
+                (
+                    "built_at",
+                    models.DateTimeField(
+                        blank=True,
+                        null=True,
+                        verbose_name="built at",
+                    ),
+                ),
+                (
+                    "documents",
+                    models.ManyToManyField(
+                        related_name="share_link_bundles",
+                        to="documents.document",
+                        verbose_name="documents",
+                    ),
+                ),
+                (
+                    "owner",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="share_link_bundles",
+                        to=settings.AUTH_USER_MODEL,
+                        verbose_name="owner",
+                    ),
+                ),
+            ],
+            options={
+                "ordering": ("-created",),
+                "verbose_name": "share link bundle",
+                "verbose_name_plural": "share link bundles",
+            },
+        ),
+        migrations.RunPython(
+            grant_share_link_bundle_permissions,
+            reverse_code=revoke_share_link_bundle_permissions,
+        ),
+    ]

src/documents/models.py

@@ -766,6 +766,114 @@ class ShareLink(SoftDeleteModel):
         return f"Share Link for {self.document.title}"
 
 
+class ShareLinkBundle(models.Model):
+    class Status(models.TextChoices):
+        PENDING = ("pending", _("Pending"))
+        PROCESSING = ("processing", _("Processing"))
+        READY = ("ready", _("Ready"))
+        FAILED = ("failed", _("Failed"))
+
+    created = models.DateTimeField(
+        _("created"),
+        default=timezone.now,
+        db_index=True,
+        blank=True,
+        editable=False,
+    )
+
+    expiration = models.DateTimeField(
+        _("expiration"),
+        blank=True,
+        null=True,
+        db_index=True,
+    )
+
+    slug = models.SlugField(
+        _("slug"),
+        db_index=True,
+        unique=True,
+        blank=True,
+        editable=False,
+    )
+
+    owner = models.ForeignKey(
+        User,
+        blank=True,
+        null=True,
+        related_name="share_link_bundles",
+        on_delete=models.SET_NULL,
+        verbose_name=_("owner"),
+    )
+
+    file_version = models.CharField(
+        max_length=50,
+        choices=ShareLink.FileVersion.choices,
+        default=ShareLink.FileVersion.ARCHIVE,
+    )
+
+    status = models.CharField(
+        max_length=50,
+        choices=Status.choices,
+        default=Status.PENDING,
+    )
+
+    size_bytes = models.PositiveIntegerField(
+        _("size (bytes)"),
+        blank=True,
+        null=True,
+    )
+
+    last_error = models.JSONField(
+        _("last error"),
+        blank=True,
+        null=True,
+        default=None,
+    )
+
+    file_path = models.CharField(
+        _("file path"),
+        max_length=512,
+        blank=True,
+    )
+
+    built_at = models.DateTimeField(
+        _("built at"),
+        null=True,
+        blank=True,
+    )
+
+    documents = models.ManyToManyField(
+        "documents.Document",
+        related_name="share_link_bundles",
+        verbose_name=_("documents"),
+    )
+
+    class Meta:
+        ordering = ("-created",)
+        verbose_name = _("share link bundle")
+        verbose_name_plural = _("share link bundles")
+
+    def __str__(self):
+        return _("Share link bundle %(slug)s") % {"slug": self.slug}
+
+    @property
+    def absolute_file_path(self) -> Path | None:
+        if not self.file_path:
+            return None
+        return (settings.SHARE_LINK_BUNDLE_DIR / Path(self.file_path)).resolve()
+
+    def remove_file(self):
+        if self.absolute_file_path is not None and self.absolute_file_path.exists():
+            try:
+                self.absolute_file_path.unlink()
+            except OSError:
+                pass
+
+    def delete(self, using=None, *, keep_parents=False):
+        self.remove_file()
+        return super().delete(using=using, keep_parents=keep_parents)
+
+
 class CustomField(models.Model):
     """
     Defines the name and type of a custom field

src/documents/serialisers.py

@@ -4,6 +4,7 @@ import logging
 import math
 import re
 from datetime import datetime
+from datetime import timedelta
 from decimal import Decimal
 from typing import TYPE_CHECKING
 from typing import Literal
@@ -25,6 +26,7 @@ from django.core.validators import integer_validator
 from django.db.models import Count
 from django.db.models import Q
 from django.db.models.functions import Lower
+from django.utils import timezone
 from django.utils.crypto import get_random_string
 from django.utils.dateparse import parse_datetime
 from django.utils.text import slugify
@@ -62,6 +64,7 @@ from documents.models import PaperlessTask
 from documents.models import SavedView
 from documents.models import SavedViewFilterRule
 from documents.models import ShareLink
+from documents.models import ShareLinkBundle
 from documents.models import StoragePath
 from documents.models import Tag
 from documents.models import UiSettings
@@ -2228,6 +2231,104 @@ class ShareLinkSerializer(OwnedObjectSerializer):
         return super().create(validated_data)
 
 
+class ShareLinkBundleSerializer(OwnedObjectSerializer):
+    document_ids = serializers.ListField(
+        child=serializers.IntegerField(min_value=1),
+        allow_empty=False,
+        write_only=True,
+    )
+    expiration_days = serializers.IntegerField(
+        required=False,
+        allow_null=True,
+        min_value=1,
+        write_only=True,
+    )
+    documents = serializers.PrimaryKeyRelatedField(
+        many=True,
+        read_only=True,
+    )
+    document_count = SerializerMethodField()
+
+    class Meta:
+        model = ShareLinkBundle
+        fields = (
+            "id",
+            "created",
+            "expiration",
+            "expiration_days",
+            "slug",
+            "file_version",
+            "status",
+            "size_bytes",
+            "last_error",
+            "built_at",
+            "documents",
+            "document_ids",
+            "document_count",
+        )
+        read_only_fields = (
+            "id",
+            "created",
+            "expiration",
+            "slug",
+            "status",
+            "size_bytes",
+            "last_error",
+            "built_at",
+            "documents",
+            "document_count",
+        )
+
+    def validate_document_ids(self, value):
+        unique_ids = set(value)
+        if len(unique_ids) != len(value):
+            raise serializers.ValidationError(
+                _("Duplicate document identifiers are not allowed."),
+            )
+        return value
+
+    def create(self, validated_data):
+        document_ids = validated_data.pop("document_ids")
+        expiration_days = validated_data.pop("expiration_days", None)
+        validated_data["slug"] = get_random_string(50)
+        if expiration_days:
+            validated_data["expiration"] = timezone.now() + timedelta(
+                days=expiration_days,
+            )
+        else:
+            validated_data["expiration"] = None
+
+        share_link_bundle = super().create(validated_data)
+
+        documents = list(
+            Document.objects.filter(pk__in=document_ids).only(
+                "pk",
+            ),
+        )
+        documents_by_id = {doc.pk: doc for doc in documents}
+        missing = [
+            str(doc_id) for doc_id in document_ids if doc_id not in documents_by_id
+        ]
+        if missing:
+            raise serializers.ValidationError(
+                {
+                    "document_ids": _(
+                        "Documents not found: %(ids)s",
+                    )
+                    % {"ids": ", ".join(missing)},
+                },
+            )
+
+        ordered_documents = [documents_by_id[doc_id] for doc_id in document_ids]
+        share_link_bundle.documents.set(ordered_documents)
+        share_link_bundle.document_total = len(ordered_documents)
+
+        return share_link_bundle
+
+    def get_document_count(self, obj: ShareLinkBundle) -> int:
+        return getattr(obj, "document_total") or obj.documents.count()
+
+
 class BulkEditObjectsSerializer(SerializerWithPerms, SetPermissionsMixin):
     objects = serializers.ListField(
         required=True,

src/documents/tasks.py

@@ -3,8 +3,10 @@ import hashlib
 import logging
 import shutil
 import uuid
+import zipfile
 from pathlib import Path
 from tempfile import TemporaryDirectory
+from tempfile import mkstemp
 
 import tqdm
 from celery import Task
@@ -22,6 +24,8 @@ from whoosh.writing import AsyncWriter
 from documents import index
 from documents import sanity_checker
 from documents.barcodes import BarcodePlugin
+from documents.bulk_download import ArchiveOnlyStrategy
+from documents.bulk_download import OriginalsOnlyStrategy
 from documents.caching import clear_document_caches
 from documents.classifier import DocumentClassifier
 from documents.classifier import load_classifier
@@ -39,6 +43,8 @@ from documents.models import CustomFieldInstance
 from documents.models import Document
 from documents.models import DocumentType
 from documents.models import PaperlessTask
+from documents.models import ShareLink
+from documents.models import ShareLinkBundle
 from documents.models import StoragePath
 from documents.models import Tag
 from documents.models import WorkflowRun
@@ -625,3 +631,117 @@ def update_document_in_llm_index(document):
 @shared_task
 def remove_document_from_llm_index(document):
     llm_index_remove_document(document)
+
+
+@shared_task
+def build_share_link_bundle(bundle_id: int):
+    try:
+        bundle = (
+            ShareLinkBundle.objects.filter(pk=bundle_id)
+            .prefetch_related("documents")
+            .get()
+        )
+    except ShareLinkBundle.DoesNotExist:
+        logger.warning("Share link bundle %s no longer exists.", bundle_id)
+        return
+
+    bundle.remove_file()
+    bundle.status = ShareLinkBundle.Status.PROCESSING
+    bundle.last_error = None
+    bundle.size_bytes = None
+    bundle.built_at = None
+    bundle.file_path = ""
+    bundle.save(
+        update_fields=[
+            "status",
+            "last_error",
+            "size_bytes",
+            "built_at",
+            "file_path",
+        ],
+    )
+
+    documents = list(bundle.documents.all().order_by("pk"))
+
+    _, temp_zip_path_str = mkstemp(suffix=".zip", dir=settings.SCRATCH_DIR)
+    temp_zip_path = Path(temp_zip_path_str)
+
+    try:
+        strategy_class = (
+            ArchiveOnlyStrategy
+            if bundle.file_version == ShareLink.FileVersion.ARCHIVE
+            else OriginalsOnlyStrategy
+        )
+        with zipfile.ZipFile(temp_zip_path, "w", zipfile.ZIP_DEFLATED) as zipf:
+            strategy = strategy_class(zipf)
+            for document in documents:
+                strategy.add_document(document)
+
+        output_dir = settings.SHARE_LINK_BUNDLE_DIR
+        output_dir.mkdir(parents=True, exist_ok=True)
+        final_path = (output_dir / f"{bundle.slug}.zip").resolve()
+        if final_path.exists():
+            final_path.unlink()
+        shutil.move(temp_zip_path, final_path)
+
+        bundle.file_path = f"{bundle.slug}.zip"
+        bundle.size_bytes = final_path.stat().st_size
+        bundle.status = ShareLinkBundle.Status.READY
+        bundle.built_at = timezone.now()
+        bundle.last_error = None
+        bundle.save(
+            update_fields=[
+                "file_path",
+                "size_bytes",
+                "status",
+                "built_at",
+                "last_error",
+            ],
+        )
+        logger.info("Built share link bundle %s", bundle.pk)
+    except Exception as exc:
+        logger.exception(
+            "Failed to build share link bundle %s: %s",
+            bundle_id,
+            exc,
+        )
+        bundle.status = ShareLinkBundle.Status.FAILED
+        bundle.last_error = {
+            "bundle_id": bundle_id,
+            "exception_type": exc.__class__.__name__,
+            "message": str(exc),
+            "timestamp": timezone.now().isoformat(),
+        }
+        bundle.save(update_fields=["status", "last_error"])
+        try:
+            temp_zip_path.unlink()
+        except OSError:
+            pass
+        raise
+    finally:
+        try:
+            temp_zip_path.unlink(missing_ok=True)
+        except OSError:
+            pass
+
+
+@shared_task
+def cleanup_expired_share_link_bundles():
+    now = timezone.now()
+    expired_qs = ShareLinkBundle.objects.filter(
+        expiration__isnull=False,
+        expiration__lt=now,
+    )
+    count = 0
+    for bundle in expired_qs.iterator():
+        count += 1
+        try:
+            bundle.delete()
+        except Exception as exc:
+            logger.warning(
+                "Failed to delete expired share link bundle %s: %s",
+                bundle.pk,
+                exc,
+            )
+    if count:
+        logger.info("Deleted %s expired share link bundle(s)", count)

src/documents/tests/test_migration_share_link_bundle.py

@@ -0,0 +1,51 @@
+from documents.tests.utils import TestMigrations
+
+
+class TestMigrateShareLinkBundlePermissions(TestMigrations):
+    migrate_from = "0007_document_content_length"
+    migrate_to = "0008_sharelinkbundle"
+
+    def setUpBeforeMigration(self, apps):
+        User = apps.get_model("auth", "User")
+        Group = apps.get_model("auth", "Group")
+        self.Permission = apps.get_model("auth", "Permission")
+        self.user = User.objects.create(username="user1")
+        self.group = Group.objects.create(name="group1")
+        add_document = self.Permission.objects.get(codename="add_document")
+        self.user.user_permissions.add(add_document.id)
+        self.group.permissions.add(add_document.id)
+
+    def test_share_link_permissions_granted_to_add_document_holders(self):
+        share_perms = self.Permission.objects.filter(
+            codename__contains="sharelinkbundle",
+        )
+        self.assertTrue(self.user.user_permissions.filter(pk__in=share_perms).exists())
+        self.assertTrue(self.group.permissions.filter(pk__in=share_perms).exists())
+
+
+class TestReverseMigrateShareLinkBundlePermissions(TestMigrations):
+    migrate_from = "0008_sharelinkbundle"
+    migrate_to = "0007_document_content_length"
+
+    def setUpBeforeMigration(self, apps):
+        User = apps.get_model("auth", "User")
+        Group = apps.get_model("auth", "Group")
+        self.Permission = apps.get_model("auth", "Permission")
+        self.user = User.objects.create(username="user1")
+        self.group = Group.objects.create(name="group1")
+        add_document = self.Permission.objects.get(codename="add_document")
+        share_perms = self.Permission.objects.filter(
+            codename__contains="sharelinkbundle",
+        )
+        self.share_perm_ids = list(share_perms.values_list("id", flat=True))
+
+        self.user.user_permissions.add(add_document.id, *self.share_perm_ids)
+        self.group.permissions.add(add_document.id, *self.share_perm_ids)
+
+    def test_share_link_permissions_revoked_on_reverse(self):
+        self.assertFalse(
+            self.user.user_permissions.filter(pk__in=self.share_perm_ids).exists(),
+        )
+        self.assertFalse(
+            self.group.permissions.filter(pk__in=self.share_perm_ids).exists(),
+        )

src/documents/tests/test_share_link_bundles.py

@@ -0,0 +1,536 @@
+from __future__ import annotations
+
+import zipfile
+from datetime import timedelta
+from pathlib import Path
+from unittest import mock
+
+from django.conf import settings
+from django.contrib.auth.models import User
+from django.utils import timezone
+from rest_framework import serializers
+from rest_framework import status
+from rest_framework.test import APITestCase
+
+from documents.filters import ShareLinkBundleFilterSet
+from documents.models import ShareLink
+from documents.models import ShareLinkBundle
+from documents.serialisers import ShareLinkBundleSerializer
+from documents.tasks import build_share_link_bundle
+from documents.tasks import cleanup_expired_share_link_bundles
+from documents.tests.factories import DocumentFactory
+from documents.tests.utils import DirectoriesMixin
+
+
+class ShareLinkBundleAPITests(DirectoriesMixin, APITestCase):
+    ENDPOINT = "/api/share_link_bundles/"
+
+    def setUp(self):
+        super().setUp()
+        self.user = User.objects.create_superuser(username="bundle_admin")
+        self.client.force_authenticate(self.user)
+        self.document = DocumentFactory.create()
+
+    @mock.patch("documents.views.build_share_link_bundle.delay")
+    def test_create_bundle_triggers_build_job(self, delay_mock):
+        payload = {
+            "document_ids": [self.document.pk],
+            "file_version": ShareLink.FileVersion.ARCHIVE,
+            "expiration_days": 7,
+        }
+
+        response = self.client.post(self.ENDPOINT, payload, format="json")
+
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+        bundle = ShareLinkBundle.objects.get(pk=response.data["id"])
+        self.assertEqual(bundle.documents.count(), 1)
+        self.assertEqual(bundle.status, ShareLinkBundle.Status.PENDING)
+        delay_mock.assert_called_once_with(bundle.pk)
+
+    def test_create_bundle_rejects_missing_documents(self):
+        payload = {
+            "document_ids": [9999],
+            "file_version": ShareLink.FileVersion.ARCHIVE,
+            "expiration_days": 7,
+        }
+
+        response = self.client.post(self.ENDPOINT, payload, format="json")
+
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+        self.assertIn("document_ids", response.data)
+
+    @mock.patch("documents.views.has_perms_owner_aware", return_value=False)
+    def test_create_bundle_rejects_insufficient_permissions(self, perms_mock):
+        payload = {
+            "document_ids": [self.document.pk],
+            "file_version": ShareLink.FileVersion.ARCHIVE,
+            "expiration_days": 7,
+        }
+
+        response = self.client.post(self.ENDPOINT, payload, format="json")
+
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+        self.assertIn("document_ids", response.data)
+        perms_mock.assert_called()
+
+    @mock.patch("documents.views.build_share_link_bundle.delay")
+    def test_rebuild_bundle_resets_state(self, delay_mock):
+        bundle = ShareLinkBundle.objects.create(
+            slug="rebuild-slug",
+            file_version=ShareLink.FileVersion.ARCHIVE,
+            status=ShareLinkBundle.Status.FAILED,
+        )
+        bundle.documents.set([self.document])
+        bundle.last_error = {"message": "Something went wrong"}
+        bundle.size_bytes = 100
+        bundle.file_path = "path/to/file.zip"
+        bundle.save()
+
+        response = self.client.post(f"{self.ENDPOINT}{bundle.pk}/rebuild/")
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        bundle.refresh_from_db()
+        self.assertEqual(bundle.status, ShareLinkBundle.Status.PENDING)
+        self.assertIsNone(bundle.last_error)
+        self.assertIsNone(bundle.size_bytes)
+        self.assertEqual(bundle.file_path, "")
+        delay_mock.assert_called_once_with(bundle.pk)
+
+    def test_rebuild_bundle_rejects_processing_status(self):
+        bundle = ShareLinkBundle.objects.create(
+            slug="processing-slug",
+            file_version=ShareLink.FileVersion.ARCHIVE,
+            status=ShareLinkBundle.Status.PROCESSING,
+        )
+        bundle.documents.set([self.document])
+
+        response = self.client.post(f"{self.ENDPOINT}{bundle.pk}/rebuild/")
+
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+        self.assertIn("detail", response.data)
+
+    def test_create_bundle_rejects_duplicate_documents(self):
+        payload = {
+            "document_ids": [self.document.pk, self.document.pk],
+            "file_version": ShareLink.FileVersion.ARCHIVE,
+            "expiration_days": 7,
+        }
+
+        response = self.client.post(self.ENDPOINT, payload, format="json")
+
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+        self.assertIn("document_ids", response.data)
+
+    def test_download_ready_bundle_streams_file(self):
+        bundle_file = Path(self.dirs.media_dir) / "bundles" / "ready.zip"
+        bundle_file.parent.mkdir(parents=True, exist_ok=True)
+        bundle_file.write_bytes(b"binary-zip-content")
+
+        bundle = ShareLinkBundle.objects.create(
+            slug="readyslug",
+            file_version=ShareLink.FileVersion.ARCHIVE,
+            status=ShareLinkBundle.Status.READY,
+            file_path=str(bundle_file),
+        )
+        bundle.documents.set([self.document])
+
+        self.client.logout()
+        response = self.client.get(f"/share/{bundle.slug}/")
+        content = b"".join(response.streaming_content)
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response["Content-Type"], "application/zip")
+        self.assertEqual(content, b"binary-zip-content")
+        self.assertIn("attachment;", response["Content-Disposition"])
+
+    def test_download_pending_bundle_returns_202(self):
+        bundle = ShareLinkBundle.objects.create(
+            slug="pendingslug",
+            file_version=ShareLink.FileVersion.ARCHIVE,
+            status=ShareLinkBundle.Status.PENDING,
+        )
+        bundle.documents.set([self.document])
+
+        self.client.logout()
+        response = self.client.get(f"/share/{bundle.slug}/")
+
+        self.assertEqual(response.status_code, status.HTTP_202_ACCEPTED)
+
+    def test_download_failed_bundle_returns_503(self):
+        bundle = ShareLinkBundle.objects.create(
+            slug="failedslug",
+            file_version=ShareLink.FileVersion.ARCHIVE,
+            status=ShareLinkBundle.Status.FAILED,
+        )
+        bundle.documents.set([self.document])
+
+        self.client.logout()
+        response = self.client.get(f"/share/{bundle.slug}/")
+
+        self.assertEqual(response.status_code, status.HTTP_503_SERVICE_UNAVAILABLE)
+
+    def test_expired_share_link_redirects(self):
+        share_link = ShareLink.objects.create(
+            slug="expiredlink",
+            document=self.document,
+            file_version=ShareLink.FileVersion.ORIGINAL,
+            expiration=timezone.now() - timedelta(hours=1),
+        )
+
+        self.client.logout()
+        response = self.client.get(f"/share/{share_link.slug}/")
+
+        self.assertEqual(response.status_code, status.HTTP_302_FOUND)
+        self.assertIn("sharelink_expired=1", response["Location"])
+
+    def test_unknown_share_link_redirects(self):
+        self.client.logout()
+        response = self.client.get("/share/unknownsharelink/")
+
+        self.assertEqual(response.status_code, status.HTTP_302_FOUND)
+        self.assertIn("sharelink_notfound=1", response["Location"])
+
+
+class ShareLinkBundleTaskTests(DirectoriesMixin, APITestCase):
+    def setUp(self):
+        super().setUp()
+        self.document = DocumentFactory.create()
+
+    def test_cleanup_expired_share_link_bundles(self):
+        expired_path = Path(self.dirs.media_dir) / "expired.zip"
+        expired_path.parent.mkdir(parents=True, exist_ok=True)
+        expired_path.write_bytes(b"expired")
+
+        active_path = Path(self.dirs.media_dir) / "active.zip"
+        active_path.write_bytes(b"active")
+
+        expired_bundle = ShareLinkBundle.objects.create(
+            slug="expired-bundle",
+            file_version=ShareLink.FileVersion.ARCHIVE,
+            status=ShareLinkBundle.Status.READY,
+            expiration=timezone.now() - timedelta(days=1),
+            file_path=str(expired_path),
+        )
+        expired_bundle.documents.set([self.document])
+
+        active_bundle = ShareLinkBundle.objects.create(
+            slug="active-bundle",
+            file_version=ShareLink.FileVersion.ARCHIVE,
+            status=ShareLinkBundle.Status.READY,
+            expiration=timezone.now() + timedelta(days=1),
+            file_path=str(active_path),
+        )
+        active_bundle.documents.set([self.document])
+
+        cleanup_expired_share_link_bundles()
+
+        self.assertFalse(ShareLinkBundle.objects.filter(pk=expired_bundle.pk).exists())
+        self.assertTrue(ShareLinkBundle.objects.filter(pk=active_bundle.pk).exists())
+        self.assertFalse(expired_path.exists())
+        self.assertTrue(active_path.exists())
+
+    def test_cleanup_expired_share_link_bundles_logs_on_failure(self):
+        expired_bundle = ShareLinkBundle.objects.create(
+            slug="expired-bundle",
+            file_version=ShareLink.FileVersion.ARCHIVE,
+            status=ShareLinkBundle.Status.READY,
+            expiration=timezone.now() - timedelta(days=1),
+        )
+        expired_bundle.documents.set([self.document])
+
+        with mock.patch.object(
+            ShareLinkBundle,
+            "delete",
+            side_effect=RuntimeError("fail"),
+        ):
+            with self.assertLogs("paperless.tasks", level="WARNING") as logs:
+                cleanup_expired_share_link_bundles()
+
+        self.assertTrue(
+            any(
+                "Failed to delete expired share link bundle" in msg
+                for msg in logs.output
+            ),
+        )
+
+
+class ShareLinkBundleBuildTaskTests(DirectoriesMixin, APITestCase):
+    def setUp(self):
+        super().setUp()
+        self.document = DocumentFactory.create(
+            mime_type="application/pdf",
+            checksum="123",
+        )
+        self.document.archive_checksum = ""
+        self.document.save()
+        self.addCleanup(
+            setattr,
+            settings,
+            "SHARE_LINK_BUNDLE_DIR",
+            settings.SHARE_LINK_BUNDLE_DIR,
+        )
+        settings.SHARE_LINK_BUNDLE_DIR = (
+            Path(settings.MEDIA_ROOT) / "documents" / "share_link_bundles"
+        )
+
+    def _write_document_file(self, *, archive: bool, content: bytes) -> Path:
+        if archive:
+            self.document.archive_filename = f"{self.document.pk:07}.pdf"
+            self.document.save()
+            path = self.document.archive_path
+        else:
+            path = self.document.source_path
+        path.parent.mkdir(parents=True, exist_ok=True)
+        path.write_bytes(content)
+        return path
+
+    def test_build_share_link_bundle_creates_zip_and_sets_metadata(self):
+        self._write_document_file(archive=False, content=b"source")
+        archive_path = self._write_document_file(archive=True, content=b"archive")
+        bundle = ShareLinkBundle.objects.create(
+            slug="build-archive",
+            file_version=ShareLink.FileVersion.ARCHIVE,
+        )
+        bundle.documents.set([self.document])
+
+        build_share_link_bundle(bundle.pk)
+
+        bundle.refresh_from_db()
+        self.assertEqual(bundle.status, ShareLinkBundle.Status.READY)
+        self.assertIsNone(bundle.last_error)
+        self.assertIsNotNone(bundle.built_at)
+        self.assertGreater(bundle.size_bytes or 0, 0)
+        final_path = bundle.absolute_file_path
+        self.assertIsNotNone(final_path)
+        self.assertTrue(final_path.exists())
+        with zipfile.ZipFile(final_path) as zipf:
+            names = zipf.namelist()
+            self.assertEqual(len(names), 1)
+            self.assertEqual(zipf.read(names[0]), archive_path.read_bytes())
+
+    def test_build_share_link_bundle_overwrites_existing_file(self):
+        self._write_document_file(archive=False, content=b"source")
+        bundle = ShareLinkBundle.objects.create(
+            slug="overwrite",
+            file_version=ShareLink.FileVersion.ORIGINAL,
+        )
+        bundle.documents.set([self.document])
+
+        existing = settings.SHARE_LINK_BUNDLE_DIR / "overwrite.zip"
+        existing.parent.mkdir(parents=True, exist_ok=True)
+        existing.write_bytes(b"old")
+
+        build_share_link_bundle(bundle.pk)
+
+        bundle.refresh_from_db()
+        final_path = bundle.absolute_file_path
+        self.assertIsNotNone(final_path)
+        self.assertTrue(final_path.exists())
+        self.assertNotEqual(final_path.read_bytes(), b"old")
+
+    def test_build_share_link_bundle_failure_marks_failed(self):
+        self._write_document_file(archive=False, content=b"source")
+        bundle = ShareLinkBundle.objects.create(
+            slug="fail-bundle",
+            file_version=ShareLink.FileVersion.ORIGINAL,
+        )
+        bundle.documents.set([self.document])
+
+        with (
+            mock.patch(
+                "documents.tasks.OriginalsOnlyStrategy.add_document",
+                side_effect=RuntimeError("zip failure"),
+            ),
+            mock.patch("pathlib.Path.unlink") as unlink_mock,
+        ):
+            unlink_mock.side_effect = [OSError("unlink"), OSError("unlink-finally")] + [
+                None,
+            ] * 5
+            with self.assertRaises(RuntimeError):
+                build_share_link_bundle(bundle.pk)
+
+        bundle.refresh_from_db()
+        self.assertEqual(bundle.status, ShareLinkBundle.Status.FAILED)
+        self.assertIsInstance(bundle.last_error, dict)
+        self.assertEqual(bundle.last_error.get("message"), "zip failure")
+        self.assertEqual(bundle.last_error.get("exception_type"), "RuntimeError")
+        scratch_zips = list(Path(settings.SCRATCH_DIR).glob("*.zip"))
+        self.assertTrue(scratch_zips)
+        for path in scratch_zips:
+            path.unlink(missing_ok=True)
+
+    def test_build_share_link_bundle_missing_bundle_noop(self):
+        # Should not raise when bundle does not exist
+        build_share_link_bundle(99999)
+
+
+class ShareLinkBundleFilterSetTests(DirectoriesMixin, APITestCase):
+    def setUp(self):
+        super().setUp()
+        self.document = DocumentFactory.create()
+        self.document.checksum = "doc1checksum"
+        self.document.save()
+        self.other_document = DocumentFactory.create()
+        self.other_document.checksum = "doc2checksum"
+        self.other_document.save()
+        self.bundle_one = ShareLinkBundle.objects.create(
+            slug="bundle-one",
+            file_version=ShareLink.FileVersion.ORIGINAL,
+        )
+        self.bundle_one.documents.set([self.document])
+        self.bundle_two = ShareLinkBundle.objects.create(
+            slug="bundle-two",
+            file_version=ShareLink.FileVersion.ORIGINAL,
+        )
+        self.bundle_two.documents.set([self.other_document])
+
+    def test_filter_documents_returns_all_for_empty_value(self):
+        filterset = ShareLinkBundleFilterSet(
+            data={"documents": ""},
+            queryset=ShareLinkBundle.objects.all(),
+        )
+
+        self.assertCountEqual(filterset.qs, [self.bundle_one, self.bundle_two])
+
+    def test_filter_documents_handles_invalid_input(self):
+        filterset = ShareLinkBundleFilterSet(
+            data={"documents": "invalid"},
+            queryset=ShareLinkBundle.objects.all(),
+        )
+
+        self.assertFalse(filterset.qs.exists())
+
+    def test_filter_documents_filters_by_multiple_ids(self):
+        filterset = ShareLinkBundleFilterSet(
+            data={"documents": f"{self.document.pk},{self.other_document.pk}"},
+            queryset=ShareLinkBundle.objects.all(),
+        )
+
+        self.assertCountEqual(filterset.qs, [self.bundle_one, self.bundle_two])
+
+    def test_filter_documents_returns_queryset_for_empty_ids(self):
+        filterset = ShareLinkBundleFilterSet(
+            data={"documents": ","},
+            queryset=ShareLinkBundle.objects.all(),
+        )
+
+        self.assertCountEqual(filterset.qs, [self.bundle_one, self.bundle_two])
+
+
+class ShareLinkBundleModelTests(DirectoriesMixin, APITestCase):
+    def test_absolute_file_path_handles_relative_and_absolute(self):
+        relative_path = Path("relative.zip")
+        bundle = ShareLinkBundle.objects.create(
+            slug="relative-bundle",
+            file_version=ShareLink.FileVersion.ORIGINAL,
+            file_path=str(relative_path),
+        )
+
+        self.assertEqual(
+            bundle.absolute_file_path,
+            (settings.SHARE_LINK_BUNDLE_DIR / relative_path).resolve(),
+        )
+
+        absolute_path = Path(self.dirs.media_dir) / "absolute.zip"
+        bundle.file_path = str(absolute_path)
+
+        self.assertEqual(bundle.absolute_file_path.resolve(), absolute_path.resolve())
+
+    def test_str_returns_translated_slug(self):
+        bundle = ShareLinkBundle.objects.create(
+            slug="string-slug",
+            file_version=ShareLink.FileVersion.ORIGINAL,
+        )
+
+        self.assertIn("string-slug", str(bundle))
+
+    def test_remove_file_deletes_existing_file(self):
+        bundle_path = settings.SHARE_LINK_BUNDLE_DIR / "remove.zip"
+        bundle_path.parent.mkdir(parents=True, exist_ok=True)
+        bundle_path.write_bytes(b"remove-me")
+        bundle = ShareLinkBundle.objects.create(
+            slug="remove-bundle",
+            file_version=ShareLink.FileVersion.ORIGINAL,
+            file_path=str(bundle_path.relative_to(settings.SHARE_LINK_BUNDLE_DIR)),
+        )
+
+        bundle.remove_file()
+
+        self.assertFalse(bundle_path.exists())
+
+    def test_remove_file_handles_oserror(self):
+        bundle_path = settings.SHARE_LINK_BUNDLE_DIR / "remove-error.zip"
+        bundle_path.parent.mkdir(parents=True, exist_ok=True)
+        bundle_path.write_bytes(b"remove-me")
+        bundle = ShareLinkBundle.objects.create(
+            slug="remove-error",
+            file_version=ShareLink.FileVersion.ORIGINAL,
+            file_path=str(bundle_path.relative_to(settings.SHARE_LINK_BUNDLE_DIR)),
+        )
+
+        with mock.patch("pathlib.Path.unlink", side_effect=OSError("fail")):
+            bundle.remove_file()
+
+        self.assertTrue(bundle_path.exists())
+
+    def test_delete_calls_remove_file(self):
+        bundle_path = settings.SHARE_LINK_BUNDLE_DIR / "delete.zip"
+        bundle_path.parent.mkdir(parents=True, exist_ok=True)
+        bundle_path.write_bytes(b"remove-me")
+        bundle = ShareLinkBundle.objects.create(
+            slug="delete-bundle",
+            file_version=ShareLink.FileVersion.ORIGINAL,
+            file_path=str(bundle_path.relative_to(settings.SHARE_LINK_BUNDLE_DIR)),
+        )
+
+        bundle.delete()
+        self.assertFalse(bundle_path.exists())
+
+
+class ShareLinkBundleSerializerTests(DirectoriesMixin, APITestCase):
+    def setUp(self):
+        super().setUp()
+        self.document = DocumentFactory.create()
+
+    def test_validate_document_ids_rejects_duplicates(self):
+        serializer = ShareLinkBundleSerializer(
+            data={
+                "document_ids": [self.document.pk, self.document.pk],
+                "file_version": ShareLink.FileVersion.ORIGINAL,
+            },
+        )
+
+        self.assertFalse(serializer.is_valid())
+        self.assertIn("document_ids", serializer.errors)
+
+    def test_create_assigns_documents_and_expiration(self):
+        serializer = ShareLinkBundleSerializer(
+            data={
+                "document_ids": [self.document.pk],
+                "file_version": ShareLink.FileVersion.ORIGINAL,
+                "expiration_days": 3,
+            },
+        )
+
+        self.assertTrue(serializer.is_valid(), serializer.errors)
+        bundle = serializer.save()
+
+        self.assertEqual(list(bundle.documents.all()), [self.document])
+        expected_expiration = timezone.now() + timedelta(days=3)
+        self.assertAlmostEqual(
+            bundle.expiration,
+            expected_expiration,
+            delta=timedelta(seconds=10),
+        )
+
+    def test_create_raises_when_missing_documents(self):
+        serializer = ShareLinkBundleSerializer(
+            data={
+                "document_ids": [self.document.pk, 9999],
+                "file_version": ShareLink.FileVersion.ORIGINAL,
+            },
+        )
+
+        self.assertTrue(serializer.is_valid(), serializer.errors)
+        with self.assertRaises(serializers.ValidationError):
+            serializer.save(documents=[self.document])

src/documents/views.py

@@ -50,6 +50,7 @@ from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.utils.timezone import make_aware
 from django.utils.translation import get_language
+from django.utils.translation import gettext_lazy as _
 from django.views import View
 from django.views.decorators.cache import cache_control
 from django.views.decorators.csrf import ensure_csrf_cookie
@@ -70,6 +71,7 @@ from packaging import version as packaging_version
 from redis import Redis
 from rest_framework import parsers
 from rest_framework import serializers
+from rest_framework import status
 from rest_framework.decorators import action
 from rest_framework.exceptions import NotFound
 from rest_framework.exceptions import ValidationError
@@ -120,6 +122,7 @@ from documents.filters import DocumentTypeFilterSet
 from documents.filters import ObjectOwnedOrGrantedPermissionsFilter
 from documents.filters import ObjectOwnedPermissionsFilter
 from documents.filters import PaperlessTaskFilterSet
+from documents.filters import ShareLinkBundleFilterSet
 from documents.filters import ShareLinkFilterSet
 from documents.filters import StoragePathFilterSet
 from documents.filters import TagFilterSet
@@ -137,6 +140,7 @@ from documents.models import Note
 from documents.models import PaperlessTask
 from documents.models import SavedView
 from documents.models import ShareLink
+from documents.models import ShareLinkBundle
 from documents.models import StoragePath
 from documents.models import Tag
 from documents.models import UiSettings
@@ -170,6 +174,7 @@ from documents.serialisers import PostDocumentSerializer
 from documents.serialisers import RunTaskViewSerializer
 from documents.serialisers import SavedViewSerializer
 from documents.serialisers import SearchResultSerializer
+from documents.serialisers import ShareLinkBundleSerializer
 from documents.serialisers import ShareLinkSerializer
 from documents.serialisers import StoragePathSerializer
 from documents.serialisers import StoragePathTestSerializer
@@ -182,6 +187,7 @@ from documents.serialisers import WorkflowActionSerializer
 from documents.serialisers import WorkflowSerializer
 from documents.serialisers import WorkflowTriggerSerializer
 from documents.signals import document_updated
+from documents.tasks import build_share_link_bundle
 from documents.tasks import consume_file
 from documents.tasks import empty_trash
 from documents.tasks import index_optimize
@@ -2435,7 +2441,7 @@ class BulkDownloadView(GenericAPIView):
         follow_filename_format = serializer.validated_data.get("follow_formatting")
 
         for document in documents:
-            if not has_perms_owner_aware(request.user, "view_document", document):
+            if not has_perms_owner_aware(request.user, "change_document", document):
                 return HttpResponseForbidden("Insufficient permissions")
 
         settings.SCRATCH_DIR.mkdir(parents=True, exist_ok=True)
@@ -2790,21 +2796,187 @@ class ShareLinkViewSet(ModelViewSet, PassUserMixin):
     ordering_fields = ("created", "expiration", "document")
 
 
+class ShareLinkBundleViewSet(ModelViewSet, PassUserMixin):
+    model = ShareLinkBundle
+
+    queryset = ShareLinkBundle.objects.all()
+
+    serializer_class = ShareLinkBundleSerializer
+    pagination_class = StandardPagination
+    permission_classes = (IsAuthenticated, PaperlessObjectPermissions)
+    filter_backends = (
+        DjangoFilterBackend,
+        OrderingFilter,
+        ObjectOwnedOrGrantedPermissionsFilter,
+    )
+    filterset_class = ShareLinkBundleFilterSet
+    ordering_fields = ("created", "expiration", "status")
+
+    def get_queryset(self):
+        return (
+            super()
+            .get_queryset()
+            .prefetch_related("documents")
+            .annotate(document_total=Count("documents", distinct=True))
+        )
+
+    def create(self, request, *args, **kwargs):
+        serializer = self.get_serializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+        document_ids = serializer.validated_data["document_ids"]
+        documents_qs = Document.objects.filter(pk__in=document_ids).select_related(
+            "owner",
+        )
+        found_ids = set(documents_qs.values_list("pk", flat=True))
+        missing = sorted(set(document_ids) - found_ids)
+        if missing:
+            raise ValidationError(
+                {
+                    "document_ids": _(
+                        "Documents not found: %(ids)s",
+                    )
+                    % {"ids": ", ".join(str(item) for item in missing)},
+                },
+            )
+
+        documents = list(documents_qs)
+        for document in documents:
+            if not has_perms_owner_aware(request.user, "view_document", document):
+                raise ValidationError(
+                    {
+                        "document_ids": _(
+                            "Insufficient permissions to share document %(id)s.",
+                        )
+                        % {"id": document.pk},
+                    },
+                )
+
+        document_map = {document.pk: document for document in documents}
+        ordered_documents = [document_map[doc_id] for doc_id in document_ids]
+
+        bundle = serializer.save(
+            owner=request.user,
+            documents=ordered_documents,
+        )
+        bundle.remove_file()
+        bundle.status = ShareLinkBundle.Status.PENDING
+        bundle.last_error = None
+        bundle.size_bytes = None
+        bundle.built_at = None
+        bundle.file_path = ""
+        bundle.save(
+            update_fields=[
+                "status",
+                "last_error",
+                "size_bytes",
+                "built_at",
+                "file_path",
+            ],
+        )
+        build_share_link_bundle.delay(bundle.pk)
+        bundle.document_total = len(ordered_documents)
+        response_serializer = self.get_serializer(bundle)
+        headers = self.get_success_headers(response_serializer.data)
+        return Response(
+            response_serializer.data,
+            status=status.HTTP_201_CREATED,
+            headers=headers,
+        )
+
+    @action(detail=True, methods=["post"])
+    def rebuild(self, request, pk=None):
+        bundle = self.get_object()
+        if bundle.status == ShareLinkBundle.Status.PROCESSING:
+            return Response(
+                {"detail": _("Bundle is already being processed.")},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+        bundle.remove_file()
+        bundle.status = ShareLinkBundle.Status.PENDING
+        bundle.last_error = None
+        bundle.size_bytes = None
+        bundle.built_at = None
+        bundle.file_path = ""
+        bundle.save(
+            update_fields=[
+                "status",
+                "last_error",
+                "size_bytes",
+                "built_at",
+                "file_path",
+            ],
+        )
+        build_share_link_bundle.delay(bundle.pk)
+        bundle.document_total = (
+            getattr(bundle, "document_total", None) or bundle.documents.count()
+        )
+        serializer = self.get_serializer(bundle)
+        return Response(serializer.data)
+
+
 class SharedLinkView(View):
     authentication_classes = []
     permission_classes = []
 
     def get(self, request, slug):
         share_link = ShareLink.objects.filter(slug=slug).first()
-        if share_link is None:
+        if share_link is not None:
+            if (
+                share_link.expiration is not None
+                and share_link.expiration < timezone.now()
+            ):
+                return HttpResponseRedirect("/accounts/login/?sharelink_expired=1")
+            return serve_file(
+                doc=share_link.document,
+                use_archive=share_link.file_version == "archive",
+                disposition="inline",
+            )
+
+        bundle = ShareLinkBundle.objects.filter(slug=slug).first()
+        if bundle is None:
             return HttpResponseRedirect("/accounts/login/?sharelink_notfound=1")
-        if share_link.expiration is not None and share_link.expiration < timezone.now():
+
+        if bundle.expiration is not None and bundle.expiration < timezone.now():
             return HttpResponseRedirect("/accounts/login/?sharelink_expired=1")
-        return serve_file(
-            doc=share_link.document,
-            use_archive=share_link.file_version == "archive",
-            disposition="inline",
+
+        if bundle.status in {
+            ShareLinkBundle.Status.PENDING,
+            ShareLinkBundle.Status.PROCESSING,
+        }:
+            return HttpResponse(
+                _(
+                    "The share link bundle is still being prepared. Please try again later.",
+                ),
+                status=status.HTTP_202_ACCEPTED,
+            )
+
+        file_path = bundle.absolute_file_path
+
+        if bundle.status == ShareLinkBundle.Status.FAILED or file_path is None:
+            return HttpResponse(
+                _(
+                    "The share link bundle is unavailable.",
+                ),
+                status=status.HTTP_503_SERVICE_UNAVAILABLE,
+            )
+
+        response = FileResponse(file_path.open("rb"), content_type="application/zip")
+        short_slug = bundle.slug[:12]
+        download_name = f"paperless-share-{short_slug}.zip"
+        filename_normalized = (
+            normalize("NFKD", download_name)
+            .encode(
+                "ascii",
+                "ignore",
+            )
+            .decode("ascii")
         )
+        filename_encoded = quote(download_name)
+        response["Content-Disposition"] = (
+            f"attachment; filename='{filename_normalized}'; "
+            f"filename*=utf-8''{filename_encoded}"
+        )
+        return response
 
 
 def serve_file(*, doc: Document, use_archive: bool, disposition: str):