mirror of
https://github.com/daniviga/django-ram.git
synced 2026-02-03 17:40:39 +01:00
Compare commits
2 Commits
49c8d804d6
...
9a469378df
| Author | SHA1 | Date | |
|---|---|---|---|
| 9a469378df | |||
| ede8741473 |
@@ -1,4 +1,4 @@
|
|||||||
from ram.utils import git_suffix
|
from ram.utils import git_suffix
|
||||||
|
|
||||||
__version__ = "0.19.6"
|
__version__ = "0.19.7"
|
||||||
__version__ += git_suffix(__file__)
|
__version__ += git_suffix(__file__)
|
||||||
|
|||||||
@@ -206,6 +206,9 @@ ROLLING_STOCK_TYPES = [
|
|||||||
|
|
||||||
FEATURED_ITEMS_MAX = 6
|
FEATURED_ITEMS_MAX = 6
|
||||||
|
|
||||||
|
# If True, use X-Accel-Redirect (Nginx)
|
||||||
|
USE_X_ACCEL_REDIRECT = False
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from ram.local_settings import *
|
from ram.local_settings import *
|
||||||
except ImportError:
|
except ImportError:
|
||||||
|
|||||||
@@ -21,17 +21,22 @@ from django.conf.urls.static import static
|
|||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
from django.urls import include, path
|
from django.urls import include, path
|
||||||
|
|
||||||
from ram.views import UploadImage
|
from ram.views import UploadImage, DownloadFile
|
||||||
from portal.views import Render404
|
from portal.views import Render404
|
||||||
|
|
||||||
handler404 = Render404.as_view()
|
handler404 = Render404.as_view()
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
path("", lambda r: redirect("portal/")),
|
path("", lambda r: redirect("portal/")),
|
||||||
|
path("admin/", admin.site.urls),
|
||||||
path("tinymce/", include("tinymce.urls")),
|
path("tinymce/", include("tinymce.urls")),
|
||||||
path("tinymce/upload_image", UploadImage.as_view(), name="upload_image"),
|
path("tinymce/upload_image", UploadImage.as_view(), name="upload_image"),
|
||||||
|
path(
|
||||||
|
"media/files/<path:filename>",
|
||||||
|
DownloadFile.as_view(),
|
||||||
|
name="download_file",
|
||||||
|
),
|
||||||
path("portal/", include("portal.urls")),
|
path("portal/", include("portal.urls")),
|
||||||
path("admin/", admin.site.urls),
|
|
||||||
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
||||||
|
|
||||||
# Enable the "/dcc" routing only if the "driver" app is active
|
# Enable the "/dcc" routing only if the "driver" app is active
|
||||||
@@ -55,6 +60,7 @@ if settings.DEBUG:
|
|||||||
if settings.REST_ENABLED:
|
if settings.REST_ENABLED:
|
||||||
from django.views.generic import TemplateView
|
from django.views.generic import TemplateView
|
||||||
from rest_framework.schemas import get_schema_view
|
from rest_framework.schemas import get_schema_view
|
||||||
|
|
||||||
urlpatterns += [
|
urlpatterns += [
|
||||||
path(
|
path(
|
||||||
"swagger/",
|
"swagger/",
|
||||||
|
|||||||
@@ -5,19 +5,26 @@ import posixpath
|
|||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from PIL import Image, UnidentifiedImageError
|
from PIL import Image, UnidentifiedImageError
|
||||||
|
|
||||||
from django.views import View
|
from django.apps import apps
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.http import (
|
from django.http import (
|
||||||
|
Http404,
|
||||||
|
HttpResponse,
|
||||||
HttpResponseBadRequest,
|
HttpResponseBadRequest,
|
||||||
HttpResponseForbidden,
|
HttpResponseForbidden,
|
||||||
|
FileResponse,
|
||||||
JsonResponse,
|
JsonResponse,
|
||||||
)
|
)
|
||||||
|
from django.views import View
|
||||||
from django.utils.text import slugify as slugify
|
from django.utils.text import slugify as slugify
|
||||||
|
from django.utils.encoding import smart_str
|
||||||
from django.utils.decorators import method_decorator
|
from django.utils.decorators import method_decorator
|
||||||
from django.views.decorators.csrf import csrf_exempt
|
from django.views.decorators.csrf import csrf_exempt
|
||||||
|
|
||||||
from rest_framework.pagination import LimitOffsetPagination
|
from rest_framework.pagination import LimitOffsetPagination
|
||||||
|
|
||||||
|
from ram.models import PrivateDocument
|
||||||
|
|
||||||
|
|
||||||
class CustomLimitOffsetPagination(LimitOffsetPagination):
|
class CustomLimitOffsetPagination(LimitOffsetPagination):
|
||||||
default_limit = 10
|
default_limit = 10
|
||||||
@@ -67,3 +74,43 @@ class UploadImage(View):
|
|||||||
),
|
),
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class DownloadFile(View):
|
||||||
|
def get(self, request, filename, disposition="inline"):
|
||||||
|
# Clean up the filename to prevent directory traversal attacks
|
||||||
|
filename = os.path.basename(filename)
|
||||||
|
|
||||||
|
# Find a document where the stored file name matches
|
||||||
|
# Find all models inheriting from PublishableFile
|
||||||
|
for model in apps.get_models():
|
||||||
|
if issubclass(model, PrivateDocument) and not model._meta.abstract:
|
||||||
|
try:
|
||||||
|
doc = model.objects.get(file__endswith=filename)
|
||||||
|
if doc.private and not request.user.is_staff:
|
||||||
|
break
|
||||||
|
|
||||||
|
file = doc.file
|
||||||
|
if not os.path.exists(file.path):
|
||||||
|
break
|
||||||
|
|
||||||
|
if getattr(settings, "USE_X_ACCEL_REDIRECT", False):
|
||||||
|
response = HttpResponse()
|
||||||
|
response["Content-Type"] = ""
|
||||||
|
response["X-Accel-Redirect"] = file.url
|
||||||
|
else:
|
||||||
|
response = FileResponse(
|
||||||
|
open(file.path, "rb"), as_attachment=True
|
||||||
|
)
|
||||||
|
|
||||||
|
response["Content-Disposition"] = (
|
||||||
|
'{}; filename="{}"'.format(
|
||||||
|
disposition,
|
||||||
|
smart_str(os.path.basename(file.path))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
return response
|
||||||
|
except model.DoesNotExist:
|
||||||
|
continue
|
||||||
|
|
||||||
|
raise Http404("File not found")
|
||||||
|
|||||||
Reference in New Issue
Block a user