Change the rule for applying PL restrictions

This commit is contained in:
Brendan Abolivier 2019-07-03 15:44:22 +01:00
parent 8d28817eac
commit d085e0df2a
No known key found for this signature in database
GPG Key ID: 1E015C145F1916CD

View File

@ -33,6 +33,11 @@ VALID_ACCESS_RULES = (
ACCESS_RULE_UNRESTRICTED,
)
# Rules to which we need to apply the power levels restrictions.
RULES_WITH_RESTRICTED_POWER_LEVELS = (
ACCESS_RULE_UNRESTRICTED,
)
class RoomAccessRules(object):
"""Implementation of the ThirdPartyEventRules module API that allows federation admins
@ -369,9 +374,8 @@ class RoomAccessRules(object):
bool, True if the event can be allowed, False otherwise.
"""
# Blacklisted servers shouldn't have any restriction in "direct" mode, so always
# accept the event.
if access_rule == ACCESS_RULE_DIRECT:
# Check if we need to apply the restrictions with the current rule.
if access_rule not in RULES_WITH_RESTRICTED_POWER_LEVELS:
return True
# If users_default is explicitly set to a non-0 value, deny the event.