This repository was archived by the owner on Apr 26, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Default PL100 to enable encryption in a room #7230
Merged
Merged
Changes from 10 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
9c34f8b
Default PL100 to enable encryption in a room
anoadragon453 9c8582d
Changelog
anoadragon453 2facfc5
Add get_state method to test RestHelper
anoadragon453 6ad8b02
Add tests for default room power levels
anoadragon453 5bd30f5
lint
anoadragon453 6618923
Apply suggestions from code review
anoadragon453 154a354
Don't send a body for GET requests
anoadragon453 dae6e76
Merge branch 'anoa/power_levels_admin' of github.com:matrix-org/synap…
anoadragon453 29ee9f7
Update changelog
anoadragon453 0832a6f
Add positive test cases as well
anoadragon453 340a479
Check body for None, not just falsey
anoadragon453 44ee631
Add some typing
anoadragon453 417e26b
More docstrings
anoadragon453 7d90405
Fix method names
anoadragon453 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Require admin privileges to enable room encryption by default. This does not affect existing rooms. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,205 @@ | ||
# -*- coding: utf-8 -*- | ||
# Copyright 2020 The Matrix.org Foundation C.I.C. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
from synapse.rest import admin | ||
from synapse.rest.client.v1 import login, room | ||
from synapse.rest.client.v2_alpha import sync | ||
|
||
from tests.unittest import HomeserverTestCase | ||
|
||
|
||
class PowerLevelsTestCase(HomeserverTestCase): | ||
"""Tests that power levels are enforced in various situations""" | ||
|
||
servlets = [ | ||
admin.register_servlets, | ||
room.register_servlets, | ||
login.register_servlets, | ||
sync.register_servlets, | ||
] | ||
|
||
def make_homeserver(self, reactor, clock): | ||
config = self.default_config() | ||
|
||
return self.setup_test_homeserver(config=config) | ||
|
||
def prepare(self, reactor, clock, hs): | ||
# register a room admin, moderator and regular user | ||
self.admin_user_id = self.register_user("admin", "pass") | ||
self.admin_access_token = self.login("admin", "pass") | ||
self.mod_user_id = self.register_user("mod", "pass") | ||
self.mod_access_token = self.login("mod", "pass") | ||
self.user_user_id = self.register_user("user", "pass") | ||
self.user_access_token = self.login("user", "pass") | ||
|
||
# Create a room | ||
self.room_id = self.helper.create_room_as( | ||
self.admin_user_id, tok=self.admin_access_token | ||
) | ||
|
||
# Invite the other users | ||
self.helper.invite( | ||
room=self.room_id, | ||
src=self.admin_user_id, | ||
tok=self.admin_access_token, | ||
targ=self.mod_user_id, | ||
) | ||
self.helper.invite( | ||
room=self.room_id, | ||
src=self.admin_user_id, | ||
tok=self.admin_access_token, | ||
targ=self.user_user_id, | ||
) | ||
|
||
# Make the other users join the room | ||
self.helper.join( | ||
room=self.room_id, user=self.mod_user_id, tok=self.mod_access_token | ||
) | ||
self.helper.join( | ||
room=self.room_id, user=self.user_user_id, tok=self.user_access_token | ||
) | ||
|
||
# Mod the mod | ||
room_power_levels = self.helper.get_state( | ||
self.room_id, "m.room.power_levels", tok=self.admin_access_token, | ||
) | ||
|
||
# Update existing power levels with mod at PL50 | ||
room_power_levels["users"].update({self.mod_user_id: 50}) | ||
|
||
self.helper.send_state( | ||
self.room_id, | ||
"m.room.power_levels", | ||
room_power_levels, | ||
tok=self.admin_access_token, | ||
) | ||
|
||
def test_non_admins_cannot_enable_room_encryption(self): | ||
# have the mod try to enable room encryption | ||
self.helper.send_state( | ||
self.room_id, | ||
"m.room.encryption", | ||
{"algorithm": "m.megolm.v1.aes-sha2"}, | ||
tok=self.mod_access_token, | ||
expect_code=403, # expect failure | ||
) | ||
|
||
# have the user try to enable room encryption | ||
self.helper.send_state( | ||
self.room_id, | ||
"m.room.encryption", | ||
{"algorithm": "m.megolm.v1.aes-sha2"}, | ||
tok=self.user_access_token, | ||
expect_code=403, # expect failure | ||
) | ||
|
||
def test_non_admins_cannot_send_server_acl(self): | ||
anoadragon453 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
# have the mod try to send a server ACL | ||
self.helper.send_state( | ||
self.room_id, | ||
"m.room.server_acl", | ||
{ | ||
"allow": ["*"], | ||
"allow_ip_literals": False, | ||
"deny": ["*.evil.com", "evil.com"], | ||
}, | ||
tok=self.mod_access_token, | ||
expect_code=403, # expect failure | ||
) | ||
|
||
# have the user try to send a server ACL | ||
self.helper.send_state( | ||
self.room_id, | ||
"m.room.server_acl", | ||
{ | ||
"allow": ["*"], | ||
"allow_ip_literals": False, | ||
"deny": ["*.evil.com", "evil.com"], | ||
}, | ||
tok=self.user_access_token, | ||
expect_code=403, # expect failure | ||
) | ||
|
||
def test_non_admins_cannot_tombstone_room(self): | ||
# Create another room that will serve as our "upgraded room" | ||
self.upgraded_room_id = self.helper.create_room_as( | ||
self.admin_user_id, tok=self.admin_access_token | ||
) | ||
|
||
# have the mod try to send a tombstone event | ||
self.helper.send_state( | ||
self.room_id, | ||
"m.room.tombstone", | ||
{ | ||
"body": "This room has been replaced", | ||
"replacement_room": self.upgraded_room_id, | ||
}, | ||
tok=self.mod_access_token, | ||
expect_code=403, # expect failure | ||
) | ||
|
||
# have the user try to send a tombstone event | ||
self.helper.send_state( | ||
self.room_id, | ||
"m.room.tombstone", | ||
{ | ||
"body": "This room has been replaced", | ||
"replacement_room": self.upgraded_room_id, | ||
}, | ||
tok=self.user_access_token, | ||
expect_code=403, # expect failure | ||
) | ||
|
||
def test_admins_can_enable_room_encryption(self): | ||
# have the admin try to enable room encryption | ||
self.helper.send_state( | ||
self.room_id, | ||
"m.room.encryption", | ||
{"algorithm": "m.megolm.v1.aes-sha2"}, | ||
tok=self.admin_access_token, | ||
expect_code=200, # expect success | ||
) | ||
|
||
def test_admins_can_send_server_acl(self): | ||
# have the admin try to send a server ACL | ||
self.helper.send_state( | ||
self.room_id, | ||
"m.room.server_acl", | ||
{ | ||
"allow": ["*"], | ||
"allow_ip_literals": False, | ||
"deny": ["*.evil.com", "evil.com"], | ||
}, | ||
tok=self.admin_access_token, | ||
expect_code=200, # expect success | ||
) | ||
|
||
def test_admins_can_tombstone_room(self): | ||
# Create another room that will serve as our "upgraded room" | ||
self.upgraded_room_id = self.helper.create_room_as( | ||
self.admin_user_id, tok=self.admin_access_token | ||
) | ||
|
||
# have the admin try to send a tombstone event | ||
self.helper.send_state( | ||
self.room_id, | ||
"m.room.tombstone", | ||
{ | ||
"body": "This room has been replaced", | ||
"replacement_room": self.upgraded_room_id, | ||
}, | ||
tok=self.admin_access_token, | ||
expect_code=200, # expect success | ||
) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.