summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Baker <dbkr@users.noreply.github.com>2016-01-15 09:18:02 +0000
committerDavid Baker <dbkr@users.noreply.github.com>2016-01-15 09:18:02 +0000
commit5bf1a3d6dcf10b06cc53947c4536512901464c02 (patch)
treefb23cbf9573ae74b7cf7b4846369efa45e385297
parentMerge pull request #497 from matrix-org/erikj/max_limit (diff)
parentAdd specific error code for invalid user names. (diff)
downloadsynapse-5bf1a3d6dcf10b06cc53947c4536512901464c02.tar.xz
Merge pull request #499 from matrix-org/invalid_user_name
Add specific error code for invalid user names.
-rw-r--r--synapse/api/errors.py1
-rw-r--r--synapse/handlers/register.py3
2 files changed, 3 insertions, 1 deletions
diff --git a/synapse/api/errors.py b/synapse/api/errors.py
index be0c58a4ca..e6d32acced 100644
--- a/synapse/api/errors.py
+++ b/synapse/api/errors.py
@@ -42,6 +42,7 @@ class Codes(object):
     EXCLUSIVE = "M_EXCLUSIVE"
     THREEPID_AUTH_FAILED = "M_THREEPID_AUTH_FAILED"
     THREEPID_IN_USE = "THREEPID_IN_USE"
+    INVALID_USER_NAME = "M_INVALID_USER_NAME"
 
 
 class CodeMessageException(RuntimeError):
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py
index ba26d13d49..83f4daaa8c 100644
--- a/synapse/handlers/register.py
+++ b/synapse/handlers/register.py
@@ -53,7 +53,8 @@ class RegistrationHandler(BaseHandler):
             raise SynapseError(
                 400,
                 "User ID must only contain characters which do not"
-                " require URL encoding."
+                " require URL encoding.",
+                Codes.INVALID_USER_NAME
             )
 
         user = UserID(localpart, self.hs.hostname)