paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 14:35:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

emoji: Add none checks for uploaded file name.

Browse Source 
Signed-off-by: Zixuan James Li <p359101898@gmail.com>
This commit is contained in:
Zixuan James Li
2022-06-14 22:02:27 -04:00
committed by Tim Abbott
parent 10dc6ea39e
commit 40b4da8f58
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/lib/upload.py
View File

@@ -377,6 +377,7 @@ def check_upload_within_quota(realm: Realm, uploaded_file_size: int) -> None:
def get_file_info(request: HttpRequest, user_file: File) -> Tuple[str, int, Optional[str]]: def get_file_info(request: HttpRequest, user_file: File) -> Tuple[str, int, Optional[str]]:
uploaded_file_name = user_file.name uploaded_file_name = user_file.name
assert uploaded_file_name is not None
content_type = request.GET.get("mimetype") content_type = request.GET.get("mimetype")
if content_type is None: if content_type is None:
guessed_type = guess_type(uploaded_file_name)[0] guessed_type = guess_type(uploaded_file_name)[0]
@@ -1201,6 +1202,7 @@ def handle_reupload_emojis_event(realm: Realm, logger: logging.Logger) -> None:
for realm_emoji in query: for realm_emoji in query:
logger.info("Processing emoji %s", realm_emoji.id) logger.info("Processing emoji %s", realm_emoji.id)
emoji_filename = realm_emoji.file_name emoji_filename = realm_emoji.file_name
assert emoji_filename is not None
emoji_url = get_emoji_url(emoji_filename, realm_emoji.realm_id) emoji_url = get_emoji_url(emoji_filename, realm_emoji.realm_id)
if emoji_url.startswith("/"): if emoji_url.startswith("/"):
emoji_url = urljoin(realm_emoji.realm.uri, emoji_url) emoji_url = urljoin(realm_emoji.realm.uri, emoji_url)