diff options
| author | Richard van der Hoff <richard@matrix.org> | 2017-11-13 11:56:22 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2017-11-13 11:56:22 +0000 |
| commit | 8b33ac8f6c39b9debf89f1e96c72549cae29ae5f (patch) | |
| tree | 7b48d39b17a82fa3751f5429b77bd5f7803aa40f /synapse/handlers/register.py | |
| parent | Fix 500 on invalid utf-8 in request (diff) | |
| parent | Revert "move _state_group_cache to statestore" (diff) | |
| download | synapse-8b33ac8f6c39b9debf89f1e96c72549cae29ae5f.tar.xz | |
Merge branch 'develop' into rav/invalid_request_utf8
Diffstat (limited to 'synapse/handlers/register.py')
| -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 '=_-./'", |