Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix up auth check #3474

Merged
merged 3 commits into from
Jul 4, 2018
Merged

Fix up auth check #3474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cbf82dd
Ensure that we define sender_domain
erikjohnston Jul 2, 2018
2c33b55
Avoid relying on int vs None comparison
erikjohnston Jul 2, 2018
f88dea5
Newsfile
erikjohnston Jul 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added changelog.d/3474.misc
View file
Open in desktop
Empty file.
7 changes: 6 additions & 1 deletion synapse/event_auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ def check(event, auth_events, do_sig_check=True, do_size_check=True):
return

if event.type == EventTypes.Create:
sender_domain = get_domain_from_id(event.sender)
room_id_domain = get_domain_from_id(event.room_id)
if room_id_domain != sender_domain:
raise AuthError(
Expand Down Expand Up @@ -524,7 +525,11 @@ def _check_power_levels(event, auth_events):
"to your own"
)

if old_level > user_level or new_level > user_level:
# Check if the old and new levels are greater than the user level
# (if defined)
old_level_too_big = old_level is not None and old_level > user_level
new_level_too_big = new_level is not None and new_level > user_level
if old_level_too_big or new_level_too_big:
raise AuthError(
403,
"You don't have permission to add ops level greater "
Expand Down