diff options
| author | Chen Zhang <c.expecto.patronum@gmail.com> | 2023-08-29 02:37:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-29 10:37:09 +0100 |
| commit | 692ee2af190a82f2484427d0be773a0ff5282be1 (patch) | |
| tree | 982f1b162f955758ff182fbda26ea22aea655e9a | |
| parent | Pass the device ID around in the presence handler (#16171) (diff) | |
| download | synapse-692ee2af190a82f2484427d0be773a0ff5282be1.tar.xz | |
Fix inaccurate error message while trying to ban or unban a user with the same or higher PL (#16205)
| -rw-r--r-- | changelog.d/16205.bugfix | 1 | ||||
| -rw-r--r-- | synapse/event_auth.py | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/changelog.d/16205.bugfix b/changelog.d/16205.bugfix new file mode 100644 index 0000000000..97ac92a148 --- /dev/null +++ b/changelog.d/16205.bugfix @@ -0,0 +1 @@ +Fix inaccurate error message while attempting to ban or unban a user with the same or higher PL by spliting the conditional statements. Contributed by @leviosacz. \ No newline at end of file diff --git a/synapse/event_auth.py b/synapse/event_auth.py index 3a260a492b..531bb74f07 100644 --- a/synapse/event_auth.py +++ b/synapse/event_auth.py @@ -669,12 +669,18 @@ def _is_membership_change_allowed( errcode=Codes.INSUFFICIENT_POWER, ) elif Membership.BAN == membership: - if user_level < ban_level or user_level <= target_level: + if user_level < ban_level: raise UnstableSpecAuthError( 403, "You don't have permission to ban", errcode=Codes.INSUFFICIENT_POWER, ) + elif user_level <= target_level: + raise UnstableSpecAuthError( + 403, + "You don't have permission to ban this user", + errcode=Codes.INSUFFICIENT_POWER, + ) elif room_version.knock_join_rule and Membership.KNOCK == membership: if join_rule != JoinRules.KNOCK and ( not room_version.knock_restricted_join_rule |