Merge pull request #868 from matrix-org/erikj/invalid_id

Make get_domain_from_id throw SynapseError on invalid ID
2016-06-14 15:09:07 +01:00 · 2016-06-14 15:09:07 +01:00 · d12134ce37
parent e9892b4b26 36e2aade87
commit d12134ce37
1 changed files with 4 additions and 1 deletions
--- a/synapse/types.py
+++ b/synapse/types.py
@ -22,7 +22,10 @@ Requester = namedtuple("Requester", ["user", "access_token_id", "is_guest"])


 def get_domain_from_id(string):
+    try:
        return string.split(":", 1)[1]
+    except IndexError:
+        raise SynapseError(400, "Invalid ID: %r", string)


 class DomainSpecificString(