diff options
| author | Kegan Dougal <kegan@matrix.org> | 2015-03-26 10:07:59 +0000 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2015-03-26 10:07:59 +0000 |
| commit | 4edcbcee3b9579f4b50ecb97e566edab1a7c4c8b (patch) | |
| tree | 5ab27c5ebbfc762ee133223fb48e868b85474c79 /synapse/handlers/register.py | |
| parent | Set the service ID as soon as it is known. (diff) | |
| parent | Allow a choice of LRU behaviour for Cache() by using LruCache() or OrderedDict() (diff) | |
| download | synapse-4edcbcee3b9579f4b50ecb97e566edab1a7c4c8b.tar.xz | |
Merge branch 'develop' into application-services-txn-reliability
Conflicts: synapse/storage/__init__.py
Diffstat (limited to 'synapse/handlers/register.py')
| -rw-r--r-- | synapse/handlers/register.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index cda4a8502a..c25e321099 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -31,6 +31,7 @@ import base64 import bcrypt import json import logging +import urllib logger = logging.getLogger(__name__) @@ -63,6 +64,13 @@ class RegistrationHandler(BaseHandler): password_hash = bcrypt.hashpw(password, bcrypt.gensalt()) if localpart: + if localpart and urllib.quote(localpart) != localpart: + raise SynapseError( + 400, + "User ID must only contain characters which do not" + " require URL encoding." + ) + user = UserID(localpart, self.hs.hostname) user_id = user.to_string() |