Add signing host and keyname to signatures

synapse/api/auth.py

@@ -416,11 +416,15 @@ class Auth(object):
                     key_validity_url
                 )
                 return False
-            verify_key = nacl.signing.VerifyKey(decode_base64(public_key))
+            for _, signature_block in join_third_party_invite["signatures"].items():
-            encoded_signature = join_third_party_invite["signature"]
+                for key_name, encoded_signature in signature_block.items():
-            signature = decode_base64(encoded_signature)
+                    if not key_name.startswith("ed25519:"):
-            verify_key.verify(token, signature)
+                        return False
-            return True
+                    verify_key = nacl.signing.VerifyKey(decode_base64(public_key))
+                    signature = decode_base64(encoded_signature)
+                    verify_key.verify(token, signature)
+                    return True
+            return False
         except (KeyError, BadSignatureError,):
             return False
 

synapse/util/third_party_invites.py

@@ -23,7 +23,7 @@ JOIN_KEYS = {
     "token",
     "public_key",
     "key_validity_url",
-    "signature",
+    "signatures",
     "sender",
 }