newsfile

.github/workflows/release-artifacts.yml

@@ -114,8 +114,8 @@ jobs:
         os:
           - ubuntu-24.04
           - ubuntu-24.04-arm
+          - macos-13 # This uses x86-64
           - macos-14 # This uses arm64
-          - macos-15-intel # This uses x86-64
         # is_pr is a flag used to exclude certain jobs from the matrix on PRs.
         # It is not read by the rest of the workflow.
         is_pr:
@@ -124,7 +124,7 @@ jobs:
         exclude:
           # Don't build macos wheels on PR CI.
           - is_pr: true
-            os: "macos-15-intel"
+            os: "macos-13"
           - is_pr: true
             os: "macos-14"
           # Don't build aarch64 wheels on PR CI.

CHANGES.md

@@ -1,110 +1,3 @@
-# Synapse 1.140.0 (2025-10-14)
-
-## Compatibility notice for users of `synapse-s3-storage-provider`
-
-Deployments that make use of the
-[synapse-s3-storage-provider](https://github.com/matrix-org/synapse-s3-storage-provider)
-module must upgrade to
-[v1.6.0](https://github.com/matrix-org/synapse-s3-storage-provider/releases/tag/v1.6.0).
-Using older versions of the module with this release of Synapse will prevent
-users from being able to upload or download media.
-
-
-No significant changes since 1.140.0rc1.
-
-
-
-
-# Synapse 1.140.0rc1 (2025-10-10)
-
-## Features
-
-- Add [a new Media Query by ID Admin API](https://element-hq.github.io/synapse/v1.140/admin_api/media_admin_api.html#query-a-piece-of-media-by-id) that allows server admins to query and investigate the metadata of local or cached remote media via
-  the `origin/media_id` identifier found in a [Matrix Content URI](https://spec.matrix.org/v1.14/client-server-api/#matrix-content-mxc-uris). ([\#18911](https://github.com/element-hq/synapse/issues/18911))
-- Add [a new Fetch Event Admin API](https://element-hq.github.io/synapse/v1.140/admin_api/fetch_event.html) to fetch an event by ID. ([\#18963](https://github.com/element-hq/synapse/issues/18963))
-- Update [MSC4284: Policy Servers](https://github.com/matrix-org/matrix-spec-proposals/pull/4284) implementation to support signatures when available. ([\#18934](https://github.com/element-hq/synapse/issues/18934))
-- Add experimental implementation of the `GET /_matrix/client/v1/rtc/transports` endpoint for the latest draft of [MSC4143: MatrixRTC](https://github.com/matrix-org/matrix-spec-proposals/pull/4143). ([\#18967](https://github.com/element-hq/synapse/issues/18967))
-- Expose a `defer_to_threadpool` function in the Synapse Module API that allows modules to run a function on a separate thread in a custom threadpool. ([\#19032](https://github.com/element-hq/synapse/issues/19032))
-
-## Bugfixes
-
-- Fix room upgrade `room_config` argument and documentation for `user_may_create_room` spam-checker callback. ([\#18721](https://github.com/element-hq/synapse/issues/18721))
-- Compute a user's last seen timestamp from their devices' last seen timestamps instead of IPs, because the latter are automatically cleared according to `user_ips_max_age`. ([\#18948](https://github.com/element-hq/synapse/issues/18948))
-- Fix bug where ephemeral events were not filtered by room ID. Contributed by @frastefanini. ([\#19002](https://github.com/element-hq/synapse/issues/19002))
-- Update Synapse main process version string to include git info. ([\#19011](https://github.com/element-hq/synapse/issues/19011))
-
-## Improved Documentation
-
-- Explain how `Deferred` callbacks interact with logcontexts. ([\#18914](https://github.com/element-hq/synapse/issues/18914))
-- Fix documentation for `rc_room_creation` and `rc_reports` to clarify that a `per_user` rate limit is not supported. ([\#18998](https://github.com/element-hq/synapse/issues/18998))
-
-## Deprecations and Removals
-
-- Remove deprecated `LoggingContext.set_current_context`/`LoggingContext.current_context` methods which already have equivalent bare methods in `synapse.logging.context`. ([\#18989](https://github.com/element-hq/synapse/issues/18989))
-- Drop support for unstable field names from the long-accepted [MSC2732](https://github.com/matrix-org/matrix-spec-proposals/pull/2732) (Olm fallback keys) proposal. ([\#18996](https://github.com/element-hq/synapse/issues/18996))
-
-## Internal Changes
-
-- Cleanly shutdown `SynapseHomeServer` object, allowing artifacts of embedded small hosts to be properly garbage collected. ([\#18828](https://github.com/element-hq/synapse/issues/18828))
-- Update OEmbed providers to use 'X' instead of 'Twitter' in URL previews, following a rebrand. Contributed by @HammyHavoc. ([\#18767](https://github.com/element-hq/synapse/issues/18767))
-- Fix `server_name` in logging context for multiple Synapse instances in one process. ([\#18868](https://github.com/element-hq/synapse/issues/18868))
-- Wrap the Rust HTTP client with `make_deferred_yieldable` so it follows Synapse logcontext rules. ([\#18903](https://github.com/element-hq/synapse/issues/18903))
-- Fix the GitHub Actions workflow that moves issues labeled "X-Needs-Info" to the "Needs info" column on the team's internal triage board. ([\#18913](https://github.com/element-hq/synapse/issues/18913))
-- Disconnect background process work from request trace. ([\#18932](https://github.com/element-hq/synapse/issues/18932))
-- Reduce overall number of calls to `_get_e2e_cross_signing_signatures_for_devices` by increasing the batch size of devices the query is called with, reducing DB load. ([\#18939](https://github.com/element-hq/synapse/issues/18939))
-- Update error code used when an appservice tries to masquerade as an unknown device using [MSC4326](https://github.com/matrix-org/matrix-spec-proposals/pull/4326). Contributed by @tulir @ Beeper. ([\#18947](https://github.com/element-hq/synapse/issues/18947))
-- Fix `no active span when trying to log` tracing error on startup (when OpenTracing is enabled). ([\#18959](https://github.com/element-hq/synapse/issues/18959))
-- Fix `run_coroutine_in_background(...)` incorrectly handling logcontext. ([\#18964](https://github.com/element-hq/synapse/issues/18964))
-- Add debug logs wherever we change current logcontext. ([\#18966](https://github.com/element-hq/synapse/issues/18966))
-- Update dockerfile metadata to fix broken link; point to documentation website. ([\#18971](https://github.com/element-hq/synapse/issues/18971))
-- Note that the code is additionally licensed under the [Element Commercial license](https://github.com/element-hq/synapse/blob/develop/LICENSE-COMMERCIAL) in SPDX expression field configs. ([\#18973](https://github.com/element-hq/synapse/issues/18973))
-- Fix logcontext handling in `timeout_deferred` tests. ([\#18974](https://github.com/element-hq/synapse/issues/18974))
-- Remove internal `ReplicationUploadKeysForUserRestServlet` as a follow-up to the work in https://github.com/element-hq/synapse/pull/18581 that moved device changes off the main process. ([\#18988](https://github.com/element-hq/synapse/issues/18988))
-- Switch task scheduler from raw logcontext manipulation to using the dedicated logcontext utils. ([\#18990](https://github.com/element-hq/synapse/issues/18990))
-- Remove `MockClock()` in tests. ([\#18992](https://github.com/element-hq/synapse/issues/18992))
-- Switch back to our own custom `LogContextScopeManager` instead of OpenTracing's `ContextVarsScopeManager` which was causing problems when using the experimental `SYNAPSE_ASYNC_IO_REACTOR` option with tracing enabled. ([\#19007](https://github.com/element-hq/synapse/issues/19007))
-- Remove `version_string` argument from `HomeServer` since it's always the same. ([\#19012](https://github.com/element-hq/synapse/issues/19012))
-- Remove duplicate call to `hs.start_background_tasks()` introduced from a bad merge. ([\#19013](https://github.com/element-hq/synapse/issues/19013))
-- Split homeserver creation (`create_homeserver`) and setup (`setup`). ([\#19015](https://github.com/element-hq/synapse/issues/19015))
-- Swap near-end-of-life `macos-13` GitHub Actions runner for the `macos-15-intel` variant. ([\#19025](https://github.com/element-hq/synapse/issues/19025))
-- Introduce `RootConfig.validate_config()` which can be subclassed in `HomeServerConfig` to do cross-config class validation. ([\#19027](https://github.com/element-hq/synapse/issues/19027))
-- Allow any command of the `release.py` script to accept a `--gh-token` argument. ([\#19035](https://github.com/element-hq/synapse/issues/19035))
-
-
-
-### Updates to locked dependencies
-
-* Bump Swatinem/rust-cache from 2.8.0 to 2.8.1. ([\#18949](https://github.com/element-hq/synapse/issues/18949))
-* Bump actions/cache from 4.2.4 to 4.3.0. ([\#18983](https://github.com/element-hq/synapse/issues/18983))
-* Bump anyhow from 1.0.99 to 1.0.100. ([\#18950](https://github.com/element-hq/synapse/issues/18950))
-* Bump authlib from 1.6.3 to 1.6.4. ([\#18957](https://github.com/element-hq/synapse/issues/18957))
-* Bump authlib from 1.6.4 to 1.6.5. ([\#19019](https://github.com/element-hq/synapse/issues/19019))
-* Bump bcrypt from 4.3.0 to 5.0.0. ([\#18984](https://github.com/element-hq/synapse/issues/18984))
-* Bump docker/login-action from 3.5.0 to 3.6.0. ([\#18978](https://github.com/element-hq/synapse/issues/18978))
-* Bump lxml from 6.0.0 to 6.0.2. ([\#18979](https://github.com/element-hq/synapse/issues/18979))
-* Bump phonenumbers from 9.0.13 to 9.0.14. ([\#18954](https://github.com/element-hq/synapse/issues/18954))
-* Bump phonenumbers from 9.0.14 to 9.0.15. ([\#18991](https://github.com/element-hq/synapse/issues/18991))
-* Bump prometheus-client from 0.22.1 to 0.23.1. ([\#19016](https://github.com/element-hq/synapse/issues/19016))
-* Bump pydantic from 2.11.9 to 2.11.10. ([\#19017](https://github.com/element-hq/synapse/issues/19017))
-* Bump pygithub from 2.7.0 to 2.8.1. ([\#18952](https://github.com/element-hq/synapse/issues/18952))
-* Bump regex from 1.11.2 to 1.11.3. ([\#18981](https://github.com/element-hq/synapse/issues/18981))
-* Bump serde from 1.0.224 to 1.0.226. ([\#18953](https://github.com/element-hq/synapse/issues/18953))
-* Bump serde from 1.0.226 to 1.0.228. ([\#18982](https://github.com/element-hq/synapse/issues/18982))
-* Bump setuptools-rust from 1.11.1 to 1.12.0. ([\#18980](https://github.com/element-hq/synapse/issues/18980))
-* Bump twine from 6.1.0 to 6.2.0. ([\#18985](https://github.com/element-hq/synapse/issues/18985))
-* Bump types-pyyaml from 6.0.12.20250809 to 6.0.12.20250915. ([\#19018](https://github.com/element-hq/synapse/issues/19018))
-* Bump types-requests from 2.32.4.20250809 to 2.32.4.20250913. ([\#18951](https://github.com/element-hq/synapse/issues/18951))
-* Bump typing-extensions from 4.14.1 to 4.15.0. ([\#18956](https://github.com/element-hq/synapse/issues/18956))
-
-# Synapse 1.139.2 (2025-10-07)
-
-## Bugfixes
-
-- Fix a bug introduced in 1.139.1 where a client could receive an Internal Server Error if they set `device_keys: null` in the request to [`POST /_matrix/client/v3/keys/upload`](https://spec.matrix.org/v1.16/client-server-api/#post_matrixclientv3keysupload). ([\#19023](https://github.com/element-hq/synapse/issues/19023))
-
-
-
-
 # Synapse 1.139.1 (2025-10-07)
 
 ## Security Fixes
@@ -115,17 +8,6 @@ No significant changes since 1.140.0rc1.
 
 - Drop support for unstable field names from the long-accepted [MSC2732](https://github.com/matrix-org/matrix-spec-proposals/pull/2732) (Olm fallback keys) proposal. This change allows unit tests to pass following the security patch above. ([\#18996](https://github.com/element-hq/synapse/issues/18996))
 
-
-
-# Synapse 1.138.4 (2025-10-07)
-
-## Bugfixes
-
-- Fix a bug introduced in 1.138.3 where a client could receive an Internal Server Error if they set `device_keys: null` in the request to [`POST /_matrix/client/v3/keys/upload`](https://spec.matrix.org/v1.16/client-server-api/#post_matrixclientv3keysupload). ([\#19023](https://github.com/element-hq/synapse/issues/19023))
-
-
-
-
 # Synapse 1.138.3 (2025-10-07)
 
 ## Security Fixes

changelog.d/17097.misc

@@ -0,0 +1 @@
+Extend validation of uploaded device keys.

changelog.d/18721.bugfix

@@ -0,0 +1 @@
+Fix room upgrade `room_config` argument and documentation for `user_may_create_room` spam-checker callback.

changelog.d/18767.misc

@@ -0,0 +1 @@
+Update OEmbed providers to use 'X' instead of 'Twitter' in URL previews, following a rebrand. Contributed by @HammyHavoc.

changelog.d/18828.feature

@@ -0,0 +1 @@
+Cleanly shutdown `SynapseHomeServer` object.

changelog.d/18868.misc

@@ -0,0 +1 @@
+Fix `server_name` in logging context for multiple Synapse instances in one process.

changelog.d/18903.misc

@@ -0,0 +1 @@
+Wrap the Rust HTTP client with `make_deferred_yieldable` so it follows Synapse logcontext rules.

changelog.d/18911.feature

@@ -0,0 +1,2 @@
+Add an Admin API that allows server admins to to query and investigate the metadata of local or cached remote media via
+the `origin/media_id` identifier found in a [Matrix Content URI](https://spec.matrix.org/v1.14/client-server-api/#matrix-content-mxc-uris).

changelog.d/18913.misc

@@ -0,0 +1 @@
+Fix the GitHub Actions workflow that moves issues labeled "X-Needs-Info" to the "Needs info" column on the team's internal triage board.

changelog.d/18914.doc

@@ -0,0 +1 @@
+Explain how Deferred callbacks interact with logcontexts.

changelog.d/18932.misc

@@ -0,0 +1 @@
+Disconnect background process work from request trace.

changelog.d/18934.feature

@@ -0,0 +1 @@
+Update [MSC4284: Policy Servers](https://github.com/matrix-org/matrix-spec-proposals/pull/4284) implementation to support signatures when available.

changelog.d/18939.misc

@@ -0,0 +1 @@
+Reduce overall number of calls to `_get_e2e_cross_signing_signatures_for_devices` by increasing the batch size of devices the query is called with, reducing DB load.

changelog.d/18947.misc

@@ -0,0 +1 @@
+Update error code used when an appservice tries to masquerade as an unknown device using [MSC4326](https://github.com/matrix-org/matrix-spec-proposals/pull/4326). Contributed by @tulir @ Beeper.

changelog.d/18948.bugfix

@@ -0,0 +1 @@
+Compute a user's last seen timestamp from their devices' last seen timestamps instead of IPs, because the latter are automatically cleared according to `user_ips_max_age`.

changelog.d/18959.misc

@@ -0,0 +1 @@
+Fix `no active span when trying to log` tracing error on startup (when OpenTracing is enabled).

changelog.d/18964.misc

@@ -0,0 +1 @@
+Fix `run_coroutine_in_background(...)` incorrectly handling logcontext.

changelog.d/18966.misc

@@ -0,0 +1 @@
+Add debug logs wherever we change current logcontext.

changelog.d/18971.misc

@@ -0,0 +1 @@
+Update dockerfile metadata to fix broken link; point to documentation website.

changelog.d/18973.misc

@@ -0,0 +1 @@
+Note that the code is additionally licensed under the [Element Commercial license](https://github.com/element-hq/synapse/blob/develop/LICENSE-COMMERCIAL) in SPDX expression field configs.

changelog.d/18974.misc

@@ -0,0 +1 @@
+Fix logcontext handling in `timeout_deferred` tests.

changelog.d/18988.misc

@@ -0,0 +1 @@
+Remove internal `ReplicationUploadKeysForUserRestServlet` as a follow-up to the work in https://github.com/element-hq/synapse/pull/18581 that moved device changes off the main process.

changelog.d/18989.removal

@@ -0,0 +1 @@
+Remove deprecated `LoggingContext.set_current_context`/`LoggingContext.current_context` methods which already have equivalent bare methods in `synapse.logging.context`.

changelog.d/18990.misc

@@ -0,0 +1 @@
+Switch task scheduler from raw logcontext manipulation to using the dedicated logcontext utils.

changelog.d/18992.misc

@@ -0,0 +1 @@
+Remove `MockClock()` in tests.

changelog.d/18996.removal

@@ -0,0 +1 @@
+Drop support for unstable field names from the long-accepted [MSC2732](https://github.com/matrix-org/matrix-spec-proposals/pull/2732) (Olm fallback keys) proposal.

changelog.d/18998.doc

@@ -0,0 +1 @@
+Fix documentation for `rc_room_creation` and `rc_reports` to clarify that a `per_user` rate limit is not supported.

changelog.d/19002.bugfix

@@ -0,0 +1 @@
+Fix bug where ephemeral events were not filtered by room ID. Contributed by @frastefanini.

changelog.d/19007.misc

@@ -0,0 +1 @@
+Switch back to our own custom `LogContextScopeManager` instead of OpenTracing's `ContextVarsScopeManager` which was causing problems when using the experimental `SYNAPSE_ASYNC_IO_REACTOR` option with tracing enabled.

changelog.d/19023.bugfix

@@ -0,0 +1 @@
+Fix a bug introduced in 1.139.1 where a client could receive an Internal Server Error if they set `device_keys: null` in the request to [`POST /_matrix/client/v3/keys/upload`](https://spec.matrix.org/v1.16/client-server-api/#post_matrixclientv3keysupload).

changelog.d/19024.feature

@@ -0,0 +1 @@
+Allow Synapse modules to specify a custom threadpool when calling `defer_to_thread`.

debian/changelog

@@ -1,33 +1,9 @@
-matrix-synapse-py3 (1.140.0) stable; urgency=medium
-
-  * New Synapse release 1.140.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 14 Oct 2025 15:22:36 +0100
-
-matrix-synapse-py3 (1.140.0~rc1) stable; urgency=medium
-
-  * New Synapse release 1.140.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Fri, 10 Oct 2025 10:56:51 +0100
-
-matrix-synapse-py3 (1.139.2) stable; urgency=medium
-
-  * New Synapse release 1.139.2.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 07 Oct 2025 16:29:47 +0100
-
 matrix-synapse-py3 (1.139.1) stable; urgency=medium
 
   * New Synapse release 1.139.1.
 
  -- Synapse Packaging team <packages@matrix.org>  Tue, 07 Oct 2025 11:46:51 +0100
 
-matrix-synapse-py3 (1.138.4) stable; urgency=medium
-
-  * New Synapse release 1.138.4.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 07 Oct 2025 16:28:38 +0100
-
 matrix-synapse-py3 (1.138.3) stable; urgency=medium
 
   * New Synapse release 1.138.3.

docs/SUMMARY.md

@@ -60,7 +60,6 @@
     - [Admin API](usage/administration/admin_api/README.md)
       - [Account Validity](admin_api/account_validity.md)
       - [Background Updates](usage/administration/admin_api/background_updates.md)
-      - [Fetch Event](admin_api/fetch_event.md)
       - [Event Reports](admin_api/event_reports.md)
       - [Experimental Features](admin_api/experimental_features.md)
       - [Media](admin_api/media_admin_api.md)

docs/admin_api/fetch_event.md

@@ -1,53 +0,0 @@
-# Fetch Event API
-
-The fetch event API allows admins to fetch an event regardless of their membership in the room it
-originated in.
-
-To use it, you will need to authenticate by providing an `access_token`
-for a server admin: see [Admin API](../usage/administration/admin_api/).
-
-Request:
-```http
-GET /_synapse/admin/v1/fetch_event/<event_id>
-```
-
-The API returns a JSON body like the following:
-
-Response:
-```json
-{
-    "event": {
-        "auth_events": [
-            "$WhLChbYg6atHuFRP7cUd95naUtc8L0f7fqeizlsUVvc",
-            "$9Wj8dt02lrNEWweeq-KjRABUYKba0K9DL2liRvsAdtQ",
-            "$qJxBFxBt8_ODd9b3pgOL_jXP98S_igc1_kizuPSZFi4"
-        ],
-        "content": {
-            "body": "Hey now",
-            "msgtype": "m.text"
-        },
-        "depth": 6,
-        "event_id": "$hJ_kcXbVMcI82JDrbqfUJIHu61tJD86uIFJ_8hNHi7s",
-        "hashes": {
-            "sha256": "LiNw8DtrRVf55EgAH8R42Wz7WCJUqGsPt2We6qZO5Rg"
-        },
-        "origin_server_ts": 799,
-        "prev_events": [
-            "$cnSUrNMnC3Ywh9_W7EquFxYQjC_sT3BAAVzcUVxZq1g"
-        ],
-        "room_id": "!aIhKToCqgPTBloWMpf:test",
-        "sender": "@user:test",
-        "signatures": {
-            "test": {
-                "ed25519:a_lPym": "7mqSDwK1k7rnw34Dd8Fahu0rhPW7jPmcWPRtRDoEN9Yuv+BCM2+Rfdpv2MjxNKy3AYDEBwUwYEuaKMBaEMiKAQ"
-            }
-        },
-        "type": "m.room.message",
-        "unsigned": {
-            "age_ts": 799
-        }
-    }
-}
-```
-
-

docs/upgrade.md

@@ -117,16 +117,6 @@ each upgrade are complete before moving on to the next upgrade, to avoid
 stacking them up. You can monitor the currently running background updates with
 [the Admin API](usage/administration/admin_api/background_updates.html#status).
 
-# Upgrading to v1.140.0
-
-## Users of `synapse-s3-storage-provider` must update the module to `v1.6.0`
-
-Deployments that make use of the
-[synapse-s3-storage-provider](https://github.com/matrix-org/synapse-s3-storage-provider/)
-module must update it to
-[v1.6.0](https://github.com/matrix-org/synapse-s3-storage-provider/releases/tag/v1.6.0),
-otherwise users will be unable to upload or download media.
-
 # Upgrading to v1.139.0
 
 ## `/register` requests from old application service implementations may break when using MAS

docs/usage/configuration/config_documentation.md

@@ -2573,28 +2573,6 @@ Example configuration:
 turn_allow_guests: false
 ```
 ---
-### `matrix_rtc`
-
-*(object)* Options related to MatrixRTC. Defaults to `{}`.
-
-This setting has the following sub-options:
-
-* `transports` (array): A list of transport types and arguments to use for MatrixRTC connections. Defaults to `[]`.
-
-  Options for each entry include:
-
-  * `type` (string): The type of transport to use to connect to the selective forwarding unit (SFU).
-
-  * `livekit_service_url` (string): The base URL of the LiveKit service. Should only be used with LiveKit-based transports.
-
-Example configuration:
-```yaml
-matrix_rtc:
-  transports:
-  - type: livekit
-    livekit_service_url: https://matrix-rtc.example.com/livekit/jwt
-```
----
 ## Registration
 
 Registration can be rate-limited using the parameters in the [Ratelimiting](#ratelimiting) section of this manual.

poetry.lock

@@ -34,15 +34,15 @@ tests-mypy = ["mypy (>=1.11.1) ; platform_python_implementation == \"CPython\" a
 
 [[package]]
 name = "authlib"
-version = "1.6.5"
+version = "1.6.4"
 description = "The ultimate Python library in building OAuth and OpenID Connect servers and clients."
 optional = true
 python-versions = ">=3.9"
 groups = ["main"]
 markers = "extra == \"all\" or extra == \"jwt\" or extra == \"oidc\""
 files = [
-    {file = "authlib-1.6.5-py2.py3-none-any.whl", hash = "sha256:3e0e0507807f842b02175507bdee8957a1d5707fd4afb17c32fb43fee90b6e3a"},
-    {file = "authlib-1.6.5.tar.gz", hash = "sha256:6aaf9c79b7cc96c900f0b284061691c5d4e61221640a948fe690b556a6d6d10b"},
+    {file = "authlib-1.6.4-py2.py3-none-any.whl", hash = "sha256:39313d2a2caac3ecf6d8f95fbebdfd30ae6ea6ae6a6db794d976405fdd9aa796"},
+    {file = "authlib-1.6.4.tar.gz", hash = "sha256:104b0442a43061dc8bc23b133d1d06a2b0a9c2e3e33f34c4338929e816287649"},
 ]
 
 [package.dependencies]
@@ -1726,14 +1726,14 @@ xmp = ["defusedxml"]
 
 [[package]]
 name = "prometheus-client"
-version = "0.23.1"
+version = "0.22.1"
 description = "Python client for the Prometheus monitoring system."
 optional = false
 python-versions = ">=3.9"
 groups = ["main"]
 files = [
-    {file = "prometheus_client-0.23.1-py3-none-any.whl", hash = "sha256:dd1913e6e76b59cfe44e7a4b83e01afc9873c1bdfd2ed8739f1e76aeca115f99"},
-    {file = "prometheus_client-0.23.1.tar.gz", hash = "sha256:6ae8f9081eaaaf153a2e959d2e6c4f4fb57b12ef76c8c7980202f1e57b48b2ce"},
+    {file = "prometheus_client-0.22.1-py3-none-any.whl", hash = "sha256:cca895342e308174341b2cbf99a56bef291fbc0ef7b9e5412a0f26d653ba7094"},
+    {file = "prometheus_client-0.22.1.tar.gz", hash = "sha256:190f1331e783cf21eb60bca559354e0a4d4378facecf78f5428c39b675d20d28"},
 ]
 
 [package.extras]
@@ -1832,14 +1832,14 @@ files = [
 
 [[package]]
 name = "pydantic"
-version = "2.11.10"
+version = "2.11.9"
 description = "Data validation using Python type hints"
 optional = false
 python-versions = ">=3.9"
 groups = ["main", "dev"]
 files = [
-    {file = "pydantic-2.11.10-py3-none-any.whl", hash = "sha256:802a655709d49bd004c31e865ef37da30b540786a46bfce02333e0e24b5fe29a"},
-    {file = "pydantic-2.11.10.tar.gz", hash = "sha256:dc280f0982fbda6c38fada4e476dc0a4f3aeaf9c6ad4c28df68a666ec3c61423"},
+    {file = "pydantic-2.11.9-py3-none-any.whl", hash = "sha256:c42dd626f5cfc1c6950ce6205ea58c93efa406da65f479dcb4029d5934857da2"},
+    {file = "pydantic-2.11.9.tar.gz", hash = "sha256:6b8ffda597a14812a7975c90b82a8a2e777d9257aba3453f973acd3c032a18e2"},
 ]
 
 [package.dependencies]
@@ -3057,14 +3057,14 @@ types-cffi = "*"
 
 [[package]]
 name = "types-pyyaml"
-version = "6.0.12.20250915"
+version = "6.0.12.20250809"
 description = "Typing stubs for PyYAML"
 optional = false
 python-versions = ">=3.9"
 groups = ["dev"]
 files = [
-    {file = "types_pyyaml-6.0.12.20250915-py3-none-any.whl", hash = "sha256:e7d4d9e064e89a3b3cae120b4990cd370874d2bf12fa5f46c97018dd5d3c9ab6"},
-    {file = "types_pyyaml-6.0.12.20250915.tar.gz", hash = "sha256:0f8b54a528c303f0e6f7165687dd33fafa81c807fcac23f632b63aa624ced1d3"},
+    {file = "types_pyyaml-6.0.12.20250809-py3-none-any.whl", hash = "sha256:032b6003b798e7de1a1ddfeefee32fac6486bdfe4845e0ae0e7fb3ee4512b52f"},
+    {file = "types_pyyaml-6.0.12.20250809.tar.gz", hash = "sha256:af4a1aca028f18e75297da2ee0da465f799627370d74073e96fee876524f61b5"},
 ]
 
 [[package]]

pyproject.toml

@@ -101,7 +101,7 @@ module-name = "synapse.synapse_rust"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.140.0"
+version = "1.139.1"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "AGPL-3.0-or-later OR LicenseRef-Element-Commercial"

schema/synapse-config.schema.yaml

@@ -1,5 +1,5 @@
 $schema: https://element-hq.github.io/synapse/latest/schema/v1/meta.schema.json
-$id: https://element-hq.github.io/synapse/schema/synapse/v1.140/synapse-config.schema.json
+$id: https://element-hq.github.io/synapse/schema/synapse/v1.139/synapse-config.schema.json
 type: object
 properties:
   modules:
@@ -2884,35 +2884,6 @@ properties:
     default: true
     examples:
       - false
-  matrix_rtc:
-    type: object 
-    description: >-
-      Options related to MatrixRTC.
-    properties:
-      transports:
-        type: array
-        items:
-          type: object
-          required:
-            - type
-          properties:
-            type:
-              type: string
-              description: The type of transport to use to connect to the selective forwarding unit (SFU).
-              example: livekit
-            livekit_service_url:
-              type: string
-              description: >-
-                The base URL of the LiveKit service. Should only be used with LiveKit-based transports.
-              example: https://matrix-rtc.example.com/livekit/jwt
-        description:
-          A list of transport types and arguments to use for MatrixRTC connections.
-        default: []
-    default: {}
-    examples:
-      - transports:
-        - type: livekit
-          livekit_service_url: https://matrix-rtc.example.com/livekit/jwt
   enable_registration:
     type: boolean
     description: >-

scripts-dev/release.py

@@ -639,16 +639,7 @@ def _notify(message: str) -> None:
 
 
 @cli.command()
-# Although this option is not used, allow it anyways. Otherwise the user will
-# receive an error when providing it, which is annoying as other commands accept
-# it.
-@click.option(
-    "--gh-token",
-    "_gh_token",
-    envvar=["GH_TOKEN", "GITHUB_TOKEN"],
-    required=False,
-)
-def merge_back(_gh_token: Optional[str]) -> None:
+def merge_back() -> None:
     _merge_back()
 
 
@@ -696,16 +687,7 @@ def _merge_back() -> None:
 
 
 @cli.command()
-# Although this option is not used, allow it anyways. Otherwise the user will
-# receive an error when providing it, which is annoying as other commands accept
-# it.
-@click.option(
-    "--gh-token",
-    "_gh_token",
-    envvar=["GH_TOKEN", "GITHUB_TOKEN"],
-    required=False,
-)
-def announce(_gh_token: Optional[str]) -> None:
+def announce() -> None:
     _announce()
 
 

synapse/_scripts/synapse_port_db.py

@@ -98,6 +98,7 @@ from synapse.storage.databases.state.bg_updates import StateBackgroundUpdateStor
 from synapse.storage.engines import create_engine
 from synapse.storage.prepare_database import prepare_database
 from synapse.types import ISynapseReactor
+from synapse.util import SYNAPSE_VERSION
 
 # Cast safety: Twisted does some naughty magic which replaces the
 # twisted.internet.reactor module with a Reactor instance at runtime.
@@ -324,6 +325,7 @@ class MockHomeserver(HomeServer):
             hostname=config.server.server_name,
             config=config,
             reactor=reactor,
+            version_string=f"Synapse/{SYNAPSE_VERSION}",
         )
 
 

synapse/_scripts/update_synapse_database.py

@@ -31,6 +31,7 @@ from synapse.config.homeserver import HomeServerConfig
 from synapse.server import HomeServer
 from synapse.storage import DataStore
 from synapse.types import ISynapseReactor
+from synapse.util import SYNAPSE_VERSION
 
 # Cast safety: Twisted does some naughty magic which replaces the
 # twisted.internet.reactor module with a Reactor instance at runtime.
@@ -46,6 +47,7 @@ class MockHomeserver(HomeServer):
             hostname=config.server.server_name,
             config=config,
             reactor=reactor,
+            version_string=f"Synapse/{SYNAPSE_VERSION}",
         )
 
 

synapse/app/_base.py

@@ -421,26 +421,17 @@ def listen_http(
     context_factory: Optional[IOpenSSLContextFactory],
     reactor: ISynapseReactor = reactor,
 ) -> List[Port]:
-    """
-    Args:
-        listener_config: TODO
-        root_resource: TODO
-        version_string: A string to present for the Server header
-        max_request_body_size: TODO
-        context_factory: TODO
-        reactor: TODO
-    """
     assert listener_config.http_options is not None
 
     site_tag = listener_config.get_site_tag()
 
     site = SynapseSite(
-        logger_name="synapse.access.%s.%s"
+        "synapse.access.%s.%s"
         % ("https" if listener_config.is_tls() else "http", site_tag),
-        site_tag=site_tag,
-        config=listener_config,
-        resource=root_resource,
-        server_version_string=version_string,
+        site_tag,
+        listener_config,
+        root_resource,
+        version_string,
         max_request_body_size=max_request_body_size,
         reactor=reactor,
         hs=hs,

synapse/app/admin_cmd.py

@@ -65,6 +65,7 @@ from synapse.storage.databases.main.stream import StreamWorkerStore
 from synapse.storage.databases.main.tags import TagsWorkerStore
 from synapse.storage.databases.main.user_erasure_store import UserErasureWorkerStore
 from synapse.types import JsonMapping, StateMap
+from synapse.util import SYNAPSE_VERSION
 from synapse.util.logcontext import LoggingContext
 
 logger = logging.getLogger("synapse.app.admin_cmd")
@@ -315,6 +316,7 @@ def start(config: HomeServerConfig, args: argparse.Namespace) -> None:
     ss = AdminCmdServer(
         config.server.server_name,
         config=config,
+        version_string=f"Synapse/{SYNAPSE_VERSION}",
     )
 
     setup_logging(ss, config, use_worker_options=True)

synapse/app/generic_worker.py

@@ -112,6 +112,7 @@ from synapse.storage.databases.main.transactions import TransactionWorkerStore
 from synapse.storage.databases.main.ui_auth import UIAuthWorkerStore
 from synapse.storage.databases.main.user_directory import UserDirectoryStore
 from synapse.storage.databases.main.user_erasure_store import UserErasureWorkerStore
+from synapse.util import SYNAPSE_VERSION
 from synapse.util.httpresourcetree import create_resource_tree
 
 logger = logging.getLogger("synapse.app.generic_worker")
@@ -358,6 +359,7 @@ def start(config: HomeServerConfig) -> None:
     hs = GenericWorkerServer(
         config.server.server_name,
         config=config,
+        version_string=f"Synapse/{SYNAPSE_VERSION}",
     )
 
     setup_logging(hs, config, use_worker_options=True)

synapse/app/homeserver.py

@@ -71,7 +71,7 @@ from synapse.rest.well_known import well_known_resource
 from synapse.server import HomeServer
 from synapse.storage import DataStore
 from synapse.types import ISynapseReactor
-from synapse.util.check_dependencies import check_requirements
+from synapse.util.check_dependencies import VERSION, check_requirements
 from synapse.util.httpresourcetree import create_resource_tree
 from synapse.util.module_loader import load_module
 
@@ -83,10 +83,6 @@ def gz_wrap(r: Resource) -> Resource:
 
 
 class SynapseHomeServer(HomeServer):
-    """
-    Homeserver class for the main Synapse process.
-    """
-
     DATASTORE_CLASS = DataStore
 
     def _listener_http(
@@ -349,53 +345,18 @@ def load_or_generate_config(argv_options: List[str]) -> HomeServerConfig:
     return config
 
 
-def create_homeserver(
+def setup(
     config: HomeServerConfig,
     reactor: Optional[ISynapseReactor] = None,
+    freeze: bool = True,
 ) -> SynapseHomeServer:
     """
-    Create a homeserver instance for the Synapse main process.
+    Create and setup a Synapse homeserver instance given a configuration.
 
     Args:
         config: The configuration for the homeserver.
         reactor: Optionally provide a reactor to use. Can be useful in different
             scenarios that you want control over the reactor, such as tests.
-
-    Returns:
-        A homeserver instance.
-    """
-
-    if config.worker.worker_app:
-        raise ConfigError(
-            "You have specified `worker_app` in the config but are attempting to setup a non-worker "
-            "instance. Please use `python -m synapse.app.generic_worker` instead (or remove the option if this is the main process)."
-        )
-
-    events.USE_FROZEN_DICTS = config.server.use_frozen_dicts
-    synapse.util.caches.TRACK_MEMORY_USAGE = config.caches.track_memory_usage
-
-    if config.server.gc_seconds:
-        synapse.metrics.MIN_TIME_BETWEEN_GCS = config.server.gc_seconds
-
-    hs = SynapseHomeServer(
-        hostname=config.server.server_name,
-        config=config,
-        reactor=reactor,
-    )
-
-    return hs
-
-
-def setup(
-    hs: SynapseHomeServer,
-    *,
-    freeze: bool = True,
-) -> None:
-    """
-    Setup a Synapse homeserver instance given a configuration.
-
-    Args:
-        hs: The homeserver to setup.
         freeze: whether to freeze the homeserver base objects in the garbage collector.
             May improve garbage collection performance by marking objects with an effectively
             static lifetime as frozen so they don't need to be considered for cleanup.
@@ -406,22 +367,55 @@ def setup(
         A homeserver instance.
     """
 
-    setup_logging(hs, hs.config, use_worker_options=False)
+    if config.worker.worker_app:
+        raise ConfigError(
+            "You have specified `worker_app` in the config but are attempting to start a non-worker "
+            "instance. Please use `python -m synapse.app.generic_worker` instead (or remove the option if this is the main process)."
+        )
+        sys.exit(1)
 
-    # Log after we've configured logging.
-    logger.info("Setting up server")
+    events.USE_FROZEN_DICTS = config.server.use_frozen_dicts
+    synapse.util.caches.TRACK_MEMORY_USAGE = config.caches.track_memory_usage
+
+    if config.server.gc_seconds:
+        synapse.metrics.MIN_TIME_BETWEEN_GCS = config.server.gc_seconds
+
+    if (
+        config.registration.enable_registration
+        and not config.registration.enable_registration_without_verification
+    ):
+        if (
+            not config.captcha.enable_registration_captcha
+            and not config.registration.registrations_require_3pid
+            and not config.registration.registration_requires_token
+        ):
+            raise ConfigError(
+                "You have enabled open registration without any verification. This is a known vector for "
+                "spam and abuse. If you would like to allow public registration, please consider adding email, "
+                "captcha, or token-based verification. Otherwise this check can be removed by setting the "
+                "`enable_registration_without_verification` config option to `true`."
+            )
+
+    hs = SynapseHomeServer(
+        config.server.server_name,
+        config=config,
+        version_string=f"Synapse/{VERSION}",
+        reactor=reactor,
+    )
+
+    setup_logging(hs, config, use_worker_options=False)
 
     # Start the tracer
     init_tracer(hs)  # noqa
 
+    logger.info("Setting up server")
+
     try:
         hs.setup()
     except Exception as e:
         handle_startup_exception(e)
 
-    async def _start_when_reactor_running() -> None:
-        # TODO: Feels like this should be moved somewhere else.
-        #
+    async def start() -> None:
         # Load the OIDC provider metadatas, if OIDC is enabled.
         if hs.config.oidc.oidc_enabled:
             oidc = hs.get_oidc_handler()
@@ -430,31 +424,21 @@ def setup(
 
         await _base.start(hs, freeze)
 
-        # TODO: This should be moved to `SynapseHomeServer.start_background_tasks` (not
-        # `HomeServer.start_background_tasks`) (this way it matches the behavior of only
-        # running on `main`)
         hs.get_datastores().main.db_pool.updates.start_doing_background_updates()
 
-    # Register a callback to be invoked once the reactor is running
-    register_start(hs, _start_when_reactor_running)
+    register_start(hs, start)
+
+    return hs
 
 
-def start_reactor(
-    config: HomeServerConfig,
-) -> None:
-    """
-    Start the reactor (Twisted event-loop).
-
-    Args:
-        config: The configuration for the homeserver.
-    """
+def run(hs: HomeServer) -> None:
     _base.start_reactor(
         "synapse-homeserver",
-        soft_file_limit=config.server.soft_file_limit,
-        gc_thresholds=config.server.gc_thresholds,
-        pid_file=config.server.pid_file,
-        daemonize=config.server.daemonize,
-        print_pidfile=config.server.print_pidfile,
+        soft_file_limit=hs.config.server.soft_file_limit,
+        gc_thresholds=hs.config.server.gc_thresholds,
+        pid_file=hs.config.server.pid_file,
+        daemonize=hs.config.server.daemonize,
+        print_pidfile=hs.config.server.print_pidfile,
         logger=logger,
     )
 
@@ -465,14 +449,13 @@ def main() -> None:
     with LoggingContext(name="main", server_name=homeserver_config.server.server_name):
         # check base requirements
         check_requirements()
-        hs = create_homeserver(homeserver_config)
-        setup(hs)
+        hs = setup(homeserver_config)
 
         # redirect stdio to the logs, if configured.
         if not hs.config.logging.no_redirect_stdio:
             redirect_stdio_to_logs()
 
-        start_reactor(homeserver_config)
+        run(hs)
 
 
 if __name__ == "__main__":

synapse/config/_base.py

@@ -545,22 +545,18 @@ class RootConfig:
 
     @classmethod
     def load_config(
-        cls: Type[TRootConfig], description: str, argv_options: List[str]
+        cls: Type[TRootConfig], description: str, argv: List[str]
     ) -> TRootConfig:
         """Parse the commandline and config files
 
         Doesn't support config-file-generation: used by the worker apps.
 
-        Args:
-            description: TODO
-            argv_options: The options passed to Synapse. Usually `sys.argv[1:]`.
-
         Returns:
             Config object.
         """
         config_parser = argparse.ArgumentParser(description=description)
         cls.add_arguments_to_parser(config_parser)
-        obj, _ = cls.load_config_with_parser(config_parser, argv_options)
+        obj, _ = cls.load_config_with_parser(config_parser, argv)
 
         return obj
 
@@ -613,10 +609,6 @@ class RootConfig:
 
         Used for workers where we want to add extra flags/subcommands.
 
-        Note: This is the common denominator for loading config and is also used by
-        `load_config` and `load_or_generate_config`. Which is why we call
-        `validate_config()` here.
-
         Args:
             parser
             argv_options: The options passed to Synapse. Usually `sys.argv[1:]`.
@@ -650,10 +642,6 @@ class RootConfig:
 
         obj.invoke_all("read_arguments", config_args)
 
-        # Now that we finally have the full config sections parsed, allow subclasses to
-        # do some extra validation across the entire config.
-        obj.validate_config()
-
         return obj, config_args
 
     @classmethod
@@ -854,7 +842,15 @@ class RootConfig:
         ):
             return None
 
-        return cls.load_config(description, argv_options)
+        obj.parse_config_dict(
+            config_dict,
+            config_dir_path=config_dir_path,
+            data_dir_path=data_dir_path,
+            allow_secrets_in_config=config_args.secrets_in_config,
+        )
+        obj.invoke_all("read_arguments", config_args)
+
+        return obj
 
     def parse_config_dict(
         self,
@@ -915,20 +911,6 @@ class RootConfig:
         existing_config.root = None
         return existing_config
 
-    def validate_config(self) -> None:
-        """
-        Additional config validation across all config sections.
-
-        Override this in subclasses to add extra validation. This is called once all
-        config option values have been populated.
-
-        XXX: This should only validate, not modify the configuration, as the final
-        config state is required for proper validation across all config sections.
-
-        Raises:
-            ConfigError: if the config is invalid.
-        """
-
 
 def read_config_files(config_files: Iterable[str]) -> Dict[str, Any]:
     """Read the config files and shallowly merge them into a dict.

synapse/config/_base.pyi

@@ -37,7 +37,6 @@ from synapse.config import (  # noqa: F401
     key,
     logger,
     mas,
-    matrixrtc,
     metrics,
     modules,
     oembed,
@@ -127,7 +126,6 @@ class RootConfig:
     auto_accept_invites: auto_accept_invites.AutoAcceptInvitesConfig
     user_types: user_types.UserTypesConfig
     mas: mas.MasConfig
-    matrix_rtc: matrixrtc.MatrixRtcConfig
 
     config_classes: List[Type["Config"]] = ...
     config_files: List[str]
@@ -158,11 +156,11 @@ class RootConfig:
     ) -> str: ...
     @classmethod
     def load_or_generate_config(
-        cls: Type[TRootConfig], description: str, argv_options: List[str]
+        cls: Type[TRootConfig], description: str, argv: List[str]
     ) -> Optional[TRootConfig]: ...
     @classmethod
     def load_config(
-        cls: Type[TRootConfig], description: str, argv_options: List[str]
+        cls: Type[TRootConfig], description: str, argv: List[str]
     ) -> TRootConfig: ...
     @classmethod
     def add_arguments_to_parser(
@@ -170,7 +168,7 @@ class RootConfig:
     ) -> None: ...
     @classmethod
     def load_config_with_parser(
-        cls: Type[TRootConfig], parser: argparse.ArgumentParser, argv_options: List[str]
+        cls: Type[TRootConfig], parser: argparse.ArgumentParser, argv: List[str]
     ) -> Tuple[TRootConfig, argparse.Namespace]: ...
     def generate_missing_files(
         self, config_dict: dict, config_dir_path: str

synapse/config/experimental.py

@@ -556,9 +556,6 @@ class ExperimentalConfig(Config):
         # MSC4133: Custom profile fields
         self.msc4133_enabled: bool = experimental.get("msc4133_enabled", False)
 
-        # MSC4143: Matrix RTC Transport using Livekit Backend
-        self.msc4143_enabled: bool = experimental.get("msc4143_enabled", False)
-
         # MSC4169: Backwards-compatible redaction sending using `/send`
         self.msc4169_enabled: bool = experimental.get("msc4169_enabled", False)
 

synapse/config/homeserver.py

@@ -18,8 +18,7 @@
 # [This file includes modifications made by New Vector Limited]
 #
 #
-
-from ._base import ConfigError, RootConfig
+from ._base import RootConfig
 from .account_validity import AccountValidityConfig
 from .api import ApiConfig
 from .appservice import AppServiceConfig
@@ -38,7 +37,6 @@ from .jwt import JWTConfig
 from .key import KeyConfig
 from .logger import LoggingConfig
 from .mas import MasConfig
-from .matrixrtc import MatrixRtcConfig
 from .metrics import MetricsConfig
 from .modules import ModulesConfig
 from .oembed import OembedConfig
@@ -68,10 +66,6 @@ from .workers import WorkerConfig
 
 
 class HomeServerConfig(RootConfig):
-    """
-    Top-level config object for Synapse homeserver (main process and workers).
-    """
-
     config_classes = [
         ModulesConfig,
         ServerConfig,
@@ -86,7 +80,6 @@ class HomeServerConfig(RootConfig):
         OembedConfig,
         CaptchaConfig,
         VoipConfig,
-        MatrixRtcConfig,
         RegistrationConfig,
         AccountValidityConfig,
         MetricsConfig,
@@ -120,22 +113,3 @@ class HomeServerConfig(RootConfig):
         # This must be last, as it checks for conflicts with other config options.
         MasConfig,
     ]
-
-    def validate_config(
-        self,
-    ) -> None:
-        if (
-            self.registration.enable_registration
-            and not self.registration.enable_registration_without_verification
-        ):
-            if (
-                not self.captcha.enable_registration_captcha
-                and not self.registration.registrations_require_3pid
-                and not self.registration.registration_requires_token
-            ):
-                raise ConfigError(
-                    "You have enabled open registration without any verification. This is a known vector for "
-                    "spam and abuse. If you would like to allow public registration, please consider adding email, "
-                    "captcha, or token-based verification. Otherwise this check can be removed by setting the "
-                    "`enable_registration_without_verification` config option to `true`."
-                )

synapse/config/matrixrtc.py

@@ -1,67 +0,0 @@
-#
-# This file is licensed under the Affero General Public License (AGPL) version 3.
-#
-# Copyright (C) 2025 New Vector, 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>.
-#
-# [This file includes modifications made by New Vector Limited]
-#
-#
-
-from typing import Any, Optional
-
-from pydantic import ValidationError
-
-from synapse._pydantic_compat import Field, StrictStr, validator
-from synapse.types import JsonDict
-from synapse.util.pydantic_models import ParseModel
-
-from ._base import Config, ConfigError
-
-
-class TransportConfigModel(ParseModel):
-    type: StrictStr
-
-    livekit_service_url: Optional[StrictStr] = Field(default=None)
-    """An optional livekit service URL. Only required if type is "livekit"."""
-
-    @validator("livekit_service_url", always=True)
-    def validate_livekit_service_url(cls, v: Any, values: dict) -> Any:
-        if values.get("type") == "livekit" and not v:
-            raise ValueError(
-                "You must set a `livekit_service_url` when using the 'livekit' transport."
-            )
-
-        return v
-
-
-class MatrixRtcConfigModel(ParseModel):
-    transports: list = []
-
-
-class MatrixRtcConfig(Config):
-    section = "matrix_rtc"
-
-    def read_config(
-        self, config: JsonDict, allow_secrets_in_config: bool, **kwargs: Any
-    ) -> None:
-        matrix_rtc = config.get("matrix_rtc", {})
-        if matrix_rtc is None:
-            matrix_rtc = {}
-
-        try:
-            parsed = MatrixRtcConfigModel(**matrix_rtc)
-        except ValidationError as e:
-            raise ConfigError(
-                "Could not validate matrix_rtc config",
-                ("matrix_rtc",),
-            ) from e
-
-        self.transports = parsed.transports

synapse/http/site.py

@@ -741,7 +741,6 @@ class SynapseSite(ProxySite):
 
     def __init__(
         self,
-        *,
         logger_name: str,
         site_tag: str,
         config: ListenerConfig,

synapse/module_api/__init__.py

@@ -79,7 +79,6 @@ from synapse.http.server import (
 from synapse.http.servlet import parse_json_object_from_request
 from synapse.http.site import SynapseRequest
 from synapse.logging.context import (
-    defer_to_thread,
     defer_to_threadpool,
     make_deferred_yieldable,
     run_in_background,
@@ -1718,6 +1717,7 @@ class ModuleApi:
     async def defer_to_thread(
         self,
         f: Callable[P, T],
+        threadpool: Optional[ThreadPool] = None,
         *args: P.args,
         **kwargs: P.kwargs,
     ) -> T:
@@ -1733,31 +1733,11 @@ class ModuleApi:
         Returns:
             The return value of the function once ran in a thread.
         """
-        return await defer_to_thread(self._hs.get_reactor(), f, *args, **kwargs)
+        # If a threadpool is not provided by the module, then use the default
+        # reactor threadpool of the homeserver.
+        if threadpool is None:
+            threadpool = self._hs.get_reactor().getThreadPool()
 
-    async def defer_to_threadpool(
-        self,
-        threadpool: ThreadPool,
-        f: Callable[P, T],
-        *args: P.args,
-        **kwargs: P.kwargs,
-    ) -> T:
-        """Runs the given function in a separate thread from the given thread pool.
-
-        Allows specifying a custom thread pool instead of using the default Synapse
-        one. To use the default Synapse threadpool, use `defer_to_thread` instead.
-
-        Added in Synapse v1.140.0.
-
-        Args:
-            threadpool: The thread pool to use.
-            f: The function to run.
-            args: The function's arguments.
-            kwargs: The function's keyword arguments.
-
-        Returns:
-            The return value of the function once ran in a thread.
-        """
         return await defer_to_threadpool(
             self._hs.get_reactor(), threadpool, f, *args, **kwargs
         )

synapse/rest/__init__.py

@@ -42,7 +42,6 @@ from synapse.rest.client import (
     login,
     login_token_request,
     logout,
-    matrixrtc,
     mutual_rooms,
     notifications,
     openid,
@@ -90,7 +89,6 @@ CLIENT_SERVLET_FUNCTIONS: Tuple[RegisterServletsFunc, ...] = (
     presence.register_servlets,
     directory.register_servlets,
     voip.register_servlets,
-    matrixrtc.register_servlets,
     pusher.register_servlets,
     push_rule.register_servlets,
     logout.register_servlets,

synapse/rest/admin/__init__.py

@@ -57,9 +57,6 @@ from synapse.rest.admin.event_reports import (
     EventReportDetailRestServlet,
     EventReportsRestServlet,
 )
-from synapse.rest.admin.events import (
-    EventRestServlet,
-)
 from synapse.rest.admin.experimental_features import ExperimentalFeaturesRestServlet
 from synapse.rest.admin.federation import (
     DestinationMembershipRestServlet,
@@ -342,7 +339,6 @@ def register_servlets(hs: "HomeServer", http_server: HttpServer) -> None:
     ExperimentalFeaturesRestServlet(hs).register(http_server)
     SuspendAccountRestServlet(hs).register(http_server)
     ScheduledTasksRestServlet(hs).register(http_server)
-    EventRestServlet(hs).register(http_server)
 
 
 def register_servlets_for_client_rest_resource(

synapse/rest/admin/events.py

@@ -1,69 +0,0 @@
-from http import HTTPStatus
-from typing import TYPE_CHECKING, Tuple
-
-from synapse.api.errors import NotFoundError
-from synapse.events.utils import (
-    SerializeEventConfig,
-    format_event_raw,
-    serialize_event,
-)
-from synapse.http.servlet import RestServlet
-from synapse.http.site import SynapseRequest
-from synapse.rest.admin import admin_patterns
-from synapse.rest.admin._base import assert_user_is_admin
-from synapse.storage.databases.main.events_worker import EventRedactBehaviour
-from synapse.types import JsonDict
-
-if TYPE_CHECKING:
-    from synapse.server import HomeServer
-
-
-class EventRestServlet(RestServlet):
-    """
-    Get an event that is known to the homeserver.
-    The requester must have administrator access in Synapse.
-
-    GET /_synapse/admin/v1/fetch_event/<event_id>
-    returns:
-        200 OK with event json if the event is known to the homeserver. Otherwise raises
-        a NotFound error.
-
-    Args:
-        event_id: the id of the requested event.
-    Returns:
-        JSON blob of the event
-    """
-
-    PATTERNS = admin_patterns("/fetch_event/(?P<event_id>[^/]*)$")
-
-    def __init__(self, hs: "HomeServer"):
-        self._auth = hs.get_auth()
-        self._store = hs.get_datastores().main
-        self._clock = hs.get_clock()
-
-    async def on_GET(
-        self, request: SynapseRequest, event_id: str
-    ) -> Tuple[int, JsonDict]:
-        requester = await self._auth.get_user_by_req(request)
-        await assert_user_is_admin(self._auth, requester)
-
-        event = await self._store.get_event(
-            event_id,
-            EventRedactBehaviour.as_is,
-            allow_none=True,
-        )
-
-        if event is None:
-            raise NotFoundError("Event not found")
-
-        config = SerializeEventConfig(
-            as_client_event=False,
-            event_format=format_event_raw,
-            requester=requester,
-            only_event_fields=None,
-            include_stripped_room_state=True,
-            include_admin_metadata=True,
-        )
-        res = {"event": serialize_event(event, self._clock.time_msec(), config=config)}
-
-        return HTTPStatus.OK, res

synapse/rest/client/matrixrtc.py

@@ -1,52 +0,0 @@
-#
-# This file is licensed under the Affero General Public License (AGPL) version 3.
-#
-# Copyright (C) 2025 New Vector, 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>.
-#
-# [This file includes modifications made by New Vector Limited]
-#
-#
-
-from typing import TYPE_CHECKING, Tuple
-
-from synapse.http.server import HttpServer
-from synapse.http.servlet import RestServlet
-from synapse.http.site import SynapseRequest
-from synapse.rest.client._base import client_patterns
-from synapse.types import JsonDict
-
-if TYPE_CHECKING:
-    from synapse.server import HomeServer
-
-
-class MatrixRTCRestServlet(RestServlet):
-    PATTERNS = client_patterns(r"/org\.matrix\.msc4143/rtc/transports$", releases=())
-    CATEGORY = "Client API requests"
-
-    def __init__(self, hs: "HomeServer"):
-        super().__init__()
-        self._hs = hs
-        self._auth = hs.get_auth()
-        self._transports = hs.config.matrix_rtc.transports
-
-    async def on_GET(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
-        # Require authentication for this endpoint.
-        await self._auth.get_user_by_req(request)
-
-        if self._transports:
-            return 200, {"rtc_transports": self._transports}
-
-        return 200, {}
-
-
-def register_servlets(hs: "HomeServer", http_server: HttpServer) -> None:
-    if hs.config.experimental.msc4143_enabled:
-        MatrixRTCRestServlet(hs).register(http_server)

synapse/server.py

@@ -175,7 +175,6 @@ from synapse.storage.controllers import StorageControllers
 from synapse.streams.events import EventSources
 from synapse.synapse_rust.rendezvous import RendezvousHandler
 from synapse.types import DomainSpecificString, ISynapseReactor
-from synapse.util import SYNAPSE_VERSION
 from synapse.util.caches import CACHE_METRIC_REGISTRY
 from synapse.util.clock import Clock
 from synapse.util.distributor import Distributor
@@ -323,6 +322,7 @@ class HomeServer(metaclass=abc.ABCMeta):
         hostname: str,
         config: HomeServerConfig,
         reactor: Optional[ISynapseReactor] = None,
+        version_string: str = "Synapse",
     ):
         """
         Args:
@@ -347,7 +347,7 @@ class HomeServer(metaclass=abc.ABCMeta):
         self._instance_id = random_string(5)
         self._instance_name = config.worker.instance_name
 
-        self.version_string = f"Synapse/{SYNAPSE_VERSION}"
+        self.version_string = version_string
 
         self.datastores: Optional[Databases] = None
 
@@ -613,6 +613,12 @@ class HomeServer(metaclass=abc.ABCMeta):
         self.datastores = Databases(self.DATASTORE_CLASS, self)
         logger.info("Finished setting up.")
 
+        # Register background tasks required by this server. This must be done
+        # somewhat manually due to the background tasks not being registered
+        # unless handlers are instantiated.
+        if self.config.worker.run_background_tasks:
+            self.start_background_tasks()
+
     # def __del__(self) -> None:
     #    """
     #    Called when an the homeserver is garbage collected.

tests/app/test_homeserver_start.py

@@ -37,13 +37,7 @@ class HomeserverAppStartTestCase(ConfigFileTestCase):
         self.add_lines_to_config(["  main:", "    host: 127.0.0.1", "    port: 1234"])
         # Ensure that starting master process with worker config raises an exception
         with self.assertRaises(ConfigError):
-            # Do a normal homeserver creation and setup
             homeserver_config = synapse.app.homeserver.load_or_generate_config(
                 ["-c", self.config_file]
             )
-            # XXX: The error will be raised at this point
-            hs = synapse.app.homeserver.create_homeserver(homeserver_config)
-            # Continue with the setup. We don't expect this to run because we raised
-            # earlier, but in the future, the code could be refactored to raise the
-            # error in a different place.
-            synapse.app.homeserver.setup(hs)
+            synapse.app.homeserver.setup(homeserver_config)

tests/config/test_load.py

@@ -99,14 +99,7 @@ class ConfigLoadingFileTestCase(ConfigFileTestCase):
     def test_disable_registration(self) -> None:
         self.generate_config()
         self.add_lines_to_config(
-            [
-                "enable_registration: true",
-                "disable_registration: true",
-                # We're not worried about open registration in this test. This test is
-                # focused on making sure that enable/disable_registration properly
-                # override each other.
-                "enable_registration_without_verification: true",
-            ]
+            ["enable_registration: true", "disable_registration: true"]
         )
         # Check that disable_registration clobbers enable_registration.
         config = HomeServerConfig.load_config("", ["-c", self.config_file])

tests/config/test_registration_config.py

@@ -19,8 +19,6 @@
 #
 #
 
-import argparse
-
 import synapse.app.homeserver
 from synapse.config import ConfigError
 from synapse.config.homeserver import HomeServerConfig
@@ -101,10 +99,6 @@ class RegistrationConfigTestCase(ConfigFileTestCase):
         )
 
     def test_refuse_to_start_if_open_registration_and_no_verification(self) -> None:
-        """
-        Test that our utilities to start the main Synapse homeserver process refuses
-        to start if we detect open registration.
-        """
         self.generate_config()
         self.add_lines_to_config(
             [
@@ -117,87 +111,8 @@ class RegistrationConfigTestCase(ConfigFileTestCase):
         )
 
         # Test that allowing open registration without verification raises an error
-        with self.assertRaises(SystemExit):
-            # Do a normal homeserver creation and setup
+        with self.assertRaises(ConfigError):
             homeserver_config = synapse.app.homeserver.load_or_generate_config(
                 ["-c", self.config_file]
             )
-            # XXX: The error will be raised at this point
-            hs = synapse.app.homeserver.create_homeserver(homeserver_config)
-            # Continue with the setup. We don't expect this to run because we raised
-            # earlier, but in the future, the code could be refactored to raise the
-            # error in a different place.
-            synapse.app.homeserver.setup(hs)
-
-    def test_load_config_error_if_open_registration_and_no_verification(self) -> None:
-        """
-        Test that `HomeServerConfig.load_config(...)` raises an exception when we detect open
-        registration.
-        """
-        self.generate_config()
-        self.add_lines_to_config(
-            [
-                " ",
-                "enable_registration: true",
-                "registrations_require_3pid: []",
-                "enable_registration_captcha: false",
-                "registration_requires_token: false",
-            ]
-        )
-
-        # Test that allowing open registration without verification raises an error
-        with self.assertRaises(ConfigError):
-            _homeserver_config = HomeServerConfig.load_config(
-                description="test", argv_options=["-c", self.config_file]
-            )
-
-    def test_load_or_generate_config_error_if_open_registration_and_no_verification(
-        self,
-    ) -> None:
-        """
-        Test that `HomeServerConfig.load_or_generate_config(...)` raises an exception when we detect open
-        registration.
-        """
-        self.generate_config()
-        self.add_lines_to_config(
-            [
-                " ",
-                "enable_registration: true",
-                "registrations_require_3pid: []",
-                "enable_registration_captcha: false",
-                "registration_requires_token: false",
-            ]
-        )
-
-        # Test that allowing open registration without verification raises an error
-        with self.assertRaises(ConfigError):
-            _homeserver_config = HomeServerConfig.load_or_generate_config(
-                description="test", argv_options=["-c", self.config_file]
-            )
-
-    def test_load_config_with_parser_error_if_open_registration_and_no_verification(
-        self,
-    ) -> None:
-        """
-        Test that `HomeServerConfig.load_config_with_parser(...)` raises an exception when we detect open
-        registration.
-        """
-        self.generate_config()
-        self.add_lines_to_config(
-            [
-                " ",
-                "enable_registration: true",
-                "registrations_require_3pid: []",
-                "enable_registration_captcha: false",
-                "registration_requires_token: false",
-            ]
-        )
-
-        # Test that allowing open registration without verification raises an error
-        with self.assertRaises(ConfigError):
-            config_parser = argparse.ArgumentParser(description="test")
-            HomeServerConfig.add_arguments_to_parser(config_parser)
-
-            _homeserver_config = HomeServerConfig.load_config_with_parser(
-                parser=config_parser, argv_options=["-c", self.config_file]
-            )
+            synapse.app.homeserver.setup(homeserver_config)

tests/rest/admin/test_event.py

@@ -1,74 +0,0 @@
-from twisted.internet.testing import MemoryReactor
-
-import synapse.rest.admin
-from synapse.api.errors import Codes
-from synapse.rest.client import login, room
-from synapse.server import HomeServer
-from synapse.util.clock import Clock
-
-from tests import unittest
-
-
-class FetchEventTestCase(unittest.HomeserverTestCase):
-    servlets = [
-        synapse.rest.admin.register_servlets,
-        login.register_servlets,
-        room.register_servlets,
-    ]
-
-    def prepare(self, reactor: MemoryReactor, clock: Clock, hs: HomeServer) -> None:
-        self.admin_user = self.register_user("admin", "pass", admin=True)
-        self.admin_user_tok = self.login("admin", "pass")
-
-        self.other_user = self.register_user("user", "pass")
-        self.other_user_tok = self.login("user", "pass")
-
-        self.room_id1 = self.helper.create_room_as(
-            self.other_user, tok=self.other_user_tok, is_public=True
-        )
-        resp = self.helper.send(self.room_id1, body="Hey now", tok=self.other_user_tok)
-        self.event_id = resp["event_id"]
-
-    def test_no_auth(self) -> None:
-        """
-        Try to get an event without authentication.
-        """
-        channel = self.make_request(
-            "GET",
-            f"/_synapse/admin/v1/fetch_event/{self.event_id}",
-        )
-
-        self.assertEqual(401, channel.code, msg=channel.json_body)
-        self.assertEqual(Codes.MISSING_TOKEN, channel.json_body["errcode"])
-
-    def test_requester_is_not_admin(self) -> None:
-        """
-        If the user is not a server admin, an error 403 is returned.
-        """
-
-        channel = self.make_request(
-            "GET",
-            f"/_synapse/admin/v1/fetch_event/{self.event_id}",
-            access_token=self.other_user_tok,
-        )
-
-        self.assertEqual(403, channel.code, msg=channel.json_body)
-        self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
-
-    def test_fetch_event(self) -> None:
-        """
-        Test that we can successfully fetch an event
-        """
-        channel = self.make_request(
-            "GET",
-            f"/_synapse/admin/v1/fetch_event/{self.event_id}",
-            access_token=self.admin_user_tok,
-        )
-        self.assertEqual(200, channel.code, msg=channel.json_body)
-        self.assertEqual(
-            channel.json_body["event"]["content"],
-            {"body": "Hey now", "msgtype": "m.text"},
-        )
-        self.assertEqual(channel.json_body["event"]["event_id"], self.event_id)
-        self.assertEqual(channel.json_body["event"]["type"], "m.room.message")
-        self.assertEqual(channel.json_body["event"]["sender"], self.other_user)

tests/rest/client/test_matrixrtc.py

@@ -1,105 +0,0 @@
-#
-# This file is licensed under the Affero General Public License (AGPL) version 3.
-#
-# Copyright (C) 2025 New Vector, 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>.
-#
-# [This file includes modifications made by New Vector Limited]
-#
-#
-
-"""Tests REST events for /rtc/endpoints path."""
-
-from twisted.internet.testing import MemoryReactor
-
-from synapse.rest import admin
-from synapse.rest.client import login, matrixrtc, register, room
-from synapse.server import HomeServer
-from synapse.util.clock import Clock
-
-from tests.unittest import HomeserverTestCase, override_config
-
-PATH_PREFIX = "/_matrix/client/unstable/org.matrix.msc4143"
-RTC_ENDPOINT = {"type": "focusA", "required_field": "theField"}
-LIVEKIT_ENDPOINT = {
-    "type": "livekit",
-    "livekit_service_url": "https://livekit.example.com",
-}
-
-
-class MatrixRtcTestCase(HomeserverTestCase):
-    """Tests /rtc/transports Client-Server REST API."""
-
-    servlets = [
-        admin.register_servlets,
-        room.register_servlets,
-        login.register_servlets,
-        register.register_servlets,
-        matrixrtc.register_servlets,
-    ]
-
-    def prepare(
-        self, reactor: MemoryReactor, clock: Clock, homeserver: HomeServer
-    ) -> None:
-        self.register_user("alice", "password")
-        self._alice_tok = self.login("alice", "password")
-
-    def test_matrixrtc_endpoint_not_enabled(self) -> None:
-        channel = self.make_request(
-            "GET", f"{PATH_PREFIX}/rtc/transports", access_token=self._alice_tok
-        )
-        self.assertEqual(404, channel.code, channel.json_body)
-        self.assertEqual(
-            "M_UNRECOGNIZED", channel.json_body["errcode"], channel.json_body
-        )
-
-    @override_config({"experimental_features": {"msc4143_enabled": True}})
-    def test_matrixrtc_endpoint_requires_authentication(self) -> None:
-        channel = self.make_request("GET", f"{PATH_PREFIX}/rtc/transports")
-        self.assertEqual(401, channel.code, channel.json_body)
-
-    @override_config(
-        {
-            "experimental_features": {"msc4143_enabled": True},
-            "matrix_rtc": {"transports": [RTC_ENDPOINT]},
-        }
-    )
-    def test_matrixrtc_endpoint_contains_expected_transport(self) -> None:
-        channel = self.make_request(
-            "GET", f"{PATH_PREFIX}/rtc/transports", access_token=self._alice_tok
-        )
-        self.assertEqual(200, channel.code, channel.json_body)
-        self.assert_dict({"rtc_transports": [RTC_ENDPOINT]}, channel.json_body)
-
-    @override_config(
-        {
-            "experimental_features": {"msc4143_enabled": True},
-            "matrix_rtc": {"transports": []},
-        }
-    )
-    def test_matrixrtc_endpoint_no_transports_configured(self) -> None:
-        channel = self.make_request(
-            "GET", f"{PATH_PREFIX}/rtc/transports", access_token=self._alice_tok
-        )
-        self.assertEqual(200, channel.code, channel.json_body)
-        self.assert_dict({}, channel.json_body)
-
-    @override_config(
-        {
-            "experimental_features": {"msc4143_enabled": True},
-            "matrix_rtc": {"transports": [LIVEKIT_ENDPOINT]},
-        }
-    )
-    def test_matrixrtc_endpoint_livekit_transport(self) -> None:
-        channel = self.make_request(
-            "GET", f"{PATH_PREFIX}/rtc/transports", access_token=self._alice_tok
-        )
-        self.assertEqual(200, channel.code, channel.json_body)
-        self.assert_dict({"rtc_transports": [LIVEKIT_ENDPOINT]}, channel.json_body)

tests/server.py

@@ -1198,6 +1198,7 @@ def setup_test_homeserver(
     hs = homeserver_to_use(
         server_name,
         config=config,
+        version_string="Synapse/tests",
         reactor=reactor,
     )
 

tests/test_server.py

@@ -236,17 +236,17 @@ class OptionsResourceTests(unittest.TestCase):
         """Create a request from the method/path and return a channel with the response."""
         # Create a site and query for the resource.
         site = SynapseSite(
-            logger_name="test",
-            site_tag="site_tag",
-            config=parse_listener_def(
+            "test",
+            "site_tag",
+            parse_listener_def(
                 0,
                 {
                     "type": "http",
                     "port": 0,
                 },
             ),
-            resource=self.resource,
-            server_version_string="1",
+            self.resource,
+            "1.0",
             max_request_body_size=4096,
             reactor=self.reactor,
             hs=self.homeserver,