diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-07-14 09:09:19 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-14 09:09:19 +1000 |
| commit | 8532953c048ba8dc258d57d18e56e2243c41b085 (patch) | |
| tree | 1de20a1972e313b196b2c5abcacb5d40413a8b36 /synapse/rest/media/v1/upload_resource.py | |
| parent | Make auth & transactions more testable (#3499) (diff) | |
| parent | fix sytests (diff) | |
| download | synapse-8532953c048ba8dc258d57d18e56e2243c41b085.tar.xz | |
Merge pull request #3534 from krombel/use_parse_and_asserts_from_servlet
Use parse and asserts from http.servlet
Diffstat (limited to 'synapse/rest/media/v1/upload_resource.py')
| -rw-r--r-- | synapse/rest/media/v1/upload_resource.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/rest/media/v1/upload_resource.py b/synapse/rest/media/v1/upload_resource.py index 1a98120e1d..9b22d204a6 100644 --- a/synapse/rest/media/v1/upload_resource.py +++ b/synapse/rest/media/v1/upload_resource.py @@ -21,6 +21,7 @@ from twisted.web.server import NOT_DONE_YET from synapse.api.errors import SynapseError from synapse.http.server import respond_with_json, wrap_json_request_handler +from synapse.http.servlet import parse_string logger = logging.getLogger(__name__) @@ -65,10 +66,10 @@ class UploadResource(Resource): code=413, ) - upload_name = request.args.get("filename", None) + upload_name = parse_string(request, "filename") if upload_name: try: - upload_name = upload_name[0].decode('UTF-8') + upload_name = upload_name.decode('UTF-8') except UnicodeDecodeError: raise SynapseError( msg="Invalid UTF-8 filename parameter: %r" % (upload_name), |