From 543f8dbf782218f6de3154a6a90f82476e47f693 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Fri, 11 Jun 2021 10:55:51 +0300
Subject: [PATCH] Fix registering accounts with shared secret. Fixes #107

---
 maubot/management/api/client_auth.py | 56 ++++++++++++++--------------
 optional-requirements.txt            |  2 +-
 requirements.txt                     |  2 +-
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/maubot/management/api/client_auth.py b/maubot/management/api/client_auth.py
index 8a007f0..36c4d9a 100644
--- a/maubot/management/api/client_auth.py
+++ b/maubot/management/api/client_auth.py
@@ -22,7 +22,7 @@ import string
 import hmac
 
 from aiohttp import web
-from mautrix.api import HTTPAPI, Path, Method
+from mautrix.api import HTTPAPI, Path, SynapseAdminPath, Method
 from mautrix.errors import MatrixRequestError
 
 from .base import routes, get_config, get_loop
@@ -33,21 +33,6 @@ def registration_secrets() -> Dict[str, Dict[str, str]]:
     return get_config()["registration_secrets"]
 
 
-def generate_mac(secret: str, nonce: str, user: str, password: str, admin: bool = False, user_type: str = None):
-    mac = hmac.new(key=secret.encode("utf-8"), digestmod=hashlib.sha1)
-    mac.update(nonce.encode("utf-8"))
-    mac.update(b"\x00")
-    mac.update(user.encode("utf-8"))
-    mac.update(b"\x00")
-    mac.update(password.encode("utf-8"))
-    mac.update(b"\x00")
-    mac.update(b"admin" if admin else b"notadmin")
-    if user_type is not None:
-        mac.update(b"\x00")
-        mac.update(user_type.encode("utf8"))
-    return mac.hexdigest()
-
-
 @routes.get("/client/auth/servers")
 async def get_registerable_servers(_: web.Request) -> web.Response:
     return web.json_response({key: value["url"] for key, value in registration_secrets().items()})
@@ -82,25 +67,40 @@ async def read_client_auth_request(request: web.Request) -> Tuple[Optional[AuthR
     return AuthRequestInfo(api, secret, username, password, user_type), None
 
 
+def generate_mac(secret: str, nonce: str, user: str, password: str, admin: bool = False,
+                 user_type: str = None) -> str:
+    mac = hmac.new(key=secret.encode("utf-8"), digestmod=hashlib.sha1)
+    mac.update(nonce.encode("utf-8"))
+    mac.update(b"\x00")
+    mac.update(user.encode("utf-8"))
+    mac.update(b"\x00")
+    mac.update(password.encode("utf-8"))
+    mac.update(b"\x00")
+    mac.update(b"admin" if admin else b"notadmin")
+    if user_type is not None:
+        mac.update(b"\x00")
+        mac.update(user_type.encode("utf8"))
+    return mac.hexdigest()
+
+
 @routes.post("/client/auth/{server}/register")
 async def register(request: web.Request) -> web.Response:
     info, err = await read_client_auth_request(request)
     if err is not None:
         return err
     api, secret, username, password, user_type = info
-    res = await api.request(Method.GET, Path.admin.register)
-    nonce = res["nonce"]
-    mac = generate_mac(secret, nonce, username, password, user_type=user_type)
+    path = SynapseAdminPath.v1.register
+    res = await api.request(Method.GET, path)
+    content = {
+        "nonce": res["nonce"],
+        "username": username,
+        "password": password,
+        "admin": False,
+        "mac": generate_mac(secret, res["nonce"], username, password, user_type=user_type),
+        "user_type": user_type,
+    }
     try:
-        return web.json_response(await api.request(Method.POST, Path.admin.register, content={
-            "nonce": nonce,
-            "username": username,
-            "password": password,
-            "admin": False,
-            "mac": mac,
-            # Older versions of synapse will ignore this field if it is None
-            "user_type": user_type,
-        }))
+        return web.json_response(await api.request(Method.POST, path, content=content))
     except MatrixRequestError as e:
         return web.json_response({
             "errcode": e.errcode,
diff --git a/optional-requirements.txt b/optional-requirements.txt
index 50352be..3366255 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -5,7 +5,7 @@
 psycopg2-binary>=2,<3
 
 #/e2be
-asyncpg>=0.20,<0.23
+asyncpg>=0.20,<0.24
 python-olm>=3,<4
 pycryptodome>=3,<4
 unpaddedbase64>=1,<2
diff --git a/requirements.txt b/requirements.txt
index 2bcccff..34e5c3e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-mautrix>=0.9,<0.10
+mautrix>=0.9.5,<0.10
 aiohttp>=3,<4
 yarl>=1,<2
 SQLAlchemy>=1,<1.4