Bläddra i källkod

feat(api): enhance file preview handling (#9674)

tags/0.10.1
-LAN- 1 år sedan
förälder
incheckning
67016feb96
Inget konto är kopplat till bidragsgivarens mejladress
2 ändrade filer med 29 tillägg och 15 borttagningar
  1. 25
    10
      api/controllers/files/image_preview.py
  2. 4
    5
      api/services/file_service.py

+ 25
- 10
api/controllers/files/image_preview.py Visa fil

from flask import Response, request from flask import Response, request
from flask_restful import Resource
from flask_restful import Resource, reqparse
from werkzeug.exceptions import NotFound from werkzeug.exceptions import NotFound


import services import services
def get(self, file_id): def get(self, file_id):
file_id = str(file_id) file_id = str(file_id)


timestamp = request.args.get("timestamp")
nonce = request.args.get("nonce")
sign = request.args.get("sign")
parser = reqparse.RequestParser()
parser.add_argument("timestamp", type=str, required=True, location="args")
parser.add_argument("nonce", type=str, required=True, location="args")
parser.add_argument("sign", type=str, required=True, location="args")
parser.add_argument("as_attachment", type=bool, required=False, default=False, location="args")


if not timestamp or not nonce or not sign:
args = parser.parse_args()

if not args["timestamp"] or not args["nonce"] or not args["sign"]:
return {"content": "Invalid request."}, 400 return {"content": "Invalid request."}, 400


try: try:
generator, mimetype = FileService.get_signed_file_preview(
generator, upload_file = FileService.get_file_generator_by_file_id(
file_id=file_id, file_id=file_id,
timestamp=timestamp,
nonce=nonce,
sign=sign,
timestamp=args["timestamp"],
nonce=args["nonce"],
sign=args["sign"],
) )
except services.errors.file.UnsupportedFileTypeError: except services.errors.file.UnsupportedFileTypeError:
raise UnsupportedFileTypeError() raise UnsupportedFileTypeError()


return Response(generator, mimetype=mimetype)
response = Response(
generator,
mimetype=upload_file.mime_type,
direct_passthrough=True,
headers={},
)
if upload_file.size > 0:
response.headers["Content-Length"] = str(upload_file.size)
if args["as_attachment"]:
response.headers["Content-Disposition"] = f"attachment; filename={upload_file.name}"

return response




class WorkspaceWebappLogoApi(Resource): class WorkspaceWebappLogoApi(Resource):

+ 4
- 5
api/services/file_service.py Visa fil

import datetime import datetime
import hashlib import hashlib
import uuid import uuid
from collections.abc import Generator
from typing import Literal, Union from typing import Literal, Union


from flask_login import current_user from flask_login import current_user
return upload_file return upload_file


@staticmethod @staticmethod
def get_file_preview(file_id: str) -> str:
def get_file_preview(file_id: str):
upload_file = db.session.query(UploadFile).filter(UploadFile.id == file_id).first() upload_file = db.session.query(UploadFile).filter(UploadFile.id == file_id).first()


if not upload_file: if not upload_file:
return generator, upload_file.mime_type return generator, upload_file.mime_type


@staticmethod @staticmethod
def get_signed_file_preview(file_id: str, timestamp: str, nonce: str, sign: str):
def get_file_generator_by_file_id(file_id: str, timestamp: str, nonce: str, sign: str):
result = file_helpers.verify_file_signature(upload_file_id=file_id, timestamp=timestamp, nonce=nonce, sign=sign) result = file_helpers.verify_file_signature(upload_file_id=file_id, timestamp=timestamp, nonce=nonce, sign=sign)
if not result: if not result:
raise NotFound("File not found or signature is invalid") raise NotFound("File not found or signature is invalid")


generator = storage.load(upload_file.key, stream=True) generator = storage.load(upload_file.key, stream=True)


return generator, upload_file.mime_type
return generator, upload_file


@staticmethod @staticmethod
def get_public_image_preview(file_id: str) -> tuple[Generator, str]:
def get_public_image_preview(file_id: str):
upload_file = db.session.query(UploadFile).filter(UploadFile.id == file_id).first() upload_file = db.session.query(UploadFile).filter(UploadFile.id == file_id).first()


if not upload_file: if not upload_file:

Laddar…
Avbryt
Spara