summary refs log tree commit diff
path: root/synapse/event_auth.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2021-08-09 14:44:28 +0100
committerBrendan Abolivier <babolivier@matrix.org>2021-08-09 14:44:28 +0100
commitf8e86b7d2e8670e9688db806ff5a9b97c9ad5365 (patch)
treefd9b350b10b2480b0b9b41dc1ceca6f75796bdc8 /synapse/event_auth.py
parentConvert Transaction and Edu object to attrs (#10542) (diff)
parent 1.40.0rc3 (diff)
downloadsynapse-f8e86b7d2e8670e9688db806ff5a9b97c9ad5365.tar.xz
Merge branch 'release-v1.40' into develop
Diffstat (limited to 'synapse/event_auth.py')
-rw-r--r--synapse/event_auth.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/synapse/event_auth.py b/synapse/event_auth.py

index 4c92e9a2d4..c3a0c10499 100644 --- a/synapse/event_auth.py +++ b/synapse/event_auth.py
@@ -370,10 +370,7 @@ def _is_membership_change_allowed( raise AuthError(403, "You are banned from this room") elif join_rule == JoinRules.PUBLIC: pass - elif ( - room_version.msc3083_join_rules - and join_rule == JoinRules.MSC3083_RESTRICTED - ): + elif room_version.msc3083_join_rules and join_rule == JoinRules.RESTRICTED: # This is the same as public, but the event must contain a reference # to the server who authorised the join. If the event does not contain # the proper content it is rejected.