Compare commits

...

14 Commits

Author SHA1 Message Date
Richard van der Hoff
1d7511c199 tweak error wording 2019-07-30 08:27:32 +01:00
Michael Telatynski
8c8482c7c6 fix if condition 2019-07-29 17:25:33 +01:00
Michael Telatynski
ed1eb6dff6 delint 2019-07-29 17:19:40 +01:00
Michael Telatynski
dc0657f0e6 Move power_level_content_override.users check before room creation 2019-07-29 17:14:47 +01:00
Michael Telatynski
f7e96e765d fix typo in Changelog 2019-07-29 10:55:40 +01:00
Michael Telatynski
22fbca6568 Merge branches 'develop' and 't3chguy/do_not_create_room_invalid_power_level_content_override' of https://github.com/matrix-org/synapse into t3chguy/do_not_create_room_invalid_power_level_content_override
# Conflicts:
#	changelog.d/5633.bugfix
2019-07-29 10:54:36 +01:00
Michael Telatynski
820c10cf84 revert other change 2019-07-29 10:53:52 +01:00
Michael Telatynski
27697dee46 Update 5633.bugfix 2019-07-09 10:59:55 +01:00
Michael Telatynski
2d90267722 Fix createRoom power_level_content_override behaviour to match the spec 2019-07-09 00:07:17 +01:00
Michael Telatynski
0d40ae3390 Delint again 2019-07-07 10:42:33 +01:00
Michael Telatynski
8e54a69bee delint 2019-07-07 10:28:57 +01:00
Michael Telatynski
878c37c48c add dot 2019-07-07 10:15:35 +01:00
Michael Telatynski
741a476ea7 Add changelog 2019-07-07 10:12:49 +01:00
Michael Telatynski
7bff1516f8 Do not create room if power_level_content_override.users did not contain creator 2019-07-07 10:10:23 +01:00
2 changed files with 14 additions and 1 deletions

1
changelog.d/5633.bugfix Normal file
View File

@@ -0,0 +1 @@
Don't create broken room when power_level_content_override.users does not contain creator_id.

View File

@@ -560,6 +560,18 @@ class RoomCreationHandler(BaseHandler):
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)
@@ -604,7 +616,7 @@ class RoomCreationHandler(BaseHandler):
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,
)