mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-05-19 08:48:19 +00:00
Code Issues Projects Releases Wiki Activity

Only generate signed S3 link to user export when user clicks download

Browse source
This commit is contained in:
Bart Schuurmans 2024-03-24 13:03:47 +01:00
parent ab7b0893e0
commit 5bd66cb3f7
2 changed files with 29 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
bookwyrm/templates/preferences/export-user.html
View file

@ -126,27 +126,15 @@
<span>{{ export.size|get_file_size }}</span>
</td>
<td>
{% if export.job.complete and not export.job.status == "stopped" and not export.job.status == "failed" %}
{% if export.url%}
<p>
<a href="{{ export.url }}">
<span class="icon icon-download" aria-hidden="true"></span>
<span class="is-hidden-mobile">
{% trans "Download your export" %}
</span>
</a>
</p>
{% else %}
<p>
<a download="" href="/preferences/user-export/{{ export.job.task_id }}">
<span class="icon icon-download" aria-hidden="true"></span>
<span class="is-hidden-mobile">
{% trans "Download your export" %}
</span>
</a>
</p>
{% endif %}
{% if export.url %}
<a href="{{ export.url }}">
<span class="icon icon-download" aria-hidden="true"></span>
<span class="is-hidden-mobile">
{% trans "Download your export" %}
</span>
</a>
{% elif export.job.complete and not export.job.status == "stopped" and not export.job.status == "failed" %}
{% trans "Archive is no longer available" %}
{% endif %}
</td>
</tr>

29
bookwyrm/views/preferences/export.py
View file

@ -10,6 +10,7 @@ from django.http import HttpResponse, HttpResponseServerError, Http404
from django.template.response import TemplateResponse
from django.utils import timezone
from django.views import View
from django.urls import reverse
from django.utils.decorators import method_decorator
from django.utils.translation import gettext_lazy as _
from django.shortcuts import redirect
@ -166,17 +167,8 @@ class ExportUser(View):
export = {"job": job}
if settings.USE_S3:
# make custom_domain None so we can sign the url
# see https://github.com/jschneier/django-storages/issues/944
storage = S3Boto3Storage(querystring_auth=True, custom_domain=None)
# for s3 we download directly from s3, so we need a signed url
export["url"] = S3Boto3Storage.url(
storage,
f"/exports/{job.task_id}.tar.gz",
expire=settings.S3_SIGNED_URL_EXPIRY,
)
# for s3 we create a new tar file in s3,
# so we need to check the size of _that_ file
try:
@ -194,6 +186,9 @@ class ExportUser(View):
# file no longer exists
export["size"] = 0
if export["size"] > 0:
export["url"] = reverse("prefs-export-file", args=[job.task_id])
exports.append(export)
site = models.SiteSettings.objects.get()
@ -235,6 +230,21 @@ class ExportArchive(View):
def get(self, request, archive_id):
"""download user export file"""
export = BookwyrmExportJob.objects.get(task_id=archive_id, user=request.user)
if isinstance(export.export_data.storage, storage_backends.ExportsS3Storage):
# make custom_domain None so we can sign the url
# see https://github.com/jschneier/django-storages/issues/944
storage = S3Boto3Storage(querystring_auth=True, custom_domain=None)
try:
url = S3Boto3Storage.url(
storage,
f"/exports/{export.task_id}.tar.gz",
expire=settings.S3_SIGNED_URL_EXPIRY,
)
except Exception:
raise Http404()
return redirect(url)
if isinstance(export.export_data.storage, storage_backends.ExportsFileStorage):
try:
return HttpResponse(
@ -246,4 +256,5 @@ class ExportArchive(View):
)
except FileNotFoundError:
raise Http404()
return HttpResponseServerError()