Skip to content

Commit

Permalink
Merge pull request matrix-org#3474 from matrix-org/erikj/py3_auth
Browse files Browse the repository at this point in the history
Fix up auth check
  • Loading branch information
erikjohnston authored Jul 4, 2018
2 parents 508196e + f88dea5 commit 40252d1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
Empty file added changelog.d/3474.misc
Empty file.
7 changes: 6 additions & 1 deletion synapse/event_auth.py
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

0 comments on commit 40252d1

Please sign in to comment.