OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix check of the association between a 3PID invite and the subsequent m.room.member event in the 3rd party rules

pull/5702/head
Brendan Abolivier 2019-07-17 14:54:58 +02:00
parent 5fe0cea37e
commit 048f86ef5d
No known key found for this signature in database
GPG Key ID: 1E015C145F1916CD
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
synapse/third_party_rules/access_rules.py
View File

@ -454,5 +454,11 @@ class RoomAccessRules(object):
invite (EventBase): The m.room.member event with "invite" membership.
threepid_invite_token (str): The state key from the 3PID invite.
"""
token = invite.content.get("third_party_signed", {}).get("token", "")
if "third_party_signed" in invite.content:
token = invite.content.get("third_party_signed", {}).get("token", "")
else:
token = invite.content.get(
"third_party_invite", {},
).get("signed", {}).get("token", "")
return token == threepid_invite_token