Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-10-01 08:25:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add signing host and keyname to signatures

Browse Source
This commit is contained in:
Daniel Wagner-Hall 2015-10-16 15:07:56 +01:00
parent b8dd5b1a2d
commit c225d63e9e
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/api/auth.py
View File

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

2
synapse/util/third_party_invites.py
View File

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