diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-07-03 18:30:13 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-07-03 18:30:13 +0100 |
| commit | 95b5d4ad5410ef838165f1bff2a68d65bba77382 (patch) | |
| tree | 3ac3804b58ea91bf678cd1242f0a94e7ea07eb9b | |
| parent | Incorporate review (diff) | |
| parent | Update synapse/third_party_rules/access_rules.py (diff) | |
| download | synapse-95b5d4ad5410ef838165f1bff2a68d65bba77382.tar.xz | |
Merge branch 'babolivier/power-levels' of github.com:matrix-org/synapse into babolivier/power-levels
| -rw-r--r-- | synapse/third_party_rules/access_rules.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/third_party_rules/access_rules.py b/synapse/third_party_rules/access_rules.py index 5f0629ae2e..c8698c66cc 100644 --- a/synapse/third_party_rules/access_rules.py +++ b/synapse/third_party_rules/access_rules.py @@ -371,6 +371,7 @@ class RoomAccessRules(object): def _is_power_level_content_allowed(self, content, access_rule): """Check if a given power levels event is permitted under the given access rule. + It shouldn't be allowed if it either changes the default PL to a non-0 value or gives a non-0 PL to a user that would have been forbidden from joining the room under a more restrictive access rule. |