Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit b3bcacf

Browse files
authored
Add missing errcode to parse_string and parse_boolean (#11542)
1 parent afa0a5e commit b3bcacf

File tree

6 files changed

+13
-12
lines changed

6 files changed

+13
-12
lines changed

changelog.d/11542.misc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add missing `errcode` to `parse_string` and `parse_boolean`.

synapse/http/servlet.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ def parse_boolean_from_args(
246246
message = (
247247
"Boolean query parameter %r must be one of ['true', 'false']"
248248
) % (name,)
249-
raise SynapseError(400, message)
249+
raise SynapseError(400, message, errcode=Codes.INVALID_PARAM)
250250
else:
251251
if required:
252252
message = "Missing boolean query parameter %r" % (name,)
@@ -414,7 +414,7 @@ def _parse_string_value(
414414
name,
415415
", ".join(repr(v) for v in allowed_values),
416416
)
417-
raise SynapseError(400, message)
417+
raise SynapseError(400, message, errcode=Codes.INVALID_PARAM)
418418
else:
419419
return value_str
420420

tests/rest/admin/test_federation.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def test_invalid_parameter(self):
9595
)
9696

9797
self.assertEqual(HTTPStatus.BAD_REQUEST, channel.code, msg=channel.json_body)
98-
self.assertEqual(Codes.UNKNOWN, channel.json_body["errcode"])
98+
self.assertEqual(Codes.INVALID_PARAM, channel.json_body["errcode"])
9999

100100
# invalid search order
101101
channel = self.make_request(
@@ -105,7 +105,7 @@ def test_invalid_parameter(self):
105105
)
106106

107107
self.assertEqual(HTTPStatus.BAD_REQUEST, channel.code, msg=channel.json_body)
108-
self.assertEqual(Codes.UNKNOWN, channel.json_body["errcode"])
108+
self.assertEqual(Codes.INVALID_PARAM, channel.json_body["errcode"])
109109

110110
# invalid destination
111111
channel = self.make_request(

tests/rest/admin/test_media.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ def test_invalid_parameter(self) -> None:
360360
channel.code,
361361
msg=channel.json_body,
362362
)
363-
self.assertEqual(Codes.UNKNOWN, channel.json_body["errcode"])
363+
self.assertEqual(Codes.INVALID_PARAM, channel.json_body["errcode"])
364364
self.assertEqual(
365365
"Boolean query parameter 'keep_profiles' must be one of ['true', 'false']",
366366
channel.json_body["error"],

tests/rest/admin/test_statistics.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def test_invalid_parameter(self) -> None:
9292
channel.code,
9393
msg=channel.json_body,
9494
)
95-
self.assertEqual(Codes.UNKNOWN, channel.json_body["errcode"])
95+
self.assertEqual(Codes.INVALID_PARAM, channel.json_body["errcode"])
9696

9797
# negative from
9898
channel = self.make_request(

tests/rest/admin/test_user.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ def test_invalid_parameter(self):
608608
)
609609

610610
self.assertEqual(HTTPStatus.BAD_REQUEST, channel.code, msg=channel.json_body)
611-
self.assertEqual(Codes.UNKNOWN, channel.json_body["errcode"])
611+
self.assertEqual(Codes.INVALID_PARAM, channel.json_body["errcode"])
612612

613613
# invalid deactivated
614614
channel = self.make_request(
@@ -618,7 +618,7 @@ def test_invalid_parameter(self):
618618
)
619619

620620
self.assertEqual(HTTPStatus.BAD_REQUEST, channel.code, msg=channel.json_body)
621-
self.assertEqual(Codes.UNKNOWN, channel.json_body["errcode"])
621+
self.assertEqual(Codes.INVALID_PARAM, channel.json_body["errcode"])
622622

623623
# unkown order_by
624624
channel = self.make_request(
@@ -628,7 +628,7 @@ def test_invalid_parameter(self):
628628
)
629629

630630
self.assertEqual(HTTPStatus.BAD_REQUEST, channel.code, msg=channel.json_body)
631-
self.assertEqual(Codes.UNKNOWN, channel.json_body["errcode"])
631+
self.assertEqual(Codes.INVALID_PARAM, channel.json_body["errcode"])
632632

633633
# invalid search order
634634
channel = self.make_request(
@@ -638,7 +638,7 @@ def test_invalid_parameter(self):
638638
)
639639

640640
self.assertEqual(HTTPStatus.BAD_REQUEST, channel.code, msg=channel.json_body)
641-
self.assertEqual(Codes.UNKNOWN, channel.json_body["errcode"])
641+
self.assertEqual(Codes.INVALID_PARAM, channel.json_body["errcode"])
642642

643643
def test_limit(self):
644644
"""
@@ -2896,7 +2896,7 @@ def test_invalid_parameter(self, method: str):
28962896
)
28972897

28982898
self.assertEqual(HTTPStatus.BAD_REQUEST, channel.code, msg=channel.json_body)
2899-
self.assertEqual(Codes.UNKNOWN, channel.json_body["errcode"])
2899+
self.assertEqual(Codes.INVALID_PARAM, channel.json_body["errcode"])
29002900

29012901
# invalid search order
29022902
channel = self.make_request(
@@ -2906,7 +2906,7 @@ def test_invalid_parameter(self, method: str):
29062906
)
29072907

29082908
self.assertEqual(HTTPStatus.BAD_REQUEST, channel.code, msg=channel.json_body)
2909-
self.assertEqual(Codes.UNKNOWN, channel.json_body["errcode"])
2909+
self.assertEqual(Codes.INVALID_PARAM, channel.json_body["errcode"])
29102910

29112911
# negative limit
29122912
channel = self.make_request(

0 commit comments

Comments
 (0)