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

Commit b19b63e

Browse files
authored
Don't 500 for invalid group IDs (#8628)
1 parent a9f90fa commit b19b63e

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

changelog.d/8628.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix handling of invalid group IDs to return a 400 rather than log an exception and return a 500.

synapse/handlers/groups_local.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import logging
1818

1919
from synapse.api.errors import HttpResponseException, RequestSendFailed, SynapseError
20-
from synapse.types import get_domain_from_id
20+
from synapse.types import GroupID, get_domain_from_id
2121

2222
logger = logging.getLogger(__name__)
2323

@@ -28,6 +28,9 @@ def _create_rerouter(func_name):
2828
"""
2929

3030
async def f(self, group_id, *args, **kwargs):
31+
if not GroupID.is_valid(group_id):
32+
raise SynapseError(400, "%s was not legal group ID" % (group_id,))
33+
3134
if self.is_mine_id(group_id):
3235
return await getattr(self.groups_server_handler, func_name)(
3336
group_id, *args, **kwargs

0 commit comments

Comments
 (0)