Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Admin API: Set adminship of a user #5878

Merged
merged 5 commits into from
Aug 27, 2019
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/5878.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add admin API endpoint for setting whether or not a user is a server administrator.
10 changes: 10 additions & 0 deletions synapse/handlers/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,16 @@ def search_users(self, term):

return ret

def set_user_server_admin(self, user, admin):
"""
Set the admin bit on a user.

Args:
user_id (UserID): the (necessarily local) user to manipulate
admin (bool): whether or not the user should be an admin of this server
"""
return self.store.set_server_admin(user, admin)

@defer.inlineCallbacks
def export_user_data(self, user_id, writer):
"""Write all data we have on the user to the given writer.
Expand Down
2 changes: 2 additions & 0 deletions synapse/rest/admin/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
)
from synapse.rest.admin.media import register_servlets_for_media_repo
from synapse.rest.admin.server_notice_servlet import SendServerNoticeServlet
from synapse.rest.admin.users import UserAdminServlet
from synapse.types import UserID, create_requester
from synapse.util.versionstring import get_version_string

Expand Down Expand Up @@ -740,6 +741,7 @@ def register_servlets(hs, http_server):
register_servlets_for_client_rest_resource(hs, http_server)
SendServerNoticeServlet(hs).register(http_server)
VersionServlet(hs).register(http_server)
UserAdminServlet(hs).register(http_server)


def register_servlets_for_client_rest_resource(hs, http_server):
Expand Down
76 changes: 76 additions & 0 deletions synapse/rest/admin/users.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# -*- coding: utf-8 -*-
# Copyright 2019 The Matrix.org Foundation C.I.C.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import re

from twisted.internet import defer

from synapse.api.errors import SynapseError
from synapse.http.servlet import (
RestServlet,
assert_params_in_dict,
parse_json_object_from_request,
)
from synapse.rest.admin import assert_requester_is_admin
from synapse.types import UserID


class UserAdminServlet(RestServlet):
"""
Set whether or not a user is a server administrator.

Note that only local users can be server administrators, and that an
administrator may not demote themselves.

Only server administrators can use this API.

Example:
PUT /_synapse/admin/v1/users/@reivilibre:librepush.net/admin
{
"admin": true
}
"""

PATTERNS = (re.compile("^/_synapse/admin/v1/users/(?P<user_id>@[^/]*)/admin$"),)
richvdh marked this conversation as resolved.
Show resolved Hide resolved

def __init__(self, hs):
self.hs = hs
self.auth = hs.get_auth()
self.handlers = hs.get_handlers()

@defer.inlineCallbacks
def on_PUT(self, request, user_id):
yield assert_requester_is_admin(self.auth, request)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for the record, I'd have been inclined to do assert_user_is_admin(self.auth, auth_user), but this is fine.

requester = yield self.auth.get_user_by_req(request)
auth_user = requester.user

target_user = UserID.from_string(user_id)

body = parse_json_object_from_request(request)

assert_params_in_dict(body, ["admin"])

if not self.hs.is_mine(target_user):
raise SynapseError(400, "Only local users can be admins of this homeserver")

set_admin_to = bool(body["admin"])

if target_user == auth_user and not set_admin_to:
raise SynapseError(400, "You may not demote yourself.")

ret = yield self.handlers.admin_handler.set_user_server_admin(
target_user, set_admin_to
)

return (200, ret)
23 changes: 23 additions & 0 deletions synapse/storage/registration.py
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,14 @@ def delete_account_validity_for_user(self, user_id):

@defer.inlineCallbacks
def is_server_admin(self, user):
"""Determines if a user is an admin of this homeserver.

Args:
user (UserID): user ID of the user to test

Returns (bool):
true iff the user is a server admin, false otherwise.
"""
res = yield self._simple_select_one_onecol(
table="users",
keyvalues={"name": user.to_string()},
Expand All @@ -282,6 +290,21 @@ def is_server_admin(self, user):

return res if res else False

def set_server_admin(self, user, admin):
"""Sets whether a user is an admin of this homeserver.

Args:
user (UserID): user ID of the user to test
admin (bool): true iff the user is to be a server admin,
false otherwise.
"""
return self._simple_update_one(
table="users",
keyvalues={"name": user.to_string()},
updatevalues={"admin": 1 if admin else 0},
desc="set_server_admin",
)

def _query_for_auth(self, txn, token):
sql = (
"SELECT users.name, users.is_guest, access_tokens.id as token_id,"
Expand Down