Matrix/synapse
Matrix/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse synced 2024-07-02 13:33:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reject instead of erroring on invalid membership events. (#15564)

Browse source 
Instead of resulting in an internal server error for invalid events,
return that the event is invalid.
This commit is contained in:
Patrick Cloke 2023-05-15 15:01:29 -04:00 committed by GitHub
parent ba6b21c81e
commit eb3c1823d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/15564.bugfix Normal file
View file

@ -0,0 +1 @@
Fix a long-standing bug where an invalid membership event could cause an internal server error.

17
synapse/event_auth.py
View file

@ -1054,10 +1054,15 @@ def _verify_third_party_invite(
""" """
if "third_party_invite" not in event.content: if "third_party_invite" not in event.content:
return False return False
if "signed" not in event.content["third_party_invite"]: third_party_invite = event.content["third_party_invite"]
if not isinstance(third_party_invite, collections.abc.Mapping):
return False return False
signed = event.content["third_party_invite"]["signed"] if "signed" not in third_party_invite:
for key in {"mxid", "token"}: return False
signed = third_party_invite["signed"]
if not isinstance(signed, collections.abc.Mapping):
return False
for key in {"mxid", "token", "signatures"}:
if key not in signed: if key not in signed:
return False return False
@ -1075,8 +1080,6 @@ def _verify_third_party_invite(
if signed["mxid"] != event.state_key: if signed["mxid"] != event.state_key:
return False return False
if signed["token"] != token:
return False
for public_key_object in get_public_keys(invite_event): for public_key_object in get_public_keys(invite_event):
public_key = public_key_object["public_key"] public_key = public_key_object["public_key"]
@ -1088,7 +1091,9 @@ def _verify_third_party_invite(
verify_key = decode_verify_key_bytes( verify_key = decode_verify_key_bytes(
key_name, decode_base64(public_key) key_name, decode_base64(public_key)
) )
verify_signed_json(signed, server, verify_key) # verify_signed_json incorrectly states it wants a dict, it
# just needs a mapping.
verify_signed_json(signed, server, verify_key) # type: ignore[arg-type]
# We got the public key from the invite, so we know that the # We got the public key from the invite, so we know that the
# correct server signed the signed bundle. # correct server signed the signed bundle.