Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Give a sensible error message if the filename is invalid UTF-8

This commit is contained in:
Mark Haines 2015-08-26 17:27:23 +01:00
parent 5a9e0c3682
commit c9cb354b58
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,7 +155,7 @@ class BaseMediaResource(Resource):
if upload_name: if upload_name:
upload_name = urlparse.unquote(upload_name) upload_name = urlparse.unquote(upload_name)
try: try:
upload_name = upload_name.decode("utf-8"); upload_name = upload_name.decode("utf-8")
except UnicodeDecodeError: except UnicodeDecodeError:
upload_name = None upload_name = None
else: else:

8
synapse/rest/media/v1/upload_resource.py
View File

@ -86,7 +86,13 @@ class UploadResource(BaseMediaResource):
upload_name = request.args.get("filename", None) upload_name = request.args.get("filename", None)
if upload_name: if upload_name:
upload_name = upload_name[0].decode('UTF-8') try:
upload_name = upload_name[0].decode('UTF-8')
except UnicodeDecodeError:
raise SynapseError(
msg="Invalid UTF-8 filename parameter: %r" % (upload_name),
code=400,
)
headers = request.requestHeaders headers = request.requestHeaders