mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-09-28 21:19:29 -04:00
Remove spurious "SynapseRequest" result from `make_request"
This was never used, so let's get rid of it.
This commit is contained in:
Richard van der Hoff
parent
ac2acf1524
commit
394516ad1b
59 changed files with 742 additions and 983 deletions
|
|
@ -42,7 +42,7 @@ class VersionTestCase(unittest.HomeserverTestCase):
|
|||
return resource
|
||||
|
||||
def test_version_string(self):
|
||||
request, channel = self.make_request("GET", self.url, shorthand=False)
|
||||
channel = self.make_request("GET", self.url, shorthand=False)
|
||||
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(
|
||||
|
|
@ -68,7 +68,7 @@ class DeleteGroupTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
def test_delete_group(self):
|
||||
# Create a new group
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
"/create_group".encode("ascii"),
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -84,13 +84,13 @@ class DeleteGroupTestCase(unittest.HomeserverTestCase):
|
|||
# Invite/join another user
|
||||
|
||||
url = "/groups/%s/admin/users/invite/%s" % (group_id, self.other_user)
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT", url.encode("ascii"), access_token=self.admin_user_tok, content={}
|
||||
)
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
|
||||
url = "/groups/%s/self/accept_invite" % (group_id,)
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT", url.encode("ascii"), access_token=self.other_user_token, content={}
|
||||
)
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
|
|
@ -101,7 +101,7 @@ class DeleteGroupTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# Now delete the group
|
||||
url = "/_synapse/admin/v1/delete_group/" + group_id
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
url.encode("ascii"),
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -123,7 +123,7 @@ class DeleteGroupTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
|
||||
url = "/groups/%s/profile" % (group_id,)
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", url.encode("ascii"), access_token=self.admin_user_tok
|
||||
)
|
||||
|
||||
|
|
@ -134,7 +134,7 @@ class DeleteGroupTestCase(unittest.HomeserverTestCase):
|
|||
def _get_groups_user_is_in(self, access_token):
|
||||
"""Returns the list of groups the user is in (given their access token)
|
||||
"""
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", "/joined_groups".encode("ascii"), access_token=access_token
|
||||
)
|
||||
|
||||
|
|
@ -216,7 +216,7 @@ class QuarantineMediaTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
def _ensure_quarantined(self, admin_user_tok, server_and_media_id):
|
||||
"""Ensure a piece of media is quarantined when trying to access it."""
|
||||
request, channel = make_request(
|
||||
channel = make_request(
|
||||
self.reactor,
|
||||
FakeSite(self.download_resource),
|
||||
"GET",
|
||||
|
|
@ -241,7 +241,7 @@ class QuarantineMediaTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# Attempt quarantine media APIs as non-admin
|
||||
url = "/_synapse/admin/v1/media/quarantine/example.org/abcde12345"
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST", url.encode("ascii"), access_token=non_admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -254,7 +254,7 @@ class QuarantineMediaTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# And the roomID/userID endpoint
|
||||
url = "/_synapse/admin/v1/room/!room%3Aexample.com/media/quarantine"
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST", url.encode("ascii"), access_token=non_admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -282,7 +282,7 @@ class QuarantineMediaTestCase(unittest.HomeserverTestCase):
|
|||
server_name, media_id = server_name_and_media_id.split("/")
|
||||
|
||||
# Attempt to access the media
|
||||
request, channel = make_request(
|
||||
channel = make_request(
|
||||
self.reactor,
|
||||
FakeSite(self.download_resource),
|
||||
"GET",
|
||||
|
|
@ -299,7 +299,7 @@ class QuarantineMediaTestCase(unittest.HomeserverTestCase):
|
|||
urllib.parse.quote(server_name),
|
||||
urllib.parse.quote(media_id),
|
||||
)
|
||||
request, channel = self.make_request("POST", url, access_token=admin_user_tok,)
|
||||
channel = self.make_request("POST", url, access_token=admin_user_tok,)
|
||||
self.pump(1.0)
|
||||
self.assertEqual(200, int(channel.code), msg=channel.result["body"])
|
||||
|
||||
|
|
@ -351,7 +351,7 @@ class QuarantineMediaTestCase(unittest.HomeserverTestCase):
|
|||
url = "/_synapse/admin/v1/room/%s/media/quarantine" % urllib.parse.quote(
|
||||
room_id
|
||||
)
|
||||
request, channel = self.make_request("POST", url, access_token=admin_user_tok,)
|
||||
channel = self.make_request("POST", url, access_token=admin_user_tok,)
|
||||
self.pump(1.0)
|
||||
self.assertEqual(200, int(channel.code), msg=channel.result["body"])
|
||||
self.assertEqual(
|
||||
|
|
@ -395,7 +395,7 @@ class QuarantineMediaTestCase(unittest.HomeserverTestCase):
|
|||
url = "/_synapse/admin/v1/user/%s/media/quarantine" % urllib.parse.quote(
|
||||
non_admin_user
|
||||
)
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST", url.encode("ascii"), access_token=admin_user_tok,
|
||||
)
|
||||
self.pump(1.0)
|
||||
|
|
@ -437,7 +437,7 @@ class QuarantineMediaTestCase(unittest.HomeserverTestCase):
|
|||
url = "/_synapse/admin/v1/user/%s/media/quarantine" % urllib.parse.quote(
|
||||
non_admin_user
|
||||
)
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST", url.encode("ascii"), access_token=admin_user_tok,
|
||||
)
|
||||
self.pump(1.0)
|
||||
|
|
@ -453,7 +453,7 @@ class QuarantineMediaTestCase(unittest.HomeserverTestCase):
|
|||
self._ensure_quarantined(admin_user_tok, server_and_media_id_1)
|
||||
|
||||
# Attempt to access each piece of media
|
||||
request, channel = make_request(
|
||||
channel = make_request(
|
||||
self.reactor,
|
||||
FakeSite(self.download_resource),
|
||||
"GET",
|
||||
|
|
|
|||
|
|
@ -50,17 +50,17 @@ class DeviceRestTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
Try to get a device of an user without authentication.
|
||||
"""
|
||||
request, channel = self.make_request("GET", self.url, b"{}")
|
||||
channel = self.make_request("GET", self.url, b"{}")
|
||||
|
||||
self.assertEqual(401, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"])
|
||||
|
||||
request, channel = self.make_request("PUT", self.url, b"{}")
|
||||
channel = self.make_request("PUT", self.url, b"{}")
|
||||
|
||||
self.assertEqual(401, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"])
|
||||
|
||||
request, channel = self.make_request("DELETE", self.url, b"{}")
|
||||
channel = self.make_request("DELETE", self.url, b"{}")
|
||||
|
||||
self.assertEqual(401, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"])
|
||||
|
|
@ -69,21 +69,21 @@ class DeviceRestTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
If the user is not a server admin, an error is returned.
|
||||
"""
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url, access_token=self.other_user_token,
|
||||
)
|
||||
|
||||
self.assertEqual(403, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT", self.url, access_token=self.other_user_token,
|
||||
)
|
||||
|
||||
self.assertEqual(403, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"DELETE", self.url, access_token=self.other_user_token,
|
||||
)
|
||||
|
||||
|
|
@ -99,23 +99,17 @@ class DeviceRestTestCase(unittest.HomeserverTestCase):
|
|||
% self.other_user_device_id
|
||||
)
|
||||
|
||||
request, channel = self.make_request(
|
||||
"GET", url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(404, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
|
||||
|
||||
request, channel = self.make_request(
|
||||
"PUT", url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("PUT", url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(404, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
|
||||
|
||||
request, channel = self.make_request(
|
||||
"DELETE", url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("DELETE", url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(404, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
|
||||
|
|
@ -129,23 +123,17 @@ class DeviceRestTestCase(unittest.HomeserverTestCase):
|
|||
% self.other_user_device_id
|
||||
)
|
||||
|
||||
request, channel = self.make_request(
|
||||
"GET", url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(400, channel.code, msg=channel.json_body)
|
||||
self.assertEqual("Can only lookup local users", channel.json_body["error"])
|
||||
|
||||
request, channel = self.make_request(
|
||||
"PUT", url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("PUT", url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(400, channel.code, msg=channel.json_body)
|
||||
self.assertEqual("Can only lookup local users", channel.json_body["error"])
|
||||
|
||||
request, channel = self.make_request(
|
||||
"DELETE", url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("DELETE", url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(400, channel.code, msg=channel.json_body)
|
||||
self.assertEqual("Can only lookup local users", channel.json_body["error"])
|
||||
|
|
@ -158,22 +146,16 @@ class DeviceRestTestCase(unittest.HomeserverTestCase):
|
|||
self.other_user
|
||||
)
|
||||
|
||||
request, channel = self.make_request(
|
||||
"GET", url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(404, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
|
||||
|
||||
request, channel = self.make_request(
|
||||
"PUT", url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("PUT", url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
|
||||
request, channel = self.make_request(
|
||||
"DELETE", url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("DELETE", url, access_token=self.admin_user_tok,)
|
||||
|
||||
# Delete unknown device returns status 200
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
|
|
@ -197,7 +179,7 @@ class DeviceRestTestCase(unittest.HomeserverTestCase):
|
|||
}
|
||||
|
||||
body = json.dumps(update)
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
self.url,
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -208,9 +190,7 @@ class DeviceRestTestCase(unittest.HomeserverTestCase):
|
|||
self.assertEqual(Codes.TOO_LARGE, channel.json_body["errcode"])
|
||||
|
||||
# Ensure the display name was not updated.
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", self.url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
self.assertEqual("new display", channel.json_body["display_name"])
|
||||
|
|
@ -227,16 +207,12 @@ class DeviceRestTestCase(unittest.HomeserverTestCase):
|
|||
)
|
||||
)
|
||||
|
||||
request, channel = self.make_request(
|
||||
"PUT", self.url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("PUT", self.url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
|
||||
# Ensure the display name was not updated.
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", self.url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
self.assertEqual("new display", channel.json_body["display_name"])
|
||||
|
|
@ -247,7 +223,7 @@ class DeviceRestTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
# Set new display_name
|
||||
body = json.dumps({"display_name": "new displayname"})
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
self.url,
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -257,9 +233,7 @@ class DeviceRestTestCase(unittest.HomeserverTestCase):
|
|||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
|
||||
# Check new display_name
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", self.url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
self.assertEqual("new displayname", channel.json_body["display_name"])
|
||||
|
|
@ -268,9 +242,7 @@ class DeviceRestTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
Tests that a normal lookup for a device is successfully
|
||||
"""
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", self.url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(self.other_user, channel.json_body["user_id"])
|
||||
|
|
@ -291,7 +263,7 @@ class DeviceRestTestCase(unittest.HomeserverTestCase):
|
|||
self.assertEqual(1, number_devices)
|
||||
|
||||
# Delete device
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"DELETE", self.url, access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -323,7 +295,7 @@ class DevicesRestTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
Try to list devices of an user without authentication.
|
||||
"""
|
||||
request, channel = self.make_request("GET", self.url, b"{}")
|
||||
channel = self.make_request("GET", self.url, b"{}")
|
||||
|
||||
self.assertEqual(401, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"])
|
||||
|
|
@ -334,9 +306,7 @@ class DevicesRestTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
other_user_token = self.login("user", "pass")
|
||||
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url, access_token=other_user_token,
|
||||
)
|
||||
channel = self.make_request("GET", self.url, access_token=other_user_token,)
|
||||
|
||||
self.assertEqual(403, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
|
||||
|
|
@ -346,9 +316,7 @@ class DevicesRestTestCase(unittest.HomeserverTestCase):
|
|||
Tests that a lookup for a user that does not exist returns a 404
|
||||
"""
|
||||
url = "/_synapse/admin/v2/users/@unknown_person:test/devices"
|
||||
request, channel = self.make_request(
|
||||
"GET", url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(404, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
|
||||
|
|
@ -359,9 +327,7 @@ class DevicesRestTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
url = "/_synapse/admin/v2/users/@unknown_person:unknown_domain/devices"
|
||||
|
||||
request, channel = self.make_request(
|
||||
"GET", url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(400, channel.code, msg=channel.json_body)
|
||||
self.assertEqual("Can only lookup local users", channel.json_body["error"])
|
||||
|
|
@ -373,9 +339,7 @@ class DevicesRestTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
|
||||
# Get devices
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", self.url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(0, channel.json_body["total"])
|
||||
|
|
@ -391,9 +355,7 @@ class DevicesRestTestCase(unittest.HomeserverTestCase):
|
|||
self.login("user", "pass")
|
||||
|
||||
# Get devices
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", self.url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(number_devices, channel.json_body["total"])
|
||||
|
|
@ -431,7 +393,7 @@ class DeleteDevicesRestTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
Try to delete devices of an user without authentication.
|
||||
"""
|
||||
request, channel = self.make_request("POST", self.url, b"{}")
|
||||
channel = self.make_request("POST", self.url, b"{}")
|
||||
|
||||
self.assertEqual(401, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"])
|
||||
|
|
@ -442,9 +404,7 @@ class DeleteDevicesRestTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
other_user_token = self.login("user", "pass")
|
||||
|
||||
request, channel = self.make_request(
|
||||
"POST", self.url, access_token=other_user_token,
|
||||
)
|
||||
channel = self.make_request("POST", self.url, access_token=other_user_token,)
|
||||
|
||||
self.assertEqual(403, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
|
||||
|
|
@ -454,9 +414,7 @@ class DeleteDevicesRestTestCase(unittest.HomeserverTestCase):
|
|||
Tests that a lookup for a user that does not exist returns a 404
|
||||
"""
|
||||
url = "/_synapse/admin/v2/users/@unknown_person:test/delete_devices"
|
||||
request, channel = self.make_request(
|
||||
"POST", url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("POST", url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(404, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
|
||||
|
|
@ -467,9 +425,7 @@ class DeleteDevicesRestTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
url = "/_synapse/admin/v2/users/@unknown_person:unknown_domain/delete_devices"
|
||||
|
||||
request, channel = self.make_request(
|
||||
"POST", url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("POST", url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(400, channel.code, msg=channel.json_body)
|
||||
self.assertEqual("Can only lookup local users", channel.json_body["error"])
|
||||
|
|
@ -479,7 +435,7 @@ class DeleteDevicesRestTestCase(unittest.HomeserverTestCase):
|
|||
Tests that a remove of a device that does not exist returns 200.
|
||||
"""
|
||||
body = json.dumps({"devices": ["unknown_device1", "unknown_device2"]})
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
self.url,
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -510,7 +466,7 @@ class DeleteDevicesRestTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# Delete devices
|
||||
body = json.dumps({"devices": device_ids})
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
self.url,
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
Try to get an event report without authentication.
|
||||
"""
|
||||
request, channel = self.make_request("GET", self.url, b"{}")
|
||||
channel = self.make_request("GET", self.url, b"{}")
|
||||
|
||||
self.assertEqual(401, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"])
|
||||
|
|
@ -84,9 +84,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
If the user is not a server admin, an error 403 is returned.
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url, access_token=self.other_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", self.url, access_token=self.other_user_tok,)
|
||||
|
||||
self.assertEqual(403, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
|
||||
|
|
@ -96,9 +94,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
Testing list of reported events
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", self.url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(channel.json_body["total"], 20)
|
||||
|
|
@ -111,7 +107,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
Testing list of reported events with limit
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?limit=5", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -126,7 +122,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
Testing list of reported events with a defined starting point (from)
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?from=5", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -141,7 +137,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
Testing list of reported events with a defined starting point and limit
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?from=5&limit=10", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -156,7 +152,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
Testing list of reported events with a filter of room
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
self.url + "?room_id=%s" % self.room_id1,
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -176,7 +172,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
Testing list of reported events with a filter of user
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
self.url + "?user_id=%s" % self.other_user,
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -196,7 +192,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
Testing list of reported events with a filter of user and room
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
self.url + "?user_id=%s&room_id=%s" % (self.other_user, self.room_id1),
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -218,7 +214,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
|
||||
# fetch the most recent first, largest timestamp
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?dir=b", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -234,7 +230,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
report += 1
|
||||
|
||||
# fetch the oldest first, smallest timestamp
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?dir=f", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -254,7 +250,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
Testing that a invalid search order returns a 400
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?dir=bar", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -267,7 +263,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
Testing that a negative limit parameter returns a 400
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?limit=-5", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -279,7 +275,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
Testing that a negative from parameter returns a 400
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?from=-5", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -293,7 +289,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# `next_token` does not appear
|
||||
# Number of results is the number of entries
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?limit=20", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -304,7 +300,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# `next_token` does not appear
|
||||
# Number of max results is larger than the number of entries
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?limit=21", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -315,7 +311,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# `next_token` does appear
|
||||
# Number of max results is smaller than the number of entries
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?limit=19", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -327,7 +323,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
# Check
|
||||
# Set `from` to value of `next_token` for request remaining entries
|
||||
# `next_token` does not appear
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?from=19", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -342,7 +338,7 @@ class EventReportsTestCase(unittest.HomeserverTestCase):
|
|||
resp = self.helper.send(room_id, tok=user_tok)
|
||||
event_id = resp["event_id"]
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
"rooms/%s/report/%s" % (room_id, event_id),
|
||||
json.dumps({"score": -100, "reason": "this makes me sad"}),
|
||||
|
|
@ -399,7 +395,7 @@ class EventReportDetailTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
Try to get event report without authentication.
|
||||
"""
|
||||
request, channel = self.make_request("GET", self.url, b"{}")
|
||||
channel = self.make_request("GET", self.url, b"{}")
|
||||
|
||||
self.assertEqual(401, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"])
|
||||
|
|
@ -409,9 +405,7 @@ class EventReportDetailTestCase(unittest.HomeserverTestCase):
|
|||
If the user is not a server admin, an error 403 is returned.
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url, access_token=self.other_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", self.url, access_token=self.other_user_tok,)
|
||||
|
||||
self.assertEqual(403, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
|
||||
|
|
@ -421,9 +415,7 @@ class EventReportDetailTestCase(unittest.HomeserverTestCase):
|
|||
Testing get a reported event
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", self.url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self._check_fields(channel.json_body)
|
||||
|
|
@ -434,7 +426,7 @@ class EventReportDetailTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
|
||||
# `report_id` is negative
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
"/_synapse/admin/v1/event_reports/-123",
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -448,7 +440,7 @@ class EventReportDetailTestCase(unittest.HomeserverTestCase):
|
|||
)
|
||||
|
||||
# `report_id` is a non-numerical string
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
"/_synapse/admin/v1/event_reports/abcdef",
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -462,7 +454,7 @@ class EventReportDetailTestCase(unittest.HomeserverTestCase):
|
|||
)
|
||||
|
||||
# `report_id` is undefined
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
"/_synapse/admin/v1/event_reports/",
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -480,7 +472,7 @@ class EventReportDetailTestCase(unittest.HomeserverTestCase):
|
|||
Testing that a not existing `report_id` returns a 404.
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
"/_synapse/admin/v1/event_reports/123",
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -496,7 +488,7 @@ class EventReportDetailTestCase(unittest.HomeserverTestCase):
|
|||
resp = self.helper.send(room_id, tok=user_tok)
|
||||
event_id = resp["event_id"]
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
"rooms/%s/report/%s" % (room_id, event_id),
|
||||
json.dumps({"score": -100, "reason": "this makes me sad"}),
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ class DeleteMediaByIDTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
url = "/_synapse/admin/v1/media/%s/%s" % (self.server_name, "12345")
|
||||
|
||||
request, channel = self.make_request("DELETE", url, b"{}")
|
||||
channel = self.make_request("DELETE", url, b"{}")
|
||||
|
||||
self.assertEqual(401, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"])
|
||||
|
|
@ -64,9 +64,7 @@ class DeleteMediaByIDTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
url = "/_synapse/admin/v1/media/%s/%s" % (self.server_name, "12345")
|
||||
|
||||
request, channel = self.make_request(
|
||||
"DELETE", url, access_token=self.other_user_token,
|
||||
)
|
||||
channel = self.make_request("DELETE", url, access_token=self.other_user_token,)
|
||||
|
||||
self.assertEqual(403, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
|
||||
|
|
@ -77,9 +75,7 @@ class DeleteMediaByIDTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
url = "/_synapse/admin/v1/media/%s/%s" % (self.server_name, "12345")
|
||||
|
||||
request, channel = self.make_request(
|
||||
"DELETE", url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("DELETE", url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(404, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
|
||||
|
|
@ -90,9 +86,7 @@ class DeleteMediaByIDTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
url = "/_synapse/admin/v1/media/%s/%s" % ("unknown_domain", "12345")
|
||||
|
||||
request, channel = self.make_request(
|
||||
"DELETE", url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("DELETE", url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(400, channel.code, msg=channel.json_body)
|
||||
self.assertEqual("Can only delete local media", channel.json_body["error"])
|
||||
|
|
@ -121,7 +115,7 @@ class DeleteMediaByIDTestCase(unittest.HomeserverTestCase):
|
|||
self.assertEqual(server_name, self.server_name)
|
||||
|
||||
# Attempt to access media
|
||||
request, channel = make_request(
|
||||
channel = make_request(
|
||||
self.reactor,
|
||||
FakeSite(download_resource),
|
||||
"GET",
|
||||
|
|
@ -146,9 +140,7 @@ class DeleteMediaByIDTestCase(unittest.HomeserverTestCase):
|
|||
url = "/_synapse/admin/v1/media/%s/%s" % (self.server_name, media_id)
|
||||
|
||||
# Delete media
|
||||
request, channel = self.make_request(
|
||||
"DELETE", url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("DELETE", url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(1, channel.json_body["total"])
|
||||
|
|
@ -157,7 +149,7 @@ class DeleteMediaByIDTestCase(unittest.HomeserverTestCase):
|
|||
)
|
||||
|
||||
# Attempt to access media
|
||||
request, channel = make_request(
|
||||
channel = make_request(
|
||||
self.reactor,
|
||||
FakeSite(download_resource),
|
||||
"GET",
|
||||
|
|
@ -204,7 +196,7 @@ class DeleteMediaByDateSizeTestCase(unittest.HomeserverTestCase):
|
|||
Try to delete media without authentication.
|
||||
"""
|
||||
|
||||
request, channel = self.make_request("POST", self.url, b"{}")
|
||||
channel = self.make_request("POST", self.url, b"{}")
|
||||
|
||||
self.assertEqual(401, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"])
|
||||
|
|
@ -216,7 +208,7 @@ class DeleteMediaByDateSizeTestCase(unittest.HomeserverTestCase):
|
|||
self.other_user = self.register_user("user", "pass")
|
||||
self.other_user_token = self.login("user", "pass")
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST", self.url, access_token=self.other_user_token,
|
||||
)
|
||||
|
||||
|
|
@ -229,7 +221,7 @@ class DeleteMediaByDateSizeTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
url = "/_synapse/admin/v1/media/%s/delete" % "unknown_domain"
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST", url + "?before_ts=1234", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -240,9 +232,7 @@ class DeleteMediaByDateSizeTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
If the parameter `before_ts` is missing, an error is returned.
|
||||
"""
|
||||
request, channel = self.make_request(
|
||||
"POST", self.url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("POST", self.url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(400, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.MISSING_PARAM, channel.json_body["errcode"])
|
||||
|
|
@ -254,7 +244,7 @@ class DeleteMediaByDateSizeTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
If parameters are invalid, an error is returned.
|
||||
"""
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST", self.url + "?before_ts=-1234", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -265,7 +255,7 @@ class DeleteMediaByDateSizeTestCase(unittest.HomeserverTestCase):
|
|||
channel.json_body["error"],
|
||||
)
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
self.url + "?before_ts=1234&size_gt=-1234",
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -278,7 +268,7 @@ class DeleteMediaByDateSizeTestCase(unittest.HomeserverTestCase):
|
|||
channel.json_body["error"],
|
||||
)
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
self.url + "?before_ts=1234&keep_profiles=not_bool",
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -308,7 +298,7 @@ class DeleteMediaByDateSizeTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# timestamp after upload/create
|
||||
now_ms = self.clock.time_msec()
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
self.url + "?before_ts=" + str(now_ms),
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -332,7 +322,7 @@ class DeleteMediaByDateSizeTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
self._access_media(server_and_media_id)
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
self.url + "?before_ts=" + str(now_ms),
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -344,7 +334,7 @@ class DeleteMediaByDateSizeTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# timestamp after upload
|
||||
now_ms = self.clock.time_msec()
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
self.url + "?before_ts=" + str(now_ms),
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -367,7 +357,7 @@ class DeleteMediaByDateSizeTestCase(unittest.HomeserverTestCase):
|
|||
self._access_media(server_and_media_id)
|
||||
|
||||
now_ms = self.clock.time_msec()
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
self.url + "?before_ts=" + str(now_ms) + "&size_gt=67",
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -378,7 +368,7 @@ class DeleteMediaByDateSizeTestCase(unittest.HomeserverTestCase):
|
|||
self._access_media(server_and_media_id)
|
||||
|
||||
now_ms = self.clock.time_msec()
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
self.url + "?before_ts=" + str(now_ms) + "&size_gt=66",
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -401,7 +391,7 @@ class DeleteMediaByDateSizeTestCase(unittest.HomeserverTestCase):
|
|||
self._access_media(server_and_media_id)
|
||||
|
||||
# set media as avatar
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
"/profile/%s/avatar_url" % (self.admin_user,),
|
||||
content=json.dumps({"avatar_url": "mxc://%s" % (server_and_media_id,)}),
|
||||
|
|
@ -410,7 +400,7 @@ class DeleteMediaByDateSizeTestCase(unittest.HomeserverTestCase):
|
|||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
|
||||
now_ms = self.clock.time_msec()
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
self.url + "?before_ts=" + str(now_ms) + "&keep_profiles=true",
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -421,7 +411,7 @@ class DeleteMediaByDateSizeTestCase(unittest.HomeserverTestCase):
|
|||
self._access_media(server_and_media_id)
|
||||
|
||||
now_ms = self.clock.time_msec()
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
self.url + "?before_ts=" + str(now_ms) + "&keep_profiles=false",
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -445,7 +435,7 @@ class DeleteMediaByDateSizeTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# set media as room avatar
|
||||
room_id = self.helper.create_room_as(self.admin_user, tok=self.admin_user_tok)
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
"/rooms/%s/state/m.room.avatar" % (room_id,),
|
||||
content=json.dumps({"url": "mxc://%s" % (server_and_media_id,)}),
|
||||
|
|
@ -454,7 +444,7 @@ class DeleteMediaByDateSizeTestCase(unittest.HomeserverTestCase):
|
|||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
|
||||
now_ms = self.clock.time_msec()
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
self.url + "?before_ts=" + str(now_ms) + "&keep_profiles=true",
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -465,7 +455,7 @@ class DeleteMediaByDateSizeTestCase(unittest.HomeserverTestCase):
|
|||
self._access_media(server_and_media_id)
|
||||
|
||||
now_ms = self.clock.time_msec()
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
self.url + "?before_ts=" + str(now_ms) + "&keep_profiles=false",
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -512,7 +502,7 @@ class DeleteMediaByDateSizeTestCase(unittest.HomeserverTestCase):
|
|||
media_id = server_and_media_id.split("/")[1]
|
||||
local_path = self.filepaths.local_media_filepath(media_id)
|
||||
|
||||
request, channel = make_request(
|
||||
channel = make_request(
|
||||
self.reactor,
|
||||
FakeSite(download_resource),
|
||||
"GET",
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ class ShutdownRoomTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# Test that the admin can still send shutdown
|
||||
url = "/_synapse/admin/v1/shutdown_room/" + room_id
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
url.encode("ascii"),
|
||||
json.dumps({"new_room_user_id": self.admin_user}),
|
||||
|
|
@ -103,7 +103,7 @@ class ShutdownRoomTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# Enable world readable
|
||||
url = "rooms/%s/state/m.room.history_visibility" % (room_id,)
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
url.encode("ascii"),
|
||||
json.dumps({"history_visibility": "world_readable"}),
|
||||
|
|
@ -113,7 +113,7 @@ class ShutdownRoomTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# Test that the admin can still send shutdown
|
||||
url = "/_synapse/admin/v1/shutdown_room/" + room_id
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
url.encode("ascii"),
|
||||
json.dumps({"new_room_user_id": self.admin_user}),
|
||||
|
|
@ -130,7 +130,7 @@ class ShutdownRoomTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
|
||||
url = "rooms/%s/initialSync" % (room_id,)
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", url.encode("ascii"), access_token=self.admin_user_tok
|
||||
)
|
||||
self.assertEqual(
|
||||
|
|
@ -138,7 +138,7 @@ class ShutdownRoomTestCase(unittest.HomeserverTestCase):
|
|||
)
|
||||
|
||||
url = "events?timeout=0&room_id=" + room_id
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", url.encode("ascii"), access_token=self.admin_user_tok
|
||||
)
|
||||
self.assertEqual(
|
||||
|
|
@ -184,7 +184,7 @@ class DeleteRoomTestCase(unittest.HomeserverTestCase):
|
|||
If the user is not a server admin, an error 403 is returned.
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST", self.url, json.dumps({}), access_token=self.other_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -197,7 +197,7 @@ class DeleteRoomTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
url = "/_synapse/admin/v1/rooms/!unknown:test/delete"
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST", url, json.dumps({}), access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -210,7 +210,7 @@ class DeleteRoomTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
url = "/_synapse/admin/v1/rooms/invalidroom/delete"
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST", url, json.dumps({}), access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -225,7 +225,7 @@ class DeleteRoomTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
body = json.dumps({"new_room_user_id": "@unknown:test"})
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
self.url,
|
||||
content=body.encode(encoding="utf_8"),
|
||||
|
|
@ -244,7 +244,7 @@ class DeleteRoomTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
body = json.dumps({"new_room_user_id": "@not:exist.bla"})
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
self.url,
|
||||
content=body.encode(encoding="utf_8"),
|
||||
|
|
@ -262,7 +262,7 @@ class DeleteRoomTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
body = json.dumps({"block": "NotBool"})
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
self.url,
|
||||
content=body.encode(encoding="utf_8"),
|
||||
|
|
@ -278,7 +278,7 @@ class DeleteRoomTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
body = json.dumps({"purge": "NotBool"})
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
self.url,
|
||||
content=body.encode(encoding="utf_8"),
|
||||
|
|
@ -304,7 +304,7 @@ class DeleteRoomTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
body = json.dumps({"block": True, "purge": True})
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
self.url.encode("ascii"),
|
||||
content=body.encode(encoding="utf_8"),
|
||||
|
|
@ -337,7 +337,7 @@ class DeleteRoomTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
body = json.dumps({"block": False, "purge": True})
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
self.url.encode("ascii"),
|
||||
content=body.encode(encoding="utf_8"),
|
||||
|
|
@ -371,7 +371,7 @@ class DeleteRoomTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
body = json.dumps({"block": False, "purge": False})
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
self.url.encode("ascii"),
|
||||
content=body.encode(encoding="utf_8"),
|
||||
|
|
@ -418,7 +418,7 @@ class DeleteRoomTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# Test that the admin can still send shutdown
|
||||
url = "/_synapse/admin/v1/rooms/%s/delete" % self.room_id
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
url.encode("ascii"),
|
||||
json.dumps({"new_room_user_id": self.admin_user}),
|
||||
|
|
@ -448,7 +448,7 @@ class DeleteRoomTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# Enable world readable
|
||||
url = "rooms/%s/state/m.room.history_visibility" % (self.room_id,)
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
url.encode("ascii"),
|
||||
json.dumps({"history_visibility": "world_readable"}),
|
||||
|
|
@ -465,7 +465,7 @@ class DeleteRoomTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# Test that the admin can still send shutdown
|
||||
url = "/_synapse/admin/v1/rooms/%s/delete" % self.room_id
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
url.encode("ascii"),
|
||||
json.dumps({"new_room_user_id": self.admin_user}),
|
||||
|
|
@ -530,7 +530,7 @@ class DeleteRoomTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
|
||||
url = "rooms/%s/initialSync" % (room_id,)
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", url.encode("ascii"), access_token=self.admin_user_tok
|
||||
)
|
||||
self.assertEqual(
|
||||
|
|
@ -538,7 +538,7 @@ class DeleteRoomTestCase(unittest.HomeserverTestCase):
|
|||
)
|
||||
|
||||
url = "events?timeout=0&room_id=" + room_id
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", url.encode("ascii"), access_token=self.admin_user_tok
|
||||
)
|
||||
self.assertEqual(
|
||||
|
|
@ -569,7 +569,7 @@ class PurgeRoomTestCase(unittest.HomeserverTestCase):
|
|||
self.helper.leave(room_id, user=self.admin_user, tok=self.admin_user_tok)
|
||||
|
||||
url = "/_synapse/admin/v1/purge_room"
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
url.encode("ascii"),
|
||||
{"room_id": room_id},
|
||||
|
|
@ -623,7 +623,7 @@ class RoomTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# Request the list of rooms
|
||||
url = "/_synapse/admin/v1/rooms"
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", url.encode("ascii"), access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -704,7 +704,7 @@ class RoomTestCase(unittest.HomeserverTestCase):
|
|||
limit,
|
||||
"name",
|
||||
)
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", url.encode("ascii"), access_token=self.admin_user_tok,
|
||||
)
|
||||
self.assertEqual(
|
||||
|
|
@ -744,7 +744,7 @@ class RoomTestCase(unittest.HomeserverTestCase):
|
|||
self.assertEqual(room_ids, returned_room_ids)
|
||||
|
||||
url = "/_synapse/admin/v1/rooms?from=%d&limit=%d" % (start, limit)
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", url.encode("ascii"), access_token=self.admin_user_tok,
|
||||
)
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
|
|
@ -764,7 +764,7 @@ class RoomTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# Create a new alias to this room
|
||||
url = "/_matrix/client/r0/directory/room/%s" % (urllib.parse.quote(test_alias),)
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
url.encode("ascii"),
|
||||
{"room_id": room_id},
|
||||
|
|
@ -794,7 +794,7 @@ class RoomTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# Request the list of rooms
|
||||
url = "/_synapse/admin/v1/rooms"
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", url.encode("ascii"), access_token=self.admin_user_tok,
|
||||
)
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
|
|
@ -835,7 +835,7 @@ class RoomTestCase(unittest.HomeserverTestCase):
|
|||
url = "/_matrix/client/r0/directory/room/%s" % (
|
||||
urllib.parse.quote(test_alias),
|
||||
)
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
url.encode("ascii"),
|
||||
{"room_id": room_id},
|
||||
|
|
@ -875,7 +875,7 @@ class RoomTestCase(unittest.HomeserverTestCase):
|
|||
url = "/_synapse/admin/v1/rooms?order_by=%s" % (order_type,)
|
||||
if reverse:
|
||||
url += "&dir=b"
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", url.encode("ascii"), access_token=self.admin_user_tok,
|
||||
)
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
|
|
@ -1011,7 +1011,7 @@ class RoomTestCase(unittest.HomeserverTestCase):
|
|||
expected_http_code: The expected http code for the request
|
||||
"""
|
||||
url = "/_synapse/admin/v1/rooms?search_term=%s" % (search_term,)
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", url.encode("ascii"), access_token=self.admin_user_tok,
|
||||
)
|
||||
self.assertEqual(expected_http_code, channel.code, msg=channel.json_body)
|
||||
|
|
@ -1072,7 +1072,7 @@ class RoomTestCase(unittest.HomeserverTestCase):
|
|||
)
|
||||
|
||||
url = "/_synapse/admin/v1/rooms/%s" % (room_id_1,)
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", url.encode("ascii"), access_token=self.admin_user_tok,
|
||||
)
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
|
|
@ -1102,7 +1102,7 @@ class RoomTestCase(unittest.HomeserverTestCase):
|
|||
room_id_1 = self.helper.create_room_as(self.admin_user, tok=self.admin_user_tok)
|
||||
|
||||
url = "/_synapse/admin/v1/rooms/%s" % (room_id_1,)
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", url.encode("ascii"), access_token=self.admin_user_tok,
|
||||
)
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
|
|
@ -1114,7 +1114,7 @@ class RoomTestCase(unittest.HomeserverTestCase):
|
|||
self.helper.join(room_id_1, user_1, tok=user_tok_1)
|
||||
|
||||
url = "/_synapse/admin/v1/rooms/%s" % (room_id_1,)
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", url.encode("ascii"), access_token=self.admin_user_tok,
|
||||
)
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
|
|
@ -1124,7 +1124,7 @@ class RoomTestCase(unittest.HomeserverTestCase):
|
|||
self.helper.leave(room_id_1, self.admin_user, tok=self.admin_user_tok)
|
||||
self.helper.leave(room_id_1, user_1, tok=user_tok_1)
|
||||
url = "/_synapse/admin/v1/rooms/%s" % (room_id_1,)
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", url.encode("ascii"), access_token=self.admin_user_tok,
|
||||
)
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
|
|
@ -1153,7 +1153,7 @@ class RoomTestCase(unittest.HomeserverTestCase):
|
|||
self.helper.join(room_id_2, user_3, tok=user_tok_3)
|
||||
|
||||
url = "/_synapse/admin/v1/rooms/%s/members" % (room_id_1,)
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", url.encode("ascii"), access_token=self.admin_user_tok,
|
||||
)
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
|
|
@ -1164,7 +1164,7 @@ class RoomTestCase(unittest.HomeserverTestCase):
|
|||
self.assertEqual(channel.json_body["total"], 3)
|
||||
|
||||
url = "/_synapse/admin/v1/rooms/%s/members" % (room_id_2,)
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", url.encode("ascii"), access_token=self.admin_user_tok,
|
||||
)
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
|
|
@ -1204,7 +1204,7 @@ class JoinAliasRoomTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
body = json.dumps({"user_id": self.second_user_id})
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
self.url,
|
||||
content=body.encode(encoding="utf_8"),
|
||||
|
|
@ -1220,7 +1220,7 @@ class JoinAliasRoomTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
body = json.dumps({"unknown_parameter": "@unknown:test"})
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
self.url,
|
||||
content=body.encode(encoding="utf_8"),
|
||||
|
|
@ -1236,7 +1236,7 @@ class JoinAliasRoomTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
body = json.dumps({"user_id": "@unknown:test"})
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
self.url,
|
||||
content=body.encode(encoding="utf_8"),
|
||||
|
|
@ -1252,7 +1252,7 @@ class JoinAliasRoomTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
body = json.dumps({"user_id": "@not:exist.bla"})
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
self.url,
|
||||
content=body.encode(encoding="utf_8"),
|
||||
|
|
@ -1272,7 +1272,7 @@ class JoinAliasRoomTestCase(unittest.HomeserverTestCase):
|
|||
body = json.dumps({"user_id": self.second_user_id})
|
||||
url = "/_synapse/admin/v1/join/!unknown:test"
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
url,
|
||||
content=body.encode(encoding="utf_8"),
|
||||
|
|
@ -1289,7 +1289,7 @@ class JoinAliasRoomTestCase(unittest.HomeserverTestCase):
|
|||
body = json.dumps({"user_id": self.second_user_id})
|
||||
url = "/_synapse/admin/v1/join/invalidroom"
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
url,
|
||||
content=body.encode(encoding="utf_8"),
|
||||
|
|
@ -1308,7 +1308,7 @@ class JoinAliasRoomTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
body = json.dumps({"user_id": self.second_user_id})
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
self.url,
|
||||
content=body.encode(encoding="utf_8"),
|
||||
|
|
@ -1320,7 +1320,7 @@ class JoinAliasRoomTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# Validate if user is a member of the room
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", "/_matrix/client/r0/joined_rooms", access_token=self.second_tok,
|
||||
)
|
||||
self.assertEquals(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
|
|
@ -1337,7 +1337,7 @@ class JoinAliasRoomTestCase(unittest.HomeserverTestCase):
|
|||
url = "/_synapse/admin/v1/join/{}".format(private_room_id)
|
||||
body = json.dumps({"user_id": self.second_user_id})
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
url,
|
||||
content=body.encode(encoding="utf_8"),
|
||||
|
|
@ -1367,7 +1367,7 @@ class JoinAliasRoomTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# Validate if server admin is a member of the room
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", "/_matrix/client/r0/joined_rooms", access_token=self.admin_user_tok,
|
||||
)
|
||||
self.assertEquals(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
|
|
@ -1378,7 +1378,7 @@ class JoinAliasRoomTestCase(unittest.HomeserverTestCase):
|
|||
url = "/_synapse/admin/v1/join/{}".format(private_room_id)
|
||||
body = json.dumps({"user_id": self.second_user_id})
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
url,
|
||||
content=body.encode(encoding="utf_8"),
|
||||
|
|
@ -1389,7 +1389,7 @@ class JoinAliasRoomTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# Validate if user is a member of the room
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", "/_matrix/client/r0/joined_rooms", access_token=self.second_tok,
|
||||
)
|
||||
self.assertEquals(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
|
|
@ -1406,7 +1406,7 @@ class JoinAliasRoomTestCase(unittest.HomeserverTestCase):
|
|||
url = "/_synapse/admin/v1/join/{}".format(private_room_id)
|
||||
body = json.dumps({"user_id": self.second_user_id})
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST",
|
||||
url,
|
||||
content=body.encode(encoding="utf_8"),
|
||||
|
|
@ -1418,7 +1418,7 @@ class JoinAliasRoomTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# Validate if user is a member of the room
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", "/_matrix/client/r0/joined_rooms", access_token=self.second_tok,
|
||||
)
|
||||
self.assertEquals(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ class UserMediaStatisticsTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
Try to list users without authentication.
|
||||
"""
|
||||
request, channel = self.make_request("GET", self.url, b"{}")
|
||||
channel = self.make_request("GET", self.url, b"{}")
|
||||
|
||||
self.assertEqual(401, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"])
|
||||
|
|
@ -55,7 +55,7 @@ class UserMediaStatisticsTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
If the user is not a server admin, an error 403 is returned.
|
||||
"""
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url, json.dumps({}), access_token=self.other_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -67,7 +67,7 @@ class UserMediaStatisticsTestCase(unittest.HomeserverTestCase):
|
|||
If parameters are invalid, an error is returned.
|
||||
"""
|
||||
# unkown order_by
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?order_by=bar", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -75,7 +75,7 @@ class UserMediaStatisticsTestCase(unittest.HomeserverTestCase):
|
|||
self.assertEqual(Codes.INVALID_PARAM, channel.json_body["errcode"])
|
||||
|
||||
# negative from
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?from=-5", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -83,7 +83,7 @@ class UserMediaStatisticsTestCase(unittest.HomeserverTestCase):
|
|||
self.assertEqual(Codes.INVALID_PARAM, channel.json_body["errcode"])
|
||||
|
||||
# negative limit
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?limit=-5", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -91,7 +91,7 @@ class UserMediaStatisticsTestCase(unittest.HomeserverTestCase):
|
|||
self.assertEqual(Codes.INVALID_PARAM, channel.json_body["errcode"])
|
||||
|
||||
# negative from_ts
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?from_ts=-1234", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -99,7 +99,7 @@ class UserMediaStatisticsTestCase(unittest.HomeserverTestCase):
|
|||
self.assertEqual(Codes.INVALID_PARAM, channel.json_body["errcode"])
|
||||
|
||||
# negative until_ts
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?until_ts=-1234", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -107,7 +107,7 @@ class UserMediaStatisticsTestCase(unittest.HomeserverTestCase):
|
|||
self.assertEqual(Codes.INVALID_PARAM, channel.json_body["errcode"])
|
||||
|
||||
# until_ts smaller from_ts
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
self.url + "?from_ts=10&until_ts=5",
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -117,7 +117,7 @@ class UserMediaStatisticsTestCase(unittest.HomeserverTestCase):
|
|||
self.assertEqual(Codes.INVALID_PARAM, channel.json_body["errcode"])
|
||||
|
||||
# empty search term
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?search_term=", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -125,7 +125,7 @@ class UserMediaStatisticsTestCase(unittest.HomeserverTestCase):
|
|||
self.assertEqual(Codes.INVALID_PARAM, channel.json_body["errcode"])
|
||||
|
||||
# invalid search order
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?dir=bar", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -138,7 +138,7 @@ class UserMediaStatisticsTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
self._create_users_with_media(10, 2)
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?limit=5", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -154,7 +154,7 @@ class UserMediaStatisticsTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
self._create_users_with_media(20, 2)
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?from=5", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -170,7 +170,7 @@ class UserMediaStatisticsTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
self._create_users_with_media(20, 2)
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?from=5&limit=10", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -190,7 +190,7 @@ class UserMediaStatisticsTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# `next_token` does not appear
|
||||
# Number of results is the number of entries
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?limit=20", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -201,7 +201,7 @@ class UserMediaStatisticsTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# `next_token` does not appear
|
||||
# Number of max results is larger than the number of entries
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?limit=21", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -212,7 +212,7 @@ class UserMediaStatisticsTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# `next_token` does appear
|
||||
# Number of max results is smaller than the number of entries
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?limit=19", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -223,7 +223,7 @@ class UserMediaStatisticsTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# Set `from` to value of `next_token` for request remaining entries
|
||||
# Check `next_token` does not appear
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?from=19", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -238,9 +238,7 @@ class UserMediaStatisticsTestCase(unittest.HomeserverTestCase):
|
|||
if users have no media created
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", self.url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(0, channel.json_body["total"])
|
||||
|
|
@ -316,15 +314,13 @@ class UserMediaStatisticsTestCase(unittest.HomeserverTestCase):
|
|||
ts1 = self.clock.time_msec()
|
||||
|
||||
# list all media when filter is not set
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", self.url, access_token=self.admin_user_tok,)
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(channel.json_body["users"][0]["media_count"], 3)
|
||||
|
||||
# filter media starting at `ts1` after creating first media
|
||||
# result is 0
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?from_ts=%s" % (ts1,), access_token=self.admin_user_tok,
|
||||
)
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
|
|
@ -337,7 +333,7 @@ class UserMediaStatisticsTestCase(unittest.HomeserverTestCase):
|
|||
self._create_media(self.other_user_tok, 3)
|
||||
|
||||
# filter media between `ts1` and `ts2`
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
self.url + "?from_ts=%s&until_ts=%s" % (ts1, ts2),
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -346,7 +342,7 @@ class UserMediaStatisticsTestCase(unittest.HomeserverTestCase):
|
|||
self.assertEqual(channel.json_body["users"][0]["media_count"], 3)
|
||||
|
||||
# filter media until `ts2` and earlier
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?until_ts=%s" % (ts2,), access_token=self.admin_user_tok,
|
||||
)
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
|
|
@ -356,14 +352,12 @@ class UserMediaStatisticsTestCase(unittest.HomeserverTestCase):
|
|||
self._create_users_with_media(20, 1)
|
||||
|
||||
# check without filter get all users
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", self.url, access_token=self.admin_user_tok,)
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(channel.json_body["total"], 20)
|
||||
|
||||
# filter user 1 and 10-19 by `user_id`
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
self.url + "?search_term=foo_user_1",
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -372,7 +366,7 @@ class UserMediaStatisticsTestCase(unittest.HomeserverTestCase):
|
|||
self.assertEqual(channel.json_body["total"], 11)
|
||||
|
||||
# filter on this user in `displayname`
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
self.url + "?search_term=bar_user_10",
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -382,7 +376,7 @@ class UserMediaStatisticsTestCase(unittest.HomeserverTestCase):
|
|||
self.assertEqual(channel.json_body["total"], 1)
|
||||
|
||||
# filter and get empty result
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?search_term=foobar", access_token=self.admin_user_tok,
|
||||
)
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
|
|
@ -447,7 +441,7 @@ class UserMediaStatisticsTestCase(unittest.HomeserverTestCase):
|
|||
url = self.url + "?order_by=%s" % (order_type,)
|
||||
if dir is not None and dir in ("b", "f"):
|
||||
url += "&dir=%s" % (dir,)
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", url.encode("ascii"), access_token=self.admin_user_tok,
|
||||
)
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ class UserRegisterTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
self.hs.config.registration_shared_secret = None
|
||||
|
||||
request, channel = self.make_request("POST", self.url, b"{}")
|
||||
channel = self.make_request("POST", self.url, b"{}")
|
||||
|
||||
self.assertEqual(400, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(
|
||||
|
|
@ -87,7 +87,7 @@ class UserRegisterTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
self.hs.get_secrets = Mock(return_value=secrets)
|
||||
|
||||
request, channel = self.make_request("GET", self.url)
|
||||
channel = self.make_request("GET", self.url)
|
||||
|
||||
self.assertEqual(channel.json_body, {"nonce": "abcd"})
|
||||
|
||||
|
|
@ -96,14 +96,14 @@ class UserRegisterTestCase(unittest.HomeserverTestCase):
|
|||
Calling GET on the endpoint will return a randomised nonce, which will
|
||||
only last for SALT_TIMEOUT (60s).
|
||||
"""
|
||||
request, channel = self.make_request("GET", self.url)
|
||||
channel = self.make_request("GET", self.url)
|
||||
nonce = channel.json_body["nonce"]
|
||||
|
||||
# 59 seconds
|
||||
self.reactor.advance(59)
|
||||
|
||||
body = json.dumps({"nonce": nonce})
|
||||
request, channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
|
||||
self.assertEqual(400, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual("username must be specified", channel.json_body["error"])
|
||||
|
|
@ -111,7 +111,7 @@ class UserRegisterTestCase(unittest.HomeserverTestCase):
|
|||
# 61 seconds
|
||||
self.reactor.advance(2)
|
||||
|
||||
request, channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
|
||||
self.assertEqual(400, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual("unrecognised nonce", channel.json_body["error"])
|
||||
|
|
@ -120,7 +120,7 @@ class UserRegisterTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
Only the provided nonce can be used, as it's checked in the MAC.
|
||||
"""
|
||||
request, channel = self.make_request("GET", self.url)
|
||||
channel = self.make_request("GET", self.url)
|
||||
nonce = channel.json_body["nonce"]
|
||||
|
||||
want_mac = hmac.new(key=b"shared", digestmod=hashlib.sha1)
|
||||
|
|
@ -136,7 +136,7 @@ class UserRegisterTestCase(unittest.HomeserverTestCase):
|
|||
"mac": want_mac,
|
||||
}
|
||||
)
|
||||
request, channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
|
||||
self.assertEqual(403, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual("HMAC incorrect", channel.json_body["error"])
|
||||
|
|
@ -146,7 +146,7 @@ class UserRegisterTestCase(unittest.HomeserverTestCase):
|
|||
When the correct nonce is provided, and the right key is provided, the
|
||||
user is registered.
|
||||
"""
|
||||
request, channel = self.make_request("GET", self.url)
|
||||
channel = self.make_request("GET", self.url)
|
||||
nonce = channel.json_body["nonce"]
|
||||
|
||||
want_mac = hmac.new(key=b"shared", digestmod=hashlib.sha1)
|
||||
|
|
@ -165,7 +165,7 @@ class UserRegisterTestCase(unittest.HomeserverTestCase):
|
|||
"mac": want_mac,
|
||||
}
|
||||
)
|
||||
request, channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual("@bob:test", channel.json_body["user_id"])
|
||||
|
|
@ -174,7 +174,7 @@ class UserRegisterTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
A valid unrecognised nonce.
|
||||
"""
|
||||
request, channel = self.make_request("GET", self.url)
|
||||
channel = self.make_request("GET", self.url)
|
||||
nonce = channel.json_body["nonce"]
|
||||
|
||||
want_mac = hmac.new(key=b"shared", digestmod=hashlib.sha1)
|
||||
|
|
@ -190,13 +190,13 @@ class UserRegisterTestCase(unittest.HomeserverTestCase):
|
|||
"mac": want_mac,
|
||||
}
|
||||
)
|
||||
request, channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual("@bob:test", channel.json_body["user_id"])
|
||||
|
||||
# Now, try and reuse it
|
||||
request, channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
|
||||
self.assertEqual(400, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual("unrecognised nonce", channel.json_body["error"])
|
||||
|
|
@ -209,7 +209,7 @@ class UserRegisterTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
|
||||
def nonce():
|
||||
request, channel = self.make_request("GET", self.url)
|
||||
channel = self.make_request("GET", self.url)
|
||||
return channel.json_body["nonce"]
|
||||
|
||||
#
|
||||
|
|
@ -218,7 +218,7 @@ class UserRegisterTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# Must be present
|
||||
body = json.dumps({})
|
||||
request, channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
|
||||
self.assertEqual(400, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual("nonce must be specified", channel.json_body["error"])
|
||||
|
|
@ -229,28 +229,28 @@ class UserRegisterTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# Must be present
|
||||
body = json.dumps({"nonce": nonce()})
|
||||
request, channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
|
||||
self.assertEqual(400, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual("username must be specified", channel.json_body["error"])
|
||||
|
||||
# Must be a string
|
||||
body = json.dumps({"nonce": nonce(), "username": 1234})
|
||||
request, channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
|
||||
self.assertEqual(400, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual("Invalid username", channel.json_body["error"])
|
||||
|
||||
# Must not have null bytes
|
||||
body = json.dumps({"nonce": nonce(), "username": "abcd\u0000"})
|
||||
request, channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
|
||||
self.assertEqual(400, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual("Invalid username", channel.json_body["error"])
|
||||
|
||||
# Must not have null bytes
|
||||
body = json.dumps({"nonce": nonce(), "username": "a" * 1000})
|
||||
request, channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
|
||||
self.assertEqual(400, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual("Invalid username", channel.json_body["error"])
|
||||
|
|
@ -261,28 +261,28 @@ class UserRegisterTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# Must be present
|
||||
body = json.dumps({"nonce": nonce(), "username": "a"})
|
||||
request, channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
|
||||
self.assertEqual(400, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual("password must be specified", channel.json_body["error"])
|
||||
|
||||
# Must be a string
|
||||
body = json.dumps({"nonce": nonce(), "username": "a", "password": 1234})
|
||||
request, channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
|
||||
self.assertEqual(400, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual("Invalid password", channel.json_body["error"])
|
||||
|
||||
# Must not have null bytes
|
||||
body = json.dumps({"nonce": nonce(), "username": "a", "password": "abcd\u0000"})
|
||||
request, channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
|
||||
self.assertEqual(400, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual("Invalid password", channel.json_body["error"])
|
||||
|
||||
# Super long
|
||||
body = json.dumps({"nonce": nonce(), "username": "a", "password": "A" * 1000})
|
||||
request, channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
|
||||
self.assertEqual(400, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual("Invalid password", channel.json_body["error"])
|
||||
|
|
@ -300,7 +300,7 @@ class UserRegisterTestCase(unittest.HomeserverTestCase):
|
|||
"user_type": "invalid",
|
||||
}
|
||||
)
|
||||
request, channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
|
||||
self.assertEqual(400, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual("Invalid user type", channel.json_body["error"])
|
||||
|
|
@ -311,7 +311,7 @@ class UserRegisterTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
|
||||
# set no displayname
|
||||
request, channel = self.make_request("GET", self.url)
|
||||
channel = self.make_request("GET", self.url)
|
||||
nonce = channel.json_body["nonce"]
|
||||
|
||||
want_mac = hmac.new(key=b"shared", digestmod=hashlib.sha1)
|
||||
|
|
@ -321,17 +321,17 @@ class UserRegisterTestCase(unittest.HomeserverTestCase):
|
|||
body = json.dumps(
|
||||
{"nonce": nonce, "username": "bob1", "password": "abc123", "mac": want_mac}
|
||||
)
|
||||
request, channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual("@bob1:test", channel.json_body["user_id"])
|
||||
|
||||
request, channel = self.make_request("GET", "/profile/@bob1:test/displayname")
|
||||
channel = self.make_request("GET", "/profile/@bob1:test/displayname")
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual("bob1", channel.json_body["displayname"])
|
||||
|
||||
# displayname is None
|
||||
request, channel = self.make_request("GET", self.url)
|
||||
channel = self.make_request("GET", self.url)
|
||||
nonce = channel.json_body["nonce"]
|
||||
|
||||
want_mac = hmac.new(key=b"shared", digestmod=hashlib.sha1)
|
||||
|
|
@ -347,17 +347,17 @@ class UserRegisterTestCase(unittest.HomeserverTestCase):
|
|||
"mac": want_mac,
|
||||
}
|
||||
)
|
||||
request, channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual("@bob2:test", channel.json_body["user_id"])
|
||||
|
||||
request, channel = self.make_request("GET", "/profile/@bob2:test/displayname")
|
||||
channel = self.make_request("GET", "/profile/@bob2:test/displayname")
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual("bob2", channel.json_body["displayname"])
|
||||
|
||||
# displayname is empty
|
||||
request, channel = self.make_request("GET", self.url)
|
||||
channel = self.make_request("GET", self.url)
|
||||
nonce = channel.json_body["nonce"]
|
||||
|
||||
want_mac = hmac.new(key=b"shared", digestmod=hashlib.sha1)
|
||||
|
|
@ -373,16 +373,16 @@ class UserRegisterTestCase(unittest.HomeserverTestCase):
|
|||
"mac": want_mac,
|
||||
}
|
||||
)
|
||||
request, channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual("@bob3:test", channel.json_body["user_id"])
|
||||
|
||||
request, channel = self.make_request("GET", "/profile/@bob3:test/displayname")
|
||||
channel = self.make_request("GET", "/profile/@bob3:test/displayname")
|
||||
self.assertEqual(404, int(channel.result["code"]), msg=channel.result["body"])
|
||||
|
||||
# set displayname
|
||||
request, channel = self.make_request("GET", self.url)
|
||||
channel = self.make_request("GET", self.url)
|
||||
nonce = channel.json_body["nonce"]
|
||||
|
||||
want_mac = hmac.new(key=b"shared", digestmod=hashlib.sha1)
|
||||
|
|
@ -398,12 +398,12 @@ class UserRegisterTestCase(unittest.HomeserverTestCase):
|
|||
"mac": want_mac,
|
||||
}
|
||||
)
|
||||
request, channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual("@bob4:test", channel.json_body["user_id"])
|
||||
|
||||
request, channel = self.make_request("GET", "/profile/@bob4:test/displayname")
|
||||
channel = self.make_request("GET", "/profile/@bob4:test/displayname")
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual("Bob's Name", channel.json_body["displayname"])
|
||||
|
||||
|
|
@ -429,7 +429,7 @@ class UserRegisterTestCase(unittest.HomeserverTestCase):
|
|||
)
|
||||
|
||||
# Register new user with admin API
|
||||
request, channel = self.make_request("GET", self.url)
|
||||
channel = self.make_request("GET", self.url)
|
||||
nonce = channel.json_body["nonce"]
|
||||
|
||||
want_mac = hmac.new(key=b"shared", digestmod=hashlib.sha1)
|
||||
|
|
@ -448,7 +448,7 @@ class UserRegisterTestCase(unittest.HomeserverTestCase):
|
|||
"mac": want_mac,
|
||||
}
|
||||
)
|
||||
request, channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
channel = self.make_request("POST", self.url, body.encode("utf8"))
|
||||
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual("@bob:test", channel.json_body["user_id"])
|
||||
|
|
@ -473,7 +473,7 @@ class UsersListTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
Try to list users without authentication.
|
||||
"""
|
||||
request, channel = self.make_request("GET", self.url, b"{}")
|
||||
channel = self.make_request("GET", self.url, b"{}")
|
||||
|
||||
self.assertEqual(401, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual("M_MISSING_TOKEN", channel.json_body["errcode"])
|
||||
|
|
@ -482,7 +482,7 @@ class UsersListTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
List all users, including deactivated users.
|
||||
"""
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
self.url + "?deactivated=true",
|
||||
b"{}",
|
||||
|
|
@ -520,14 +520,12 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
url = "/_synapse/admin/v2/users/@bob:test"
|
||||
|
||||
request, channel = self.make_request(
|
||||
"GET", url, access_token=self.other_user_token,
|
||||
)
|
||||
channel = self.make_request("GET", url, access_token=self.other_user_token,)
|
||||
|
||||
self.assertEqual(403, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual("You are not a server admin", channel.json_body["error"])
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT", url, access_token=self.other_user_token, content=b"{}",
|
||||
)
|
||||
|
||||
|
|
@ -539,7 +537,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||
Tests that a lookup for a user that does not exist returns a 404
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
"/_synapse/admin/v2/users/@unknown_person:test",
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -565,7 +563,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||
}
|
||||
)
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
url,
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -581,9 +579,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||
self.assertEqual("mxc://fibble/wibble", channel.json_body["avatar_url"])
|
||||
|
||||
# Get user
|
||||
request, channel = self.make_request(
|
||||
"GET", url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual("@bob:test", channel.json_body["name"])
|
||||
|
|
@ -612,7 +608,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||
}
|
||||
)
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
url,
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -628,9 +624,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||
self.assertEqual("mxc://fibble/wibble", channel.json_body["avatar_url"])
|
||||
|
||||
# Get user
|
||||
request, channel = self.make_request(
|
||||
"GET", url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual("@bob:test", channel.json_body["name"])
|
||||
|
|
@ -656,9 +650,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# Sync to set admin user to active
|
||||
# before limit of monthly active users is reached
|
||||
request, channel = self.make_request(
|
||||
"GET", "/sync", access_token=self.admin_user_tok
|
||||
)
|
||||
channel = self.make_request("GET", "/sync", access_token=self.admin_user_tok)
|
||||
|
||||
if channel.code != 200:
|
||||
raise HttpResponseException(
|
||||
|
|
@ -681,7 +673,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||
# Create user
|
||||
body = json.dumps({"password": "abc123", "admin": False})
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
url,
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -720,7 +712,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||
# Create user
|
||||
body = json.dumps({"password": "abc123", "admin": False})
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
url,
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -757,7 +749,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||
}
|
||||
)
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
url,
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -801,7 +793,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||
}
|
||||
)
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
url,
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -827,7 +819,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||
# Change password
|
||||
body = json.dumps({"password": "hahaha"})
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
self.url_other_user,
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -844,7 +836,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||
# Modify user
|
||||
body = json.dumps({"displayname": "foobar"})
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
self.url_other_user,
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -856,7 +848,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||
self.assertEqual("foobar", channel.json_body["displayname"])
|
||||
|
||||
# Get user
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url_other_user, access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -874,7 +866,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||
{"threepids": [{"medium": "email", "address": "bob3@bob.bob"}]}
|
||||
)
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
self.url_other_user,
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -887,7 +879,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||
self.assertEqual("bob3@bob.bob", channel.json_body["threepids"][0]["address"])
|
||||
|
||||
# Get user
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url_other_user, access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -904,7 +896,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||
# Deactivate user
|
||||
body = json.dumps({"deactivated": True})
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
self.url_other_user,
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -917,7 +909,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||
# the user is deactivated, the threepid will be deleted
|
||||
|
||||
# Get user
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url_other_user, access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -931,7 +923,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
|
||||
# Deactivate the user.
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
self.url_other_user,
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -944,7 +936,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||
self._is_erased("@user:test", True)
|
||||
|
||||
# Attempt to reactivate the user (without a password).
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
self.url_other_user,
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -953,7 +945,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||
self.assertEqual(400, int(channel.result["code"]), msg=channel.result["body"])
|
||||
|
||||
# Reactivate the user.
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
self.url_other_user,
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -964,7 +956,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
|
||||
# Get user
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url_other_user, access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -981,7 +973,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||
# Set a user as an admin
|
||||
body = json.dumps({"admin": True})
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
self.url_other_user,
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -993,7 +985,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||
self.assertEqual(True, channel.json_body["admin"])
|
||||
|
||||
# Get user
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url_other_user, access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -1011,7 +1003,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||
# Create user
|
||||
body = json.dumps({"password": "abc123"})
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
url,
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -1023,9 +1015,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||
self.assertEqual("bob", channel.json_body["displayname"])
|
||||
|
||||
# Get user
|
||||
request, channel = self.make_request(
|
||||
"GET", url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual("@bob:test", channel.json_body["name"])
|
||||
|
|
@ -1035,7 +1025,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||
# Change password (and use a str for deactivate instead of a bool)
|
||||
body = json.dumps({"password": "abc123", "deactivated": "false"}) # oops!
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"PUT",
|
||||
url,
|
||||
access_token=self.admin_user_tok,
|
||||
|
|
@ -1045,9 +1035,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||
self.assertEqual(400, int(channel.result["code"]), msg=channel.result["body"])
|
||||
|
||||
# Check user is not deactivated
|
||||
request, channel = self.make_request(
|
||||
"GET", url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual("@bob:test", channel.json_body["name"])
|
||||
|
|
@ -1089,7 +1077,7 @@ class UserMembershipRestTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
Try to list rooms of an user without authentication.
|
||||
"""
|
||||
request, channel = self.make_request("GET", self.url, b"{}")
|
||||
channel = self.make_request("GET", self.url, b"{}")
|
||||
|
||||
self.assertEqual(401, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"])
|
||||
|
|
@ -1100,9 +1088,7 @@ class UserMembershipRestTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
other_user_token = self.login("user", "pass")
|
||||
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url, access_token=other_user_token,
|
||||
)
|
||||
channel = self.make_request("GET", self.url, access_token=other_user_token,)
|
||||
|
||||
self.assertEqual(403, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
|
||||
|
|
@ -1112,9 +1098,7 @@ class UserMembershipRestTestCase(unittest.HomeserverTestCase):
|
|||
Tests that a lookup for a user that does not exist returns a 404
|
||||
"""
|
||||
url = "/_synapse/admin/v1/users/@unknown_person:test/joined_rooms"
|
||||
request, channel = self.make_request(
|
||||
"GET", url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(404, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
|
||||
|
|
@ -1125,9 +1109,7 @@ class UserMembershipRestTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
url = "/_synapse/admin/v1/users/@unknown_person:unknown_domain/joined_rooms"
|
||||
|
||||
request, channel = self.make_request(
|
||||
"GET", url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(400, channel.code, msg=channel.json_body)
|
||||
self.assertEqual("Can only lookup local users", channel.json_body["error"])
|
||||
|
|
@ -1138,9 +1120,7 @@ class UserMembershipRestTestCase(unittest.HomeserverTestCase):
|
|||
if user has no memberships
|
||||
"""
|
||||
# Get rooms
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", self.url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(0, channel.json_body["total"])
|
||||
|
|
@ -1157,9 +1137,7 @@ class UserMembershipRestTestCase(unittest.HomeserverTestCase):
|
|||
self.helper.create_room_as(self.other_user, tok=other_user_tok)
|
||||
|
||||
# Get rooms
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", self.url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(number_rooms, channel.json_body["total"])
|
||||
|
|
@ -1188,7 +1166,7 @@ class PushersRestTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
Try to list pushers of an user without authentication.
|
||||
"""
|
||||
request, channel = self.make_request("GET", self.url, b"{}")
|
||||
channel = self.make_request("GET", self.url, b"{}")
|
||||
|
||||
self.assertEqual(401, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"])
|
||||
|
|
@ -1199,9 +1177,7 @@ class PushersRestTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
other_user_token = self.login("user", "pass")
|
||||
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url, access_token=other_user_token,
|
||||
)
|
||||
channel = self.make_request("GET", self.url, access_token=other_user_token,)
|
||||
|
||||
self.assertEqual(403, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
|
||||
|
|
@ -1211,9 +1187,7 @@ class PushersRestTestCase(unittest.HomeserverTestCase):
|
|||
Tests that a lookup for a user that does not exist returns a 404
|
||||
"""
|
||||
url = "/_synapse/admin/v1/users/@unknown_person:test/pushers"
|
||||
request, channel = self.make_request(
|
||||
"GET", url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(404, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
|
||||
|
|
@ -1224,9 +1198,7 @@ class PushersRestTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
url = "/_synapse/admin/v1/users/@unknown_person:unknown_domain/pushers"
|
||||
|
||||
request, channel = self.make_request(
|
||||
"GET", url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(400, channel.code, msg=channel.json_body)
|
||||
self.assertEqual("Can only lookup local users", channel.json_body["error"])
|
||||
|
|
@ -1237,9 +1209,7 @@ class PushersRestTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
|
||||
# Get pushers
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", self.url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(0, channel.json_body["total"])
|
||||
|
|
@ -1266,9 +1236,7 @@ class PushersRestTestCase(unittest.HomeserverTestCase):
|
|||
)
|
||||
|
||||
# Get pushers
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", self.url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(1, channel.json_body["total"])
|
||||
|
|
@ -1307,7 +1275,7 @@ class UserMediaRestTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
Try to list media of an user without authentication.
|
||||
"""
|
||||
request, channel = self.make_request("GET", self.url, b"{}")
|
||||
channel = self.make_request("GET", self.url, b"{}")
|
||||
|
||||
self.assertEqual(401, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"])
|
||||
|
|
@ -1318,9 +1286,7 @@ class UserMediaRestTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
other_user_token = self.login("user", "pass")
|
||||
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url, access_token=other_user_token,
|
||||
)
|
||||
channel = self.make_request("GET", self.url, access_token=other_user_token,)
|
||||
|
||||
self.assertEqual(403, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
|
||||
|
|
@ -1330,9 +1296,7 @@ class UserMediaRestTestCase(unittest.HomeserverTestCase):
|
|||
Tests that a lookup for a user that does not exist returns a 404
|
||||
"""
|
||||
url = "/_synapse/admin/v1/users/@unknown_person:test/media"
|
||||
request, channel = self.make_request(
|
||||
"GET", url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(404, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
|
||||
|
|
@ -1343,9 +1307,7 @@ class UserMediaRestTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
url = "/_synapse/admin/v1/users/@unknown_person:unknown_domain/media"
|
||||
|
||||
request, channel = self.make_request(
|
||||
"GET", url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(400, channel.code, msg=channel.json_body)
|
||||
self.assertEqual("Can only lookup local users", channel.json_body["error"])
|
||||
|
|
@ -1359,7 +1321,7 @@ class UserMediaRestTestCase(unittest.HomeserverTestCase):
|
|||
other_user_tok = self.login("user", "pass")
|
||||
self._create_media(other_user_tok, number_media)
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?limit=5", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -1378,7 +1340,7 @@ class UserMediaRestTestCase(unittest.HomeserverTestCase):
|
|||
other_user_tok = self.login("user", "pass")
|
||||
self._create_media(other_user_tok, number_media)
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?from=5", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -1397,7 +1359,7 @@ class UserMediaRestTestCase(unittest.HomeserverTestCase):
|
|||
other_user_tok = self.login("user", "pass")
|
||||
self._create_media(other_user_tok, number_media)
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?from=5&limit=10", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -1412,7 +1374,7 @@ class UserMediaRestTestCase(unittest.HomeserverTestCase):
|
|||
Testing that a negative limit parameter returns a 400
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?limit=-5", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -1424,7 +1386,7 @@ class UserMediaRestTestCase(unittest.HomeserverTestCase):
|
|||
Testing that a negative from parameter returns a 400
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?from=-5", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -1442,7 +1404,7 @@ class UserMediaRestTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# `next_token` does not appear
|
||||
# Number of results is the number of entries
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?limit=20", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -1453,7 +1415,7 @@ class UserMediaRestTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# `next_token` does not appear
|
||||
# Number of max results is larger than the number of entries
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?limit=21", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -1464,7 +1426,7 @@ class UserMediaRestTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# `next_token` does appear
|
||||
# Number of max results is smaller than the number of entries
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?limit=19", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -1476,7 +1438,7 @@ class UserMediaRestTestCase(unittest.HomeserverTestCase):
|
|||
# Check
|
||||
# Set `from` to value of `next_token` for request remaining entries
|
||||
# `next_token` does not appear
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", self.url + "?from=19", access_token=self.admin_user_tok,
|
||||
)
|
||||
|
||||
|
|
@ -1491,9 +1453,7 @@ class UserMediaRestTestCase(unittest.HomeserverTestCase):
|
|||
if user has no media created
|
||||
"""
|
||||
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", self.url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(0, channel.json_body["total"])
|
||||
|
|
@ -1508,9 +1468,7 @@ class UserMediaRestTestCase(unittest.HomeserverTestCase):
|
|||
other_user_tok = self.login("user", "pass")
|
||||
self._create_media(other_user_tok, number_media)
|
||||
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", self.url, access_token=self.admin_user_tok,)
|
||||
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(number_media, channel.json_body["total"])
|
||||
|
|
@ -1576,7 +1534,7 @@ class UserTokenRestTestCase(unittest.HomeserverTestCase):
|
|||
)
|
||||
|
||||
def _get_token(self) -> str:
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST", self.url, b"{}", access_token=self.admin_user_tok
|
||||
)
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
|
|
@ -1585,7 +1543,7 @@ class UserTokenRestTestCase(unittest.HomeserverTestCase):
|
|||
def test_no_auth(self):
|
||||
"""Try to login as a user without authentication.
|
||||
"""
|
||||
request, channel = self.make_request("POST", self.url, b"{}")
|
||||
channel = self.make_request("POST", self.url, b"{}")
|
||||
|
||||
self.assertEqual(401, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"])
|
||||
|
|
@ -1593,7 +1551,7 @@ class UserTokenRestTestCase(unittest.HomeserverTestCase):
|
|||
def test_not_admin(self):
|
||||
"""Try to login as a user as a non-admin user.
|
||||
"""
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST", self.url, b"{}", access_token=self.other_user_tok
|
||||
)
|
||||
|
||||
|
|
@ -1621,7 +1579,7 @@ class UserTokenRestTestCase(unittest.HomeserverTestCase):
|
|||
self._get_token()
|
||||
|
||||
# Check that we don't see a new device in our devices list
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", "devices", b"{}", access_token=self.other_user_tok
|
||||
)
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
|
|
@ -1636,25 +1594,19 @@ class UserTokenRestTestCase(unittest.HomeserverTestCase):
|
|||
puppet_token = self._get_token()
|
||||
|
||||
# Test that we can successfully make a request
|
||||
request, channel = self.make_request(
|
||||
"GET", "devices", b"{}", access_token=puppet_token
|
||||
)
|
||||
channel = self.make_request("GET", "devices", b"{}", access_token=puppet_token)
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
|
||||
# Logout with the puppet token
|
||||
request, channel = self.make_request(
|
||||
"POST", "logout", b"{}", access_token=puppet_token
|
||||
)
|
||||
channel = self.make_request("POST", "logout", b"{}", access_token=puppet_token)
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
|
||||
# The puppet token should no longer work
|
||||
request, channel = self.make_request(
|
||||
"GET", "devices", b"{}", access_token=puppet_token
|
||||
)
|
||||
channel = self.make_request("GET", "devices", b"{}", access_token=puppet_token)
|
||||
self.assertEqual(401, int(channel.result["code"]), msg=channel.result["body"])
|
||||
|
||||
# .. but the real user's tokens should still work
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", "devices", b"{}", access_token=self.other_user_tok
|
||||
)
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
|
|
@ -1667,25 +1619,21 @@ class UserTokenRestTestCase(unittest.HomeserverTestCase):
|
|||
puppet_token = self._get_token()
|
||||
|
||||
# Test that we can successfully make a request
|
||||
request, channel = self.make_request(
|
||||
"GET", "devices", b"{}", access_token=puppet_token
|
||||
)
|
||||
channel = self.make_request("GET", "devices", b"{}", access_token=puppet_token)
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
|
||||
# Logout all with the real user token
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST", "logout/all", b"{}", access_token=self.other_user_tok
|
||||
)
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
|
||||
# The puppet token should still work
|
||||
request, channel = self.make_request(
|
||||
"GET", "devices", b"{}", access_token=puppet_token
|
||||
)
|
||||
channel = self.make_request("GET", "devices", b"{}", access_token=puppet_token)
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
|
||||
# .. but the real user's tokens shouldn't
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", "devices", b"{}", access_token=self.other_user_tok
|
||||
)
|
||||
self.assertEqual(401, int(channel.result["code"]), msg=channel.result["body"])
|
||||
|
|
@ -1698,25 +1646,21 @@ class UserTokenRestTestCase(unittest.HomeserverTestCase):
|
|||
puppet_token = self._get_token()
|
||||
|
||||
# Test that we can successfully make a request
|
||||
request, channel = self.make_request(
|
||||
"GET", "devices", b"{}", access_token=puppet_token
|
||||
)
|
||||
channel = self.make_request("GET", "devices", b"{}", access_token=puppet_token)
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
|
||||
# Logout all with the admin user token
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"POST", "logout/all", b"{}", access_token=self.admin_user_tok
|
||||
)
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
|
||||
# The puppet token should no longer work
|
||||
request, channel = self.make_request(
|
||||
"GET", "devices", b"{}", access_token=puppet_token
|
||||
)
|
||||
channel = self.make_request("GET", "devices", b"{}", access_token=puppet_token)
|
||||
self.assertEqual(401, int(channel.result["code"]), msg=channel.result["body"])
|
||||
|
||||
# .. but the real user's tokens should still work
|
||||
request, channel = self.make_request(
|
||||
channel = self.make_request(
|
||||
"GET", "devices", b"{}", access_token=self.other_user_tok
|
||||
)
|
||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||
|
|
@ -1798,11 +1742,11 @@ class WhoisRestTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
Try to get information of an user without authentication.
|
||||
"""
|
||||
request, channel = self.make_request("GET", self.url1, b"{}")
|
||||
channel = self.make_request("GET", self.url1, b"{}")
|
||||
self.assertEqual(401, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"])
|
||||
|
||||
request, channel = self.make_request("GET", self.url2, b"{}")
|
||||
channel = self.make_request("GET", self.url2, b"{}")
|
||||
self.assertEqual(401, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"])
|
||||
|
||||
|
|
@ -1813,15 +1757,11 @@ class WhoisRestTestCase(unittest.HomeserverTestCase):
|
|||
self.register_user("user2", "pass")
|
||||
other_user2_token = self.login("user2", "pass")
|
||||
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url1, access_token=other_user2_token,
|
||||
)
|
||||
channel = self.make_request("GET", self.url1, access_token=other_user2_token,)
|
||||
self.assertEqual(403, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
|
||||
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url2, access_token=other_user2_token,
|
||||
)
|
||||
channel = self.make_request("GET", self.url2, access_token=other_user2_token,)
|
||||
self.assertEqual(403, int(channel.result["code"]), msg=channel.result["body"])
|
||||
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
|
||||
|
||||
|
|
@ -1832,15 +1772,11 @@ class WhoisRestTestCase(unittest.HomeserverTestCase):
|
|||
url1 = "/_synapse/admin/v1/whois/@unknown_person:unknown_domain"
|
||||
url2 = "/_matrix/client/r0/admin/whois/@unknown_person:unknown_domain"
|
||||
|
||||
request, channel = self.make_request(
|
||||
"GET", url1, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", url1, access_token=self.admin_user_tok,)
|
||||
self.assertEqual(400, channel.code, msg=channel.json_body)
|
||||
self.assertEqual("Can only whois a local user", channel.json_body["error"])
|
||||
|
||||
request, channel = self.make_request(
|
||||
"GET", url2, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", url2, access_token=self.admin_user_tok,)
|
||||
self.assertEqual(400, channel.code, msg=channel.json_body)
|
||||
self.assertEqual("Can only whois a local user", channel.json_body["error"])
|
||||
|
||||
|
|
@ -1848,16 +1784,12 @@ class WhoisRestTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
The lookup should succeed for an admin.
|
||||
"""
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url1, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", self.url1, access_token=self.admin_user_tok,)
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(self.other_user, channel.json_body["user_id"])
|
||||
self.assertIn("devices", channel.json_body)
|
||||
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url2, access_token=self.admin_user_tok,
|
||||
)
|
||||
channel = self.make_request("GET", self.url2, access_token=self.admin_user_tok,)
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(self.other_user, channel.json_body["user_id"])
|
||||
self.assertIn("devices", channel.json_body)
|
||||
|
|
@ -1868,16 +1800,12 @@ class WhoisRestTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
other_user_token = self.login("user", "pass")
|
||||
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url1, access_token=other_user_token,
|
||||
)
|
||||
channel = self.make_request("GET", self.url1, access_token=other_user_token,)
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(self.other_user, channel.json_body["user_id"])
|
||||
self.assertIn("devices", channel.json_body)
|
||||
|
||||
request, channel = self.make_request(
|
||||
"GET", self.url2, access_token=other_user_token,
|
||||
)
|
||||
channel = self.make_request("GET", self.url2, access_token=other_user_token,)
|
||||
self.assertEqual(200, channel.code, msg=channel.json_body)
|
||||
self.assertEqual(self.other_user, channel.json_body["user_id"])
|
||||
self.assertIn("devices", channel.json_body)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue