MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-15 11:23:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #260 from matrix-org/erikj/filename_order

Browse source 
Check for an internationalised filename first
This commit is contained in:
Erik Johnston 2015-08-27 11:18:01 +01:00
commit 4a6d894850
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
synapse/rest/media/v1/base_resource.py
View file

@ -145,14 +145,20 @@ class BaseMediaResource(Resource):
content_disposition = headers.get("Content-Disposition", None) content_disposition = headers.get("Content-Disposition", None)
if content_disposition: if content_disposition:
_, params = cgi.parse_header(content_disposition[0],) _, params = cgi.parse_header(content_disposition[0],)
upload_name = params.get("filename", None) upload_name = None
if upload_name and not is_ascii(upload_name):
upload_name = None # First check if there is a valid UTF-8 filename
else: upload_name_utf8 = params.get("filename*", None)
upload_name_utf8 = params.get("filename*", None) if upload_name_utf8:
if upload_name_utf8: if upload_name_utf8.lower().startswith("utf-8''"):
if upload_name_utf8.lower().startswith("utf-8''"): upload_name = upload_name_utf8[7:]
upload_name = upload_name_utf8[7:]
# If there isn't check for an ascii name.
if not upload_name:
upload_name_ascii = params.get("filename", None)
if upload_name_ascii and is_ascii(upload_name_ascii):
upload_name = upload_name_ascii
if upload_name: if upload_name:
upload_name = urlparse.unquote(upload_name) upload_name = urlparse.unquote(upload_name)
try: try: