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

Don't create broken room when power_level_content_override.users does not contain creator_id. #5633

Merged
merged 14 commits into from
Aug 15, 2019
Merged

Don't create broken room when power_level_content_override.users does not contain creator_id. #5633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7bff151
Do not create room if power_level_content_override.users did not cont…
t3chguy Jul 7, 2019
741a476
Add changelog
t3chguy Jul 7, 2019
878c37c
add dot
t3chguy Jul 7, 2019
8e54a69
delint
t3chguy Jul 7, 2019
0d40ae3
Delint again
t3chguy Jul 7, 2019
2d90267
Fix createRoom power_level_content_override behaviour to match the spec
t3chguy Jul 8, 2019
27697de
Update 5633.bugfix
t3chguy Jul 9, 2019
820c10c
revert other change
t3chguy Jul 29, 2019
22fbca6
Merge branches 'develop' and 't3chguy/do_not_create_room_invalid_powe…
t3chguy Jul 29, 2019
f7e96e7
fix typo in Changelog
t3chguy Jul 29, 2019
dc0657f
Move power_level_content_override.users check before room creation
t3chguy Jul 29, 2019
ed1eb6d
delint
t3chguy Jul 29, 2019
8c8482c
fix if condition
t3chguy Jul 29, 2019
1d7511c
tweak error wording
richvdh Jul 30, 2019
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
1 change: 1 addition & 0 deletions changelog.d/5633.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Don't create broken room when power_level_content_override.users does not contain creator_id.
14 changes: 13 additions & 1 deletion synapse/handlers/room.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,18 @@ def create_room(self, requester, config, ratelimit=True, creator_join_profile=No

yield self.event_creation_handler.assert_accepted_privacy_policy(requester)

power_level_content_override = config.get("power_level_content_override")
if (
power_level_content_override
and "users" in power_level_content_override
and user_id not in power_level_content_override["users"]
):
raise SynapseError(
400,
"Not a valid power_level_content_override: 'users' did not contain %s"
% (user_id,),
)

invite_3pid_list = config.get("invite_3pid", [])

visibility = config.get("visibility", None)
Expand Down Expand Up @@ -604,7 +616,7 @@ def create_room(self, requester, config, ratelimit=True, creator_join_profile=No
initial_state=initial_state,
creation_content=creation_content,
room_alias=room_alias,
power_level_content_override=config.get("power_level_content_override"),
power_level_content_override=power_level_content_override,
creator_join_profile=creator_join_profile,
)

Expand Down