From fd379b0108979e2aea98f69c71637c5b9d7ff4c2 Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Thu, 20 Feb 2020 14:36:29 +0000 Subject: [PATCH] User types are part of the hmac https://github.com/matrix-org/synapse/blob/b98971e8a437eb3903506eadbefdf6cb2e0853d6/synapse/_scripts/register_new_matrix_user.py#L62-L71 --- maubot/management/api/client_auth.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maubot/management/api/client_auth.py b/maubot/management/api/client_auth.py index f83002f..faf318e 100644 --- a/maubot/management/api/client_auth.py +++ b/maubot/management/api/client_auth.py @@ -33,7 +33,7 @@ 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): +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") @@ -42,6 +42,9 @@ def generate_mac(secret: str, nonce: str, user: str, password: str, admin: bool 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()