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

Implement MSC2175 to stop adding the creator field. #15394

Merged
merged 13 commits into from
Apr 6, 2023
Merged

Implement MSC2175 to stop adding the creator field. #15394

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
04ce3e3
Implement MSC2175 to stop adding the creator field.
clokep Apr 5, 2023
f5c325b
Inline confusing function which doesn't have to do with the create ev…
clokep Apr 5, 2023
fd8f45a
Newsfragment
clokep Apr 5, 2023
811df39
Tweak event auth rules to use sender in most places.
clokep Apr 5, 2023
48ef4f9
Update other references to the room creator.
clokep Apr 5, 2023
06b6fd8
Review comments.
clokep Apr 5, 2023
a353870
Update check against creator.
clokep Apr 5, 2023
c66df21
Also update power level check.
clokep Apr 5, 2023
b18ab18
Add back logic to use creator field.
clokep Apr 6, 2023
b682443
Fix-up one more spot.
clokep Apr 6, 2023
96598a5
Lint
clokep Apr 6, 2023
9403987
Merge remote-tracking branch 'origin/develop' into clokep/msc2175
clokep Apr 6, 2023
22a71da
Avoid allocating a dict.
clokep Apr 6, 2023
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
Prev Previous commit
Next Next commit
Update check against creator.
  • Loading branch information
@clokep
clokep committed Apr 5, 2023
commit a353870852b7bbfbc151ad0ecb21741ef04c92ab
6 changes: 5 additions & 1 deletion synapse/event_auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,11 @@ def _is_membership_change_allowed(
key = (EventTypes.Create, "")
create = auth_events.get(key)
if create and event.prev_event_ids()[0] == create.event_id:
if create.sender == event.state_key:
if room_version.msc2175_implicit_room_creator:
creator = create.sender
else:
creator = create.content[EventContentFields.ROOM_CREATOR]
if creator == event.state_key:
return

target_user_id = event.state_key
Expand Down