mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-12-24 19:59:27 -05:00
Merge remote-tracking branch 'origin/release-v1.11.1' into release-v1.11.1
This commit is contained in:
commit
27d099edd6
1
changelog.d/6910.bugfix
Normal file
1
changelog.d/6910.bugfix
Normal file
@ -0,0 +1 @@
|
|||||||
|
Fixed set a user as an admin with the admin API `PUT /_synapse/admin/v2/users/<user_id>`. Contributed by @dklimpel.
|
@ -211,9 +211,7 @@ class UserRestServletV2(RestServlet):
|
|||||||
if target_user == auth_user and not set_admin_to:
|
if target_user == auth_user and not set_admin_to:
|
||||||
raise SynapseError(400, "You may not demote yourself.")
|
raise SynapseError(400, "You may not demote yourself.")
|
||||||
|
|
||||||
await self.admin_handler.set_user_server_admin(
|
await self.store.set_server_admin(target_user, set_admin_to)
|
||||||
target_user, set_admin_to
|
|
||||||
)
|
|
||||||
|
|
||||||
if "password" in body:
|
if "password" in body:
|
||||||
if (
|
if (
|
||||||
@ -648,6 +646,6 @@ class UserAdminServlet(RestServlet):
|
|||||||
if target_user == auth_user and not set_admin_to:
|
if target_user == auth_user and not set_admin_to:
|
||||||
raise SynapseError(400, "You may not demote yourself.")
|
raise SynapseError(400, "You may not demote yourself.")
|
||||||
|
|
||||||
await self.store.set_user_server_admin(target_user, set_admin_to)
|
await self.store.set_server_admin(target_user, set_admin_to)
|
||||||
|
|
||||||
return 200, {}
|
return 200, {}
|
||||||
|
@ -301,12 +301,16 @@ class RegistrationWorkerStore(SQLBaseStore):
|
|||||||
admin (bool): true iff the user is to be a server admin,
|
admin (bool): true iff the user is to be a server admin,
|
||||||
false otherwise.
|
false otherwise.
|
||||||
"""
|
"""
|
||||||
return self.db.simple_update_one(
|
|
||||||
table="users",
|
def set_server_admin_txn(txn):
|
||||||
keyvalues={"name": user.to_string()},
|
self.db.simple_update_one_txn(
|
||||||
updatevalues={"admin": 1 if admin else 0},
|
txn, "users", {"name": user.to_string()}, {"admin": 1 if admin else 0}
|
||||||
desc="set_server_admin",
|
)
|
||||||
)
|
self._invalidate_cache_and_stream(
|
||||||
|
txn, self.get_user_by_id, (user.to_string(),)
|
||||||
|
)
|
||||||
|
|
||||||
|
return self.db.runInteraction("set_server_admin", set_server_admin_txn)
|
||||||
|
|
||||||
def _query_for_auth(self, txn, token):
|
def _query_for_auth(self, txn, token):
|
||||||
sql = (
|
sql = (
|
||||||
|
@ -16,6 +16,7 @@
|
|||||||
import hashlib
|
import hashlib
|
||||||
import hmac
|
import hmac
|
||||||
import json
|
import json
|
||||||
|
import urllib.parse
|
||||||
|
|
||||||
from mock import Mock
|
from mock import Mock
|
||||||
|
|
||||||
@ -371,22 +372,24 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||||||
def prepare(self, reactor, clock, hs):
|
def prepare(self, reactor, clock, hs):
|
||||||
self.store = hs.get_datastore()
|
self.store = hs.get_datastore()
|
||||||
|
|
||||||
self.url = "/_synapse/admin/v2/users/@bob:test"
|
|
||||||
|
|
||||||
self.admin_user = self.register_user("admin", "pass", admin=True)
|
self.admin_user = self.register_user("admin", "pass", admin=True)
|
||||||
self.admin_user_tok = self.login("admin", "pass")
|
self.admin_user_tok = self.login("admin", "pass")
|
||||||
|
|
||||||
self.other_user = self.register_user("user", "pass")
|
self.other_user = self.register_user("user", "pass")
|
||||||
self.other_user_token = self.login("user", "pass")
|
self.other_user_token = self.login("user", "pass")
|
||||||
|
self.url_other_user = "/_synapse/admin/v2/users/%s" % urllib.parse.quote(
|
||||||
|
self.other_user
|
||||||
|
)
|
||||||
|
|
||||||
def test_requester_is_no_admin(self):
|
def test_requester_is_no_admin(self):
|
||||||
"""
|
"""
|
||||||
If the user is not a server admin, an error is returned.
|
If the user is not a server admin, an error is returned.
|
||||||
"""
|
"""
|
||||||
self.hs.config.registration_shared_secret = None
|
self.hs.config.registration_shared_secret = None
|
||||||
|
url = "/_synapse/admin/v2/users/@bob:test"
|
||||||
|
|
||||||
request, channel = self.make_request(
|
request, channel = self.make_request(
|
||||||
"GET", self.url, access_token=self.other_user_token,
|
"GET", url, access_token=self.other_user_token,
|
||||||
)
|
)
|
||||||
self.render(request)
|
self.render(request)
|
||||||
|
|
||||||
@ -394,7 +397,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||||||
self.assertEqual("You are not a server admin", channel.json_body["error"])
|
self.assertEqual("You are not a server admin", channel.json_body["error"])
|
||||||
|
|
||||||
request, channel = self.make_request(
|
request, channel = self.make_request(
|
||||||
"PUT", self.url, access_token=self.other_user_token, content=b"{}",
|
"PUT", url, access_token=self.other_user_token, content=b"{}",
|
||||||
)
|
)
|
||||||
self.render(request)
|
self.render(request)
|
||||||
|
|
||||||
@ -417,24 +420,26 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||||||
self.assertEqual(404, channel.code, msg=channel.json_body)
|
self.assertEqual(404, channel.code, msg=channel.json_body)
|
||||||
self.assertEqual("M_NOT_FOUND", channel.json_body["errcode"])
|
self.assertEqual("M_NOT_FOUND", channel.json_body["errcode"])
|
||||||
|
|
||||||
def test_requester_is_admin(self):
|
def test_create_server_admin(self):
|
||||||
"""
|
"""
|
||||||
If the user is a server admin, a new user is created.
|
Check that a new admin user is created successfully.
|
||||||
"""
|
"""
|
||||||
self.hs.config.registration_shared_secret = None
|
self.hs.config.registration_shared_secret = None
|
||||||
|
url = "/_synapse/admin/v2/users/@bob:test"
|
||||||
|
|
||||||
|
# Create user (server admin)
|
||||||
body = json.dumps(
|
body = json.dumps(
|
||||||
{
|
{
|
||||||
"password": "abc123",
|
"password": "abc123",
|
||||||
"admin": True,
|
"admin": True,
|
||||||
|
"displayname": "Bob's name",
|
||||||
"threepids": [{"medium": "email", "address": "bob@bob.bob"}],
|
"threepids": [{"medium": "email", "address": "bob@bob.bob"}],
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
# Create user
|
|
||||||
request, channel = self.make_request(
|
request, channel = self.make_request(
|
||||||
"PUT",
|
"PUT",
|
||||||
self.url,
|
url,
|
||||||
access_token=self.admin_user_tok,
|
access_token=self.admin_user_tok,
|
||||||
content=body.encode(encoding="utf_8"),
|
content=body.encode(encoding="utf_8"),
|
||||||
)
|
)
|
||||||
@ -442,29 +447,85 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||||||
|
|
||||||
self.assertEqual(201, int(channel.result["code"]), msg=channel.result["body"])
|
self.assertEqual(201, int(channel.result["code"]), msg=channel.result["body"])
|
||||||
self.assertEqual("@bob:test", channel.json_body["name"])
|
self.assertEqual("@bob:test", channel.json_body["name"])
|
||||||
self.assertEqual("bob", channel.json_body["displayname"])
|
self.assertEqual("Bob's name", channel.json_body["displayname"])
|
||||||
self.assertEqual("email", channel.json_body["threepids"][0]["medium"])
|
self.assertEqual("email", channel.json_body["threepids"][0]["medium"])
|
||||||
self.assertEqual("bob@bob.bob", channel.json_body["threepids"][0]["address"])
|
self.assertEqual("bob@bob.bob", channel.json_body["threepids"][0]["address"])
|
||||||
|
self.assertEqual(True, channel.json_body["admin"])
|
||||||
|
|
||||||
# Get user
|
# Get user
|
||||||
request, channel = self.make_request(
|
request, channel = self.make_request(
|
||||||
"GET", self.url, access_token=self.admin_user_tok,
|
"GET", url, access_token=self.admin_user_tok,
|
||||||
)
|
)
|
||||||
self.render(request)
|
self.render(request)
|
||||||
|
|
||||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||||
self.assertEqual("@bob:test", channel.json_body["name"])
|
self.assertEqual("@bob:test", channel.json_body["name"])
|
||||||
self.assertEqual("bob", channel.json_body["displayname"])
|
self.assertEqual("Bob's name", channel.json_body["displayname"])
|
||||||
self.assertEqual(1, channel.json_body["admin"])
|
self.assertEqual("email", channel.json_body["threepids"][0]["medium"])
|
||||||
self.assertEqual(0, channel.json_body["is_guest"])
|
self.assertEqual("bob@bob.bob", channel.json_body["threepids"][0]["address"])
|
||||||
self.assertEqual(0, channel.json_body["deactivated"])
|
self.assertEqual(True, channel.json_body["admin"])
|
||||||
|
self.assertEqual(False, channel.json_body["is_guest"])
|
||||||
|
self.assertEqual(False, channel.json_body["deactivated"])
|
||||||
|
|
||||||
|
def test_create_user(self):
|
||||||
|
"""
|
||||||
|
Check that a new regular user is created successfully.
|
||||||
|
"""
|
||||||
|
self.hs.config.registration_shared_secret = None
|
||||||
|
url = "/_synapse/admin/v2/users/@bob:test"
|
||||||
|
|
||||||
|
# Create user
|
||||||
|
body = json.dumps(
|
||||||
|
{
|
||||||
|
"password": "abc123",
|
||||||
|
"admin": False,
|
||||||
|
"displayname": "Bob's name",
|
||||||
|
"threepids": [{"medium": "email", "address": "bob@bob.bob"}],
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
request, channel = self.make_request(
|
||||||
|
"PUT",
|
||||||
|
url,
|
||||||
|
access_token=self.admin_user_tok,
|
||||||
|
content=body.encode(encoding="utf_8"),
|
||||||
|
)
|
||||||
|
self.render(request)
|
||||||
|
|
||||||
|
self.assertEqual(201, int(channel.result["code"]), msg=channel.result["body"])
|
||||||
|
self.assertEqual("@bob:test", channel.json_body["name"])
|
||||||
|
self.assertEqual("Bob's name", channel.json_body["displayname"])
|
||||||
|
self.assertEqual("email", channel.json_body["threepids"][0]["medium"])
|
||||||
|
self.assertEqual("bob@bob.bob", channel.json_body["threepids"][0]["address"])
|
||||||
|
self.assertEqual(False, channel.json_body["admin"])
|
||||||
|
|
||||||
|
# Get user
|
||||||
|
request, channel = self.make_request(
|
||||||
|
"GET", url, access_token=self.admin_user_tok,
|
||||||
|
)
|
||||||
|
self.render(request)
|
||||||
|
|
||||||
|
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||||
|
self.assertEqual("@bob:test", channel.json_body["name"])
|
||||||
|
self.assertEqual("Bob's name", channel.json_body["displayname"])
|
||||||
|
self.assertEqual("email", channel.json_body["threepids"][0]["medium"])
|
||||||
|
self.assertEqual("bob@bob.bob", channel.json_body["threepids"][0]["address"])
|
||||||
|
self.assertEqual(False, channel.json_body["admin"])
|
||||||
|
self.assertEqual(False, channel.json_body["is_guest"])
|
||||||
|
self.assertEqual(False, channel.json_body["deactivated"])
|
||||||
|
|
||||||
|
def test_set_password(self):
|
||||||
|
"""
|
||||||
|
Test setting a new password for another user.
|
||||||
|
"""
|
||||||
|
self.hs.config.registration_shared_secret = None
|
||||||
|
|
||||||
# Change password
|
# Change password
|
||||||
body = json.dumps({"password": "hahaha"})
|
body = json.dumps({"password": "hahaha"})
|
||||||
|
|
||||||
request, channel = self.make_request(
|
request, channel = self.make_request(
|
||||||
"PUT",
|
"PUT",
|
||||||
self.url,
|
self.url_other_user,
|
||||||
access_token=self.admin_user_tok,
|
access_token=self.admin_user_tok,
|
||||||
content=body.encode(encoding="utf_8"),
|
content=body.encode(encoding="utf_8"),
|
||||||
)
|
)
|
||||||
@ -472,38 +533,130 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||||||
|
|
||||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||||
|
|
||||||
|
def test_set_displayname(self):
|
||||||
|
"""
|
||||||
|
Test setting the displayname of another user.
|
||||||
|
"""
|
||||||
|
self.hs.config.registration_shared_secret = None
|
||||||
|
|
||||||
# Modify user
|
# Modify user
|
||||||
|
body = json.dumps({"displayname": "foobar"})
|
||||||
|
|
||||||
|
request, channel = self.make_request(
|
||||||
|
"PUT",
|
||||||
|
self.url_other_user,
|
||||||
|
access_token=self.admin_user_tok,
|
||||||
|
content=body.encode(encoding="utf_8"),
|
||||||
|
)
|
||||||
|
self.render(request)
|
||||||
|
|
||||||
|
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||||
|
self.assertEqual("@user:test", channel.json_body["name"])
|
||||||
|
self.assertEqual("foobar", channel.json_body["displayname"])
|
||||||
|
|
||||||
|
# Get user
|
||||||
|
request, channel = self.make_request(
|
||||||
|
"GET", self.url_other_user, access_token=self.admin_user_tok,
|
||||||
|
)
|
||||||
|
self.render(request)
|
||||||
|
|
||||||
|
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||||
|
self.assertEqual("@user:test", channel.json_body["name"])
|
||||||
|
self.assertEqual("foobar", channel.json_body["displayname"])
|
||||||
|
|
||||||
|
def test_set_threepid(self):
|
||||||
|
"""
|
||||||
|
Test setting threepid for an other user.
|
||||||
|
"""
|
||||||
|
self.hs.config.registration_shared_secret = None
|
||||||
|
|
||||||
|
# Delete old and add new threepid to user
|
||||||
body = json.dumps(
|
body = json.dumps(
|
||||||
{
|
{"threepids": [{"medium": "email", "address": "bob3@bob.bob"}]}
|
||||||
"displayname": "foobar",
|
|
||||||
"deactivated": True,
|
|
||||||
"threepids": [{"medium": "email", "address": "bob2@bob.bob"}],
|
|
||||||
}
|
|
||||||
)
|
)
|
||||||
|
|
||||||
request, channel = self.make_request(
|
request, channel = self.make_request(
|
||||||
"PUT",
|
"PUT",
|
||||||
self.url,
|
self.url_other_user,
|
||||||
access_token=self.admin_user_tok,
|
access_token=self.admin_user_tok,
|
||||||
content=body.encode(encoding="utf_8"),
|
content=body.encode(encoding="utf_8"),
|
||||||
)
|
)
|
||||||
self.render(request)
|
self.render(request)
|
||||||
|
|
||||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||||
self.assertEqual("@bob:test", channel.json_body["name"])
|
self.assertEqual("@user:test", channel.json_body["name"])
|
||||||
self.assertEqual("foobar", channel.json_body["displayname"])
|
self.assertEqual("email", channel.json_body["threepids"][0]["medium"])
|
||||||
|
self.assertEqual("bob3@bob.bob", channel.json_body["threepids"][0]["address"])
|
||||||
|
|
||||||
|
# Get user
|
||||||
|
request, channel = self.make_request(
|
||||||
|
"GET", self.url_other_user, access_token=self.admin_user_tok,
|
||||||
|
)
|
||||||
|
self.render(request)
|
||||||
|
|
||||||
|
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||||
|
self.assertEqual("@user:test", channel.json_body["name"])
|
||||||
|
self.assertEqual("email", channel.json_body["threepids"][0]["medium"])
|
||||||
|
self.assertEqual("bob3@bob.bob", channel.json_body["threepids"][0]["address"])
|
||||||
|
|
||||||
|
def test_deactivate_user(self):
|
||||||
|
"""
|
||||||
|
Test deactivating another user.
|
||||||
|
"""
|
||||||
|
|
||||||
|
# Deactivate user
|
||||||
|
body = json.dumps({"deactivated": True})
|
||||||
|
|
||||||
|
request, channel = self.make_request(
|
||||||
|
"PUT",
|
||||||
|
self.url_other_user,
|
||||||
|
access_token=self.admin_user_tok,
|
||||||
|
content=body.encode(encoding="utf_8"),
|
||||||
|
)
|
||||||
|
self.render(request)
|
||||||
|
|
||||||
|
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||||
|
self.assertEqual("@user:test", channel.json_body["name"])
|
||||||
self.assertEqual(True, channel.json_body["deactivated"])
|
self.assertEqual(True, channel.json_body["deactivated"])
|
||||||
# the user is deactivated, the threepid will be deleted
|
# the user is deactivated, the threepid will be deleted
|
||||||
|
|
||||||
# Get user
|
# Get user
|
||||||
request, channel = self.make_request(
|
request, channel = self.make_request(
|
||||||
"GET", self.url, access_token=self.admin_user_tok,
|
"GET", self.url_other_user, access_token=self.admin_user_tok,
|
||||||
)
|
)
|
||||||
self.render(request)
|
self.render(request)
|
||||||
|
|
||||||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||||
self.assertEqual("@bob:test", channel.json_body["name"])
|
self.assertEqual("@user:test", channel.json_body["name"])
|
||||||
self.assertEqual("foobar", channel.json_body["displayname"])
|
self.assertEqual(True, channel.json_body["deactivated"])
|
||||||
self.assertEqual(1, channel.json_body["admin"])
|
|
||||||
self.assertEqual(0, channel.json_body["is_guest"])
|
def test_set_user_as_admin(self):
|
||||||
self.assertEqual(1, channel.json_body["deactivated"])
|
"""
|
||||||
|
Test setting the admin flag on a user.
|
||||||
|
"""
|
||||||
|
self.hs.config.registration_shared_secret = None
|
||||||
|
|
||||||
|
# Set a user as an admin
|
||||||
|
body = json.dumps({"admin": True})
|
||||||
|
|
||||||
|
request, channel = self.make_request(
|
||||||
|
"PUT",
|
||||||
|
self.url_other_user,
|
||||||
|
access_token=self.admin_user_tok,
|
||||||
|
content=body.encode(encoding="utf_8"),
|
||||||
|
)
|
||||||
|
self.render(request)
|
||||||
|
|
||||||
|
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||||
|
self.assertEqual("@user:test", channel.json_body["name"])
|
||||||
|
self.assertEqual(True, channel.json_body["admin"])
|
||||||
|
|
||||||
|
# Get user
|
||||||
|
request, channel = self.make_request(
|
||||||
|
"GET", self.url_other_user, access_token=self.admin_user_tok,
|
||||||
|
)
|
||||||
|
self.render(request)
|
||||||
|
|
||||||
|
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"])
|
||||||
|
self.assertEqual("@user:test", channel.json_body["name"])
|
||||||
|
self.assertEqual(True, channel.json_body["admin"])
|
||||||
|
Loading…
Reference in New Issue
Block a user