paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-31 20:13:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

upload: Factor out common code into zerver.lib.upload.

Browse Source
This commit is contained in:
Alex Vandiver
2024-06-20 16:11:59 +00:00
committed by Tim Abbott
parent c0d9a95aa8
commit c826d80061
4 changed files with 34 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
zerver/lib/upload/s3.py
View File

@@ -14,12 +14,7 @@ from typing_extensions import override
from zerver.lib.mime_types import guess_type
from zerver.lib.thumbnail import resize_avatar, resize_logo
from zerver.lib.upload.base import (
INLINE_MIME_TYPES,
ZulipUploadBackend,
create_attachment,
sanitize_name,
)
from zerver.lib.upload.base import INLINE_MIME_TYPES, ZulipUploadBackend
from zerver.models import Realm, RealmEmoji, UserProfile
# Duration that the signed upload URLs that we redirect to when
@@ -196,44 +191,34 @@ class S3UploadBackend(ZulipUploadBackend):
return urljoin(self.public_upload_url_base, key)
@override
def generate_message_upload_path(self, realm_id: str, uploaded_file_name: str) -> str:
def generate_message_upload_path(self, realm_id: str, sanitized_file_name: str) -> str:
return "/".join(
[
realm_id,
secrets.token_urlsafe(18),
sanitize_name(uploaded_file_name),
sanitized_file_name,
]
)
@override
def upload_message_attachment(
self,
uploaded_file_name: str,
path_id: str,
uploaded_file_size: int,
content_type: Optional[str],
file_data: bytes,
user_profile: UserProfile,
target_realm: Optional[Realm] = None,
) -> str:
if target_realm is None:
target_realm = user_profile.realm
s3_file_name = self.generate_message_upload_path(str(target_realm.id), uploaded_file_name)
url = f"/user_uploads/{s3_file_name}"
target_realm: Realm,
) -> None:
upload_image_to_s3(
self.uploads_bucket,
s3_file_name,
path_id,
content_type,
user_profile,
file_data,
settings.S3_UPLOADS_STORAGE_CLASS,
)
create_attachment(
uploaded_file_name, s3_file_name, user_profile, target_realm, uploaded_file_size
)
return url
@override
def save_attachment_contents(self, path_id: str, filehandle: BinaryIO) -> None:
for chunk in self.uploads_bucket.Object(path_id).get()["Body"]: