From 58fbbe0f1db78d9dc91a319874dc8409e77cbf4c Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Fri, 20 Oct 2017 23:37:22 +0100
Subject: Disallow capital letters in userids

Factor out a common function for checking user ids and group ids, which forbids
capitals.
---
 synapse/handlers/register.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'synapse/handlers')

diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py
index 560fb36254..c7c091f43e 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
@@ -46,9 +46,7 @@ class RegistrationHandler(BaseHandler):
     @defer.inlineCallbacks
     def check_username(self, localpart, guest_access_token=None,
                        assigned_user_id=None):
-        yield run_on_reactor()
-
-        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 '_-./'",
@@ -81,7 +79,7 @@ class RegistrationHandler(BaseHandler):
                     "A different user ID has already been registered for this session",
                 )
 
-        yield self.check_user_id_not_appservice_exclusive(user_id)
+        self.check_user_id_not_appservice_exclusive(user_id)
 
         users = yield self.store.get_users_by_id_case_insensitive(user_id)
         if users:
@@ -254,7 +252,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 must only contain characters which do not"
-- 
cgit 1.4.1


From 29812c628ba924448719f5d2cfe7e05a5b1d0f45 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Fri, 20 Oct 2017 23:42:53 +0100
Subject: Allow = in mxids and groupids

... because the spec says we should.
---
 synapse/groups/groups_server.py | 2 +-
 synapse/handlers/register.py    | 5 ++---
 synapse/types.py                | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'synapse/handlers')

diff --git a/synapse/groups/groups_server.py b/synapse/groups/groups_server.py
index c359bfa72b..3599bfe9cf 100644
--- a/synapse/groups/groups_server.py
+++ b/synapse/groups/groups_server.py
@@ -794,5 +794,5 @@ def _validate_group_id(group_id):
     if types.contains_invalid_mxid_characters(localpart):
         raise SynapseError(
             400,
-            "Group ID can only contain characters a-z, 0-9, or '_-./'",
+            "Group ID can only contain characters a-z, 0-9, or '=_-./'",
         )
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py
index c7c091f43e..52aa9964d9 100644
--- a/synapse/handlers/register.py
+++ b/synapse/handlers/register.py
@@ -49,7 +49,7 @@ class RegistrationHandler(BaseHandler):
         if types.contains_invalid_mxid_characters(localpart):
             raise SynapseError(
                 400,
-                "User ID can only contain characters a-z, 0-9, or '_-./'",
+                "User ID can only contain characters a-z, 0-9, or '=_-./'",
                 Codes.INVALID_USERNAME
             )
 
@@ -255,8 +255,7 @@ class RegistrationHandler(BaseHandler):
         if types.contains_invalid_mxid_characters(localpart):
             raise SynapseError(
                 400,
-                "User ID must only contain characters which do not"
-                " require URL encoding."
+                "User ID can only contain characters a-z, 0-9, or '=_-./'",
             )
         user = UserID(localpart, self.hs.hostname)
         user_id = user.to_string()
diff --git a/synapse/types.py b/synapse/types.py
index efa721273d..88eb818de4 100644
--- a/synapse/types.py
+++ b/synapse/types.py
@@ -162,7 +162,7 @@ class GroupID(DomainSpecificString):
     SIGIL = "+"
 
 
-mxid_localpart_allowed_characters = set("_-./" + string.ascii_lowercase + string.digits)
+mxid_localpart_allowed_characters = set("_-./=" + string.ascii_lowercase + string.digits)
 
 
 def contains_invalid_mxid_characters(localpart):
-- 
cgit 1.4.1