Matrix/synapse
Matrix/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse synced 2024-07-02 08:53:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix GET request on /_synapse/admin/v2/users endpoint (#6563)

Browse source 
Fixes #6552
This commit is contained in:
Manuel Stahl 2020-01-08 14:26:40 +01:00 committed by Richard van der Hoff
parent 573fee759c
commit 7caaa29daa
3 changed files with 44 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/6563.bugfix Normal file
View file

@ -0,0 +1 @@
Fix GET request on /_synapse/admin/v2/users endpoint. Contributed by Awesome Technologies Innovationslabor GmbH.

4
synapse/storage/data_stores/main/__init__.py
View file

@ -526,9 +526,9 @@ class DataStore(
attr_filter = {}
if not guests:
attr_filter["is_guest"] = False
attr_filter["is_guest"] = 0
if not deactivated:
attr_filter["deactivated"] = False
attr_filter["deactivated"] = 0
return self.db.simple_select_list_paginate(
desc="get_users_paginate",

41
tests/rest/admin/test_admin.py
View file

@ -341,6 +341,47 @@ class UserRegisterTestCase(unittest.HomeserverTestCase):
self.assertEqual("Invalid user type", channel.json_body["error"])
class UsersListTestCase(unittest.HomeserverTestCase):
servlets = [
synapse.rest.admin.register_servlets,
login.register_servlets,
]
url = "/_synapse/admin/v2/users"
def prepare(self, reactor, clock, hs):
self.admin_user = self.register_user("admin", "pass", admin=True)
self.admin_user_tok = self.login("admin", "pass")
self.register_user("user1", "pass1", admin=False)
self.register_user("user2", "pass2", admin=False)
def test_no_auth(self):
"""
Try to list users without authentication.
"""
request, channel = self.make_request("GET", self.url, b"{}")
self.render(request)
self.assertEqual(401, int(channel.result["code"]), msg=channel.result["body"])
self.assertEqual("M_MISSING_TOKEN", channel.json_body["errcode"])
def test_all_users(self):
"""
List all users, including deactivated users.
"""
request, channel = self.make_request(
"GET",
self.url + "?deactivated=true",
b"{}",
access_token=self.admin_user_tok,
)
self.render(request)
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
self.assertEqual(3, len(channel.json_body["users"]))
class ShutdownRoomTestCase(unittest.HomeserverTestCase):
servlets = [
synapse.rest.admin.register_servlets_for_client_rest_resource,