Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

upload: Extract generate_message_upload_path helper. 

This helper will let us avoid copying this logic in the data import
code path.
This commit is contained in:
rht 2021-09-02 08:19:44 -04:00 committed by Tim Abbott
parent 094f22e6b4
commit 6ff659d199
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
zerver/lib/upload.py
View File

@ -201,6 +201,9 @@ class ZulipUploadBackend:
def get_public_upload_root_url(self) -> str: def get_public_upload_root_url(self) -> str:
raise NotImplementedError() raise NotImplementedError()
def generate_message_upload_path(self, realm_id: str, uploaded_file_name: str) -> str:
raise NotImplementedError()
def upload_message_file( def upload_message_file(
self, self,
uploaded_file_name: str, uploaded_file_name: str,
@ -439,6 +442,15 @@ class S3UploadBackend(ZulipUploadBackend):
def get_public_upload_root_url(self) -> str: def get_public_upload_root_url(self) -> str:
return self.public_upload_url_base return self.public_upload_url_base
def generate_message_upload_path(self, realm_id: str, uploaded_file_name: str) -> str:
return "/".join(
[
realm_id,
secrets.token_urlsafe(18),
sanitize_name(uploaded_file_name),
]
)
def upload_message_file( def upload_message_file(
self, self,
uploaded_file_name: str, uploaded_file_name: str,
@ -450,13 +462,7 @@ class S3UploadBackend(ZulipUploadBackend):
) -> str: ) -> str:
if target_realm is None: if target_realm is None:
target_realm = user_profile.realm target_realm = user_profile.realm
s3_file_name = "/".join( s3_file_name = self.generate_message_upload_path(str(target_realm.id), uploaded_file_name)
[
str(target_realm.id),
secrets.token_urlsafe(18),
sanitize_name(uploaded_file_name),
]
)
url = f"/user_uploads/{s3_file_name}" url = f"/user_uploads/{s3_file_name}"
upload_image_to_s3( upload_image_to_s3(
@ -767,6 +773,17 @@ class LocalUploadBackend(ZulipUploadBackend):
def get_public_upload_root_url(self) -> str: def get_public_upload_root_url(self) -> str:
return "/user_avatars/" return "/user_avatars/"
def generate_message_upload_path(self, realm_id: str, uploaded_file_name: str) -> str:
# Split into 256 subdirectories to prevent directories from getting too big
return "/".join(
[
realm_id,
format(random.randint(0, 255), "x"),
secrets.token_urlsafe(18),
sanitize_name(uploaded_file_name),
]
)
def upload_message_file( def upload_message_file(
self, self,
uploaded_file_name: str, uploaded_file_name: str,
@ -776,15 +793,7 @@ class LocalUploadBackend(ZulipUploadBackend):
user_profile: UserProfile, user_profile: UserProfile,
target_realm: Optional[Realm] = None, target_realm: Optional[Realm] = None,
) -> str: ) -> str:
# Split into 256 subdirectories to prevent directories from getting too big path = self.generate_message_upload_path(str(user_profile.realm_id), uploaded_file_name)
path = "/".join(
[
str(user_profile.realm_id),
format(random.randint(0, 255), "x"),
secrets.token_urlsafe(18),
sanitize_name(uploaded_file_name),
]
)
write_local_file("files", path, file_data) write_local_file("files", path, file_data)
create_attachment(uploaded_file_name, path, user_profile, uploaded_file_size) create_attachment(uploaded_file_name, path, user_profile, uploaded_file_size)