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

Make get_domain_from_id throw SynapseError on invalid ID
matrix-org · Jun 14, 2016 · d12134c · d12134c
2 parents e9892b4 + 36e2aad
commit d12134c
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/synapse/types.py b/synapse/types.py
@@ -22,7 +22,10 @@
 
 
 def get_domain_from_id(string):
-    return string.split(":", 1)[1]
+    try:
+        return string.split(":", 1)[1]
+    except IndexError:
+        raise SynapseError(400, "Invalid ID: %r", string)
 
 
 class DomainSpecificString(