This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Add an admin API to check if a username is available #10578
Merged
Merged
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
7c8e6c5
Add UsernameAvailableRestServlet
Half-Shot 3449401
Add documentation
Half-Shot eae0a96
Register servlet
Half-Shot e865f79
Add test case
Half-Shot ef58ca0
changelog
Half-Shot 8d98271
Fix test
Half-Shot 9a2226f
Add a short description
Half-Shot c92de74
Remove unused
Half-Shot 55c50a6
Split out API
Half-Shot fd68923
Move tests
Half-Shot f68c9d9
Merge branch 'develop' into hs/add-admin-api-username-available
Half-Shot 3c7b074
isort isort isort
Half-Shot 9a506c8
Update docs/admin_api/user_admin_api.md to include a link for more info
Half-Shot 474068a
Remove pointless override, move url to module constant
Half-Shot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Add an admin API (`GET /_synapse/admin/username_available`) to check if a username is available (regardless of registration settings). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
# 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 logging | ||
from http import HTTPStatus | ||
from typing import TYPE_CHECKING, Tuple | ||
|
||
from synapse.http.servlet import RestServlet, parse_string | ||
from synapse.http.site import SynapseRequest | ||
from synapse.rest.admin._base import admin_patterns, assert_requester_is_admin | ||
from synapse.types import JsonDict | ||
|
||
if TYPE_CHECKING: | ||
from synapse.server import HomeServer | ||
|
||
logger = logging.getLogger(__name__) | ||
|
||
|
||
class UsernameAvailableRestServlet(RestServlet): | ||
"""An admin API to check if a given username is available, regardless of whether registration is enabled. | ||
|
||
Example: | ||
GET /_synapse/admin/v1/username_available?username=foo | ||
200 OK | ||
{ | ||
"available": true | ||
} | ||
""" | ||
|
||
PATTERNS = admin_patterns("/username_available") | ||
|
||
def __init__(self, hs: "HomeServer"): | ||
self.auth = hs.get_auth() | ||
self.registration_handler = hs.get_registration_handler() | ||
|
||
async def on_GET(self, request: SynapseRequest) -> Tuple[int, JsonDict]: | ||
await assert_requester_is_admin(self.auth, request) | ||
|
||
username = parse_string(request, "username", required=True) | ||
await self.registration_handler.check_username(username) | ||
return HTTPStatus.OK, {"available": True} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
# Copyright 2021 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 synapse.rest.admin | ||
from synapse.api.errors import Codes, SynapseError | ||
from synapse.rest.client.v1 import login | ||
|
||
from tests import unittest | ||
|
||
|
||
class UsernameAvailableTestCase(unittest.HomeserverTestCase): | ||
servlets = [ | ||
synapse.rest.admin.register_servlets, | ||
login.register_servlets, | ||
] | ||
|
||
def prepare(self, reactor, clock, hs): | ||
self.register_user("admin", "pass", admin=True) | ||
self.admin_user_tok = self.login("admin", "pass") | ||
self.url = "/_synapse/admin/v1/username_available" | ||
Half-Shot marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
async def check_username(username): | ||
if username == "allowed": | ||
return True | ||
raise SynapseError(400, "User ID already taken.", errcode=Codes.USER_IN_USE) | ||
|
||
handler = self.hs.get_registration_handler() | ||
handler.check_username = check_username | ||
|
||
def make_homeserver(self, reactor, clock): | ||
self.hs = self.setup_test_homeserver() | ||
return self.hs | ||
Half-Shot marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
def test_username_available(self): | ||
""" | ||
The endpoint should return a 200 response if the username does not exist | ||
""" | ||
|
||
url = "%s?username=%s" % (self.url, "allowed") | ||
channel = self.make_request("GET", url, None, self.admin_user_tok) | ||
|
||
self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"]) | ||
self.assertTrue(channel.json_body["available"]) | ||
|
||
def test_username_unavailable(self): | ||
""" | ||
The endpoint should return a 200 response if the username does not exist | ||
""" | ||
|
||
url = "%s?username=%s" % (self.url, "disallowed") | ||
channel = self.make_request("GET", url, None, self.admin_user_tok) | ||
|
||
self.assertEqual(400, int(channel.result["code"]), msg=channel.result["body"]) | ||
self.assertEqual(channel.json_body["errcode"], "M_USER_IN_USE") | ||
self.assertEqual(channel.json_body["error"], "User ID already taken.") |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please can you define what "available" actually means here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Or rather, I guess, give a short summary and link to the
/register/available
API for more details.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've added a short description, there is a link already here to the existing docs further down.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the link further down just talks about the request/response format shape. It doesn't say anything about defining what "available" actually means. I'm just talking about a "see ... for more information" link. See the suggestion below.