Merge pull request #163 from matrix-org/shay/normalize_username

Normalize username before interacting with Synapse
matrix-org · May 6, 2022 · 4ae8c9a · 4ae8c9a
2 parents ed863ba + bc87e5a
commit 4ae8c9a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/ldap_auth_provider.py b/ldap_auth_provider.py
@@ -133,6 +133,8 @@ async def check_auth(
             except ActiveDirectoryUPNException:
                 return None
 
+        localpart = localpart.lower()
+
         try:
             server = self._get_server()
             logger.debug("Attempting LDAP connection with %s", self.ldap_uris)

diff --git a/tests/test_simple.py b/tests/test_simple.py
@@ -95,6 +95,15 @@ def test_no_pwd(self):
         )
         self.assertFalse(result)
 
+    @defer.inlineCallbacks
+    def test_uppercase_username(self):
+        result = yield defer.ensureDeferred(
+            self.auth_provider.check_auth(
+                "BOB", "m.login.password", {"password": "secret"}
+            )
+        )
+        self.assertEqual(result, "@bob:test")
+
 
 class LdapSearchTestCase(unittest.TestCase):
     @defer.inlineCallbacks