diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-08-28 17:36:46 -0700 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-08-28 17:36:46 -0700 |
| commit | e3d3fbf63f6b75d3e0adfd71012163a2c673833b (patch) | |
| tree | 0711e2e9bbfabcd83867ff524050c05441187882 /synapse/http/servlet.py | |
| parent | black (diff) | |
| parent | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged (diff) | |
| download | synapse-e3d3fbf63f6b75d3e0adfd71012163a2c673833b.tar.xz | |
Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keys
Diffstat (limited to 'synapse/http/servlet.py')
| -rw-r--r-- | synapse/http/servlet.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/synapse/http/servlet.py b/synapse/http/servlet.py index f0ca7d9aba..c186b31f59 100644 --- a/synapse/http/servlet.py +++ b/synapse/http/servlet.py @@ -166,7 +166,12 @@ def parse_string_from_args( value = args[name][0] if encoding: - value = value.decode(encoding) + try: + value = value.decode(encoding) + except ValueError: + raise SynapseError( + 400, "Query parameter %r must be %s" % (name, encoding) + ) if allowed_values is not None and value not in allowed_values: message = "Query parameter %r must be one of [%s]" % ( @@ -295,7 +300,7 @@ class RestServlet(object): http_server.register_paths( method, patterns, - trace_servlet(servlet_classname, method_handler), + trace_servlet(servlet_classname)(method_handler), servlet_classname, ) |