Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-11 13:04:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Handle unicode filenames given when downloading or received over federation

Browse Source
This commit is contained in:
Mark Haines 2015-08-26 17:08:47 +01:00
parent e85c7873dc
commit 5a9e0c3682
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
synapse/rest/media/v1/base_resource.py
View File

@ -34,6 +34,7 @@ import os
import cgi import cgi
import logging import logging
import urllib import urllib
import urlparse
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -43,10 +44,13 @@ def parse_media_id(request):
# This allows users to append e.g. /test.png to the URL. Useful for # This allows users to append e.g. /test.png to the URL. Useful for
# clients that parse the URL to see content type. # clients that parse the URL to see content type.
server_name, media_id = request.postpath[:2] server_name, media_id = request.postpath[:2]
if len(request.postpath) > 2 and is_ascii(request.postpath[-1]): file_name = None
return server_name, media_id, request.postpath[-1] if len(request.postpath) > 2:
else: try:
return server_name, media_id, None file_name = urlparse.unquote(request.postpath[-1]).decode("utf-8")
except UnicodeDecodeError:
pass
return server_name, media_id, file_name
except: except:
raise SynapseError( raise SynapseError(
404, 404,
@ -144,6 +148,16 @@ class BaseMediaResource(Resource):
upload_name = params.get("filename", None) upload_name = params.get("filename", None)
if upload_name and not is_ascii(upload_name): if upload_name and not is_ascii(upload_name):
upload_name = None upload_name = None
else:
upload_name_utf8 = params.get("filename*", None)
if upload_name_utf8.lower().startswith("utf-8''"):
upload_name = upload_name_utf8[7:]
if upload_name:
upload_name = urlparse.unquote(upload_name)
try:
upload_name = upload_name.decode("utf-8");
except UnicodeDecodeError:
upload_name = None
else: else:
upload_name = None upload_name = None
@ -185,7 +199,9 @@ class BaseMediaResource(Resource):
if is_ascii(upload_name): if is_ascii(upload_name):
request.setHeader( request.setHeader(
b"Content-Disposition", b"Content-Disposition",
b"inline; filename=%s" % (upload_name.encode("utf-8"),), b"inline; filename=%s" % (
urllib.quote(upload_name.encode("utf-8")),
),
) )
else: else:
request.setHeader( request.setHeader(