diff --git a/tests/rest/admin/test_user.py b/tests/rest/admin/test_user.py
index c5da1e9686..16bb4349f5 100644
--- a/tests/rest/admin/test_user.py
+++ b/tests/rest/admin/test_user.py
@@ -37,6 +37,7 @@ from synapse.api.constants import ApprovalNoticeMedium, LoginType, UserTypes
from synapse.api.errors import Codes, HttpResponseException, ResourceLimitError
from synapse.api.room_versions import RoomVersions
from synapse.media.filepath import MediaFilePaths
+from synapse.rest import admin
from synapse.rest.client import (
devices,
login,
@@ -5005,3 +5006,86 @@ class AllowCrossSigningReplacementTestCase(unittest.HomeserverTestCase):
)
assert timestamp is not None
self.assertGreater(timestamp, self.clock.time_msec())
+
+
+class UserSuspensionTestCase(unittest.HomeserverTestCase):
+ servlets = [
+ synapse.rest.admin.register_servlets,
+ login.register_servlets,
+ admin.register_servlets,
+ ]
+
+ def prepare(self, reactor: MemoryReactor, clock: Clock, hs: HomeServer) -> None:
+ self.admin = self.register_user("thomas", "hackme", True)
+ self.admin_tok = self.login("thomas", "hackme")
+
+ self.bad_user = self.register_user("teresa", "hackme")
+ self.bad_user_tok = self.login("teresa", "hackme")
+
+ self.store = hs.get_datastores().main
+
+ @override_config({"experimental_features": {"msc3823_account_suspension": True}})
+ def test_suspend_user(self) -> None:
+ # test that suspending user works
+ channel = self.make_request(
+ "PUT",
+ f"/_synapse/admin/v1/suspend/{self.bad_user}",
+ {"suspend": True},
+ access_token=self.admin_tok,
+ )
+ self.assertEqual(channel.code, 200)
+ self.assertEqual(channel.json_body, {f"user_{self.bad_user}_suspended": True})
+
+ res = self.get_success(self.store.get_user_suspended_status(self.bad_user))
+ self.assertEqual(True, res)
+
+ # test that un-suspending user works
+ channel2 = self.make_request(
+ "PUT",
+ f"/_synapse/admin/v1/suspend/{self.bad_user}",
+ {"suspend": False},
+ access_token=self.admin_tok,
+ )
+ self.assertEqual(channel2.code, 200)
+ self.assertEqual(channel2.json_body, {f"user_{self.bad_user}_suspended": False})
+
+ res2 = self.get_success(self.store.get_user_suspended_status(self.bad_user))
+ self.assertEqual(False, res2)
+
+ # test that trying to un-suspend user who isn't suspended doesn't cause problems
+ channel3 = self.make_request(
+ "PUT",
+ f"/_synapse/admin/v1/suspend/{self.bad_user}",
+ {"suspend": False},
+ access_token=self.admin_tok,
+ )
+ self.assertEqual(channel3.code, 200)
+ self.assertEqual(channel3.json_body, {f"user_{self.bad_user}_suspended": False})
+
+ res3 = self.get_success(self.store.get_user_suspended_status(self.bad_user))
+ self.assertEqual(False, res3)
+
+ # test that trying to suspend user who is already suspended doesn't cause problems
+ channel4 = self.make_request(
+ "PUT",
+ f"/_synapse/admin/v1/suspend/{self.bad_user}",
+ {"suspend": True},
+ access_token=self.admin_tok,
+ )
+ self.assertEqual(channel4.code, 200)
+ self.assertEqual(channel4.json_body, {f"user_{self.bad_user}_suspended": True})
+
+ res4 = self.get_success(self.store.get_user_suspended_status(self.bad_user))
+ self.assertEqual(True, res4)
+
+ channel5 = self.make_request(
+ "PUT",
+ f"/_synapse/admin/v1/suspend/{self.bad_user}",
+ {"suspend": True},
+ access_token=self.admin_tok,
+ )
+ self.assertEqual(channel5.code, 200)
+ self.assertEqual(channel5.json_body, {f"user_{self.bad_user}_suspended": True})
+
+ res5 = self.get_success(self.store.get_user_suspended_status(self.bad_user))
+ self.assertEqual(True, res5)
diff --git a/tests/rest/client/test_rooms.py b/tests/rest/client/test_rooms.py
index d398cead1c..c559dfda83 100644
--- a/tests/rest/client/test_rooms.py
+++ b/tests/rest/client/test_rooms.py
@@ -3819,3 +3819,108 @@ class TimestampLookupTestCase(unittest.HomeserverTestCase):
# Make sure the outlier event is not returned
self.assertNotEqual(channel.json_body["event_id"], outlier_event.event_id)
+
+
+class UserSuspensionTests(unittest.HomeserverTestCase):
+ servlets = [
+ admin.register_servlets,
+ login.register_servlets,
+ room.register_servlets,
+ profile.register_servlets,
+ ]
+
+ def prepare(self, reactor: MemoryReactor, clock: Clock, hs: HomeServer) -> None:
+ self.user1 = self.register_user("thomas", "hackme")
+ self.tok1 = self.login("thomas", "hackme")
+
+ self.user2 = self.register_user("teresa", "hackme")
+ self.tok2 = self.login("teresa", "hackme")
+
+ self.room1 = self.helper.create_room_as(room_creator=self.user1, tok=self.tok1)
+ self.store = hs.get_datastores().main
+
+ def test_suspended_user_cannot_send_message_to_room(self) -> None:
+ # set the user as suspended
+ self.get_success(self.store.set_user_suspended_status(self.user1, True))
+
+ channel = self.make_request(
+ "PUT",
+ f"/rooms/{self.room1}/send/m.room.message/1",
+ access_token=self.tok1,
+ content={"body": "hello", "msgtype": "m.text"},
+ )
+ self.assertEqual(
+ channel.json_body["errcode"], "ORG.MATRIX.MSC3823.USER_ACCOUNT_SUSPENDED"
+ )
+
+ def test_suspended_user_cannot_change_profile_data(self) -> None:
+ # set the user as suspended
+ self.get_success(self.store.set_user_suspended_status(self.user1, True))
+
+ channel = self.make_request(
+ "PUT",
+ f"/_matrix/client/v3/profile/{self.user1}/avatar_url",
+ access_token=self.tok1,
+ content={"avatar_url": "mxc://matrix.org/wefh34uihSDRGhw34"},
+ shorthand=False,
+ )
+ self.assertEqual(
+ channel.json_body["errcode"], "ORG.MATRIX.MSC3823.USER_ACCOUNT_SUSPENDED"
+ )
+
+ channel2 = self.make_request(
+ "PUT",
+ f"/_matrix/client/v3/profile/{self.user1}/displayname",
+ access_token=self.tok1,
+ content={"displayname": "something offensive"},
+ shorthand=False,
+ )
+ self.assertEqual(
+ channel2.json_body["errcode"], "ORG.MATRIX.MSC3823.USER_ACCOUNT_SUSPENDED"
+ )
+
+ def test_suspended_user_cannot_redact_messages_other_than_their_own(self) -> None:
+ # first user sends message
+ self.make_request("POST", f"/rooms/{self.room1}/join", access_token=self.tok2)
+ res = self.helper.send_event(
+ self.room1,
+ "m.room.message",
+ {"body": "hello", "msgtype": "m.text"},
+ tok=self.tok2,
+ )
+ event_id = res["event_id"]
+
+ # second user sends message
+ self.make_request("POST", f"/rooms/{self.room1}/join", access_token=self.tok1)
+ res2 = self.helper.send_event(
+ self.room1,
+ "m.room.message",
+ {"body": "bad_message", "msgtype": "m.text"},
+ tok=self.tok1,
+ )
+ event_id2 = res2["event_id"]
+
+ # set the second user as suspended
+ self.get_success(self.store.set_user_suspended_status(self.user1, True))
+
+ # second user can't redact first user's message
+ channel = self.make_request(
+ "PUT",
+ f"/_matrix/client/v3/rooms/{self.room1}/redact/{event_id}/1",
+ access_token=self.tok1,
+ content={"reason": "bogus"},
+ shorthand=False,
+ )
+ self.assertEqual(
+ channel.json_body["errcode"], "ORG.MATRIX.MSC3823.USER_ACCOUNT_SUSPENDED"
+ )
+
+ # but can redact their own
+ channel = self.make_request(
+ "PUT",
+ f"/_matrix/client/v3/rooms/{self.room1}/redact/{event_id2}/1",
+ access_token=self.tok1,
+ content={"reason": "bogus"},
+ shorthand=False,
+ )
+ self.assertEqual(channel.code, 200)
|
