summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-07-17 15:03:23 +0200
committerBrendan Abolivier <babolivier@matrix.org>2019-07-17 15:03:23 +0200
commit34dd738e4b6cc1dd5ce230209b2adfddc8581e16 (patch)
treec5df17afed356f0af2cce7cb911aad3782fd61d0
parentFix check of the association between a 3PID invite and the subsequent m.room.... (diff)
downloadsynapse-34dd738e4b6cc1dd5ce230209b2adfddc8581e16.tar.xz
There's no third_party_signed property in an invite's content
Diffstat (limited to '')
-rw-r--r--synapse/third_party_rules/access_rules.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/synapse/third_party_rules/access_rules.py b/synapse/third_party_rules/access_rules.py

index 521b0347a4..e3f97bdf3a 100644 --- a/synapse/third_party_rules/access_rules.py +++ b/synapse/third_party_rules/access_rules.py
@@ -454,11 +454,8 @@ class RoomAccessRules(object): invite (EventBase): The m.room.member event with "invite" membership. threepid_invite_token (str): The state key from the 3PID invite. """ - 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", "") + token = invite.content.get( + "third_party_invite", {}, + ).get("signed", {}).get("token", "") return token == threepid_invite_token