-
Notifications
You must be signed in to change notification settings - Fork 564
Add Admin API endpoints to list, fetch and delete room reports #19648
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
H-Shay
wants to merge
24
commits into
element-hq:develop
Choose a base branch
from
H-Shay:shay/room_report_endpoint
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
558d08f
add database calls to fetch/delete room reports
H-Shay 8987534
add admin endpoints to fetch/delete room reports
H-Shay 2634ed3
tests
H-Shay 28c35fb
newsfragment
H-Shay d5742d5
small fixes
H-Shay eaea03f
add documentation for endpoint
H-Shay 5984e08
Merge branch 'develop' into shay/room_report_endpoint
H-Shay 1d1ca66
use `next_batch`
H-Shay 58e2c04
don't check for ids less than 0
H-Shay 38debcf
align pagination with spec and don't use offset
H-Shay 80e4ceb
add indexes on `room_reports` for columns we filter on
H-Shay 0f1c2ef
update tests
H-Shay d5edac4
add comment on total room report count returned
H-Shay 2fe0a9b
paginate with id vs timestamp
H-Shay e0061ed
force keyword args
H-Shay 0f89f24
remove extra trainling slashes
H-Shay e1896fb
use exact matches rather than LIKE
H-Shay 63f3632
remove deletion endpoint
H-Shay 081610c
fix docs
H-Shay a935f33
remove total count
H-Shay bbf7ad9
endpoint and database changes
H-Shay 52af00b
changes to docs and newsfragment
H-Shay 2a78664
changes to tests
H-Shay 64c3023
more test cleanup
H-Shay 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 hidden or 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 [Admin API](https://matrix-org.github.io/synapse/develop/usage/administration/admin_api/index.html) endpoints to list and fetch room reports. |
This file contains hidden or 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 hidden or 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,120 @@ | ||
| # Show reported rooms | ||
|
|
||
| This API returns information about reported rooms. | ||
|
|
||
| To use it, you will need to authenticate by providing an `access_token` | ||
| for a server admin: see [Admin API](../usage/administration/admin_api/). | ||
|
|
||
| The API is: | ||
| ``` | ||
| GET /_synapse/admin/v1/room_reports | ||
| ``` | ||
|
|
||
| It returns a JSON body like the following: | ||
|
|
||
| ```json | ||
| { | ||
| "room_reports": [ | ||
| { | ||
| "id": 2, | ||
| "received_ts": 1570897107409, | ||
| "room_id": "!ERAgBpSOcCCuTJqQPk:matrix.org", | ||
| "user_id": "@foo:matrix.org", | ||
| "reason": "This room contains spam", | ||
| "canonical_alias": "#alias1:matrix.org", | ||
| "name": "Matrix chat", | ||
| "topic": "Discussions about Matrix" | ||
| }, | ||
| { | ||
| "id": 3, | ||
| "received_ts": 1598889612059, | ||
| "room_id": "!eGvUQuTCkHGVwNMOjv:matrix.org", | ||
| "user_id": "@bar:matrix.org", | ||
| "reason": "Inappropriate content", | ||
| "canonical_alias": null, | ||
| "name": "Nefarious room", | ||
| "topic": null | ||
| } | ||
| ], | ||
| "next_batch": 2 | ||
| } | ||
| ``` | ||
|
|
||
| Note: Reports for deleted or purged rooms are not returned. The endpoint returns reports in reverse | ||
| chronological order - most recent first, oldest last. | ||
|
|
||
| To paginate, check for `next_batch` and if present, call the endpoint again with `from` | ||
| set to the value of `next_batch`. This will return a new page. | ||
|
|
||
| If the endpoint does not return a `next_batch` then there are no more reports to | ||
| paginate through. | ||
|
|
||
| **URL query parameters:** | ||
|
|
||
| * `limit`: positive integer - Optional. Used for pagination, denoting the maximum number | ||
| of items to return in this call. Defaults to `100` if not provided. | ||
| * `from`: string - Pagination token. This token can be obtained from the `next_batch` returned by a previous response from this endpoint. | ||
| * `user_id`: string - Optional. Filter by the user ID of the reporter. This is the user who | ||
| reported the room. | ||
| * `room_id`: string - Optional. Filter by room id. | ||
|
|
||
| **Response** | ||
|
|
||
| The following fields are returned in the JSON response body: | ||
|
|
||
| * `id`: integer - ID of room report. | ||
| * `received_ts`: integer - The timestamp (in milliseconds since the unix epoch) when this | ||
| report was sent. | ||
| * `room_id`: string - The ID of the reported room. | ||
| * `user_id`: string - This is the user who reported the room. | ||
| * `reason`: string - Comment made by the `user_id` in this report indicating why the room | ||
| was reported. May be blank or `null`. | ||
| * `canonical_alias`: string - The canonical alias of the room. `null` if the room does not | ||
| have a canonical alias set. | ||
| * `name`: string - The name of the room. | ||
| * `topic`: string - The topic of the room. `null` if the room does not have a topic set. | ||
| * `next_batch`: integer - Indication for pagination. See above. | ||
|
|
||
|
|
||
| # Show details of a specific room report | ||
|
|
||
| This API returns information about a specific room report. | ||
|
|
||
| The api is: | ||
| ``` | ||
| GET /_synapse/admin/v1/room_reports/<report_id> | ||
| ``` | ||
|
|
||
| It returns a JSON body like the following: | ||
|
|
||
| ```json | ||
| { | ||
| "id": 2, | ||
| "received_ts": 1570897107409, | ||
| "room_id": "!ERAgBpSOcCCuTJqQPk:matrix.org", | ||
| "user_id": "@foo:matrix.org", | ||
| "reason": "This room contains spam", | ||
| "canonical_alias": "#alias1:matrix.org", | ||
| "name": "Matrix HQ", | ||
| "topic": "Discussions about Matrix" | ||
| } | ||
| ``` | ||
|
|
||
| **URL parameters:** | ||
|
|
||
| * `report_id`: string - The ID of the room report. | ||
|
|
||
| **Response** | ||
|
|
||
| The following fields are returned in the JSON response body: | ||
|
|
||
| * `id`: integer - ID of room report. | ||
| * `received_ts`: integer - The timestamp (in milliseconds since the unix epoch) when this | ||
| report was sent. | ||
| * `room_id`: string - The ID of the reported room. | ||
| * `name`: string - The name of the room. | ||
| * `user_id`: string - This is the user who reported the room. | ||
| * `reason`: string - Comment made by the `user_id` in this report. May be blank. | ||
| * `canonical_alias`: string - The canonical alias of the room. `null` if the room does not | ||
| have a canonical alias set. | ||
| * `topic`: string - The topic of the room. `null` if the room does not have a topic set. |
This file contains hidden or 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 hidden or 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,127 @@ | ||
| # | ||
| # This file is licensed under the Affero General Public License (AGPL) version 3. | ||
| # | ||
| # Copyright (C) 2026 Element Creations Ltd | ||
| # | ||
| # This program is free software: you can redistribute it and/or modify | ||
| # it under the terms of the GNU Affero General Public License as | ||
| # published by the Free Software Foundation, either version 3 of the | ||
| # License, or (at your option) any later version. | ||
| # | ||
| # See the GNU Affero General Public License for more details: | ||
| # <https://www.gnu.org/licenses/agpl-3.0.html>. | ||
| # | ||
|
|
||
|
|
||
| import logging | ||
| from http import HTTPStatus | ||
| from typing import TYPE_CHECKING | ||
|
|
||
| from synapse.api.errors import Codes, NotFoundError, SynapseError | ||
| from synapse.http.servlet import RestServlet, parse_integer, 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 RoomReportsRestServlet(RestServlet): | ||
| """ | ||
| List all existing rooms that have been reported to the homeserver. Results are returned | ||
| in a dictionary containing report information. Supports pagination. Does not return results | ||
| for deleted/purged rooms. | ||
| The requester must have administrator access in Synapse. | ||
|
|
||
| GET /_synapse/admin/v1/room_reports | ||
| returns: | ||
| 200 OK with list of reports if success otherwise an error. | ||
|
|
||
| Args: | ||
| The parameters `from` and `limit` are required only for pagination. | ||
| By default, a `limit` of 100 is used, and the `from` parameter defaults to None, | ||
| indicating that the most recent report (largest report id) should be returned. | ||
| The `room_id` query parameter filters by room id. | ||
| The `user_id` query parameter filters by the user ID of the reporter of the room. | ||
| Returns: | ||
| A list of reported rooms filtered by the query parameters | ||
| """ | ||
|
|
||
| PATTERNS = admin_patterns("/room_reports$") | ||
|
|
||
| def __init__(self, hs: "HomeServer"): | ||
| self._auth = hs.get_auth() | ||
| self._store = hs.get_datastores().main | ||
|
|
||
| async def on_GET(self, request: SynapseRequest) -> tuple[int, JsonDict]: | ||
|
MadLittleMods marked this conversation as resolved.
|
||
| await assert_requester_is_admin(self._auth, request) | ||
|
|
||
| from_id = parse_integer(request, "from") | ||
| limit = parse_integer(request, "limit", default=100) | ||
| room_id = parse_string(request, "room_id") | ||
| user_id = parse_string(request, "user_id") | ||
|
|
||
| if limit <= 0: | ||
| raise SynapseError( | ||
| HTTPStatus.BAD_REQUEST, | ||
| "The limit parameter must be a positive integer.", | ||
| errcode=Codes.INVALID_PARAM, | ||
| ) | ||
|
|
||
| room_reports, limited = await self._store.get_room_reports_paginate( | ||
| from_id=from_id, limit=limit, user_id=user_id, room_id=room_id | ||
| ) | ||
|
|
||
| ret = {} | ||
|
|
||
| if limited: | ||
| ret["next_batch"] = room_reports[-1]["id"] | ||
|
|
||
| ret.update({"room_reports": room_reports}) | ||
|
|
||
| return HTTPStatus.OK, ret | ||
|
|
||
|
|
||
| class RoomReportDetailRestServlet(RestServlet): | ||
| """ | ||
| Get a specific reported room that is known to the homeserver. Results are returned | ||
| in a dictionary containing report information. | ||
| The requester must have administrator access in Synapse. | ||
|
|
||
| GET /_synapse/admin/v1/room_reports/<report_id> | ||
| returns: | ||
| 200 OK with details report if success otherwise an error. | ||
|
|
||
| Args: | ||
| The parameter `report_id` is the ID of the room report in the database. | ||
| Returns: | ||
| JSON blob of information about the room report | ||
| """ | ||
|
|
||
| PATTERNS = admin_patterns("/room_reports/(?P<report_id>[^/]*)$") | ||
|
|
||
| def __init__(self, hs: "HomeServer"): | ||
| self._auth = hs.get_auth() | ||
| self._store = hs.get_datastores().main | ||
|
|
||
| async def on_GET( | ||
| self, request: SynapseRequest, report_id: str | ||
| ) -> tuple[int, JsonDict]: | ||
| await assert_requester_is_admin(self._auth, request) | ||
|
|
||
| message = "The report_id parameter must be a string representing a room report ID (positive integer)." | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Might as well inline this or at-least move this to where its used |
||
| try: | ||
| resolved_report_id = int(report_id) | ||
| except ValueError: | ||
| raise SynapseError( | ||
| HTTPStatus.BAD_REQUEST, message, errcode=Codes.INVALID_PARAM | ||
| ) | ||
|
|
||
| ret = await self._store.get_room_report(resolved_report_id) | ||
| if not ret: | ||
| raise NotFoundError("Room report not found") | ||
|
|
||
| return HTTPStatus.OK, ret | ||
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.