Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Discard empty upload_name before persisting file #7905

Merged
merged 14 commits into from
Sep 29, 2020
Merged

Discard empty upload_name before persisting file #7905

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5b955a2
Check media_type and upload_name before persisting file
Half-Shot Jul 19, 2020
1f96b41
Create 7905.bugfix
Half-Shot Jul 19, 2020
2bba403
Fix lint
Half-Shot Jul 20, 2020
64d5186
Update docstring, allow upload_name to be optional
Half-Shot Jul 20, 2020
97db88c
Do not raise Errors at the handler level
Half-Shot Jul 31, 2020
cff75a8
Check if upload_name is empty
Half-Shot Jul 31, 2020
0b62575
Merge branch 'develop' into hs/check-upload
Half-Shot Jul 31, 2020
cfd2a98
Be Pythonic.
clokep Sep 28, 2020
ae842e1
More lint.
clokep Sep 28, 2020
7ee568b
Update docstring.
clokep Sep 28, 2020
0291fc8
Merge remote-tracking branch 'origin/develop' into hs/check-upload
clokep Sep 28, 2020
8f1f119
Fix handling of none.
clokep Sep 29, 2020
9b2a1cb
Update changelog
Half-Shot Sep 29, 2020
0dc79d3
Update changelog.
clokep Sep 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/7905.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix synapse storing a media file with an invalid media_type or upload_name.
12 changes: 11 additions & 1 deletion synapse/rest/media/v1/media_repository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
from twisted.web.resource import Resource

from synapse.api.errors import (
Codes,
FederationDeniedError,
HttpResponseException,
NotFoundError,
Expand Down Expand Up @@ -141,14 +142,23 @@ async def create_content(

Args:
media_type(str): The content type of the file
clokep marked this conversation as resolved.
Show resolved Hide resolved
upload_name(str): The name of the file
upload_name(str|None): The name of the file
clokep marked this conversation as resolved.
Show resolved Hide resolved
content: A file like object that is the content to store
content_length(int): The length of the content
auth_user(str): The user_id of the uploader

Returns:
Deferred[str]: The mxc url of the stored content
"""

if not isinstance(media_type, str):
raise SynapseError(400, "Invalid parameter media_type", Codes.INVALID_PARAM)

if upload_name and not isinstance(upload_name, str):
raise SynapseError(
400, "Invalid parameter upload_name", Codes.INVALID_PARAM
)

media_id = random_string(24)

file_info = FileInfo(server_name=None, file_id=media_id)
Expand Down