diff options
| author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2017-11-27 18:10:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-27 18:10:53 +0000 |
| commit | ac73960887d6a0e71b47ae7813c7d629c9a1c1ce (patch) | |
| tree | e53023baa606f066cb656ef24cf274d2cc7a779e | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff) | |
| parent | Revert "Allow upper-case characters in mxids" (diff) | |
| download | synapse-ac73960887d6a0e71b47ae7813c7d629c9a1c1ce.tar.xz | |
Merge pull request #2714 from matrix-org/rav/revert_mxid_case_thing
Revert "Allow upper-case characters in mxids"
| -rw-r--r-- | synapse/handlers/register.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index bd5ba6e1d8..f6e7e58563 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -15,7 +15,6 @@ """Contains functions for registering clients.""" import logging -import urllib from twisted.internet import defer @@ -23,6 +22,7 @@ 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 @@ -47,7 +47,7 @@ class RegistrationHandler(BaseHandler): @defer.inlineCallbacks def check_username(self, localpart, guest_access_token=None, assigned_user_id=None): - if urllib.quote(localpart.encode('utf-8')) != localpart: + if types.contains_invalid_mxid_characters(localpart): raise SynapseError( 400, "User ID can only contain characters a-z, 0-9, or '=_-./'", @@ -253,7 +253,7 @@ class RegistrationHandler(BaseHandler): """ Registers email_id as SAML2 Based Auth. """ - if urllib.quote(localpart) != localpart: + if types.contains_invalid_mxid_characters(localpart): raise SynapseError( 400, "User ID can only contain characters a-z, 0-9, or '=_-./'", |