Merge pull request #5808 from matrix-org/erikj/parse_decode_error

matrix-org · Feb 20, 2020 · 6e7f378 · 6e7f378
2 parents e7ffd4a + 3c076c7
commit 6e7f378
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/changelog.d/5808.misc b/changelog.d/5808.misc
@@ -0,0 +1 @@
+Handle incorrectly encoded query params correctly by returning a 400.
diff --git 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]" % (
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Handle incorrectly encoded query params correctly by returning a 400.