summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2017-11-09 19:36:13 +0000
committerRichard van der Hoff <richard@matrix.org>2017-11-09 20:07:36 +0000
commitf18226762b30440996aef01df1847addc40d0643 (patch)
tree57eb9513d134653d09efb57b26767e5dfa63b177
parentMerge branch 'develop' into matrix-org-hotfixes (diff)
downloadsynapse-f18226762b30440996aef01df1847addc40d0643.tar.xz
Allow upper-case characters in mxids
Because we're never going to be able to fix this :'(
-rw-r--r--synapse/handlers/register.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py
index 49dc33c147..18165252de 100644
--- a/synapse/handlers/register.py
+++ b/synapse/handlers/register.py
@@ -15,6 +15,7 @@
 
 """Contains functions for registering clients."""
 import logging
+import urllib
 
 from twisted.internet import defer
 
@@ -22,7 +23,6 @@ from synapse.api.errors import (
     AuthError, Codes, SynapseError, RegistrationError, InvalidCaptchaError
 )
 from synapse.http.client import CaptchaServerHttpClient
-from synapse import types
 from synapse.types import UserID
 from synapse.util.async import run_on_reactor
 from ._base import BaseHandler
@@ -46,7 +46,7 @@ class RegistrationHandler(BaseHandler):
     @defer.inlineCallbacks
     def check_username(self, localpart, guest_access_token=None,
                        assigned_user_id=None):
-        if types.contains_invalid_mxid_characters(localpart):
+        if urllib.quote(localpart.encode('utf-8')) != localpart:
             raise SynapseError(
                 400,
                 "User ID can only contain characters a-z, 0-9, or '=_-./'",
@@ -252,7 +252,7 @@ class RegistrationHandler(BaseHandler):
         """
         Registers email_id as SAML2 Based Auth.
         """
-        if types.contains_invalid_mxid_characters(localpart):
+        if urllib.quote(localpart) != localpart:
             raise SynapseError(
                 400,
                 "User ID can only contain characters a-z, 0-9, or '=_-./'",