Add changelog entry

.github/workflows/tests.yml

@@ -73,7 +73,7 @@ jobs:
             - 'pyproject.toml'
             - 'poetry.lock'
             - '.github/workflows/tests.yml'
-
+          
           linting_readme:
             - 'README.rst'
 
@@ -139,7 +139,7 @@ jobs:
 
       - name: Semantic checks (ruff)
         # --quiet suppresses the update check.
-        run: poetry run ruff check --quiet .
+        run: poetry run ruff --quiet .
 
   lint-mypy:
     runs-on: ubuntu-latest
@@ -305,7 +305,7 @@ jobs:
       - lint-readme
     runs-on: ubuntu-latest
     steps:
-      - uses: matrix-org/done-action@v3
+      - uses: matrix-org/done-action@v2
         with:
           needs: ${{ toJSON(needs) }}
 
@@ -737,7 +737,7 @@ jobs:
       - linting-done
     runs-on: ubuntu-latest
     steps:
-      - uses: matrix-org/done-action@v3
+      - uses: matrix-org/done-action@v2
         with:
           needs: ${{ toJSON(needs) }}
 

CHANGES.md

@@ -1,163 +1,3 @@
-# Synapse 1.112.0 (2024-07-30)
-
-This security release is to update our locked dependency on Twisted to 24.7.0rc1, which includes a security fix for [CVE-2024-41671 / GHSA-c8m8-j448-xjx7: Disordered HTTP pipeline response in twisted.web, again](https://github.com/twisted/twisted/security/advisories/GHSA-c8m8-j448-xjx7).
-
-Note that this security fix is also available as **Synapse 1.111.1**, which does not include the rest of the changes in Synapse 1.112.0.
-
-This issue means that, if multiple HTTP requests are pipelined in the same TCP connection, Synapse can send responses to the wrong HTTP request.
-If a reverse proxy was configured to use HTTP pipelining, this could result in responses being sent to the wrong user, severely harming confidentiality.
-
-With that said, despite being a high severity issue, **we consider it unlikely that Synapse installations will be affected**.
-The use of HTTP pipelining in this fashion would cause worse performance for clients (request-response latencies would be increased as users' responses would be artificially blocked behind other users' slow requests). Further, Nginx and Haproxy, two common reverse proxies, do not appear to support configuring their upstreams to use HTTP pipelining and thus would not be affected. For both of these reasons, we consider it unlikely that a Synapse deployment would be set up in such a configuration.
-
-Despite that, we cannot rule out that some installations may exist with this unusual setup and so we are releasing this security update today.
-
-**pip users:** Note that by default, upgrading Synapse using pip will not automatically upgrade Twisted. **Please manually install the new version of Twisted** using `pip install Twisted==24.7.0rc1`. Note also that even the `--upgrade-strategy=eager` flag to `pip install -U matrix-synapse` will not upgrade Twisted to a patched version because it is only a release candidate at this time.
-
-### Internal Changes
-
-- Upgrade locked dependency on Twisted to 24.7.0rc1. ([\#17502](https://github.com/element-hq/synapse/issues/17502))
-
-
-# Synapse 1.112.0rc1 (2024-07-23)
-
-Please note that this release candidate does not include the security dependency update
-included in version 1.111.1 as this version was released before 1.111.1.
-The same security fix can be found in the full release of 1.112.0.
-
-### Features
-
-- Add to-device extension support to experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint. ([\#17416](https://github.com/element-hq/synapse/issues/17416))
-- Populate `name`/`avatar` fields in experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint. ([\#17418](https://github.com/element-hq/synapse/issues/17418))
-- Populate `heroes` and room summary fields (`joined_count`, `invited_count`) in experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint. ([\#17419](https://github.com/element-hq/synapse/issues/17419))
-- Populate `is_dm` room field in experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint. ([\#17429](https://github.com/element-hq/synapse/issues/17429))
-- Add room subscriptions to experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint. ([\#17432](https://github.com/element-hq/synapse/issues/17432))
-- Prepare for authenticated media freeze. ([\#17433](https://github.com/element-hq/synapse/issues/17433))
-- Add E2EE extension support to experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint. ([\#17454](https://github.com/element-hq/synapse/issues/17454))
-
-### Bugfixes
-
-- Add configurable option to always include offline users in presence sync results. Contributed by @Michael-Hollister. ([\#17231](https://github.com/element-hq/synapse/issues/17231))
-- Fix bug in experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint when using room type filters and the user has one or more remote invites. ([\#17434](https://github.com/element-hq/synapse/issues/17434))
-- Order `heroes` by `stream_ordering` as the Matrix specification states (applies to `/sync`). ([\#17435](https://github.com/element-hq/synapse/issues/17435))
-- Fix rare bug where `/sync` would break for a user when using workers with multiple stream writers. ([\#17438](https://github.com/element-hq/synapse/issues/17438))
-
-### Improved Documentation
-
-- Update the readme image to have a white background, so that it is readable in dark mode. ([\#17387](https://github.com/element-hq/synapse/issues/17387))
-- Add Red Hat Enterprise Linux and Rocky Linux 8 and 9 installation instructions. ([\#17423](https://github.com/element-hq/synapse/issues/17423))
-- Improve documentation for the [`default_power_level_content_override`](https://element-hq.github.io/synapse/latest/usage/configuration/config_documentation.html#default_power_level_content_override) config option. ([\#17451](https://github.com/element-hq/synapse/issues/17451))
-
-### Internal Changes
-
-- Make sure we always use the right logic for enabling the media repo. ([\#17424](https://github.com/element-hq/synapse/issues/17424))
-- Fix argument documentation for method `RateLimiter.record_action`. ([\#17426](https://github.com/element-hq/synapse/issues/17426))
-- Reduce volume of 'Waiting for current token' logs, which were introduced in v1.109.0. ([\#17428](https://github.com/element-hq/synapse/issues/17428))
-- Limit concurrent remote downloads to 6 per IP address, and decrement remote downloads without a content-length from the ratelimiter after the download is complete. ([\#17439](https://github.com/element-hq/synapse/issues/17439))
-- Remove unnecessary call to resume producing in fake channel. ([\#17449](https://github.com/element-hq/synapse/issues/17449))
-- Update experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint to bump room when it is created. ([\#17453](https://github.com/element-hq/synapse/issues/17453))
-- Speed up generating sliding sync responses. ([\#17458](https://github.com/element-hq/synapse/issues/17458))
-- Add cache to `get_rooms_for_local_user_where_membership_is` to speed up sliding sync. ([\#17460](https://github.com/element-hq/synapse/issues/17460))
-- Speed up fetching room keys from backup. ([\#17461](https://github.com/element-hq/synapse/issues/17461))
-- Speed up sorting of the room list in sliding sync. ([\#17468](https://github.com/element-hq/synapse/issues/17468))
-- Implement handling of `$ME` as a state key in sliding sync. ([\#17469](https://github.com/element-hq/synapse/issues/17469))
-
-
-
-### Updates to locked dependencies
-
-* Bump bytes from 1.6.0 to 1.6.1. ([\#17441](https://github.com/element-hq/synapse/issues/17441))
-* Bump hiredis from 2.3.2 to 3.0.0. ([\#17464](https://github.com/element-hq/synapse/issues/17464))
-* Bump jsonschema from 4.22.0 to 4.23.0. ([\#17444](https://github.com/element-hq/synapse/issues/17444))
-* Bump matrix-org/done-action from 2 to 3. ([\#17440](https://github.com/element-hq/synapse/issues/17440))
-* Bump mypy from 1.9.0 to 1.10.1. ([\#17445](https://github.com/element-hq/synapse/issues/17445))
-* Bump pyopenssl from 24.1.0 to 24.2.1. ([\#17465](https://github.com/element-hq/synapse/issues/17465))
-* Bump ruff from 0.5.0 to 0.5.4. ([\#17466](https://github.com/element-hq/synapse/issues/17466))
-* Bump sentry-sdk from 2.6.0 to 2.8.0. ([\#17456](https://github.com/element-hq/synapse/issues/17456))
-* Bump sentry-sdk from 2.8.0 to 2.10.0. ([\#17467](https://github.com/element-hq/synapse/issues/17467))
-* Bump setuptools from 67.6.0 to 70.0.0. ([\#17448](https://github.com/element-hq/synapse/issues/17448))
-* Bump twine from 5.1.0 to 5.1.1. ([\#17443](https://github.com/element-hq/synapse/issues/17443))
-* Bump types-jsonschema from 4.22.0.20240610 to 4.23.0.20240712. ([\#17446](https://github.com/element-hq/synapse/issues/17446))
-* Bump ulid from 1.1.2 to 1.1.3. ([\#17442](https://github.com/element-hq/synapse/issues/17442))
-* Bump zipp from 3.15.0 to 3.19.1. ([\#17427](https://github.com/element-hq/synapse/issues/17427))
-
-# Synapse 1.111.0 (2024-07-16)
-
-No significant changes since 1.111.0rc2.
-
-
-
-
-# Synapse 1.111.0rc2 (2024-07-10)
-
-### Bugfixes
-
-- Fix bug where using `synapse.app.media_repository` worker configuration would break the new media endpoints. ([\#17420](https://github.com/element-hq/synapse/issues/17420))
-
-### Improved Documentation
-
-- Document the new federation media worker endpoints in the [upgrade notes](https://element-hq.github.io/synapse/v1.111/upgrade.html) and [worker docs](https://element-hq.github.io/synapse/v1.111/workers.html). ([\#17421](https://github.com/element-hq/synapse/issues/17421))
-
-### Internal Changes
-
-- Route authenticated federation media requests to media repository workers in Complement tests. ([\#17422](https://github.com/element-hq/synapse/issues/17422))
-
-
-
-
-# Synapse 1.111.0rc1 (2024-07-09)
-
-### Features
-
-- Add `rooms` data to experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint. ([\#17320](https://github.com/element-hq/synapse/issues/17320))
-- Add `room_types`/`not_room_types` filtering to experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint. ([\#17337](https://github.com/element-hq/synapse/issues/17337))
-- Return "required state" in experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint. ([\#17342](https://github.com/element-hq/synapse/issues/17342))
-- Support [MSC3916](https://github.com/matrix-org/matrix-spec-proposals/blob/main/proposals/3916-authentication-for-media.md) by adding [`_matrix/client/v1/media/download`](https://spec.matrix.org/v1.11/client-server-api/#get_matrixclientv1mediadownloadservernamemediaid) endpoint. ([\#17365](https://github.com/element-hq/synapse/issues/17365))
-- Support [MSC3916](https://github.com/matrix-org/matrix-spec-proposals/blob/rav/authentication-for-media/proposals/3916-authentication-for-media.md)
-  by adding [`_matrix/client/v1/media/thumbnail`](https://spec.matrix.org/v1.11/client-server-api/#get_matrixclientv1mediathumbnailservernamemediaid), [`_matrix/federation/v1/media/thumbnail`](https://spec.matrix.org/v1.11/server-server-api/#get_matrixfederationv1mediathumbnailmediaid) endpoints and stabilizing the
-  remaining [`_matrix/client/v1/media`](https://spec.matrix.org/v1.11/client-server-api/#get_matrixclientv1mediaconfig) endpoints. ([\#17388](https://github.com/element-hq/synapse/issues/17388))
-- Add `rooms.bump_stamp` for easier client-side sorting in experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint. ([\#17395](https://github.com/element-hq/synapse/issues/17395))
-- Forget all of a user's rooms upon deactivation, preventing local room purges from being blocked on deactivated users. ([\#17400](https://github.com/element-hq/synapse/issues/17400))
-- Declare support for [Matrix 1.11](https://matrix.org/blog/2024/06/20/matrix-v1.11-release/). ([\#17403](https://github.com/element-hq/synapse/issues/17403))
-- [MSC3861](https://github.com/matrix-org/matrix-spec-proposals/pull/3861): allow overriding the introspection endpoint. ([\#17406](https://github.com/element-hq/synapse/issues/17406))
-
-### Bugfixes
-
-- Fix rare race which caused no new to-device messages to be received from remote server. ([\#17362](https://github.com/element-hq/synapse/issues/17362))
-- Fix bug in experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint when using an old database. ([\#17398](https://github.com/element-hq/synapse/issues/17398))
-
-### Improved Documentation
-
-- Clarify that `url_preview_url_blacklist` is a usability feature. ([\#17356](https://github.com/element-hq/synapse/issues/17356))
-- Fix broken links in README. ([\#17379](https://github.com/element-hq/synapse/issues/17379))
-- Clarify that changelog content *and file extension* need to match in order for entries to merge. ([\#17399](https://github.com/element-hq/synapse/issues/17399))
-
-### Internal Changes
-
-- Make the release script create a release branch for Complement as well. ([\#17318](https://github.com/element-hq/synapse/issues/17318))
-- Fix uploading packages to PyPi. ([\#17363](https://github.com/element-hq/synapse/issues/17363))
-- Add CI check for the README. ([\#17367](https://github.com/element-hq/synapse/issues/17367))
-- Fix linting errors from new `ruff` version. ([\#17381](https://github.com/element-hq/synapse/issues/17381), [\#17411](https://github.com/element-hq/synapse/issues/17411))
-- Fix building debian packages on non-clean checkouts. ([\#17390](https://github.com/element-hq/synapse/issues/17390))
-- Finish up work to allow per-user feature flags. ([\#17392](https://github.com/element-hq/synapse/issues/17392), [\#17410](https://github.com/element-hq/synapse/issues/17410))
-- Allow enabling sliding sync per-user. ([\#17393](https://github.com/element-hq/synapse/issues/17393))
-
-
-
-### Updates to locked dependencies
-
-* Bump certifi from 2023.7.22 to 2024.7.4. ([\#17404](https://github.com/element-hq/synapse/issues/17404))
-* Bump cryptography from 42.0.7 to 42.0.8. ([\#17382](https://github.com/element-hq/synapse/issues/17382))
-* Bump ijson from 3.2.3 to 3.3.0. ([\#17413](https://github.com/element-hq/synapse/issues/17413))
-* Bump log from 0.4.21 to 0.4.22. ([\#17384](https://github.com/element-hq/synapse/issues/17384))
-* Bump mypy-zope from 1.0.4 to 1.0.5. ([\#17414](https://github.com/element-hq/synapse/issues/17414))
-* Bump pillow from 10.3.0 to 10.4.0. ([\#17412](https://github.com/element-hq/synapse/issues/17412))
-* Bump pydantic from 2.7.1 to 2.8.2. ([\#17415](https://github.com/element-hq/synapse/issues/17415))
-* Bump ruff from 0.3.7 to 0.5.0. ([\#17381](https://github.com/element-hq/synapse/issues/17381))
-* Bump serde from 1.0.203 to 1.0.204. ([\#17409](https://github.com/element-hq/synapse/issues/17409))
-* Bump serde_json from 1.0.117 to 1.0.120. ([\#17385](https://github.com/element-hq/synapse/issues/17385), [\#17408](https://github.com/element-hq/synapse/issues/17408))
-* Bump types-setuptools from 69.5.0.20240423 to 70.1.0.20240627. ([\#17380](https://github.com/element-hq/synapse/issues/17380))
-
 # Synapse 1.110.0 (2024-07-03)
 
 No significant changes since 1.110.0rc3.
@@ -208,7 +48,7 @@ No significant changes since 1.110.0rc3.
   This is useful for scripts that bootstrap user accounts with initial passwords. ([\#17304](https://github.com/element-hq/synapse/issues/17304))
 - Add support for via query parameter from [MSC4156](https://github.com/matrix-org/matrix-spec-proposals/pull/4156). ([\#17322](https://github.com/element-hq/synapse/issues/17322))
 - Add `is_invite` filtering to experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint. ([\#17335](https://github.com/element-hq/synapse/issues/17335))
-- Support [MSC3916](https://github.com/matrix-org/matrix-spec-proposals/blob/main/proposals/3916-authentication-for-media.md) by adding a federation /download endpoint. ([\#17350](https://github.com/element-hq/synapse/issues/17350))
+- Support [MSC3916](https://github.com/matrix-org/matrix-spec-proposals/blob/rav/authentication-for-media/proposals/3916-authentication-for-media.md) by adding a federation /download endpoint. ([\#17350](https://github.com/element-hq/synapse/issues/17350))
 
 ### Bugfixes
 

Cargo.lock

@@ -67,9 +67,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "bytes"
-version = "1.6.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
 
 [[package]]
 name = "cfg-if"
@@ -485,18 +485,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "serde"
-version = "1.0.204"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.204"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
+checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -505,9 +505,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.120"
+version = "1.0.119"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
+checksum = "e8eddb61f0697cc3989c5d64b452f5488e2b8a60fd7d5076a3045076ffef8cb0"
 dependencies = [
  "itoa",
  "ryu",
@@ -597,9 +597,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "ulid"
-version = "1.1.3"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04f903f293d11f31c0c29e4148f6dc0d033a7f80cebc0282bea147611667d289"
+checksum = "34778c17965aa2a08913b57e1f34db9b4a63f5de31768b55bf20d2795f921259"
 dependencies = [
  "getrandom",
  "rand",

README.rst

@@ -1,4 +1,4 @@
-.. image:: ./docs/element_logo_white_bg.svg
+.. image:: https://github.com/element-hq/product/assets/87339233/7abf477a-5277-47f3-be44-ea44917d8ed7
    :height: 60px
 
 **Element Synapse - Matrix homeserver implementation**
@@ -179,10 +179,10 @@ desired ``localpart`` in the 'User name' box.
 -----------------------
 
 Enterprise quality support for Synapse including SLAs is available as part of an
-`Element Server Suite (ESS) <https://element.io/pricing>`_ subscription.
+`Element Server Suite (ESS) <https://element.io/pricing>` subscription.
 
-If you are an existing ESS subscriber then you can raise a `support request <https://ems.element.io/support>`_
-and access the `knowledge base <https://ems-docs.element.io>`_.
+If you are an existing ESS subscriber then you can raise a `support request <https://ems.element.io/support>`
+and access the `knowledge base <https://ems-docs.element.io>`.
 
 🤝 Community support
 --------------------

changelog.d/17320.feature

@@ -0,0 +1 @@
+Add `rooms` data to experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint.

changelog.d/17337.feature

@@ -0,0 +1 @@
+Add `room_types`/`not_room_types` filtering to experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint.

changelog.d/17356.doc

@@ -0,0 +1 @@
+Clarify `url_preview_url_blacklist` is a usability feature.

changelog.d/17362.bugfix

@@ -0,0 +1 @@
+Fix rare race which causes no new to-device messages to be received from remote server.

changelog.d/17363.misc

@@ -0,0 +1 @@
+Fix uploading packages to PyPi.

changelog.d/17365.feature

@@ -0,0 +1 @@
+Support [MSC3916](https://github.com/matrix-org/matrix-spec-proposals/blob/rav/authentication-for-media/proposals/3916-authentication-for-media.md) by adding _matrix/client/v1/media/download endpoint.

changelog.d/17367.misc

@@ -0,0 +1 @@
+Add CI check for the README.

changelog.d/17390.misc

@@ -0,0 +1 @@
+Fix building debian packages on non-clean checkouts.

changelog.d/17396.misc

@@ -0,0 +1 @@
+Pin CI to complement release branch for releases.

debian/changelog

@@ -1,33 +1,3 @@
-matrix-synapse-py3 (1.112.0) stable; urgency=medium
-
-  * New Synapse release 1.112.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 30 Jul 2024 17:15:48 +0100
-
-matrix-synapse-py3 (1.112.0~rc1) stable; urgency=medium
-
-  * New Synapse release 1.112.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 23 Jul 2024 08:58:55 -0600
-
-matrix-synapse-py3 (1.111.0) stable; urgency=medium
-
-  * New Synapse release 1.111.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 16 Jul 2024 12:42:46 +0200
-
-matrix-synapse-py3 (1.111.0~rc2) stable; urgency=medium
-
-  * New synapse release 1.111.0rc2.
-
- -- Synapse Packaging team <packages@matrix.org>  Wed, 10 Jul 2024 08:46:54 +0000
-
-matrix-synapse-py3 (1.111.0~rc1) stable; urgency=medium
-
-  * New synapse release 1.111.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 09 Jul 2024 09:49:25 +0000
-
 matrix-synapse-py3 (1.110.0) stable; urgency=medium
 
   * New Synapse release 1.110.0.

docker/Dockerfile

@@ -27,7 +27,7 @@ ARG PYTHON_VERSION=3.11
 ###
 # We hardcode the use of Debian bookworm here because this could change upstream
 # and other Dockerfiles used for testing are expecting bookworm.
-FROM docker.io/library/python:${PYTHON_VERSION}-slim-bookworm AS requirements
+FROM docker.io/library/python:${PYTHON_VERSION}-slim-bookworm as requirements
 
 # RUN --mount is specific to buildkit and is documented at
 # https://github.com/moby/buildkit/blob/master/frontend/dockerfile/docs/syntax.md#build-mounts-run---mount.
@@ -87,7 +87,7 @@ RUN if [ -z "$TEST_ONLY_IGNORE_POETRY_LOCKFILE" ]; then \
 ###
 ### Stage 1: builder
 ###
-FROM docker.io/library/python:${PYTHON_VERSION}-slim-bookworm AS builder
+FROM docker.io/library/python:${PYTHON_VERSION}-slim-bookworm as builder
 
 # install the OS build deps
 RUN \

docker/Dockerfile-dhvirtualenv

@@ -24,7 +24,7 @@ ARG distro=""
 # https://launchpad.net/~jyrki-pulliainen/+archive/ubuntu/dh-virtualenv, but
 # it's not obviously easier to use that than to build our own.)
 
-FROM docker.io/library/${distro} AS builder
+FROM docker.io/library/${distro} as builder
 
 RUN apt-get update -qq -o Acquire::Languages=none
 RUN env DEBIAN_FRONTEND=noninteractive apt-get install \

docker/configure_workers_and_start.py

@@ -126,7 +126,6 @@ WORKERS_CONFIG: Dict[str, Dict[str, Any]] = {
             "^/_synapse/admin/v1/media/.*$",
             "^/_synapse/admin/v1/quarantine_media/.*$",
             "^/_matrix/client/v1/media/.*$",
-            "^/_matrix/federation/v1/media/.*$",
         ],
         # The first configured media worker will run the media background jobs
         "shared_extra_conf": {

docs/admin_api/experimental_features.md

@@ -1,17 +1,21 @@
 # Experimental Features API
 
 This API allows a server administrator to enable or disable some experimental features on a per-user
-basis. The currently supported features are:
-- [MSC3881](https://github.com/matrix-org/matrix-spec-proposals/pull/3881): enable remotely toggling push notifications
-for another client
-- [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575): enable experimental sliding sync support
+basis. The currently supported features are: 
+- [MSC3026](https://github.com/matrix-org/matrix-spec-proposals/pull/3026): busy 
+presence state enabled
+- [MSC3881](https://github.com/matrix-org/matrix-spec-proposals/pull/3881): enable remotely toggling push notifications 
+for another client 
+- [MSC3967](https://github.com/matrix-org/matrix-spec-proposals/pull/3967): do not require
+UIA when first uploading cross-signing keys. 
+
 
 To use it, you will need to authenticate by providing an `access_token`
 for a server admin: see [Admin API](../usage/administration/admin_api/).
 
 ## Enabling/Disabling Features
 
-This API allows a server administrator to enable experimental features for a given user. The request must
+This API allows a server administrator to enable experimental features for a given user. The request must 
 provide a body containing the user id and listing the features to enable/disable in the following format:
 ```json
 {
@@ -31,7 +35,7 @@ PUT /_synapse/admin/v1/experimental_features/<user_id>
 ```
 
 ## Listing Enabled Features
-
+ 
 To list which features are enabled/disabled for a given user send a request to the following API:
 
 ```
@@ -48,4 +52,4 @@ user like so:
       "msc3967": false
    }
 }
-```
+```

docs/development/contributing_guide.md

@@ -449,9 +449,9 @@ For example, a fix in PR #1234 would have its changelog entry in
 > The security levels of Florbs are now validated when received
 > via the `/federation/florb` endpoint. Contributed by Jane Matrix.
 
-If there are multiple pull requests involved in a single bugfix/feature/etc, then the
-content for each `changelog.d` file and file extension should be the same. Towncrier
-will merge the matching files together into a single changelog entry when we come to
+If there are multiple pull requests involved in a single bugfix/feature/etc,
+then the content for each `changelog.d` file should be the same. Towncrier will
+merge the matching files together into a single changelog entry when we come to
 release.
 
 ### How do I know what to call the changelog file before I create the PR?

docs/element_logo_white_bg.svg

@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="41.440346mm"
-   height="10.383124mm"
-   viewBox="0 0 41.440346 10.383125"
-   version="1.1"
-   id="svg1"
-   xml:space="preserve"
-   sodipodi:docname="element_logo_white_bg.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
-     id="namedview1"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="mm"
-     showgrid="false"
-     inkscape:export-bgcolor="#ffffffff" /><defs
-     id="defs1" /><g
-     id="layer1"
-     transform="translate(-84.803844,-143.2075)"
-     inkscape:export-filename="element_logo_white_bg.svg"
-     inkscape:export-xdpi="96"
-     inkscape:export-ydpi="96"><g
-       style="fill:none"
-       id="g1"
-       transform="matrix(0.26458333,0,0,0.26458333,85.841658,144.26667)"><rect
-         style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.31041;stroke-dasharray:none;stroke-opacity:1"
-         id="rect20"
-         width="155.31451"
-         height="37.932892"
-         x="-3.2672384"
-         y="-3.3479743"
-         rx="3.3718522"
-         ry="3.7915266"
-         transform="translate(-2.1259843e-6)"
-         inkscape:label="rect20"
-         inkscape:export-filename="rect20.svg"
-         inkscape:export-xdpi="96"
-         inkscape:export-ydpi="96" /><path
-         fill-rule="evenodd"
-         clip-rule="evenodd"
-         d="M 16,32 C 24.8366,32 32,24.8366 32,16 32,7.16344 24.8366,0 16,0 7.16344,0 0,7.16344 0,16 0,24.8366 7.16344,32 16,32 Z"
-         fill="#0dbd8b"
-         id="path1" /><path
-         fill-rule="evenodd"
-         clip-rule="evenodd"
-         d="m 13.0756,7.455 c 0,-0.64584 0.5247,-1.1694 1.1719,-1.1694 4.3864,0 7.9423,3.54853 7.9423,7.9259 0,0.6458 -0.5246,1.1694 -1.1718,1.1694 -0.6472,0 -1.1719,-0.5236 -1.1719,-1.1694 0,-3.0857 -2.5066,-5.58711 -5.5986,-5.58711 -0.6472,0 -1.1719,-0.52355 -1.1719,-1.16939 z"
-         fill="#ffffff"
-         id="path2" /><path
-         fill-rule="evenodd"
-         clip-rule="evenodd"
-         d="m 24.5424,13.042 c 0.6472,0 1.1719,0.5235 1.1719,1.1694 0,4.3773 -3.5559,7.9258 -7.9424,7.9258 -0.6472,0 -1.1718,-0.5235 -1.1718,-1.1693 0,-0.6459 0.5246,-1.1694 1.1718,-1.1694 3.0921,0 5.5987,-2.5015 5.5987,-5.5871 0,-0.6459 0.5247,-1.1694 1.1718,-1.1694 z"
-         fill="#ffffff"
-         id="path3" /><path
-         fill-rule="evenodd"
-         clip-rule="evenodd"
-         d="m 18.9446,24.5446 c 0,0.6459 -0.5247,1.1694 -1.1718,1.1694 -4.3865,0 -7.94239,-3.5485 -7.94239,-7.9258 0,-0.6459 0.52469,-1.1694 1.17179,-1.1694 0.6472,0 1.1719,0.5235 1.1719,1.1694 0,3.0856 2.5066,5.587 5.5987,5.587 0.6471,0 1.1718,0.5236 1.1718,1.1694 z"
-         fill="#ffffff"
-         id="path4" /><path
-         fill-rule="evenodd"
-         clip-rule="evenodd"
-         d="m 7.45823,18.9576 c -0.64718,0 -1.17183,-0.5235 -1.17183,-1.1694 0,-4.3773 3.55591,-7.92581 7.9423,-7.92581 0.6472,0 1.1719,0.52351 1.1719,1.16941 0,0.6458 -0.5247,1.1694 -1.1719,1.1694 -3.092,0 -5.59864,2.5014 -5.59864,5.587 0,0.6459 -0.52465,1.1694 -1.17183,1.1694 z"
-         fill="#ffffff"
-         id="path5" /><path
-         d="M 56.2856,18.1428 H 44.9998 c 0.1334,1.181 0.5619,2.1238 1.2858,2.8286 0.7238,0.6857 1.6761,1.0286 2.8571,1.0286 0.7809,0 1.4857,-0.1905 2.1143,-0.5715 0.6286,-0.3809 1.0762,-0.8952 1.3428,-1.5428 h 3.4286 c -0.4571,1.5047 -1.3143,2.7238 -2.5714,3.6571 -1.2381,0.9143 -2.7048,1.3715 -4.4,1.3715 -2.2095,0 -4,-0.7334 -5.3714,-2.2 -1.3524,-1.4667 -2.0286,-3.3239 -2.0286,-5.5715 0,-2.1905 0.6857,-4.0285 2.0571,-5.5143 1.3715,-1.4857 3.1429,-2.22853 5.3143,-2.22853 2.1714,0 3.9238,0.73333 5.2572,2.20003 1.3523,1.4476 2.0285,3.2762 2.0285,5.4857 z m -7.2572,-5.9714 c -1.0667,0 -1.9524,0.3143 -2.6571,0.9429 -0.7048,0.6285 -1.1429,1.4666 -1.3143,2.5142 h 7.8857 c -0.1524,-1.0476 -0.5714,-1.8857 -1.2571,-2.5142 -0.6858,-0.6286 -1.5715,-0.9429 -2.6572,-0.9429 z"
-         fill="#000000"
-         id="path6" /><path
-         d="M 58.6539,20.1428 V 3.14282 h 3.4 V 20.2 c 0,0.7619 0.419,1.1428 1.2571,1.1428 l 0.6,-0.0285 v 3.2285 c -0.3238,0.0572 -0.6667,0.0857 -1.0286,0.0857 -1.4666,0 -2.5428,-0.3714 -3.2285,-1.1142 -0.6667,-0.7429 -1,-1.8667 -1,-3.3715 z"
-         fill="#000000"
-         id="path7" /><path
-         d="M 79.7454,18.1428 H 68.4597 c 0.1333,1.181 0.5619,2.1238 1.2857,2.8286 0.7238,0.6857 1.6762,1.0286 2.8571,1.0286 0.781,0 1.4857,-0.1905 2.1143,-0.5715 0.6286,-0.3809 1.0762,-0.8952 1.3429,-1.5428 h 3.4285 c -0.4571,1.5047 -1.3143,2.7238 -2.5714,3.6571 -1.2381,0.9143 -2.7048,1.3715 -4.4,1.3715 -2.2095,0 -4,-0.7334 -5.3714,-2.2 -1.3524,-1.4667 -2.0286,-3.3239 -2.0286,-5.5715 0,-2.1905 0.6857,-4.0285 2.0571,-5.5143 1.3715,-1.4857 3.1429,-2.22853 5.3143,-2.22853 2.1715,0 3.9238,0.73333 5.2572,2.20003 1.3524,1.4476 2.0285,3.2762 2.0285,5.4857 z m -7.2572,-5.9714 c -1.0666,0 -1.9524,0.3143 -2.6571,0.9429 -0.7048,0.6285 -1.1429,1.4666 -1.3143,2.5142 h 7.8857 c -0.1524,-1.0476 -0.5714,-1.8857 -1.2571,-2.5142 -0.6857,-0.6286 -1.5715,-0.9429 -2.6572,-0.9429 z"
-         fill="#000000"
-         id="path8" /><path
-         d="m 95.0851,16.0571 v 8.5143 h -3.4 v -8.8857 c 0,-2.2476 -0.9333,-3.3714 -2.8,-3.3714 -1.0095,0 -1.819,0.3238 -2.4286,0.9714 -0.5904,0.6476 -0.8857,1.5333 -0.8857,2.6571 v 8.6286 h -3.4 V 9.74282 h 3.1429 v 1.97148 c 0.3619,-0.6667 0.9143,-1.2191 1.6571,-1.6572 0.7429,-0.43809 1.6667,-0.65713 2.7714,-0.65713 2.0572,0 3.5429,0.78093 4.4572,2.34283 1.2571,-1.5619 2.9333,-2.34283 5.0286,-2.34283 1.733,0 3.067,0.54285 4,1.62853 0.933,1.0667 1.4,2.4762 1.4,4.2286 v 9.3143 h -3.4 v -8.8857 c 0,-2.2476 -0.933,-3.3714 -2.8,-3.3714 -1.0286,0 -1.8477,0.3333 -2.4572,1 -0.5905,0.6476 -0.8857,1.5619 -0.8857,2.7428 z"
-         fill="#000000"
-         id="path9" /><path
-         d="m 121.537,18.1428 h -11.286 c 0.133,1.181 0.562,2.1238 1.286,2.8286 0.723,0.6857 1.676,1.0286 2.857,1.0286 0.781,0 1.486,-0.1905 2.114,-0.5715 0.629,-0.3809 1.076,-0.8952 1.343,-1.5428 h 3.429 c -0.458,1.5047 -1.315,2.7238 -2.572,3.6571 -1.238,0.9143 -2.705,1.3715 -4.4,1.3715 -2.209,0 -4,-0.7334 -5.371,-2.2 -1.353,-1.4667 -2.029,-3.3239 -2.029,-5.5715 0,-2.1905 0.686,-4.0285 2.057,-5.5143 1.372,-1.4857 3.143,-2.22853 5.315,-2.22853 2.171,0 3.923,0.73333 5.257,2.20003 1.352,1.4476 2.028,3.2762 2.028,5.4857 z m -7.257,-5.9714 c -1.067,0 -1.953,0.3143 -2.658,0.9429 -0.704,0.6285 -1.142,1.4666 -1.314,2.5142 h 7.886 c -0.153,-1.0476 -0.572,-1.8857 -1.257,-2.5142 -0.686,-0.6286 -1.572,-0.9429 -2.657,-0.9429 z"
-         fill="#000000"
-         id="path10" /><path
-         d="m 127.105,9.74282 v 1.97148 c 0.343,-0.6477 0.905,-1.1905 1.686,-1.6286 0.8,-0.45716 1.762,-0.68573 2.885,-0.68573 1.753,0 3.105,0.53333 4.058,1.60003 0.971,1.0666 1.457,2.4857 1.457,4.2571 v 9.3143 h -3.4 v -8.8857 c 0,-1.0476 -0.248,-1.8667 -0.743,-2.4572 -0.476,-0.6095 -1.21,-0.9142 -2.2,-0.9142 -1.086,0 -1.943,0.3238 -2.572,0.9714 -0.609,0.6476 -0.914,1.5428 -0.914,2.6857 v 8.6 h -3.4 V 9.74282 Z"
-         fill="#000000"
-         id="path11" /><path
-         d="m 147.12,21.5428 v 2.9429 c -0.419,0.1143 -1.009,0.1714 -1.771,0.1714 -2.895,0 -4.343,-1.4571 -4.343,-4.3714 v -7.8286 h -2.257 V 9.74282 h 2.257 V 5.88568 h 3.4 v 3.85714 h 2.772 v 2.71428 h -2.772 v 7.4857 c 0,1.1619 0.552,1.7429 1.657,1.7429 z"
-         fill="#000000"
-         id="path12" /></g></g></svg>

docs/setup/forward_proxy.md

@@ -67,7 +67,7 @@ in Synapse can be deactivated.
 **NOTE**: This has an impact on security and is for testing purposes only!
 
 To deactivate the certificate validation, the following setting must be added to
-your [homeserver.yaml](../usage/configuration/homeserver_sample_config.md).
+your [homserver.yaml](../usage/configuration/homeserver_sample_config.md).
 
 ```yaml
 use_insecure_ssl_client_just_for_testing_do_not_use: true

docs/setup/installation.md

@@ -309,62 +309,7 @@ sudo dnf install libtiff-devel libjpeg-devel libzip-devel freetype-devel \
                  libwebp-devel libxml2-devel libxslt-devel libpq-devel \
                  python3-virtualenv libffi-devel openssl-devel python3-devel \
                  libicu-devel
-sudo dnf group install "Development Tools"
-```
-
-##### Red Hat Enterprise Linux / Rocky Linux
-
-*Note: The term "RHEL" below refers to both Red Hat Enterprise Linux and Rocky Linux. The distributions are 1:1 binary compatible.*
-
-It's recommended to use the latest Python versions. 
-
-RHEL 8 in particular ships with Python 3.6 by default which is EOL and therefore no longer supported by Synapse. RHEL 9 ship with Python 3.9 which is still supported by the Python core team as of this writing. However, newer Python versions provide significant performance improvements and they're available in official distributions' repositories. Therefore it's recommended to use them.
-
-Python 3.11 and 3.12 are available for both RHEL 8 and 9.
-
-These commands should be run as root user.
-
-RHEL 8
-```bash
-# Enable PowerTools repository
-dnf config-manager --set-enabled powertools
-```
-RHEL 9
-```bash
-# Enable CodeReady Linux Builder repository
-crb enable
-```
-
-Install new version of Python. You only need one of these:
-```bash
-# Python 3.11
-dnf install python3.11 python3.11-devel
-```
-```bash
-# Python 3.12
-dnf install python3.12 python3.12-devel
-```
-Finally, install common prerequisites
-```bash
-dnf install libicu libicu-devel libpq5 libpq5-devel lz4 pkgconf 
-dnf group install "Development Tools"
-```
-###### Using venv module instead of virtualenv command
-
-It's recommended to use Python venv module directly rather than the virtualenv command.
-* On RHEL 9, virtualenv is only available on [EPEL](https://docs.fedoraproject.org/en-US/epel/).
-* On RHEL 8, virtualenv is based on Python 3.6. It does not support creating 3.11/3.12 virtual environments.
-
-Here's an example of creating Python 3.12 virtual environment and installing Synapse from PyPI. 
-
-```bash
-mkdir -p ~/synapse
-# To use Python 3.11, simply use the command "python3.11" instead.
-python3.12 -m venv ~/synapse/env
-source ~/synapse/env/bin/activate
-pip install --upgrade pip
-pip install --upgrade setuptools
-pip install matrix-synapse
+sudo dnf groupinstall "Development Tools"
 ```
 
 ##### macOS

docs/upgrade.md

@@ -119,14 +119,13 @@ stacking them up. You can monitor the currently running background updates with
 
 # Upgrading to v1.111.0
 
-## New worker endpoints for authenticated client and federation media
+## New worker endpoints for authenticated client media
 
 [Media repository workers](./workers.md#synapseappmedia_repository) handling
-Media APIs can now handle the following endpoint patterns:
+Media APIs can now handle the following endpoint pattern:
 
 ```
 ^/_matrix/client/v1/media/.*$
-^/_matrix/federation/v1/media/.*$
 ```
 
 Please update your reverse proxy configuration.

docs/usage/configuration/config_documentation.md

@@ -246,7 +246,6 @@ Example configuration:
 ```yaml
 presence:
   enabled: false
-  include_offline_users_on_sync: false
 ```
 
 `enabled` can also be set to a special value of "untracked" which ignores updates
@@ -255,10 +254,6 @@ received via clients and federation, while still accepting updates from the
 
 *The "untracked" option was added in Synapse 1.96.0.*
 
-When clients perform an initial or `full_state` sync, presence results for offline users are
-not included by default. Setting `include_offline_users_on_sync` to `true` will always include
-offline users in the results. Defaults to false.
-
 ---
 ### `require_auth_for_profile_requests`
 
@@ -1868,18 +1863,6 @@ federation_rr_transactions_per_room_per_second: 40
 ## Media Store
 Config options related to Synapse's media store.
 
----
-### `enable_authenticated_media`
-
-When set to true, all subsequent media uploads will be marked as authenticated, and will not be available over legacy
-unauthenticated media endpoints (`/_matrix/media/(r0|v3|v1)/download` and `/_matrix/media/(r0|v3|v1)/thumbnail`) - requests for authenticated media over these endpoints will result in a 404. All media, including authenticated media, will be available over the authenticated media endpoints `_matrix/client/v1/media/download` and `_matrix/client/v1/media/thumbnail`. Media uploaded prior to setting this option to true will still be available over the legacy endpoints. Note if the setting is switched to false
-after enabling, media marked as authenticated will be available over legacy endpoints. Defaults to false, but
-this will change to true in a future Synapse release.
-
-Example configuration:
-```yaml
-enable_authenticated_media: true
-```
 ---
 ### `enable_media_repo`
 
@@ -4151,38 +4134,6 @@ default_power_level_content_override:
    trusted_private_chat: null
    public_chat: null
 ```
-
-The default power levels for each preset are:
-```yaml
-"m.room.name": 50
-"m.room.power_levels": 100
-"m.room.history_visibility": 100
-"m.room.canonical_alias": 50
-"m.room.avatar": 50
-"m.room.tombstone": 100
-"m.room.server_acl": 100
-"m.room.encryption": 100
-```
-
-So a complete example where the default power-levels for a preset are maintained
-but the power level for a new key is set is:
-```yaml
-default_power_level_content_override:
-   private_chat:
-    events:
-      "com.example.foo": 0
-      "m.room.name": 50
-      "m.room.power_levels": 100
-      "m.room.history_visibility": 100
-      "m.room.canonical_alias": 50
-      "m.room.avatar": 50
-      "m.room.tombstone": 100
-      "m.room.server_acl": 100
-      "m.room.encryption": 100
-   trusted_private_chat: null
-   public_chat: null
-```
-
 ---
 ### `forget_rooms_on_leave`
 

docs/workers.md

@@ -740,7 +740,6 @@ Handles the media repository. It can handle all endpoints starting with:
 
     /_matrix/media/
     /_matrix/client/v1/media/
-    /_matrix/federation/v1/media/
 
 ... and the following regular expressions matching media-specific administration APIs:
 

pyproject.toml

@@ -43,7 +43,6 @@ target-version = ['py38', 'py39', 'py310', 'py311']
 [tool.ruff]
 line-length = 88
 
-[tool.ruff.lint]
 # See https://beta.ruff.rs/docs/rules/#error-e
 # for error codes. The ones we ignore are:
 #  E501: Line too long (black enforces this for us)
@@ -97,7 +96,7 @@ module-name = "synapse.synapse_rust"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.112.0"
+version = "1.110.0"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "AGPL-3.0-or-later"
@@ -322,7 +321,7 @@ all = [
 # This helps prevents merge conflicts when running a batch of dependabot updates.
 isort = ">=5.10.1"
 black = ">=22.7.0"
-ruff = "0.5.4"
+ruff = "0.3.7"
 # Type checking only works with the pydantic.v1 compat module from pydantic v2
 pydantic = "^2"
 

scripts-dev/lint.sh

@@ -112,7 +112,7 @@ python3 -m black "${files[@]}"
 
 # Catch any common programming mistakes in Python code.
 # --quiet suppresses the update check.
-ruff check --quiet --fix "${files[@]}"
+ruff --quiet --fix "${files[@]}"
 
 # Catch any common programming mistakes in Rust code.
 #

scripts-dev/release.py

@@ -70,6 +70,7 @@ def cli() -> None:
             pip install -e .[dev]
 
       - A checkout of the sytest repository at ../sytest
+
       - A checkout of the complement repository at ../complement
 
     Then to use:
@@ -115,7 +116,7 @@ def _prepare() -> None:
     sytest_repo = get_repo_and_check_clean_checkout("../sytest", "sytest")
     complement_repo = get_repo_and_check_clean_checkout("../complement", "complement")
 
-    click.secho("Updating Synapse and Sytest git repos...")
+    click.secho("Updating Synapse, Sytest and Complement git repos...")
     synapse_repo.remote().fetch()
     sytest_repo.remote().fetch()
     complement_repo.remote().fetch()
@@ -202,24 +203,28 @@ def _prepare() -> None:
         # release type.
         if current_version.is_prerelease:
             default = release_branch_name
+            complement_default = release_branch_name
         elif release_type == "minor":
             default = "develop"
+            complement_default = "main"
         else:
             default = "master"
+            complement_default = "main"
 
-        branch_name = click.prompt(
+        sy_branch_name = click.prompt(
             "Which branch should the release be based on?", default=default
         )
 
-        for repo_name, repo in {
-            "synapse": synapse_repo,
-            "sytest": sytest_repo,
-            "complement": complement_repo,
-        }.items():
-            # Special case for Complement: `develop` maps to `main`
-            if repo_name == "complement" and branch_name == "develop":
-                branch_name = "main"
+        complement_branch = click.prompt(
+            "Which Complement branch should the release be based on?",
+            default=complement_default,
+        )
 
+        for repo_name, (repo, branch_name) in {
+            "synapse": (synapse_repo, sy_branch_name),
+            "sytest": (sytest_repo, sy_branch_name),
+            "complement": (complement_repo, complement_branch),
+        }.items():
             base_branch = find_ref(repo, branch_name)
             if not base_branch:
                 print(f"Could not find base branch {branch_name} for {repo_name}!")
@@ -241,8 +246,7 @@ def _prepare() -> None:
         # not on subsequent RCs or full releases).
         if click.confirm("Push new SyTest branch?", default=True):
             sytest_repo.git.push("-u", sytest_repo.remote().name, release_branch_name)
-
-        # Same for Complement
+        # The same special case rules apply to Complement.
         if click.confirm("Push new Complement branch?", default=True):
             complement_repo.git.push(
                 "-u", complement_repo.remote().name, release_branch_name

synapse/_scripts/generate_workers_map.py

@@ -44,7 +44,7 @@ logger = logging.getLogger("generate_workers_map")
 
 
 class MockHomeserver(HomeServer):
-    DATASTORE_CLASS = DataStore
+    DATASTORE_CLASS = DataStore  # type: ignore
 
     def __init__(self, config: HomeServerConfig, worker_app: Optional[str]) -> None:
         super().__init__(config.server.server_name, config=config)

synapse/_scripts/synapse_port_db.py

@@ -119,19 +119,18 @@ BOOLEAN_COLUMNS = {
     "e2e_room_keys": ["is_verified"],
     "event_edges": ["is_state"],
     "events": ["processed", "outlier", "contains_url"],
-    "local_media_repository": ["safe_from_quarantine", "authenticated"],
-    "per_user_experimental_features": ["enabled"],
+    "local_media_repository": ["safe_from_quarantine"],
     "presence_list": ["accepted"],
     "presence_stream": ["currently_active"],
     "public_room_list_stream": ["visibility"],
     "pushers": ["enabled"],
     "redactions": ["have_censored"],
-    "remote_media_cache": ["authenticated"],
     "room_stats_state": ["is_federatable"],
     "rooms": ["is_public", "has_auth_chain_index"],
     "users": ["shadow_banned", "approved", "locked", "suspended"],
     "un_partial_stated_event_stream": ["rejection_status_changed"],
     "users_who_share_rooms": ["share_private"],
+    "per_user_experimental_features": ["enabled"],
 }
 
 

synapse/_scripts/update_synapse_database.py

@@ -41,7 +41,7 @@ logger = logging.getLogger("update_database")
 
 
 class MockHomeserver(HomeServer):
-    DATASTORE_CLASS = DataStore
+    DATASTORE_CLASS = DataStore  # type: ignore [assignment]
 
     def __init__(self, config: HomeServerConfig):
         super().__init__(

synapse/api/auth/__init__.py

@@ -18,7 +18,7 @@
 # [This file includes modifications made by New Vector Limited]
 #
 #
-from typing import TYPE_CHECKING, Optional, Tuple
+from typing import Optional, Tuple
 
 from typing_extensions import Protocol
 
@@ -28,9 +28,6 @@ from synapse.appservice import ApplicationService
 from synapse.http.site import SynapseRequest
 from synapse.types import Requester
 
-if TYPE_CHECKING:
-    from synapse.rest.admin.experimental_features import ExperimentalFeature
-
 # guests always get this device id.
 GUEST_DEVICE_ID = "guest_device"
 
@@ -90,19 +87,6 @@ class Auth(Protocol):
             AuthError if access is denied for the user in the access token
         """
 
-    async def get_user_by_req_experimental_feature(
-        self,
-        request: SynapseRequest,
-        feature: "ExperimentalFeature",
-        allow_guest: bool = False,
-        allow_expired: bool = False,
-        allow_locked: bool = False,
-    ) -> Requester:
-        """Like `get_user_by_req`, except also checks if the user has access to
-        the experimental feature. If they don't returns a 404 unrecognized
-        request.
-        """
-
     async def validate_appservice_can_control_user_id(
         self, app_service: ApplicationService, user_id: str
     ) -> None:

synapse/api/auth/internal.py

@@ -28,7 +28,6 @@ from synapse.api.errors import (
     Codes,
     InvalidClientTokenError,
     MissingClientTokenError,
-    UnrecognizedRequestError,
 )
 from synapse.http.site import SynapseRequest
 from synapse.logging.opentracing import active_span, force_tracing, start_active_span
@@ -39,10 +38,8 @@ from . import GUEST_DEVICE_ID
 from .base import BaseAuth
 
 if TYPE_CHECKING:
-    from synapse.rest.admin.experimental_features import ExperimentalFeature
     from synapse.server import HomeServer
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -109,32 +106,6 @@ class InternalAuth(BaseAuth):
                     parent_span.set_tag("appservice_id", requester.app_service.id)
             return requester
 
-    async def get_user_by_req_experimental_feature(
-        self,
-        request: SynapseRequest,
-        feature: "ExperimentalFeature",
-        allow_guest: bool = False,
-        allow_expired: bool = False,
-        allow_locked: bool = False,
-    ) -> Requester:
-        try:
-            requester = await self.get_user_by_req(
-                request,
-                allow_guest=allow_guest,
-                allow_expired=allow_expired,
-                allow_locked=allow_locked,
-            )
-            if await self.store.is_feature_enabled(requester.user.to_string(), feature):
-                return requester
-
-            raise UnrecognizedRequestError(code=404)
-        except (AuthError, InvalidClientTokenError):
-            if feature.is_globally_enabled(self.hs.config):
-                # If its globally enabled then return the auth error
-                raise
-
-            raise UnrecognizedRequestError(code=404)
-
     @cancellable
     async def _wrapped_get_user_by_req(
         self,

synapse/api/auth/msc3861_delegated.py

@@ -40,7 +40,6 @@ from synapse.api.errors import (
     OAuthInsufficientScopeError,
     StoreError,
     SynapseError,
-    UnrecognizedRequestError,
 )
 from synapse.http.site import SynapseRequest
 from synapse.logging.context import make_deferred_yieldable
@@ -49,7 +48,6 @@ from synapse.util import json_decoder
 from synapse.util.caches.cached_call import RetryOnExceptionCachedCall
 
 if TYPE_CHECKING:
-    from synapse.rest.admin.experimental_features import ExperimentalFeature
     from synapse.server import HomeServer
 
 logger = logging.getLogger(__name__)
@@ -145,18 +143,6 @@ class MSC3861DelegatedAuth(BaseAuth):
         # metadata.validate_introspection_endpoint()
         return metadata
 
-    async def _introspection_endpoint(self) -> str:
-        """
-        Returns the introspection endpoint of the issuer
-
-        It uses the config option if set, otherwise it will use OIDC discovery to get it
-        """
-        if self._config.introspection_endpoint is not None:
-            return self._config.introspection_endpoint
-
-        metadata = await self._load_metadata()
-        return metadata.get("introspection_endpoint")
-
     async def _introspect_token(self, token: str) -> IntrospectionToken:
         """
         Send a token to the introspection endpoint and returns the introspection response
@@ -173,7 +159,8 @@ class MSC3861DelegatedAuth(BaseAuth):
         Returns:
             The introspection response
         """
-        introspection_endpoint = await self._introspection_endpoint()
+        metadata = await self._issuer_metadata.get()
+        introspection_endpoint = metadata.get("introspection_endpoint")
         raw_headers: Dict[str, str] = {
             "Content-Type": "application/x-www-form-urlencoded",
             "User-Agent": str(self._http_client.user_agent, "utf-8"),
@@ -258,32 +245,6 @@ class MSC3861DelegatedAuth(BaseAuth):
 
         return requester
 
-    async def get_user_by_req_experimental_feature(
-        self,
-        request: SynapseRequest,
-        feature: "ExperimentalFeature",
-        allow_guest: bool = False,
-        allow_expired: bool = False,
-        allow_locked: bool = False,
-    ) -> Requester:
-        try:
-            requester = await self.get_user_by_req(
-                request,
-                allow_guest=allow_guest,
-                allow_expired=allow_expired,
-                allow_locked=allow_locked,
-            )
-            if await self.store.is_feature_enabled(requester.user.to_string(), feature):
-                return requester
-
-            raise UnrecognizedRequestError(code=404)
-        except (AuthError, InvalidClientTokenError):
-            if feature.is_globally_enabled(self.hs.config):
-                # If its globally enabled then return the auth error
-                raise
-
-            raise UnrecognizedRequestError(code=404)
-
     async def get_user_by_access_token(
         self,
         token: str,

synapse/api/constants.py

@@ -50,7 +50,7 @@ class Membership:
     KNOCK: Final = "knock"
     LEAVE: Final = "leave"
     BAN: Final = "ban"
-    LIST: Final = frozenset((INVITE, JOIN, KNOCK, LEAVE, BAN))
+    LIST: Final = {INVITE, JOIN, KNOCK, LEAVE, BAN}
 
 
 class PresenceState:
@@ -128,13 +128,9 @@ class EventTypes:
     SpaceParent: Final = "m.space.parent"
 
     Reaction: Final = "m.reaction"
-    Sticker: Final = "m.sticker"
-    LiveLocationShareStart: Final = "m.beacon_info"
 
     CallInvite: Final = "m.call.invite"
 
-    PollStart: Final = "m.poll.start"
-
 
 class ToDeviceEventTypes:
     RoomKeyRequest: Final = "m.room_key_request"

synapse/api/ratelimiting.py

@@ -236,8 +236,9 @@ class Ratelimiter:
             requester: The requester that is doing the action, if any.
             key: An arbitrary key used to classify an action. Defaults to the
                 requester's user ID.
-            n_actions: The number of times the user performed the action. May be negative
-                to "refund" the rate limit.
+            n_actions: The number of times the user wants to do this action. If the user
+                cannot do all of the actions, the user's action count is not incremented
+                at all.
             _time_now_s: The current time. Optional, defaults to the current time according
                 to self.clock. Only used by tests.
         """

synapse/app/admin_cmd.py

@@ -110,7 +110,7 @@ class AdminCmdStore(
 
 
 class AdminCmdServer(HomeServer):
-    DATASTORE_CLASS = AdminCmdStore
+    DATASTORE_CLASS = AdminCmdStore  # type: ignore
 
 
 async def export_data_command(hs: HomeServer, args: argparse.Namespace) -> None:

synapse/app/generic_worker.py

@@ -74,9 +74,6 @@ from synapse.storage.databases.main.event_push_actions import (
     EventPushActionsWorkerStore,
 )
 from synapse.storage.databases.main.events_worker import EventsWorkerStore
-from synapse.storage.databases.main.experimental_features import (
-    ExperimentalFeaturesStore,
-)
 from synapse.storage.databases.main.filtering import FilteringWorkerStore
 from synapse.storage.databases.main.keys import KeyStore
 from synapse.storage.databases.main.lock import LockStore
@@ -158,7 +155,6 @@ class GenericWorkerStore(
     LockStore,
     SessionStore,
     TaskSchedulerWorkerStore,
-    ExperimentalFeaturesStore,
 ):
     # Properties that multiple storage classes define. Tell mypy what the
     # expected type is.
@@ -167,7 +163,7 @@ class GenericWorkerStore(
 
 
 class GenericWorkerServer(HomeServer):
-    DATASTORE_CLASS = GenericWorkerStore
+    DATASTORE_CLASS = GenericWorkerStore  # type: ignore
 
     def _listen_http(self, listener_config: ListenerConfig) -> None:
         assert listener_config.http_options is not None

synapse/app/homeserver.py

@@ -81,7 +81,7 @@ def gz_wrap(r: Resource) -> Resource:
 
 
 class SynapseHomeServer(HomeServer):
-    DATASTORE_CLASS = DataStore
+    DATASTORE_CLASS = DataStore  # type: ignore
 
     def _listener_http(
         self,
@@ -217,7 +217,7 @@ class SynapseHomeServer(HomeServer):
             )
 
         if name in ["media", "federation", "client"]:
-            if self.config.media.can_load_media_repo:
+            if self.config.server.enable_media_repo:
                 media_repo = self.get_media_repository_resource()
                 resources.update(
                     {

synapse/config/experimental.py

@@ -140,12 +140,6 @@ class MSC3861:
                 ("experimental", "msc3861", "client_auth_method"),
             )
 
-    introspection_endpoint: Optional[str] = attr.ib(
-        default=None,
-        validator=attr.validators.optional(attr.validators.instance_of(str)),
-    )
-    """The URL of the introspection endpoint used to validate access tokens."""
-
     account_management_url: Optional[str] = attr.ib(
         default=None,
         validator=attr.validators.optional(attr.validators.instance_of(str)),
@@ -443,6 +437,10 @@ class ExperimentalConfig(Config):
             "msc3823_account_suspension", False
         )
 
+        self.msc3916_authenticated_media_enabled = experimental.get(
+            "msc3916_authenticated_media_enabled", False
+        )
+
         # MSC4151: Report room API (Client-Server API)
         self.msc4151_enabled: bool = experimental.get("msc4151_enabled", False)
 

synapse/config/repository.py

@@ -126,7 +126,7 @@ class ContentRepositoryConfig(Config):
         # Only enable the media repo if either the media repo is enabled or the
         # current worker app is the media repo.
         if (
-            config.get("enable_media_repo", True) is False
+            self.root.server.enable_media_repo is False
             and config.get("worker_app") != "synapse.app.media_repository"
         ):
             self.can_load_media_repo = False
@@ -272,10 +272,6 @@ class ContentRepositoryConfig(Config):
                 remote_media_lifetime
             )
 
-        self.enable_authenticated_media = config.get(
-            "enable_authenticated_media", False
-        )
-
     def generate_config_section(self, data_dir_path: str, **kwargs: Any) -> str:
         assert data_dir_path is not None
         media_store = os.path.join(data_dir_path, "media_store")

synapse/config/server.py

@@ -384,11 +384,6 @@ class ServerConfig(Config):
         # Whether to internally track presence, requires that presence is enabled,
         self.track_presence = self.presence_enabled and presence_enabled != "untracked"
 
-        # Determines if presence results for offline users are included on initial/full sync
-        self.presence_include_offline_users_on_sync = presence_config.get(
-            "include_offline_users_on_sync", False
-        )
-
         # Custom presence router module
         # This is the legacy way of configuring it (the config should now be put in the modules section)
         self.presence_router_module_class = None
@@ -400,6 +395,12 @@ class ServerConfig(Config):
                 self.presence_router_config,
             ) = load_module(presence_router_config, ("presence", "presence_router"))
 
+        # whether to enable the media repository endpoints. This should be set
+        # to false if the media repository is running as a separate endpoint;
+        # doing so ensures that we will not run cache cleanup jobs on the
+        # master, potentially causing inconsistency.
+        self.enable_media_repo = config.get("enable_media_repo", True)
+
         # Whether to require authentication to retrieve profile data (avatars,
         # display names) of other users through the client API.
         self.require_auth_for_profile_requests = config.get(

synapse/federation/sender/per_destination_queue.py

@@ -338,11 +338,12 @@ class PerDestinationQueue:
                     # not caught up yet
                     return
 
+            pending_pdus = []
             while True:
                 self._new_data_to_send = False
 
                 async with _TransactionQueueManager(self) as (
-                    pending_pdus,  # noqa: F811
+                    pending_pdus,
                     pending_edus,
                 ):
                     if not pending_pdus and not pending_edus:

synapse/federation/transport/server/__init__.py

@@ -33,7 +33,6 @@ from synapse.federation.transport.server.federation import (
     FEDERATION_SERVLET_CLASSES,
     FederationAccountStatusServlet,
     FederationMediaDownloadServlet,
-    FederationMediaThumbnailServlet,
     FederationUnstableClientKeysClaimServlet,
 )
 from synapse.http.server import HttpServer, JsonResource
@@ -317,11 +316,8 @@ def register_servlets(
             ):
                 continue
 
-            if (
-                servletclass == FederationMediaDownloadServlet
-                or servletclass == FederationMediaThumbnailServlet
-            ):
-                if not hs.config.media.can_load_media_repo:
+            if servletclass == FederationMediaDownloadServlet:
+                if not hs.config.server.enable_media_repo:
                     continue
 
             servletclass(

synapse/federation/transport/server/_base.py

@@ -363,8 +363,6 @@ class BaseFederationServlet:
                             if (
                                 func.__self__.__class__.__name__  # type: ignore
                                 == "FederationMediaDownloadServlet"
-                                or func.__self__.__class__.__name__  # type: ignore
-                                == "FederationMediaThumbnailServlet"
                             ):
                                 response = await func(
                                     origin, content, request, *args, **kwargs
@@ -377,8 +375,6 @@ class BaseFederationServlet:
                         if (
                             func.__self__.__class__.__name__  # type: ignore
                             == "FederationMediaDownloadServlet"
-                            or func.__self__.__class__.__name__  # type: ignore
-                            == "FederationMediaThumbnailServlet"
                         ):
                             response = await func(
                                 origin, content, request, *args, **kwargs

synapse/federation/transport/server/federation.py

@@ -46,13 +46,11 @@ from synapse.http.servlet import (
     parse_boolean_from_args,
     parse_integer,
     parse_integer_from_args,
-    parse_string,
     parse_string_from_args,
     parse_strings_from_args,
 )
 from synapse.http.site import SynapseRequest
 from synapse.media._base import DEFAULT_MAX_TIMEOUT_MS, MAXIMUM_ALLOWED_MAX_TIMEOUT_MS
-from synapse.media.thumbnailer import ThumbnailProvider
 from synapse.types import JsonDict
 from synapse.util import SYNAPSE_VERSION
 from synapse.util.ratelimitutils import FederationRateLimiter
@@ -828,59 +826,6 @@ class FederationMediaDownloadServlet(BaseFederationServerServlet):
         )
 
 
-class FederationMediaThumbnailServlet(BaseFederationServerServlet):
-    """
-    Implementation of new federation media `/thumbnail` endpoint outlined in MSC3916. Returns
-    a multipart/mixed response consisting of a JSON object and the requested media
-    item. This endpoint only returns local media.
-    """
-
-    PATH = "/media/thumbnail/(?P<media_id>[^/]*)"
-    RATELIMIT = True
-
-    def __init__(
-        self,
-        hs: "HomeServer",
-        ratelimiter: FederationRateLimiter,
-        authenticator: Authenticator,
-        server_name: str,
-    ):
-        super().__init__(hs, authenticator, ratelimiter, server_name)
-        self.media_repo = self.hs.get_media_repository()
-        self.dynamic_thumbnails = hs.config.media.dynamic_thumbnails
-        self.thumbnail_provider = ThumbnailProvider(
-            hs, self.media_repo, self.media_repo.media_storage
-        )
-
-    async def on_GET(
-        self,
-        origin: Optional[str],
-        content: Literal[None],
-        request: SynapseRequest,
-        media_id: str,
-    ) -> None:
-
-        width = parse_integer(request, "width", required=True)
-        height = parse_integer(request, "height", required=True)
-        method = parse_string(request, "method", "scale")
-        # TODO Parse the Accept header to get an prioritised list of thumbnail types.
-        m_type = "image/png"
-        max_timeout_ms = parse_integer(
-            request, "timeout_ms", default=DEFAULT_MAX_TIMEOUT_MS
-        )
-        max_timeout_ms = min(max_timeout_ms, MAXIMUM_ALLOWED_MAX_TIMEOUT_MS)
-
-        if self.dynamic_thumbnails:
-            await self.thumbnail_provider.select_or_generate_local_thumbnail(
-                request, media_id, width, height, method, m_type, max_timeout_ms, True
-            )
-        else:
-            await self.thumbnail_provider.respond_local_thumbnail(
-                request, media_id, width, height, method, m_type, max_timeout_ms, True
-            )
-        self.media_repo.mark_recently_accessed(None, media_id)
-
-
 FEDERATION_SERVLET_CLASSES: Tuple[Type[BaseFederationServlet], ...] = (
     FederationSendServlet,
     FederationEventServlet,
@@ -913,5 +858,4 @@ FEDERATION_SERVLET_CLASSES: Tuple[Type[BaseFederationServlet], ...] = (
     FederationMakeKnockServlet,
     FederationAccountStatusServlet,
     FederationMediaDownloadServlet,
-    FederationMediaThumbnailServlet,
 )

synapse/handlers/deactivate_account.py

@@ -283,10 +283,6 @@ class DeactivateAccountHandler:
                     ratelimit=False,
                     require_consent=False,
                 )
-
-                # Mark the room forgotten too, because they won't be able to do this
-                # for us. This may lead to the room being purged eventually.
-                await self._room_member_handler.forget(user, room_id)
             except Exception:
                 logger.exception(
                     "Failed to part user %r from room %r: ignoring and continuing",

synapse/handlers/device.py

@@ -39,7 +39,6 @@ from synapse.metrics.background_process_metrics import (
 )
 from synapse.storage.databases.main.client_ips import DeviceLastConnectionInfo
 from synapse.types import (
-    DeviceListUpdates,
     JsonDict,
     JsonMapping,
     ScheduledTask,
@@ -215,7 +214,7 @@ class DeviceWorkerHandler:
     @cancellable
     async def get_user_ids_changed(
         self, user_id: str, from_token: StreamToken
-    ) -> DeviceListUpdates:
+    ) -> JsonDict:
         """Get list of users that have had the devices updated, or have newly
         joined a room, that `user_id` may be interested in.
         """
@@ -342,19 +341,11 @@ class DeviceWorkerHandler:
             possibly_joined = set()
             possibly_left = set()
 
-        device_list_updates = DeviceListUpdates(
-            changed=possibly_joined,
-            left=possibly_left,
-        )
+        result = {"changed": list(possibly_joined), "left": list(possibly_left)}
 
-        log_kv(
-            {
-                "changed": device_list_updates.changed,
-                "left": device_list_updates.left,
-            }
-        )
+        log_kv(result)
 
-        return device_list_updates
+        return result
 
     async def on_federation_query_user_devices(self, user_id: str) -> JsonDict:
         if not self.hs.is_mine(UserID.from_string(user_id)):

synapse/handlers/e2e_room_keys.py

@@ -34,7 +34,7 @@ from synapse.api.errors import (
 from synapse.logging.opentracing import log_kv, trace
 from synapse.storage.databases.main.e2e_room_keys import RoomKey
 from synapse.types import JsonDict
-from synapse.util.async_helpers import ReadWriteLock
+from synapse.util.async_helpers import Linearizer
 
 if TYPE_CHECKING:
     from synapse.server import HomeServer
@@ -58,7 +58,7 @@ class E2eRoomKeysHandler:
         # clients belonging to a user will receive and try to upload a new session at
         # roughly the same time.  Also used to lock out uploads when the key is being
         # changed.
-        self._upload_lock = ReadWriteLock()
+        self._upload_linearizer = Linearizer("upload_room_keys_lock")
 
     @trace
     async def get_room_keys(
@@ -89,7 +89,7 @@ class E2eRoomKeysHandler:
 
         # we deliberately take the lock to get keys so that changing the version
         # works atomically
-        async with self._upload_lock.read(user_id):
+        async with self._upload_linearizer.queue(user_id):
             # make sure the backup version exists
             try:
                 await self.store.get_e2e_room_keys_version_info(user_id, version)
@@ -132,7 +132,7 @@ class E2eRoomKeysHandler:
         """
 
         # lock for consistency with uploading
-        async with self._upload_lock.write(user_id):
+        async with self._upload_linearizer.queue(user_id):
             # make sure the backup version exists
             try:
                 version_info = await self.store.get_e2e_room_keys_version_info(
@@ -193,7 +193,7 @@ class E2eRoomKeysHandler:
         # TODO: Validate the JSON to make sure it has the right keys.
 
         # XXX: perhaps we should use a finer grained lock here?
-        async with self._upload_lock.write(user_id):
+        async with self._upload_linearizer.queue(user_id):
             # Check that the version we're trying to upload is the current version
             try:
                 version_info = await self.store.get_e2e_room_keys_version_info(user_id)
@@ -355,7 +355,7 @@ class E2eRoomKeysHandler:
         # TODO: Validate the JSON to make sure it has the right keys.
 
         # lock everyone out until we've switched version
-        async with self._upload_lock.write(user_id):
+        async with self._upload_linearizer.queue(user_id):
             new_version = await self.store.create_e2e_room_keys_version(
                 user_id, version_info
             )
@@ -382,7 +382,7 @@ class E2eRoomKeysHandler:
         }
         """
 
-        async with self._upload_lock.read(user_id):
+        async with self._upload_linearizer.queue(user_id):
             try:
                 res = await self.store.get_e2e_room_keys_version_info(user_id, version)
             except StoreError as e:
@@ -407,7 +407,7 @@ class E2eRoomKeysHandler:
             NotFoundError: if this backup version doesn't exist
         """
 
-        async with self._upload_lock.write(user_id):
+        async with self._upload_linearizer.queue(user_id):
             try:
                 await self.store.delete_e2e_room_keys_version(user_id, version)
             except StoreError as e:
@@ -437,7 +437,7 @@ class E2eRoomKeysHandler:
             raise SynapseError(
                 400, "Version in body does not match", Codes.INVALID_PARAM
             )
-        async with self._upload_lock.write(user_id):
+        async with self._upload_linearizer.queue(user_id):
             try:
                 old_info = await self.store.get_e2e_room_keys_version_info(
                     user_id, version

synapse/handlers/room.py

@@ -1188,8 +1188,6 @@ class RoomCreationHandler:
             )
             events_to_send.append((power_event, power_context))
         else:
-            # Please update the docs for `default_power_level_content_override` when
-            # updating the `events` dict below
             power_level_content: JsonDict = {
                 "users": {creator_id: 100},
                 "users_default": 0,

synapse/handlers/sync.py

@@ -1352,7 +1352,7 @@ class SyncHandler:
             await_full_state = True
             lazy_load_members = False
 
-        state_at_timeline_end = await self._state_storage_controller.get_state_ids_at(
+        state_at_timeline_end = await self._state_storage_controller.get_state_at(
             room_id,
             stream_position=end_token,
             state_filter=state_filter,
@@ -1480,13 +1480,11 @@ class SyncHandler:
         else:
             # We can get here if the user has ignored the senders of all
             # the recent events.
-            state_at_timeline_start = (
-                await self._state_storage_controller.get_state_ids_at(
-                    room_id,
-                    stream_position=end_token,
-                    state_filter=state_filter,
-                    await_full_state=await_full_state,
-                )
+            state_at_timeline_start = await self._state_storage_controller.get_state_at(
+                room_id,
+                stream_position=end_token,
+                state_filter=state_filter,
+                await_full_state=await_full_state,
             )
 
         if batch.limited:
@@ -1504,14 +1502,14 @@ class SyncHandler:
             # about them).
             state_filter = StateFilter.all()
 
-        state_at_previous_sync = await self._state_storage_controller.get_state_ids_at(
+        state_at_previous_sync = await self._state_storage_controller.get_state_at(
             room_id,
             stream_position=since_token,
             state_filter=state_filter,
             await_full_state=await_full_state,
         )
 
-        state_at_timeline_end = await self._state_storage_controller.get_state_ids_at(
+        state_at_timeline_end = await self._state_storage_controller.get_state_at(
             room_id,
             stream_position=end_token,
             state_filter=state_filter,
@@ -2270,11 +2268,7 @@ class SyncHandler:
             user=user,
             from_key=presence_key,
             is_guest=sync_config.is_guest,
-            include_offline=(
-                True
-                if self.hs_config.server.presence_include_offline_users_on_sync
-                else include_offline
-            ),
+            include_offline=include_offline,
         )
         assert presence_key
         sync_result_builder.now_token = now_token.copy_and_replace(
@@ -2514,7 +2508,7 @@ class SyncHandler:
                 continue
 
             if room_id in sync_result_builder.joined_room_ids or has_join:
-                old_state_ids = await self._state_storage_controller.get_state_ids_at(
+                old_state_ids = await self._state_storage_controller.get_state_at(
                     room_id,
                     since_token,
                     state_filter=StateFilter.from_types([(EventTypes.Member, user_id)]),
@@ -2545,7 +2539,7 @@ class SyncHandler:
                 else:
                     if not old_state_ids:
                         old_state_ids = (
-                            await self._state_storage_controller.get_state_ids_at(
+                            await self._state_storage_controller.get_state_at(
                                 room_id,
                                 since_token,
                                 state_filter=StateFilter.from_types(

synapse/http/matrixfederationclient.py

@@ -90,7 +90,7 @@ from synapse.logging.context import make_deferred_yieldable, run_in_background
 from synapse.logging.opentracing import set_tag, start_active_span, tags
 from synapse.types import JsonDict
 from synapse.util import json_decoder
-from synapse.util.async_helpers import AwakenableSleeper, Linearizer, timeout_deferred
+from synapse.util.async_helpers import AwakenableSleeper, timeout_deferred
 from synapse.util.metrics import Measure
 from synapse.util.stringutils import parse_and_validate_server_name
 
@@ -475,8 +475,6 @@ class MatrixFederationHttpClient:
             use_proxy=True,
         )
 
-        self.remote_download_linearizer = Linearizer("remote_download_linearizer", 6)
-
     def wake_destination(self, destination: str) -> None:
         """Called when the remote server may have come back online."""
 
@@ -1488,44 +1486,35 @@ class MatrixFederationHttpClient:
         )
 
         headers = dict(response.headers.getAllRawHeaders())
-        expected_size = response.length
 
+        expected_size = response.length
+        # if we don't get an expected length then use the max length
         if expected_size == UNKNOWN_LENGTH:
             expected_size = max_size
-        else:
-            if int(expected_size) > max_size:
-                msg = "Requested file is too large > %r bytes" % (max_size,)
-                logger.warning(
-                    "{%s} [%s] %s",
-                    request.txn_id,
-                    request.destination,
-                    msg,
-                )
-                raise SynapseError(HTTPStatus.BAD_GATEWAY, msg, Codes.TOO_LARGE)
-
-            read_body, _ = await download_ratelimiter.can_do_action(
-                requester=None,
-                key=ip_address,
-                n_actions=expected_size,
+            logger.debug(
+                f"File size unknown, assuming file is max allowable size: {max_size}"
             )
-            if not read_body:
-                msg = "Requested file size exceeds ratelimits"
-                logger.warning(
-                    "{%s} [%s] %s",
-                    request.txn_id,
-                    request.destination,
-                    msg,
-                )
-                raise SynapseError(
-                    HTTPStatus.TOO_MANY_REQUESTS, msg, Codes.LIMIT_EXCEEDED
-                )
+
+        read_body, _ = await download_ratelimiter.can_do_action(
+            requester=None,
+            key=ip_address,
+            n_actions=expected_size,
+        )
+        if not read_body:
+            msg = "Requested file size exceeds ratelimits"
+            logger.warning(
+                "{%s} [%s] %s",
+                request.txn_id,
+                request.destination,
+                msg,
+            )
+            raise SynapseError(HTTPStatus.TOO_MANY_REQUESTS, msg, Codes.LIMIT_EXCEEDED)
 
         try:
-            async with self.remote_download_linearizer.queue(ip_address):
-                # add a byte of headroom to max size as function errs at >=
-                d = read_body_with_max_size(response, output_stream, expected_size + 1)
-                d.addTimeout(self.default_timeout_seconds, self.reactor)
-                length = await make_deferred_yieldable(d)
+            # add a byte of headroom to max size as function errs at >=
+            d = read_body_with_max_size(response, output_stream, expected_size + 1)
+            d.addTimeout(self.default_timeout_seconds, self.reactor)
+            length = await make_deferred_yieldable(d)
         except BodyExceededMaxSize:
             msg = "Requested file is too large > %r bytes" % (expected_size,)
             logger.warning(
@@ -1571,13 +1560,6 @@ class MatrixFederationHttpClient:
             request.method,
             request.uri.decode("ascii"),
         )
-
-        # if we didn't know the length upfront, decrement the actual size from ratelimiter
-        if response.length == UNKNOWN_LENGTH:
-            download_ratelimiter.record_action(
-                requester=None, key=ip_address, n_actions=length
-            )
-
         return length, headers
 
     async def federation_get_file(
@@ -1648,37 +1630,29 @@ class MatrixFederationHttpClient:
         )
 
         headers = dict(response.headers.getAllRawHeaders())
-        expected_size = response.length
 
+        expected_size = response.length
+        # if we don't get an expected length then use the max length
         if expected_size == UNKNOWN_LENGTH:
             expected_size = max_size
-        else:
-            if int(expected_size) > max_size:
-                msg = "Requested file is too large > %r bytes" % (max_size,)
-                logger.warning(
-                    "{%s} [%s] %s",
-                    request.txn_id,
-                    request.destination,
-                    msg,
-                )
-                raise SynapseError(HTTPStatus.BAD_GATEWAY, msg, Codes.TOO_LARGE)
-
-            read_body, _ = await download_ratelimiter.can_do_action(
-                requester=None,
-                key=ip_address,
-                n_actions=expected_size,
+            logger.debug(
+                f"File size unknown, assuming file is max allowable size: {max_size}"
             )
-            if not read_body:
-                msg = "Requested file size exceeds ratelimits"
-                logger.warning(
-                    "{%s} [%s] %s",
-                    request.txn_id,
-                    request.destination,
-                    msg,
-                )
-                raise SynapseError(
-                    HTTPStatus.TOO_MANY_REQUESTS, msg, Codes.LIMIT_EXCEEDED
-                )
+
+        read_body, _ = await download_ratelimiter.can_do_action(
+            requester=None,
+            key=ip_address,
+            n_actions=expected_size,
+        )
+        if not read_body:
+            msg = "Requested file size exceeds ratelimits"
+            logger.warning(
+                "{%s} [%s] %s",
+                request.txn_id,
+                request.destination,
+                msg,
+            )
+            raise SynapseError(HTTPStatus.TOO_MANY_REQUESTS, msg, Codes.LIMIT_EXCEEDED)
 
         # this should be a multipart/mixed response with the boundary string in the header
         try:
@@ -1698,12 +1672,11 @@ class MatrixFederationHttpClient:
             raise SynapseError(HTTPStatus.BAD_GATEWAY, msg)
 
         try:
-            async with self.remote_download_linearizer.queue(ip_address):
-                # add a byte of headroom to max size as `_MultipartParserProtocol.dataReceived` errs at >=
-                deferred = read_multipart_response(
-                    response, output_stream, boundary, expected_size + 1
-                )
-                deferred.addTimeout(self.default_timeout_seconds, self.reactor)
+            # add a byte of headroom to max size as `_MultipartParserProtocol.dataReceived` errs at >=
+            deferred = read_multipart_response(
+                response, output_stream, boundary, expected_size + 1
+            )
+            deferred.addTimeout(self.default_timeout_seconds, self.reactor)
         except BodyExceededMaxSize:
             msg = "Requested file is too large > %r bytes" % (expected_size,)
             logger.warning(
@@ -1770,13 +1743,6 @@ class MatrixFederationHttpClient:
             request.method,
             request.uri.decode("ascii"),
         )
-
-        # if we didn't know the length upfront, decrement the actual size from ratelimiter
-        if response.length == UNKNOWN_LENGTH:
-            download_ratelimiter.record_action(
-                requester=None, key=ip_address, n_actions=length
-            )
-
         return length, headers, multipart_response.json
 
 

synapse/http/proxy.py

@@ -62,15 +62,6 @@ HOP_BY_HOP_HEADERS = {
     "Upgrade",
 }
 
-if hasattr(Headers, "_canonicalNameCaps"):
-    # Twisted < 24.7.0rc1
-    _canonicalHeaderName = Headers()._canonicalNameCaps  # type: ignore[attr-defined]
-else:
-    # Twisted >= 24.7.0rc1
-    # But note that `_encodeName` still exists on prior versions,
-    # it just encodes differently
-    _canonicalHeaderName = Headers()._encodeName
-
 
 def parse_connection_header_value(
     connection_header_value: Optional[bytes],
@@ -94,10 +85,11 @@ def parse_connection_header_value(
         The set of header names that should not be copied over from the remote response.
         The keys are capitalized in canonical capitalization.
     """
+    headers = Headers()
     extra_headers_to_remove: Set[str] = set()
     if connection_header_value:
         extra_headers_to_remove = {
-            _canonicalHeaderName(connection_option.strip()).decode("ascii")
+            headers._canonicalNameCaps(connection_option.strip()).decode("ascii")
             for connection_option in connection_header_value.split(b",")
         }
 

synapse/http/server.py

@@ -74,7 +74,6 @@ from synapse.api.errors import (
 from synapse.config.homeserver import HomeServerConfig
 from synapse.logging.context import defer_to_thread, preserve_fn, run_in_background
 from synapse.logging.opentracing import active_span, start_active_span, trace_servlet
-from synapse.types import ISynapseReactor
 from synapse.util import json_encoder
 from synapse.util.caches import intern_dict
 from synapse.util.cancellation import is_function_cancellable
@@ -869,8 +868,7 @@ async def _async_write_json_to_request_in_thread(
 
     with start_active_span("encode_json_response"):
         span = active_span()
-        reactor: ISynapseReactor = request.reactor  # type: ignore
-        json_str = await defer_to_thread(reactor, encode, span)
+        json_str = await defer_to_thread(request.reactor, encode, span)
 
     _write_bytes_to_request(request, json_str)
 

synapse/http/site.py

@@ -683,7 +683,7 @@ class SynapseSite(ProxySite):
         self.access_logger = logging.getLogger(logger_name)
         self.server_version_string = server_version_string.encode("ascii")
 
-    def log(self, request: SynapseRequest) -> None:  # type: ignore[override]
+    def log(self, request: SynapseRequest) -> None:
         pass
 
 

synapse/media/media_repository.py

@@ -430,7 +430,6 @@ class MediaRepository:
         media_id: str,
         name: Optional[str],
         max_timeout_ms: int,
-        allow_authenticated: bool = True,
         federation: bool = False,
     ) -> None:
         """Responds to requests for local media, if exists, or returns 404.
@@ -443,7 +442,6 @@ class MediaRepository:
                 the filename in the Content-Disposition header of the response.
             max_timeout_ms: the maximum number of milliseconds to wait for the
                 media to be uploaded.
-            allow_authenticated: whether media marked as authenticated may be served to this request
             federation: whether the local media being fetched is for a federation request
 
         Returns:
@@ -453,10 +451,6 @@ class MediaRepository:
         if not media_info:
             return
 
-        if self.hs.config.media.enable_authenticated_media and not allow_authenticated:
-            if media_info.authenticated:
-                raise NotFoundError()
-
         self.mark_recently_accessed(None, media_id)
 
         media_type = media_info.media_type
@@ -487,7 +481,6 @@ class MediaRepository:
         max_timeout_ms: int,
         ip_address: str,
         use_federation_endpoint: bool,
-        allow_authenticated: bool = True,
     ) -> None:
         """Respond to requests for remote media.
 
@@ -502,8 +495,6 @@ class MediaRepository:
             ip_address: the IP address of the requester
             use_federation_endpoint: whether to request the remote media over the new
                 federation `/download` endpoint
-            allow_authenticated: whether media marked as authenticated may be served to this
-                request
 
         Returns:
             Resolves once a response has successfully been written to request
@@ -535,7 +526,6 @@ class MediaRepository:
                 self.download_ratelimiter,
                 ip_address,
                 use_federation_endpoint,
-                allow_authenticated,
             )
 
         # We deliberately stream the file outside the lock
@@ -552,13 +542,7 @@ class MediaRepository:
             respond_404(request)
 
     async def get_remote_media_info(
-        self,
-        server_name: str,
-        media_id: str,
-        max_timeout_ms: int,
-        ip_address: str,
-        use_federation: bool,
-        allow_authenticated: bool,
+        self, server_name: str, media_id: str, max_timeout_ms: int, ip_address: str
     ) -> RemoteMedia:
         """Gets the media info associated with the remote file, downloading
         if necessary.
@@ -569,10 +553,6 @@ class MediaRepository:
             max_timeout_ms: the maximum number of milliseconds to wait for the
                 media to be uploaded.
             ip_address: IP address of the requester
-            use_federation: if a download is necessary, whether to request the remote file
-                over the federation `/download` endpoint
-            allow_authenticated: whether media marked as authenticated may be served to this
-                request
 
         Returns:
             The media info of the file
@@ -593,8 +573,7 @@ class MediaRepository:
                 max_timeout_ms,
                 self.download_ratelimiter,
                 ip_address,
-                use_federation,
-                allow_authenticated,
+                False,
             )
 
         # Ensure we actually use the responder so that it releases resources
@@ -612,7 +591,6 @@ class MediaRepository:
         download_ratelimiter: Ratelimiter,
         ip_address: str,
         use_federation_endpoint: bool,
-        allow_authenticated: bool,
     ) -> Tuple[Optional[Responder], RemoteMedia]:
         """Looks for media in local cache, if not there then attempt to
         download from remote server.
@@ -634,11 +612,6 @@ class MediaRepository:
         """
         media_info = await self.store.get_cached_remote_media(server_name, media_id)
 
-        if self.hs.config.media.enable_authenticated_media and not allow_authenticated:
-            # if it isn't cached then don't fetch it or if it's authenticated then don't serve it
-            if not media_info or media_info.authenticated:
-                raise NotFoundError()
-
         # file_id is the ID we use to track the file locally. If we've already
         # seen the file then reuse the existing ID, otherwise generate a new
         # one.
@@ -812,11 +785,6 @@ class MediaRepository:
 
         logger.info("Stored remote media in file %r", fname)
 
-        if self.hs.config.media.enable_authenticated_media:
-            authenticated = True
-        else:
-            authenticated = False
-
         return RemoteMedia(
             media_origin=server_name,
             media_id=media_id,
@@ -827,7 +795,6 @@ class MediaRepository:
             filesystem_id=file_id,
             last_access_ts=time_now_ms,
             quarantined_by=None,
-            authenticated=authenticated,
         )
 
     async def _federation_download_remote_file(
@@ -941,11 +908,6 @@ class MediaRepository:
 
         logger.debug("Stored remote media in file %r", fname)
 
-        if self.hs.config.media.enable_authenticated_media:
-            authenticated = True
-        else:
-            authenticated = False
-
         return RemoteMedia(
             media_origin=server_name,
             media_id=media_id,
@@ -956,7 +918,6 @@ class MediaRepository:
             filesystem_id=file_id,
             last_access_ts=time_now_ms,
             quarantined_by=None,
-            authenticated=authenticated,
         )
 
     def _get_thumbnail_requirements(
@@ -1062,12 +1023,7 @@ class MediaRepository:
             t_len = os.path.getsize(output_path)
 
             await self.store.store_local_thumbnail(
-                media_id,
-                t_width,
-                t_height,
-                t_type,
-                t_method,
-                t_len,
+                media_id, t_width, t_height, t_type, t_method, t_len
             )
 
             return output_path

synapse/media/thumbnailer.py

@@ -26,7 +26,7 @@ from typing import TYPE_CHECKING, List, Optional, Tuple, Type
 
 from PIL import Image
 
-from synapse.api.errors import Codes, NotFoundError, SynapseError, cs_error
+from synapse.api.errors import Codes, SynapseError, cs_error
 from synapse.config.repository import THUMBNAIL_SUPPORTED_MEDIA_FORMAT_MAP
 from synapse.http.server import respond_with_json
 from synapse.http.site import SynapseRequest
@@ -36,11 +36,9 @@ from synapse.media._base import (
     ThumbnailInfo,
     respond_404,
     respond_with_file,
-    respond_with_multipart_responder,
     respond_with_responder,
 )
-from synapse.media.media_storage import FileResponder, MediaStorage
-from synapse.storage.databases.main.media_repository import LocalMedia
+from synapse.media.media_storage import MediaStorage
 
 if TYPE_CHECKING:
     from synapse.media.media_repository import MediaRepository
@@ -273,8 +271,6 @@ class ThumbnailProvider:
         method: str,
         m_type: str,
         max_timeout_ms: int,
-        for_federation: bool,
-        allow_authenticated: bool = True,
     ) -> None:
         media_info = await self.media_repo.get_local_media_info(
             request, media_id, max_timeout_ms
@@ -282,12 +278,6 @@ class ThumbnailProvider:
         if not media_info:
             return
 
-        # if the media the thumbnail is generated from is authenticated, don't serve the
-        # thumbnail over an unauthenticated endpoint
-        if self.hs.config.media.enable_authenticated_media and not allow_authenticated:
-            if media_info.authenticated:
-                raise NotFoundError()
-
         thumbnail_infos = await self.store.get_local_media_thumbnails(media_id)
         await self._select_and_respond_with_thumbnail(
             request,
@@ -300,8 +290,6 @@ class ThumbnailProvider:
             media_id,
             url_cache=bool(media_info.url_cache),
             server_name=None,
-            for_federation=for_federation,
-            media_info=media_info,
         )
 
     async def select_or_generate_local_thumbnail(
@@ -313,21 +301,14 @@ class ThumbnailProvider:
         desired_method: str,
         desired_type: str,
         max_timeout_ms: int,
-        for_federation: bool,
-        allow_authenticated: bool = True,
     ) -> None:
         media_info = await self.media_repo.get_local_media_info(
             request, media_id, max_timeout_ms
         )
+
         if not media_info:
             return
 
-        # if the media the thumbnail is generated from is authenticated, don't serve the
-        # thumbnail over an unauthenticated endpoint
-        if self.hs.config.media.enable_authenticated_media and not allow_authenticated:
-            if media_info.authenticated:
-                raise NotFoundError()
-
         thumbnail_infos = await self.store.get_local_media_thumbnails(media_id)
         for info in thumbnail_infos:
             t_w = info.width == desired_width
@@ -345,16 +326,10 @@ class ThumbnailProvider:
 
                 responder = await self.media_storage.fetch_media(file_info)
                 if responder:
-                    if for_federation:
-                        await respond_with_multipart_responder(
-                            self.hs.get_clock(), request, responder, media_info
-                        )
-                        return
-                    else:
-                        await respond_with_responder(
-                            request, responder, info.type, info.length
-                        )
-                        return
+                    await respond_with_responder(
+                        request, responder, info.type, info.length
+                    )
+                    return
 
         logger.debug("We don't have a thumbnail of that size. Generating")
 
@@ -369,15 +344,7 @@ class ThumbnailProvider:
         )
 
         if file_path:
-            if for_federation:
-                await respond_with_multipart_responder(
-                    self.hs.get_clock(),
-                    request,
-                    FileResponder(open(file_path, "rb")),
-                    media_info,
-                )
-            else:
-                await respond_with_file(request, desired_type, file_path)
+            await respond_with_file(request, desired_type, file_path)
         else:
             logger.warning("Failed to generate thumbnail")
             raise SynapseError(400, "Failed to generate thumbnail.")
@@ -393,28 +360,14 @@ class ThumbnailProvider:
         desired_type: str,
         max_timeout_ms: int,
         ip_address: str,
-        use_federation: bool,
-        allow_authenticated: bool = True,
     ) -> None:
         media_info = await self.media_repo.get_remote_media_info(
-            server_name,
-            media_id,
-            max_timeout_ms,
-            ip_address,
-            use_federation,
-            allow_authenticated,
+            server_name, media_id, max_timeout_ms, ip_address
         )
         if not media_info:
             respond_404(request)
             return
 
-        # if the media the thumbnail is generated from is authenticated, don't serve the
-        # thumbnail over an unauthenticated endpoint
-        if self.hs.config.media.enable_authenticated_media and not allow_authenticated:
-            if media_info.authenticated:
-                respond_404(request)
-                return
-
         thumbnail_infos = await self.store.get_remote_media_thumbnails(
             server_name, media_id
         )
@@ -471,29 +424,16 @@ class ThumbnailProvider:
         m_type: str,
         max_timeout_ms: int,
         ip_address: str,
-        use_federation: bool,
-        allow_authenticated: bool = True,
     ) -> None:
         # TODO: Don't download the whole remote file
         # We should proxy the thumbnail from the remote server instead of
         # downloading the remote file and generating our own thumbnails.
         media_info = await self.media_repo.get_remote_media_info(
-            server_name,
-            media_id,
-            max_timeout_ms,
-            ip_address,
-            use_federation,
-            allow_authenticated,
+            server_name, media_id, max_timeout_ms, ip_address
         )
         if not media_info:
             return
 
-        # if the media the thumbnail is generated from is authenticated, don't serve the
-        # thumbnail over an unauthenticated endpoint
-        if self.hs.config.media.enable_authenticated_media and not allow_authenticated:
-            if media_info.authenticated:
-                raise NotFoundError()
-
         thumbnail_infos = await self.store.get_remote_media_thumbnails(
             server_name, media_id
         )
@@ -508,7 +448,6 @@ class ThumbnailProvider:
             media_info.filesystem_id,
             url_cache=False,
             server_name=server_name,
-            for_federation=False,
         )
 
     async def _select_and_respond_with_thumbnail(
@@ -522,8 +461,6 @@ class ThumbnailProvider:
         media_id: str,
         file_id: str,
         url_cache: bool,
-        for_federation: bool,
-        media_info: Optional[LocalMedia] = None,
         server_name: Optional[str] = None,
     ) -> None:
         """
@@ -539,8 +476,6 @@ class ThumbnailProvider:
             file_id: The ID of the media that a thumbnail is being requested for.
             url_cache: True if this is from a URL cache.
             server_name: The server name, if this is a remote thumbnail.
-            for_federation: whether the request is from the federation /thumbnail request
-            media_info: metadata about the media being requested.
         """
         logger.debug(
             "_select_and_respond_with_thumbnail: media_id=%s desired=%sx%s (%s) thumbnail_infos=%s",
@@ -576,20 +511,13 @@ class ThumbnailProvider:
 
             responder = await self.media_storage.fetch_media(file_info)
             if responder:
-                if for_federation:
-                    assert media_info is not None
-                    await respond_with_multipart_responder(
-                        self.hs.get_clock(), request, responder, media_info
-                    )
-                    return
-                else:
-                    await respond_with_responder(
-                        request,
-                        responder,
-                        file_info.thumbnail.type,
-                        file_info.thumbnail.length,
-                    )
-                    return
+                await respond_with_responder(
+                    request,
+                    responder,
+                    file_info.thumbnail.type,
+                    file_info.thumbnail.length,
+                )
+                return
 
             # If we can't find the thumbnail we regenerate it. This can happen
             # if e.g. we've deleted the thumbnails but still have the original
@@ -630,18 +558,12 @@ class ThumbnailProvider:
                 )
 
             responder = await self.media_storage.fetch_media(file_info)
-            if for_federation:
-                assert media_info is not None
-                await respond_with_multipart_responder(
-                    self.hs.get_clock(), request, responder, media_info
-                )
-            else:
-                await respond_with_responder(
-                    request,
-                    responder,
-                    file_info.thumbnail.type,
-                    file_info.thumbnail.length,
-                )
+            await respond_with_responder(
+                request,
+                responder,
+                file_info.thumbnail.type,
+                file_info.thumbnail.length,
+            )
         else:
             # This might be because:
             # 1. We can't create thumbnails for the given media (corrupted or

synapse/notifier.py

@@ -773,7 +773,6 @@ class Notifier:
         stream_token = await self.event_sources.bound_future_token(stream_token)
 
         start = self.clock.time_msec()
-        logged = False
         while True:
             current_token = self.event_sources.get_current_token()
             if stream_token.is_before_or_eq(current_token):
@@ -784,13 +783,11 @@ class Notifier:
             if now - start > 10_000:
                 return False
 
-            if not logged:
-                logger.info(
-                    "Waiting for current token to reach %s; currently at %s",
-                    stream_token,
-                    current_token,
-                )
-                logged = True
+            logger.info(
+                "Waiting for current token to reach %s; currently at %s",
+                stream_token,
+                current_token,
+            )
 
             # TODO: be better
             await self.clock.sleep(0.5)

synapse/rest/__init__.py

@@ -145,7 +145,7 @@ class ClientRestResource(JsonResource):
         password_policy.register_servlets(hs, client_resource)
         knock.register_servlets(hs, client_resource)
         appservice_ping.register_servlets(hs, client_resource)
-        if hs.config.media.can_load_media_repo:
+        if hs.config.server.enable_media_repo:
             from synapse.rest.client import media
 
             media.register_servlets(hs, client_resource)

synapse/rest/admin/experimental_features.py

@@ -31,9 +31,7 @@ from synapse.rest.admin import admin_patterns, assert_requester_is_admin
 from synapse.types import JsonDict, UserID
 
 if TYPE_CHECKING:
-    from typing_extensions import assert_never
-
-    from synapse.server import HomeServer, HomeServerConfig
+    from synapse.server import HomeServer
 
 
 class ExperimentalFeature(str, Enum):
@@ -41,16 +39,8 @@ class ExperimentalFeature(str, Enum):
     Currently supported per-user features
     """
 
+    MSC3026 = "msc3026"
     MSC3881 = "msc3881"
-    MSC3575 = "msc3575"
-
-    def is_globally_enabled(self, config: "HomeServerConfig") -> bool:
-        if self is ExperimentalFeature.MSC3881:
-            return config.experimental.msc3881_enabled
-        if self is ExperimentalFeature.MSC3575:
-            return config.experimental.msc3575_enabled
-
-        assert_never(self)
 
 
 class ExperimentalFeaturesRestServlet(RestServlet):

synapse/rest/client/keys.py

@@ -256,15 +256,9 @@ class KeyChangesServlet(RestServlet):
 
         user_id = requester.user.to_string()
 
-        device_list_updates = await self.device_handler.get_user_ids_changed(
-            user_id, from_token
-        )
+        results = await self.device_handler.get_user_ids_changed(user_id, from_token)
 
-        response: JsonDict = {}
-        response["changed"] = list(device_list_updates.changed)
-        response["left"] = list(device_list_updates.left)
-
-        return 200, response
+        return 200, results
 
 
 class OneTimeKeyServlet(RestServlet):

synapse/rest/client/media.py

@@ -47,7 +47,7 @@ from synapse.util.stringutils import parse_and_validate_server_name
 logger = logging.getLogger(__name__)
 
 
-class PreviewURLServlet(RestServlet):
+class UnstablePreviewURLServlet(RestServlet):
     """
     Same as `GET /_matrix/media/r0/preview_url`, this endpoint provides a generic preview API
     for URLs which outputs Open Graph (https://ogp.me/) responses (with some Matrix
@@ -65,7 +65,9 @@ class PreviewURLServlet(RestServlet):
       * Matrix cannot be used to distribute the metadata between homeservers.
     """
 
-    PATTERNS = [re.compile(r"^/_matrix/client/v1/media/preview_url$")]
+    PATTERNS = [
+        re.compile(r"^/_matrix/client/unstable/org.matrix.msc3916/media/preview_url$")
+    ]
 
     def __init__(
         self,
@@ -93,8 +95,10 @@ class PreviewURLServlet(RestServlet):
         respond_with_json_bytes(request, 200, og, send_cors=True)
 
 
-class MediaConfigResource(RestServlet):
-    PATTERNS = [re.compile(r"^/_matrix/client/v1/media/config$")]
+class UnstableMediaConfigResource(RestServlet):
+    PATTERNS = [
+        re.compile(r"^/_matrix/client/unstable/org.matrix.msc3916/media/config$")
+    ]
 
     def __init__(self, hs: "HomeServer"):
         super().__init__()
@@ -108,10 +112,10 @@ class MediaConfigResource(RestServlet):
         respond_with_json(request, 200, self.limits_dict, send_cors=True)
 
 
-class ThumbnailResource(RestServlet):
+class UnstableThumbnailResource(RestServlet):
     PATTERNS = [
         re.compile(
-            "/_matrix/client/v1/media/thumbnail/(?P<server_name>[^/]*)/(?P<media_id>[^/]*)$"
+            "/_matrix/client/unstable/org.matrix.msc3916/media/thumbnail/(?P<server_name>[^/]*)/(?P<media_id>[^/]*)$"
         )
     ]
 
@@ -155,25 +159,11 @@ class ThumbnailResource(RestServlet):
         if self._is_mine_server_name(server_name):
             if self.dynamic_thumbnails:
                 await self.thumbnailer.select_or_generate_local_thumbnail(
-                    request,
-                    media_id,
-                    width,
-                    height,
-                    method,
-                    m_type,
-                    max_timeout_ms,
-                    False,
+                    request, media_id, width, height, method, m_type, max_timeout_ms
                 )
             else:
                 await self.thumbnailer.respond_local_thumbnail(
-                    request,
-                    media_id,
-                    width,
-                    height,
-                    method,
-                    m_type,
-                    max_timeout_ms,
-                    False,
+                    request, media_id, width, height, method, m_type, max_timeout_ms
                 )
             self.media_repo.mark_recently_accessed(None, media_id)
         else:
@@ -201,7 +191,6 @@ class ThumbnailResource(RestServlet):
                 m_type,
                 max_timeout_ms,
                 ip_address,
-                True,
             )
             self.media_repo.mark_recently_accessed(server_name, media_id)
 
@@ -271,9 +260,11 @@ class DownloadResource(RestServlet):
 def register_servlets(hs: "HomeServer", http_server: HttpServer) -> None:
     media_repo = hs.get_media_repository()
     if hs.config.media.url_preview_enabled:
-        PreviewURLServlet(hs, media_repo, media_repo.media_storage).register(
+        UnstablePreviewURLServlet(hs, media_repo, media_repo.media_storage).register(
             http_server
         )
-    MediaConfigResource(hs).register(http_server)
-    ThumbnailResource(hs, media_repo, media_repo.media_storage).register(http_server)
+    UnstableMediaConfigResource(hs).register(http_server)
+    UnstableThumbnailResource(hs, media_repo, media_repo.media_storage).register(
+        http_server
+    )
     DownloadResource(hs, media_repo).register(http_server)

synapse/rest/client/pusher.py

@@ -32,7 +32,6 @@ from synapse.http.servlet import (
 )
 from synapse.http.site import SynapseRequest
 from synapse.push import PusherConfigException
-from synapse.rest.admin.experimental_features import ExperimentalFeature
 from synapse.rest.client._base import client_patterns
 from synapse.rest.synapse.client.unsubscribe import UnsubscribeResource
 from synapse.types import JsonDict
@@ -50,22 +49,20 @@ class PushersRestServlet(RestServlet):
         super().__init__()
         self.hs = hs
         self.auth = hs.get_auth()
-        self._store = hs.get_datastores().main
+        self._msc3881_enabled = self.hs.config.experimental.msc3881_enabled
 
     async def on_GET(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
         requester = await self.auth.get_user_by_req(request)
-        user_id = requester.user.to_string()
+        user = requester.user
 
-        msc3881_enabled = await self._store.is_feature_enabled(
-            user_id, ExperimentalFeature.MSC3881
+        pushers = await self.hs.get_datastores().main.get_pushers_by_user_id(
+            user.to_string()
         )
 
-        pushers = await self.hs.get_datastores().main.get_pushers_by_user_id(user_id)
-
         pusher_dicts = [p.as_dict() for p in pushers]
 
         for pusher in pusher_dicts:
-            if msc3881_enabled:
+            if self._msc3881_enabled:
                 pusher["org.matrix.msc3881.enabled"] = pusher["enabled"]
                 pusher["org.matrix.msc3881.device_id"] = pusher["device_id"]
             del pusher["enabled"]
@@ -83,15 +80,11 @@ class PushersSetRestServlet(RestServlet):
         self.auth = hs.get_auth()
         self.notifier = hs.get_notifier()
         self.pusher_pool = self.hs.get_pusherpool()
-        self._store = hs.get_datastores().main
+        self._msc3881_enabled = self.hs.config.experimental.msc3881_enabled
 
     async def on_POST(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
         requester = await self.auth.get_user_by_req(request)
-        user_id = requester.user.to_string()
-
-        msc3881_enabled = await self._store.is_feature_enabled(
-            user_id, ExperimentalFeature.MSC3881
-        )
+        user = requester.user
 
         content = parse_json_object_from_request(request)
 
@@ -102,7 +95,7 @@ class PushersSetRestServlet(RestServlet):
             and content["kind"] is None
         ):
             await self.pusher_pool.remove_pusher(
-                content["app_id"], content["pushkey"], user_id=user_id
+                content["app_id"], content["pushkey"], user_id=user.to_string()
             )
             return 200, {}
 
@@ -127,19 +120,19 @@ class PushersSetRestServlet(RestServlet):
             append = content["append"]
 
         enabled = True
-        if msc3881_enabled and "org.matrix.msc3881.enabled" in content:
+        if self._msc3881_enabled and "org.matrix.msc3881.enabled" in content:
             enabled = content["org.matrix.msc3881.enabled"]
 
         if not append:
             await self.pusher_pool.remove_pushers_by_app_id_and_pushkey_not_user(
                 app_id=content["app_id"],
                 pushkey=content["pushkey"],
-                not_user_id=user_id,
+                not_user_id=user.to_string(),
             )
 
         try:
             await self.pusher_pool.add_or_update_pusher(
-                user_id=user_id,
+                user_id=user.to_string(),
                 kind=content["kind"],
                 app_id=content["app_id"],
                 app_display_name=content["app_display_name"],

synapse/rest/client/sync.py

@@ -53,7 +53,6 @@ from synapse.http.servlet import (
 )
 from synapse.http.site import SynapseRequest
 from synapse.logging.opentracing import trace_with_opname
-from synapse.rest.admin.experimental_features import ExperimentalFeature
 from synapse.types import JsonDict, Requester, StreamToken
 from synapse.types.rest.client import SlidingSyncBody
 from synapse.util import json_decoder
@@ -674,9 +673,7 @@ class SlidingSyncE2eeRestServlet(RestServlet):
         )
 
     async def on_GET(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
-        requester = await self.auth.get_user_by_req_experimental_feature(
-            request, allow_guest=True, feature=ExperimentalFeature.MSC3575
-        )
+        requester = await self.auth.get_user_by_req(request, allow_guest=True)
         user = requester.user
         device_id = requester.device_id
 
@@ -876,10 +873,7 @@ class SlidingSyncRestServlet(RestServlet):
         self.event_serializer = hs.get_event_client_serializer()
 
     async def on_POST(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
-        requester = await self.auth.get_user_by_req_experimental_feature(
-            request, allow_guest=True, feature=ExperimentalFeature.MSC3575
-        )
-
+        requester = await self.auth.get_user_by_req(request, allow_guest=True)
         user = requester.user
         device_id = requester.device_id
 
@@ -942,9 +936,7 @@ class SlidingSyncRestServlet(RestServlet):
         response["rooms"] = await self.encode_rooms(
             requester, sliding_sync_result.rooms
         )
-        response["extensions"] = await self.encode_extensions(
-            requester, sliding_sync_result.extensions
-        )
+        response["extensions"] = {}  # TODO: sliding_sync_result.extensions
 
         return response
 
@@ -984,7 +976,6 @@ class SlidingSyncRestServlet(RestServlet):
         serialized_rooms: Dict[str, JsonDict] = {}
         for room_id, room_result in rooms.items():
             serialized_rooms[room_id] = {
-                "bump_stamp": room_result.bump_stamp,
                 "joined_count": room_result.joined_count,
                 "invited_count": room_result.invited_count,
                 "notification_count": room_result.notification_count,
@@ -997,32 +988,16 @@ class SlidingSyncRestServlet(RestServlet):
             if room_result.avatar:
                 serialized_rooms[room_id]["avatar"] = room_result.avatar
 
-            if room_result.heroes is not None and len(room_result.heroes) > 0:
-                serialized_heroes = []
-                for hero in room_result.heroes:
-                    serialized_hero = {
-                        "user_id": hero.user_id,
-                    }
-                    if hero.display_name is not None:
-                        # Not a typo, just how "displayname" is spelled in the spec
-                        serialized_hero["displayname"] = hero.display_name
-
-                    if hero.avatar_url is not None:
-                        serialized_hero["avatar_url"] = hero.avatar_url
-
-                    serialized_heroes.append(serialized_hero)
-                serialized_rooms[room_id]["heroes"] = serialized_heroes
+            if room_result.heroes:
+                serialized_rooms[room_id]["heroes"] = room_result.heroes
 
             # We should only include the `initial` key if it's `True` to save bandwidth.
             # The absense of this flag means `False`.
             if room_result.initial:
                 serialized_rooms[room_id]["initial"] = room_result.initial
 
-            # This will be omitted for invite/knock rooms with `stripped_state`
-            if (
-                room_result.required_state is not None
-                and len(room_result.required_state) > 0
-            ):
+            # This will omitted for invite/knock rooms with `stripped_state`
+            if room_result.required_state is not None:
                 serialized_required_state = (
                     await self.event_serializer.serialize_events(
                         room_result.required_state,
@@ -1032,11 +1007,8 @@ class SlidingSyncRestServlet(RestServlet):
                 )
                 serialized_rooms[room_id]["required_state"] = serialized_required_state
 
-            # This will be omitted for invite/knock rooms with `stripped_state`
-            if (
-                room_result.timeline_events is not None
-                and len(room_result.timeline_events) > 0
-            ):
+            # This will omitted for invite/knock rooms with `stripped_state`
+            if room_result.timeline_events is not None:
                 serialized_timeline = await self.event_serializer.serialize_events(
                     room_result.timeline_events,
                     time_now,
@@ -1045,17 +1017,17 @@ class SlidingSyncRestServlet(RestServlet):
                 )
                 serialized_rooms[room_id]["timeline"] = serialized_timeline
 
-            # This will be omitted for invite/knock rooms with `stripped_state`
+            # This will omitted for invite/knock rooms with `stripped_state`
             if room_result.limited is not None:
                 serialized_rooms[room_id]["limited"] = room_result.limited
 
-            # This will be omitted for invite/knock rooms with `stripped_state`
+            # This will omitted for invite/knock rooms with `stripped_state`
             if room_result.prev_batch is not None:
                 serialized_rooms[room_id]["prev_batch"] = (
                     await room_result.prev_batch.to_string(self.store)
                 )
 
-            # This will be omitted for invite/knock rooms with `stripped_state`
+            # This will omitted for invite/knock rooms with `stripped_state`
             if room_result.num_live is not None:
                 serialized_rooms[room_id]["num_live"] = room_result.num_live
 
@@ -1064,10 +1036,7 @@ class SlidingSyncRestServlet(RestServlet):
                 serialized_rooms[room_id]["is_dm"] = room_result.is_dm
 
             # Stripped state only applies to invite/knock rooms
-            if (
-                room_result.stripped_state is not None
-                and len(room_result.stripped_state) > 0
-            ):
+            if room_result.stripped_state is not None:
                 # TODO: `knocked_state` but that isn't specced yet.
                 #
                 # TODO: Instead of adding `knocked_state`, it would be good to rename
@@ -1078,48 +1047,10 @@ class SlidingSyncRestServlet(RestServlet):
 
         return serialized_rooms
 
-    async def encode_extensions(
-        self, requester: Requester, extensions: SlidingSyncResult.Extensions
-    ) -> JsonDict:
-        serialized_extensions: JsonDict = {}
-
-        if extensions.to_device is not None:
-            serialized_extensions["to_device"] = {
-                "next_batch": extensions.to_device.next_batch,
-                "events": extensions.to_device.events,
-            }
-
-        if extensions.e2ee is not None:
-            serialized_extensions["e2ee"] = {
-                # We always include this because
-                # https://github.com/vector-im/element-android/issues/3725. The spec
-                # isn't terribly clear on when this can be omitted and how a client
-                # would tell the difference between "no keys present" and "nothing
-                # changed" in terms of whole field absent / individual key type entry
-                # absent Corresponding synapse issue:
-                # https://github.com/matrix-org/synapse/issues/10456
-                "device_one_time_keys_count": extensions.e2ee.device_one_time_keys_count,
-                # https://github.com/matrix-org/matrix-doc/blob/54255851f642f84a4f1aaf7bc063eebe3d76752b/proposals/2732-olm-fallback-keys.md
-                # states that this field should always be included, as long as the
-                # server supports the feature.
-                "device_unused_fallback_key_types": extensions.e2ee.device_unused_fallback_key_types,
-            }
-
-            if extensions.e2ee.device_list_updates is not None:
-                serialized_extensions["e2ee"]["device_lists"] = {}
-
-                serialized_extensions["e2ee"]["device_lists"]["changed"] = list(
-                    extensions.e2ee.device_list_updates.changed
-                )
-                serialized_extensions["e2ee"]["device_lists"]["left"] = list(
-                    extensions.e2ee.device_list_updates.left
-                )
-
-        return serialized_extensions
-
 
 def register_servlets(hs: "HomeServer", http_server: HttpServer) -> None:
     SyncRestServlet(hs).register(http_server)
 
-    SlidingSyncRestServlet(hs).register(http_server)
-    SlidingSyncE2eeRestServlet(hs).register(http_server)
+    if hs.config.experimental.msc3575_enabled:
+        SlidingSyncRestServlet(hs).register(http_server)
+        SlidingSyncE2eeRestServlet(hs).register(http_server)

synapse/rest/client/versions.py

@@ -25,11 +25,11 @@ import logging
 import re
 from typing import TYPE_CHECKING, Tuple
 
+from twisted.web.server import Request
+
 from synapse.api.constants import RoomCreationPreset
 from synapse.http.server import HttpServer
 from synapse.http.servlet import RestServlet
-from synapse.http.site import SynapseRequest
-from synapse.rest.admin.experimental_features import ExperimentalFeature
 from synapse.types import JsonDict
 
 if TYPE_CHECKING:
@@ -45,8 +45,6 @@ class VersionsRestServlet(RestServlet):
     def __init__(self, hs: "HomeServer"):
         super().__init__()
         self.config = hs.config
-        self.auth = hs.get_auth()
-        self.store = hs.get_datastores().main
 
         # Calculate these once since they shouldn't change after start-up.
         self.e2ee_forced_public = (
@@ -62,22 +60,7 @@ class VersionsRestServlet(RestServlet):
             in self.config.room.encryption_enabled_by_default_for_room_presets
         )
 
-    async def on_GET(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
-        msc3881_enabled = self.config.experimental.msc3881_enabled
-
-        if self.auth.has_access_token(request):
-            requester = await self.auth.get_user_by_req(
-                request,
-                allow_guest=True,
-                allow_locked=True,
-                allow_expired=True,
-            )
-            user_id = requester.user.to_string()
-
-            msc3881_enabled = await self.store.is_feature_enabled(
-                user_id, ExperimentalFeature.MSC3881
-            )
-
+    def on_GET(self, request: Request) -> Tuple[int, JsonDict]:
         return (
             200,
             {
@@ -107,7 +90,6 @@ class VersionsRestServlet(RestServlet):
                     "v1.8",
                     "v1.9",
                     "v1.10",
-                    "v1.11",
                 ],
                 # as per MSC1497:
                 "unstable_features": {
@@ -142,7 +124,7 @@ class VersionsRestServlet(RestServlet):
                     # TODO: this is no longer needed once unstable MSC3882 does not need to be supported:
                     "org.matrix.msc3882": self.config.auth.login_via_existing_enabled,
                     # Adds support for remotely enabling/disabling pushers, as per MSC3881
-                    "org.matrix.msc3881": msc3881_enabled,
+                    "org.matrix.msc3881": self.config.experimental.msc3881_enabled,
                     # Adds support for filtering /messages by event relation.
                     "org.matrix.msc3874": self.config.experimental.msc3874_enabled,
                     # Adds support for simple HTTP rendezvous as per MSC3886

synapse/rest/media/download_resource.py

@@ -84,7 +84,7 @@ class DownloadResource(RestServlet):
 
         if self._is_mine_server_name(server_name):
             await self.media_repo.get_local_media(
-                request, media_id, file_name, max_timeout_ms, allow_authenticated=False
+                request, media_id, file_name, max_timeout_ms
             )
         else:
             allow_remote = parse_boolean(request, "allow_remote", default=True)
@@ -106,5 +106,4 @@ class DownloadResource(RestServlet):
                 max_timeout_ms,
                 ip_address,
                 False,
-                allow_authenticated=False,
             )

synapse/rest/media/thumbnail_resource.py

@@ -88,27 +88,11 @@ class ThumbnailResource(RestServlet):
         if self._is_mine_server_name(server_name):
             if self.dynamic_thumbnails:
                 await self.thumbnail_provider.select_or_generate_local_thumbnail(
-                    request,
-                    media_id,
-                    width,
-                    height,
-                    method,
-                    m_type,
-                    max_timeout_ms,
-                    False,
-                    allow_authenticated=False,
+                    request, media_id, width, height, method, m_type, max_timeout_ms
                 )
             else:
                 await self.thumbnail_provider.respond_local_thumbnail(
-                    request,
-                    media_id,
-                    width,
-                    height,
-                    method,
-                    m_type,
-                    max_timeout_ms,
-                    False,
-                    allow_authenticated=False,
+                    request, media_id, width, height, method, m_type, max_timeout_ms
                 )
             self.media_repo.mark_recently_accessed(None, media_id)
         else:
@@ -136,7 +120,5 @@ class ThumbnailResource(RestServlet):
                 m_type,
                 max_timeout_ms,
                 ip_address,
-                use_federation=False,
-                allow_authenticated=False,
             )
             self.media_repo.mark_recently_accessed(server_name, media_id)

synapse/server.py

@@ -28,7 +28,7 @@
 import abc
 import functools
 import logging
-from typing import TYPE_CHECKING, Callable, Dict, List, Optional, Type, TypeVar, cast
+from typing import TYPE_CHECKING, Callable, Dict, List, Optional, TypeVar, cast
 
 from typing_extensions import TypeAlias
 
@@ -161,7 +161,6 @@ if TYPE_CHECKING:
     from synapse.handlers.jwt import JwtHandler
     from synapse.handlers.oidc import OidcHandler
     from synapse.handlers.saml import SamlHandler
-    from synapse.storage._base import SQLBaseStore
 
 
 # The annotation for `cache_in_self` used to be
@@ -256,13 +255,10 @@ class HomeServer(metaclass=abc.ABCMeta):
         "stats",
     ]
 
-    @property
-    @abc.abstractmethod
-    def DATASTORE_CLASS(self) -> Type["SQLBaseStore"]:
-        # This is overridden in derived application classes
-        # (such as synapse.app.homeserver.SynapseHomeServer) and gives the class to be
-        # instantiated during setup() for future return by get_datastores()
-        pass
+    # This is overridden in derived application classes
+    # (such as synapse.app.homeserver.SynapseHomeServer) and gives the class to be
+    # instantiated during setup() for future return by get_datastores()
+    DATASTORE_CLASS = abc.abstractproperty()
 
     def __init__(
         self,

synapse/storage/_base.py

@@ -119,10 +119,10 @@ class SQLBaseStore(metaclass=ABCMeta):
             self._attempt_to_invalidate_cache(
                 "get_user_in_room_with_profile", (room_id, user_id)
             )
-            self._attempt_to_invalidate_cache("get_rooms_for_user", (user_id,))
             self._attempt_to_invalidate_cache(
-                "_get_rooms_for_local_user_where_membership_is_inner", (user_id,)
+                "get_rooms_for_user_with_stream_ordering", (user_id,)
             )
+            self._attempt_to_invalidate_cache("get_rooms_for_user", (user_id,))
 
         # Purge other caches based on room state.
         self._attempt_to_invalidate_cache("get_room_summary", (room_id,))
@@ -148,10 +148,10 @@ class SQLBaseStore(metaclass=ABCMeta):
         self._attempt_to_invalidate_cache("get_local_users_in_room", (room_id,))
         self._attempt_to_invalidate_cache("does_pair_of_users_share_a_room", None)
         self._attempt_to_invalidate_cache("get_user_in_room_with_profile", None)
-        self._attempt_to_invalidate_cache("get_rooms_for_user", None)
         self._attempt_to_invalidate_cache(
-            "_get_rooms_for_local_user_where_membership_is_inner", None
+            "get_rooms_for_user_with_stream_ordering", None
         )
+        self._attempt_to_invalidate_cache("get_rooms_for_user", None)
         self._attempt_to_invalidate_cache("get_room_summary", (room_id,))
 
     def _attempt_to_invalidate_cache(

synapse/storage/controllers/state.py

@@ -409,7 +409,7 @@ class StateStorageController:
 
         return state_ids
 
-    async def get_state_ids_at(
+    async def get_state_at(
         self,
         room_id: str,
         stream_position: StreamToken,
@@ -460,30 +460,6 @@ class StateStorageController:
             )
         return state
 
-    @trace
-    @tag_args
-    async def get_state_at(
-        self,
-        room_id: str,
-        stream_position: StreamToken,
-        state_filter: Optional[StateFilter] = None,
-        await_full_state: bool = True,
-    ) -> StateMap[EventBase]:
-        """Same as `get_state_ids_at` but also fetches the events"""
-        state_map_ids = await self.get_state_ids_at(
-            room_id, stream_position, state_filter, await_full_state
-        )
-
-        event_map = await self.stores.main.get_events(list(state_map_ids.values()))
-
-        state_map = {}
-        for key, event_id in state_map_ids.items():
-            event = event_map.get(event_id)
-            if event:
-                state_map[key] = event
-
-        return state_map
-
     @trace
     @tag_args
     async def get_state_for_groups(

synapse/storage/databases/main/cache.py

@@ -268,12 +268,16 @@ class CacheInvalidationWorkerStore(SQLBaseStore):
             self._curr_state_delta_stream_cache.entity_has_changed(data.room_id, token)  # type: ignore[attr-defined]
 
             if data.type == EventTypes.Member:
+                self.get_rooms_for_user_with_stream_ordering.invalidate(  # type: ignore[attr-defined]
+                    (data.state_key,)
+                )
                 self.get_rooms_for_user.invalidate((data.state_key,))  # type: ignore[attr-defined]
         elif row.type == EventsStreamAllStateRow.TypeId:
             assert isinstance(data, EventsStreamAllStateRow)
             # Similar to the above, but the entire caches are invalidated. This is
             # unfortunate for the membership caches, but should recover quickly.
             self._curr_state_delta_stream_cache.entity_has_changed(data.room_id, token)  # type: ignore[attr-defined]
+            self.get_rooms_for_user_with_stream_ordering.invalidate_all()  # type: ignore[attr-defined]
             self.get_rooms_for_user.invalidate_all()  # type: ignore[attr-defined]
         else:
             raise Exception("Unknown events stream row type %s" % (row.type,))
@@ -330,10 +334,10 @@ class CacheInvalidationWorkerStore(SQLBaseStore):
             self._attempt_to_invalidate_cache(
                 "get_invited_rooms_for_local_user", (state_key,)
             )
-            self._attempt_to_invalidate_cache("get_rooms_for_user", (state_key,))
             self._attempt_to_invalidate_cache(
-                "_get_rooms_for_local_user_where_membership_is_inner", (state_key,)
+                "get_rooms_for_user_with_stream_ordering", (state_key,)
             )
+            self._attempt_to_invalidate_cache("get_rooms_for_user", (state_key,))
 
             self._attempt_to_invalidate_cache(
                 "did_forget",
@@ -395,10 +399,10 @@ class CacheInvalidationWorkerStore(SQLBaseStore):
         self._attempt_to_invalidate_cache("get_thread_id", None)
         self._attempt_to_invalidate_cache("get_thread_id_for_receipts", None)
         self._attempt_to_invalidate_cache("get_invited_rooms_for_local_user", None)
-        self._attempt_to_invalidate_cache("get_rooms_for_user", None)
         self._attempt_to_invalidate_cache(
-            "_get_rooms_for_local_user_where_membership_is_inner", None
+            "get_rooms_for_user_with_stream_ordering", None
         )
+        self._attempt_to_invalidate_cache("get_rooms_for_user", None)
         self._attempt_to_invalidate_cache("did_forget", None)
         self._attempt_to_invalidate_cache("get_forgotten_rooms_for_user", None)
         self._attempt_to_invalidate_cache("get_references_for_event", None)

synapse/storage/databases/main/event_federation.py

@@ -1313,11 +1313,6 @@ class EventFederationWorkerStore(SignatureWorkerStore, EventsWorkerStore, SQLBas
         # We want to make the cache more effective, so we clamp to the last
         # change before the given ordering.
         last_change = self._events_stream_cache.get_max_pos_of_last_change(room_id)  # type: ignore[attr-defined]
-        if last_change is None:
-            # If the room isn't in the cache we know that the last change was
-            # somewhere before the earliest known position of the cache, so we
-            # can clamp to that.
-            last_change = self._events_stream_cache.get_earliest_known_position()  # type: ignore[attr-defined]
 
         # We don't always have a full stream_to_exterm_id table, e.g. after
         # the upgrade that introduced it, so we make sure we never ask for a

synapse/storage/databases/main/events_worker.py

@@ -1457,8 +1457,7 @@ class EventsWorkerStore(SQLBaseStore):
                 event_dict[event_id] = _EventRow(
                     event_id=event_id,
                     stream_ordering=row[1],
-                    # If instance_name is null we default to "master"
-                    instance_name=row[2] or "master",
+                    instance_name=row[2],
                     internal_metadata=row[3],
                     json=row[4],
                     format_version=row[5],

synapse/storage/databases/main/experimental_features.py

@@ -21,11 +21,7 @@
 
 from typing import TYPE_CHECKING, Dict, FrozenSet, List, Tuple, cast
 
-from synapse.storage.database import (
-    DatabasePool,
-    LoggingDatabaseConnection,
-    LoggingTransaction,
-)
+from synapse.storage.database import DatabasePool, LoggingDatabaseConnection
 from synapse.storage.databases.main import CacheInvalidationWorkerStore
 from synapse.util.caches.descriptors import cached
 
@@ -77,54 +73,12 @@ class ExperimentalFeaturesStore(CacheInvalidationWorkerStore):
             features:
                 pairs of features and True/False for whether the feature should be enabled
         """
+        for feature, enabled in features.items():
+            await self.db_pool.simple_upsert(
+                table="per_user_experimental_features",
+                keyvalues={"feature": feature, "user_id": user},
+                values={"enabled": enabled},
+                insertion_values={"user_id": user, "feature": feature},
+            )
 
-        def set_features_for_user_txn(txn: LoggingTransaction) -> None:
-            for feature, enabled in features.items():
-                self.db_pool.simple_upsert_txn(
-                    txn,
-                    table="per_user_experimental_features",
-                    keyvalues={"feature": feature, "user_id": user},
-                    values={"enabled": enabled},
-                    insertion_values={"user_id": user, "feature": feature},
-                )
-
-                self._invalidate_cache_and_stream(
-                    txn, self.is_feature_enabled, (user, feature)
-                )
-
-            self._invalidate_cache_and_stream(txn, self.list_enabled_features, (user,))
-
-        return await self.db_pool.runInteraction(
-            "set_features_for_user", set_features_for_user_txn
-        )
-
-    @cached()
-    async def is_feature_enabled(
-        self, user_id: str, feature: "ExperimentalFeature"
-    ) -> bool:
-        """
-        Checks to see if a given feature is enabled for the user
-        Args:
-            user_id: the user to be queried on
-            feature: the feature in question
-        Returns:
-                True if the feature is enabled, False if it is not or if the feature was
-                not found.
-        """
-
-        if feature.is_globally_enabled(self.hs.config):
-            return True
-
-        # if it's not enabled globally, check if it is enabled per-user
-        res = await self.db_pool.simple_select_one_onecol(
-            table="per_user_experimental_features",
-            keyvalues={"user_id": user_id, "feature": feature},
-            retcol="enabled",
-            allow_none=True,
-            desc="get_feature_enabled",
-        )
-
-        # None and false are treated the same
-        db_enabled = bool(res)
-
-        return db_enabled
+            await self.invalidate_cache_and_stream("list_enabled_features", (user,))

synapse/storage/databases/main/media_repository.py

@@ -64,7 +64,6 @@ class LocalMedia:
     quarantined_by: Optional[str]
     safe_from_quarantine: bool
     user_id: Optional[str]
-    authenticated: Optional[bool]
 
 
 @attr.s(slots=True, frozen=True, auto_attribs=True)
@@ -78,7 +77,6 @@ class RemoteMedia:
     created_ts: int
     last_access_ts: int
     quarantined_by: Optional[str]
-    authenticated: Optional[bool]
 
 
 @attr.s(slots=True, frozen=True, auto_attribs=True)
@@ -220,7 +218,6 @@ class MediaRepositoryStore(MediaRepositoryBackgroundUpdateStore):
                 "last_access_ts",
                 "safe_from_quarantine",
                 "user_id",
-                "authenticated",
             ),
             allow_none=True,
             desc="get_local_media",
@@ -238,7 +235,6 @@ class MediaRepositoryStore(MediaRepositoryBackgroundUpdateStore):
             last_access_ts=row[6],
             safe_from_quarantine=row[7],
             user_id=row[8],
-            authenticated=row[9],
         )
 
     async def get_local_media_by_user_paginate(
@@ -294,8 +290,7 @@ class MediaRepositoryStore(MediaRepositoryBackgroundUpdateStore):
                     last_access_ts,
                     quarantined_by,
                     safe_from_quarantine,
-                    user_id,
-                    authenticated
+                    user_id
                 FROM local_media_repository
                 WHERE user_id = ?
                 ORDER BY {order_by_column} {order}, media_id ASC
@@ -319,7 +314,6 @@ class MediaRepositoryStore(MediaRepositoryBackgroundUpdateStore):
                     quarantined_by=row[7],
                     safe_from_quarantine=bool(row[8]),
                     user_id=row[9],
-                    authenticated=row[10],
                 )
                 for row in txn
             ]
@@ -423,18 +417,12 @@ class MediaRepositoryStore(MediaRepositoryBackgroundUpdateStore):
         time_now_ms: int,
         user_id: UserID,
     ) -> None:
-        if self.hs.config.media.enable_authenticated_media:
-            authenticated = True
-        else:
-            authenticated = False
-
         await self.db_pool.simple_insert(
             "local_media_repository",
             {
                 "media_id": media_id,
                 "created_ts": time_now_ms,
                 "user_id": user_id.to_string(),
-                "authenticated": authenticated,
             },
             desc="store_local_media_id",
         )
@@ -450,11 +438,6 @@ class MediaRepositoryStore(MediaRepositoryBackgroundUpdateStore):
         user_id: UserID,
         url_cache: Optional[str] = None,
     ) -> None:
-        if self.hs.config.media.enable_authenticated_media:
-            authenticated = True
-        else:
-            authenticated = False
-
         await self.db_pool.simple_insert(
             "local_media_repository",
             {
@@ -465,7 +448,6 @@ class MediaRepositoryStore(MediaRepositoryBackgroundUpdateStore):
                 "media_length": media_length,
                 "user_id": user_id.to_string(),
                 "url_cache": url_cache,
-                "authenticated": authenticated,
             },
             desc="store_local_media",
         )
@@ -656,7 +638,6 @@ class MediaRepositoryStore(MediaRepositoryBackgroundUpdateStore):
                 "filesystem_id",
                 "last_access_ts",
                 "quarantined_by",
-                "authenticated",
             ),
             allow_none=True,
             desc="get_cached_remote_media",
@@ -673,7 +654,6 @@ class MediaRepositoryStore(MediaRepositoryBackgroundUpdateStore):
             filesystem_id=row[4],
             last_access_ts=row[5],
             quarantined_by=row[6],
-            authenticated=row[7],
         )
 
     async def store_cached_remote_media(
@@ -686,11 +666,6 @@ class MediaRepositoryStore(MediaRepositoryBackgroundUpdateStore):
         upload_name: Optional[str],
         filesystem_id: str,
     ) -> None:
-        if self.hs.config.media.enable_authenticated_media:
-            authenticated = True
-        else:
-            authenticated = False
-
         await self.db_pool.simple_insert(
             "remote_media_cache",
             {
@@ -702,7 +677,6 @@ class MediaRepositoryStore(MediaRepositoryBackgroundUpdateStore):
                 "upload_name": upload_name,
                 "filesystem_id": filesystem_id,
                 "last_access_ts": time_now_ms,
-                "authenticated": authenticated,
             },
             desc="store_cached_remote_media",
         )

synapse/storage/databases/main/roommember.py

@@ -50,7 +50,12 @@ from synapse.storage.database import (
 from synapse.storage.databases.main.cache import CacheInvalidationWorkerStore
 from synapse.storage.databases.main.events_worker import EventsWorkerStore
 from synapse.storage.engines import Sqlite3Engine
-from synapse.storage.roommember import MemberSummary, ProfileInfo, RoomsForUser
+from synapse.storage.roommember import (
+    GetRoomsForUserWithStreamOrdering,
+    MemberSummary,
+    ProfileInfo,
+    RoomsForUser,
+)
 from synapse.types import (
     JsonDict,
     PersistedEventPosition,
@@ -279,19 +284,8 @@ class RoomMemberWorkerStore(EventsWorkerStore, CacheInvalidationWorkerStore):
 
     @cached(max_entries=100000)  # type: ignore[synapse-@cached-mutable]
     async def get_room_summary(self, room_id: str) -> Mapping[str, MemberSummary]:
-        """
-        Get the details of a room roughly suitable for use by the room
+        """Get the details of a room roughly suitable for use by the room
         summary extension to /sync. Useful when lazy loading room members.
-
-        Returns the total count of members in the room by membership type, and a
-        truncated list of members (the heroes). This will be the first 6 members of the
-        room:
-        - We want 5 heroes plus 1, in case one of them is the
-        calling user.
-        - They are ordered by `stream_ordering`, which are joined or
-        invited. When no joined or invited members are available, this also includes
-        banned and left users.
-
         Args:
             room_id: The room ID to query
         Returns:
@@ -319,36 +313,23 @@ class RoomMemberWorkerStore(EventsWorkerStore, CacheInvalidationWorkerStore):
             for count, membership in txn:
                 res.setdefault(membership, MemberSummary([], count))
 
-            # Order by membership (joins -> invites -> leave (former insiders) ->
-            # everything else (outsiders like bans/knocks), then by `stream_ordering` so
-            # the first members in the room show up first and to make the sort stable
-            # (consistent heroes).
-            #
-            # Note: rejected events will have a null membership field, so we we manually
-            # filter them out.
+            # we order by membership and then fairly arbitrarily by event_id so
+            # heroes are consistent
+            # Note, rejected events will have a null membership field, so
+            # we we manually filter them out.
             sql = """
                 SELECT state_key, membership, event_id
                 FROM current_state_events
                 WHERE type = 'm.room.member' AND room_id = ?
                     AND membership IS NOT NULL
                 ORDER BY
-                    CASE membership WHEN ? THEN 1 WHEN ? THEN 2 WHEN ? THEN 3 ELSE 4 END ASC,
-                    event_stream_ordering ASC
+                    CASE membership WHEN ? THEN 1 WHEN ? THEN 2 ELSE 3 END ASC,
+                    event_id ASC
                 LIMIT ?
             """
 
-            txn.execute(
-                sql,
-                (
-                    room_id,
-                    # Sort order
-                    Membership.JOIN,
-                    Membership.INVITE,
-                    Membership.LEAVE,
-                    # 6 is 5 (number of heroes) plus 1, in case one of them is the calling user.
-                    6,
-                ),
-            )
+            # 6 is 5 (number of heroes) plus 1, in case one of them is the calling user.
+            txn.execute(sql, (room_id, Membership.JOIN, Membership.INVITE, 6))
             for user_id, membership, event_id in txn:
                 summary = res[membership]
                 # we will always have a summary for this membership type at this
@@ -445,11 +426,9 @@ class RoomMemberWorkerStore(EventsWorkerStore, CacheInvalidationWorkerStore):
         if not membership_list:
             return []
 
-        # Convert membership list to frozen set as a) it needs to be hashable,
-        # and b) we don't care about the order.
-        membership_list = frozenset(membership_list)
-
-        rooms = await self._get_rooms_for_local_user_where_membership_is_inner(
+        rooms = await self.db_pool.runInteraction(
+            "get_rooms_for_local_user_where_membership_is",
+            self._get_rooms_for_local_user_where_membership_is_txn,
             user_id,
             membership_list,
         )
@@ -468,24 +447,6 @@ class RoomMemberWorkerStore(EventsWorkerStore, CacheInvalidationWorkerStore):
 
         return [room for room in rooms if room.room_id not in rooms_to_exclude]
 
-    @cached(max_entries=1000, tree=True)
-    async def _get_rooms_for_local_user_where_membership_is_inner(
-        self,
-        user_id: str,
-        membership_list: Collection[str],
-    ) -> Sequence[RoomsForUser]:
-        if not membership_list:
-            return []
-
-        rooms = await self.db_pool.runInteraction(
-            "get_rooms_for_local_user_where_membership_is",
-            self._get_rooms_for_local_user_where_membership_is_txn,
-            user_id,
-            membership_list,
-        )
-
-        return rooms
-
     def _get_rooms_for_local_user_where_membership_is_txn(
         self,
         txn: LoggingTransaction,
@@ -533,11 +494,7 @@ class RoomMemberWorkerStore(EventsWorkerStore, CacheInvalidationWorkerStore):
                 sender=sender,
                 membership=membership,
                 event_id=event_id,
-                event_pos=PersistedEventPosition(
-                    # If instance_name is null we default to "master"
-                    instance_name or "master",
-                    stream_ordering,
-                ),
+                event_pos=PersistedEventPosition(instance_name, stream_ordering),
                 room_version_id=room_version,
             )
             for room_id, sender, membership, event_id, instance_name, stream_ordering, room_version in txn
@@ -649,6 +606,53 @@ class RoomMemberWorkerStore(EventsWorkerStore, CacheInvalidationWorkerStore):
 
         return results
 
+    @cached(max_entries=500000, iterable=True)
+    async def get_rooms_for_user_with_stream_ordering(
+        self, user_id: str
+    ) -> FrozenSet[GetRoomsForUserWithStreamOrdering]:
+        """Returns a set of room_ids the user is currently joined to.
+
+        If a remote user only returns rooms this server is currently
+        participating in.
+
+        Args:
+            user_id
+
+        Returns:
+            Returns the rooms the user is in currently, along with the stream
+            ordering of the most recent join for that user and room, along with
+            the room version of the room.
+        """
+        return await self.db_pool.runInteraction(
+            "get_rooms_for_user_with_stream_ordering",
+            self._get_rooms_for_user_with_stream_ordering_txn,
+            user_id,
+        )
+
+    def _get_rooms_for_user_with_stream_ordering_txn(
+        self, txn: LoggingTransaction, user_id: str
+    ) -> FrozenSet[GetRoomsForUserWithStreamOrdering]:
+        # We use `current_state_events` here and not `local_current_membership`
+        # as a) this gets called with remote users and b) this only gets called
+        # for rooms the server is participating in.
+        sql = """
+            SELECT room_id, e.instance_name, e.stream_ordering
+            FROM current_state_events AS c
+            INNER JOIN events AS e USING (room_id, event_id)
+            WHERE
+                c.type = 'm.room.member'
+                AND c.state_key = ?
+                AND c.membership = ?
+        """
+
+        txn.execute(sql, (user_id, Membership.JOIN))
+        return frozenset(
+            GetRoomsForUserWithStreamOrdering(
+                room_id, PersistedEventPosition(instance, stream_id)
+            )
+            for room_id, instance, stream_id in txn
+        )
+
     async def get_users_server_still_shares_room_with(
         self, user_ids: Collection[str]
     ) -> Set[str]:
@@ -697,6 +701,13 @@ class RoomMemberWorkerStore(EventsWorkerStore, CacheInvalidationWorkerStore):
         If a remote user only returns rooms this server is currently
         participating in.
         """
+        rooms = self.get_rooms_for_user_with_stream_ordering.cache.get_immediate(
+            (user_id,),
+            None,
+            update_metrics=False,
+        )
+        if rooms:
+            return frozenset(r.room_id for r in rooms)
 
         room_ids = await self.db_pool.simple_select_onecol(
             table="current_state_events",
@@ -1553,19 +1564,10 @@ def extract_heroes_from_room_summary(
 ) -> List[str]:
     """Determine the users that represent a room, from the perspective of the `me` user.
 
-    This function expects `MemberSummary.members` to already be sorted by
-    `stream_ordering` like the results from `get_room_summary(...)`.
-
     The rules which say which users we select are specified in the "Room Summary"
     section of
     https://spec.matrix.org/v1.4/client-server-api/#get_matrixclientv3sync
 
-
-    Args:
-        details: Mapping from membership type to member summary. We expect
-            `MemberSummary.members` to already be sorted by `stream_ordering`.
-        me: The user for whom we are determining the heroes for.
-
     Returns a list (possibly empty) of heroes' mxids.
     """
     empty_ms = MemberSummary([], 0)
@@ -1580,11 +1582,11 @@ def extract_heroes_from_room_summary(
         r[0] for r in details.get(Membership.LEAVE, empty_ms).members if r[0] != me
     ] + [r[0] for r in details.get(Membership.BAN, empty_ms).members if r[0] != me]
 
-    # We expect `MemberSummary.members` to already be sorted by `stream_ordering`
+    # FIXME: order by stream ordering rather than as returned by SQL
     if joined_user_ids or invited_user_ids:
-        return (joined_user_ids + invited_user_ids)[0:5]
+        return sorted(joined_user_ids + invited_user_ids)[0:5]
     else:
-        return gone_user_ids[0:5]
+        return sorted(gone_user_ids)[0:5]
 
 
 @attr.s(slots=True, auto_attribs=True)

synapse/storage/databases/main/state.py

@@ -41,7 +41,7 @@ from typing import (
 
 import attr
 
-from synapse.api.constants import EventContentFields, EventTypes, Membership
+from synapse.api.constants import EventTypes, Membership
 from synapse.api.errors import NotFoundError, UnsupportedRoomVersionError
 from synapse.api.room_versions import KNOWN_ROOM_VERSIONS, RoomVersion
 from synapse.events import EventBase
@@ -298,56 +298,6 @@ class StateGroupWorkerStore(EventsWorkerStore, SQLBaseStore):
         create_event = await self.get_event(create_id)
         return create_event
 
-    @cached(max_entries=10000)
-    async def get_room_type(self, room_id: str) -> Optional[str]:
-        """Get the room type for a given room. The server must be joined to the
-        given room.
-        """
-
-        row = await self.db_pool.simple_select_one(
-            table="room_stats_state",
-            keyvalues={"room_id": room_id},
-            retcols=("room_type",),
-            allow_none=True,
-            desc="get_room_type",
-        )
-
-        if row is not None:
-            return row[0]
-
-        # If we haven't updated `room_stats_state` with the room yet, query the
-        # create event directly.
-        create_event = await self.get_create_event_for_room(room_id)
-        room_type = create_event.content.get(EventContentFields.ROOM_TYPE)
-        return room_type
-
-    @cachedList(cached_method_name="get_room_type", list_name="room_ids")
-    async def bulk_get_room_type(
-        self, room_ids: Set[str]
-    ) -> Mapping[str, Optional[str]]:
-        """Bulk fetch room types for the given rooms, the server must be in all
-        the rooms given.
-        """
-
-        rows = await self.db_pool.simple_select_many_batch(
-            table="room_stats_state",
-            column="room_id",
-            iterable=room_ids,
-            retcols=("room_id", "room_type"),
-            desc="bulk_get_room_type",
-        )
-
-        # If we haven't updated `room_stats_state` with the room yet, query the
-        # create events directly. This should happen only rarely so we don't
-        # mind if we do this in a loop.
-        results = dict(rows)
-        for room_id in room_ids - results.keys():
-            create_event = await self.get_create_event_for_room(room_id)
-            room_type = create_event.content.get(EventContentFields.ROOM_TYPE)
-            results[room_id] = room_type
-
-        return results
-
     @cached(max_entries=100000, iterable=True)
     async def get_partial_current_state_ids(self, room_id: str) -> StateMap[str]:
         """Get the current state event ids for a room based on the

synapse/storage/databases/main/stream.py

@@ -78,11 +78,10 @@ from synapse.storage.database import (
 from synapse.storage.databases.main.events_worker import EventsWorkerStore
 from synapse.storage.engines import BaseDatabaseEngine, PostgresEngine, Sqlite3Engine
 from synapse.storage.util.id_generators import MultiWriterIdGenerator
-from synapse.types import PersistedEventPosition, RoomStreamToken, StrCollection
+from synapse.types import PersistedEventPosition, RoomStreamToken
 from synapse.util.caches.descriptors import cached
 from synapse.util.caches.stream_change_cache import StreamChangeCache
 from synapse.util.cancellation import cancellable
-from synapse.util.iterutils import batch_iter
 
 if TYPE_CHECKING:
     from synapse.server import HomeServer
@@ -372,7 +371,7 @@ def _make_generic_sql_bound(
 def _filter_results(
     lower_token: Optional[RoomStreamToken],
     upper_token: Optional[RoomStreamToken],
-    instance_name: Optional[str],
+    instance_name: str,
     topological_ordering: int,
     stream_ordering: int,
 ) -> bool:
@@ -385,14 +384,8 @@ def _filter_results(
     position maps, which we handle by fetching more than necessary from the DB
     and then filtering (rather than attempting to construct a complicated SQL
     query).
-
-    The `instance_name` arg is optional to handle historic rows, and is
-    interpreted as if it was "master".
     """
 
-    if instance_name is None:
-        instance_name = "master"
-
     event_historical_tuple = (
         topological_ordering,
         stream_ordering,
@@ -427,7 +420,7 @@ def _filter_results(
 def _filter_results_by_stream(
     lower_token: Optional[RoomStreamToken],
     upper_token: Optional[RoomStreamToken],
-    instance_name: Optional[str],
+    instance_name: str,
     stream_ordering: int,
 ) -> bool:
     """
@@ -443,14 +436,7 @@ def _filter_results_by_stream(
     position maps, which we handle by fetching more than necessary from the DB
     and then filtering (rather than attempting to construct a complicated SQL
     query).
-
-    The `instance_name` arg is optional to handle historic rows, and is
-    interpreted as if it was "master".
     """
-
-    if instance_name is None:
-        instance_name = "master"
-
     if lower_token:
         assert lower_token.topological is None
 
@@ -926,6 +912,7 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
                 prev_sender,
             ) in txn:
                 assert room_id is not None
+                assert instance_name is not None
                 assert stream_ordering is not None
 
                 if _filter_results_by_stream(
@@ -949,8 +936,7 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
                         # Event
                         event_id=event_id,
                         event_pos=PersistedEventPosition(
-                            # If instance_name is null we default to "master"
-                            instance_name=instance_name or "master",
+                            instance_name=instance_name,
                             stream=stream_ordering,
                         ),
                         # When `s.event_id = null`, we won't be able to get respective
@@ -966,11 +952,13 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
                         prev_event_id=prev_event_id,
                         prev_event_pos=(
                             PersistedEventPosition(
-                                # If instance_name is null we default to "master"
-                                instance_name=prev_instance_name or "master",
+                                instance_name=prev_instance_name,
                                 stream=prev_stream_ordering,
                             )
-                            if (prev_stream_ordering is not None)
+                            if (
+                                prev_instance_name is not None
+                                and prev_stream_ordering is not None
+                            )
                             else None
                         ),
                         prev_membership=prev_membership,
@@ -1190,7 +1178,6 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
         self,
         room_id: str,
         end_token: RoomStreamToken,
-        event_types: Optional[Collection[str]] = None,
     ) -> Optional[Tuple[str, PersistedEventPosition]]:
         """
         Returns the ID and event position of the last event in a room at or before a
@@ -1199,7 +1186,6 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
         Args:
             room_id
             end_token: The token used to stream from
-            event_types: Optional allowlist of event types to filter by
 
         Returns:
             The ID of the most recent event and it's position, or None if there are no
@@ -1221,17 +1207,9 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
             min_stream = end_token.stream
             max_stream = end_token.get_max_stream_pos()
 
-            event_type_clause = ""
-            event_type_args: List[str] = []
-            if event_types is not None and len(event_types) > 0:
-                event_type_clause, event_type_args = make_in_list_sql_clause(
-                    txn.database_engine, "type", event_types
-                )
-                event_type_clause = f"AND {event_type_clause}"
-
-            # We use `UNION ALL` because we don't need any of the deduplication logic
-            # (`UNION` is really a `UNION` + `DISTINCT`). `UNION ALL` does preserve the
-            # ordering of the operand queries but there is no actual guarantee that it
+            # We use `union all` because we don't need any of the deduplication logic
+            # (`union` is really a union + distinct). `UNION ALL` does preserve the
+            # ordering of the operand queries but there is no actual gurantee that it
             # has this behavior in all scenarios so we need the extra `ORDER BY` at the
             # bottom.
             sql = """
@@ -1240,7 +1218,6 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
                     FROM events
                     LEFT JOIN rejections USING (event_id)
                     WHERE room_id = ?
-                        %s
                         AND ? < stream_ordering AND stream_ordering <= ?
                         AND NOT outlier
                         AND rejections.event_id IS NULL
@@ -1252,7 +1229,6 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
                     FROM events
                     LEFT JOIN rejections USING (event_id)
                     WHERE room_id = ?
-                        %s
                         AND stream_ordering <= ?
                         AND NOT outlier
                         AND rejections.event_id IS NULL
@@ -1260,17 +1236,16 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
                     LIMIT 1
                 ) AS b
                 ORDER BY stream_ordering DESC
-            """ % (
-                event_type_clause,
-                event_type_clause,
-            )
+            """
             txn.execute(
                 sql,
-                [room_id]
-                + event_type_args
-                + [min_stream, max_stream, room_id]
-                + event_type_args
-                + [min_stream],
+                (
+                    room_id,
+                    min_stream,
+                    max_stream,
+                    room_id,
+                    min_stream,
+                ),
             )
 
             for instance_name, stream_ordering, topological_ordering, event_id in txn:
@@ -1282,9 +1257,7 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
                     stream_ordering=stream_ordering,
                 ):
                     return event_id, PersistedEventPosition(
-                        # If instance_name is null we default to "master"
-                        instance_name or "master",
-                        stream_ordering,
+                        instance_name, stream_ordering
                     )
 
             return None
@@ -1294,126 +1267,6 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
             get_last_event_pos_in_room_before_stream_ordering_txn,
         )
 
-    async def bulk_get_last_event_pos_in_room_before_stream_ordering(
-        self,
-        room_ids: StrCollection,
-        end_token: RoomStreamToken,
-    ) -> Dict[str, int]:
-        """Bulk fetch the stream position of the latest events in the given
-        rooms
-        """
-
-        min_token = end_token.stream
-        max_token = end_token.get_max_stream_pos()
-        results: Dict[str, int] = {}
-
-        # First, we check for the rooms in the stream change cache to see if we
-        # can just use the latest position from it.
-        missing_room_ids: Set[str] = set()
-        for room_id in room_ids:
-            stream_pos = self._events_stream_cache.get_max_pos_of_last_change(room_id)
-            if stream_pos and stream_pos <= min_token:
-                results[room_id] = stream_pos
-            else:
-                missing_room_ids.add(room_id)
-
-        # Next, we query the stream position from the DB. At first we fetch all
-        # positions less than the *max* stream pos in the token, then filter
-        # them down. We do this as a) this is a cheaper query, and b) the vast
-        # majority of rooms will have a latest token from before the min stream
-        # pos.
-
-        def bulk_get_last_event_pos_txn(
-            txn: LoggingTransaction, batch_room_ids: StrCollection
-        ) -> Dict[str, int]:
-            # This query fetches the latest stream position in the rooms before
-            # the given max position.
-            clause, args = make_in_list_sql_clause(
-                self.database_engine, "room_id", batch_room_ids
-            )
-            sql = f"""
-                SELECT room_id, (
-                    SELECT stream_ordering FROM events AS e
-                    LEFT JOIN rejections USING (event_id)
-                    WHERE e.room_id = r.room_id
-                        AND stream_ordering <= ?
-                        AND NOT outlier
-                        AND rejection_reason IS NULL
-                    ORDER BY stream_ordering DESC
-                    LIMIT 1
-                )
-                FROM rooms AS r
-                WHERE {clause}
-            """
-            txn.execute(sql, [max_token] + args)
-            return {row[0]: row[1] for row in txn}
-
-        recheck_rooms: Set[str] = set()
-        for batched in batch_iter(missing_room_ids, 1000):
-            result = await self.db_pool.runInteraction(
-                "bulk_get_last_event_pos_in_room_before_stream_ordering",
-                bulk_get_last_event_pos_txn,
-                batched,
-            )
-
-            # Check that the stream position for the rooms are from before the
-            # minimum position of the token. If not then we need to fetch more
-            # rows.
-            for room_id, stream in result.items():
-                if stream <= min_token:
-                    results[room_id] = stream
-                else:
-                    recheck_rooms.add(room_id)
-
-        if not recheck_rooms:
-            return results
-
-        # For the remaining rooms we need to fetch all rows between the min and
-        # max stream positions in the end token, and filter out the rows that
-        # are after the end token.
-        #
-        # This query should be fast as the range between the min and max should
-        # be small.
-
-        def bulk_get_last_event_pos_recheck_txn(
-            txn: LoggingTransaction, batch_room_ids: StrCollection
-        ) -> Dict[str, int]:
-            clause, args = make_in_list_sql_clause(
-                self.database_engine, "room_id", batch_room_ids
-            )
-            sql = f"""
-                SELECT room_id, instance_name, stream_ordering
-                FROM events
-                WHERE ? < stream_ordering AND stream_ordering <= ?
-                    AND NOT outlier
-                    AND rejection_reason IS NULL
-                    AND {clause}
-                ORDER BY stream_ordering ASC
-            """
-            txn.execute(sql, [min_token, max_token] + args)
-
-            # We take the max stream ordering that is less than the token. Since
-            # we ordered by stream ordering we just need to iterate through and
-            # take the last matching stream ordering.
-            txn_results: Dict[str, int] = {}
-            for row in txn:
-                room_id = row[0]
-                event_pos = PersistedEventPosition(row[1], row[2])
-                if not event_pos.persisted_after(end_token):
-                    txn_results[room_id] = event_pos.stream
-
-            return txn_results
-
-        for batched in batch_iter(recheck_rooms, 1000):
-            recheck_result = await self.db_pool.runInteraction(
-                "bulk_get_last_event_pos_in_room_before_stream_ordering_recheck",
-                bulk_get_last_event_pos_recheck_txn,
-                batched,
-            )
-            results.update(recheck_result)
-
-        return results
-
     async def get_current_room_stream_token_for_room_id(
         self, room_id: str
     ) -> RoomStreamToken:

synapse/storage/schema/__init__.py

@@ -19,7 +19,7 @@
 #
 #
 
-SCHEMA_VERSION = 86  # remember to update the list below when updating
+SCHEMA_VERSION = 85  # remember to update the list below when updating
 """Represents the expectations made by the codebase about the database schema
 
 This should be incremented whenever the codebase changes its requirements on the
@@ -139,9 +139,6 @@ Changes in SCHEMA_VERSION = 84
 
 Changes in SCHEMA_VERSION = 85
     - Add a column `suspended` to the `users` table
-
-Changes in SCHEMA_VERSION = 86
-    - Add a column `authenticated` to the tables `local_media_repository` and `remote_media_cache`
 """
 
 

synapse/storage/schema/main/delta/86/01_authenticate_media.sql

@@ -1,15 +0,0 @@
---
--- This file is licensed under the Affero General Public License (AGPL) version 3.
---
--- Copyright (C) 2024 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>.
-
-ALTER TABLE remote_media_cache ADD COLUMN authenticated BOOLEAN DEFAULT FALSE NOT NULL;
-ALTER TABLE local_media_repository ADD COLUMN authenticated BOOLEAN DEFAULT FALSE NOT NULL;

synapse/types/__init__.py

@@ -20,7 +20,6 @@
 #
 #
 import abc
-import logging
 import re
 import string
 from enum import Enum
@@ -75,9 +74,6 @@ if TYPE_CHECKING:
     from synapse.storage.databases.main import DataStore, PurgeEventsStore
     from synapse.storage.databases.main.appservice import ApplicationServiceWorkerStore
 
-
-logger = logging.getLogger(__name__)
-
 # Define a state map type from type/state_key to T (usually an event ID or
 # event)
 T = TypeVar("T")
@@ -458,8 +454,6 @@ class AbstractMultiWriterStreamToken(metaclass=abc.ABCMeta):
     represented by a default `stream` attribute and a map of instance name to
     stream position of any writers that are ahead of the default stream
     position.
-
-    The values in `instance_map` must be greater than the `stream` attribute.
     """
 
     stream: int = attr.ib(validator=attr.validators.instance_of(int), kw_only=True)
@@ -474,15 +468,6 @@ class AbstractMultiWriterStreamToken(metaclass=abc.ABCMeta):
         kw_only=True,
     )
 
-    def __attrs_post_init__(self) -> None:
-        # Enforce that all instances have a value greater than the min stream
-        # position.
-        for i, v in self.instance_map.items():
-            if v <= self.stream:
-                raise ValueError(
-                    f"'instance_map' includes a stream position before the main 'stream' attribute. Instance: {i}"
-                )
-
     @classmethod
     @abc.abstractmethod
     async def parse(cls, store: "DataStore", string: str) -> "Self":
@@ -509,9 +494,6 @@ class AbstractMultiWriterStreamToken(metaclass=abc.ABCMeta):
             for instance in set(self.instance_map).union(other.instance_map)
         }
 
-        # Filter out any redundant entries.
-        instance_map = {i: s for i, s in instance_map.items() if s > max_stream}
-
         return attr.evolve(
             self, stream=max_stream, instance_map=immutabledict(instance_map)
         )
@@ -557,15 +539,10 @@ class AbstractMultiWriterStreamToken(metaclass=abc.ABCMeta):
     def bound_stream_token(self, max_stream: int) -> "Self":
         """Bound the stream positions to a maximum value"""
 
-        min_pos = min(self.stream, max_stream)
         return type(self)(
-            stream=min_pos,
+            stream=min(self.stream, max_stream),
             instance_map=immutabledict(
-                {
-                    k: min(s, max_stream)
-                    for k, s in self.instance_map.items()
-                    if min(s, max_stream) > min_pos
-                }
+                {k: min(s, max_stream) for k, s in self.instance_map.items()}
             ),
         )
 
@@ -660,8 +637,6 @@ class RoomStreamToken(AbstractMultiWriterStreamToken):
                 "Cannot set both 'topological' and 'instance_map' on 'RoomStreamToken'."
             )
 
-        super().__attrs_post_init__()
-
     @classmethod
     async def parse(cls, store: "PurgeEventsStore", string: str) -> "RoomStreamToken":
         try:
@@ -676,11 +651,6 @@ class RoomStreamToken(AbstractMultiWriterStreamToken):
 
                 instance_map = {}
                 for part in parts[1:]:
-                    if not part:
-                        # Handle tokens of the form `m5~`, which were created by
-                        # a bug
-                        continue
-
                     key, value = part.split(".")
                     instance_id = int(key)
                     pos = int(value)
@@ -696,10 +666,7 @@ class RoomStreamToken(AbstractMultiWriterStreamToken):
         except CancelledError:
             raise
         except Exception:
-            # We log an exception here as even though this *might* be a client
-            # handing a bad token, its more likely that Synapse returned a bad
-            # token (and we really want to catch those!).
-            logger.exception("Failed to parse stream token: %r", string)
+            pass
         raise SynapseError(400, "Invalid room stream token %r" % (string,))
 
     @classmethod
@@ -746,8 +713,6 @@ class RoomStreamToken(AbstractMultiWriterStreamToken):
         return self.instance_map.get(instance_name, self.stream)
 
     async def to_string(self, store: "DataStore") -> str:
-        """See class level docstring for information about the format."""
-
         if self.topological is not None:
             return "t%d-%d" % (self.topological, self.stream)
         elif self.instance_map:
@@ -762,10 +727,8 @@ class RoomStreamToken(AbstractMultiWriterStreamToken):
                 instance_id = await store.get_id_for_instance(name)
                 entries.append(f"{instance_id}.{pos}")
 
-            if entries:
-                encoded_map = "~".join(entries)
-                return f"m{self.stream}~{encoded_map}"
-            return f"s{self.stream}"
+            encoded_map = "~".join(entries)
+            return f"m{self.stream}~{encoded_map}"
         else:
             return "s%d" % (self.stream,)
 
@@ -777,13 +740,6 @@ class RoomStreamToken(AbstractMultiWriterStreamToken):
 
         return super().bound_stream_token(max_stream)
 
-    def __str__(self) -> str:
-        instances = ", ".join(f"{k}: {v}" for k, v in sorted(self.instance_map.items()))
-        return (
-            f"RoomStreamToken(stream: {self.stream}, topological: {self.topological}, "
-            f"instances: {{{instances}}})"
-        )
-
 
 @attr.s(frozen=True, slots=True, order=False)
 class MultiWriterStreamToken(AbstractMultiWriterStreamToken):
@@ -800,11 +756,6 @@ class MultiWriterStreamToken(AbstractMultiWriterStreamToken):
 
                 instance_map = {}
                 for part in parts[1:]:
-                    if not part:
-                        # Handle tokens of the form `m5~`, which were created by
-                        # a bug
-                        continue
-
                     key, value = part.split(".")
                     instance_id = int(key)
                     pos = int(value)
@@ -819,15 +770,10 @@ class MultiWriterStreamToken(AbstractMultiWriterStreamToken):
         except CancelledError:
             raise
         except Exception:
-            # We log an exception here as even though this *might* be a client
-            # handing a bad token, its more likely that Synapse returned a bad
-            # token (and we really want to catch those!).
-            logger.exception("Failed to parse stream token: %r", string)
+            pass
         raise SynapseError(400, "Invalid stream token %r" % (string,))
 
     async def to_string(self, store: "DataStore") -> str:
-        """See class level docstring for information about the format."""
-
         if self.instance_map:
             entries = []
             for name, pos in self.instance_map.items():
@@ -840,10 +786,8 @@ class MultiWriterStreamToken(AbstractMultiWriterStreamToken):
                 instance_id = await store.get_id_for_instance(name)
                 entries.append(f"{instance_id}.{pos}")
 
-            if entries:
-                encoded_map = "~".join(entries)
-                return f"m{self.stream}~{encoded_map}"
-            return str(self.stream)
+            encoded_map = "~".join(entries)
+            return f"m{self.stream}~{encoded_map}"
         else:
             return str(self.stream)
 
@@ -880,13 +824,6 @@ class MultiWriterStreamToken(AbstractMultiWriterStreamToken):
 
         return True
 
-    def __str__(self) -> str:
-        instances = ", ".join(f"{k}: {v}" for k, v in sorted(self.instance_map.items()))
-        return (
-            f"MultiWriterStreamToken(stream: {self.stream}, "
-            f"instances: {{{instances}}})"
-        )
-
 
 class StreamKeyType(Enum):
     """Known stream types.
@@ -1145,15 +1082,6 @@ class StreamToken:
 
         return True
 
-    def __str__(self) -> str:
-        return (
-            f"StreamToken(room: {self.room_key}, presence: {self.presence_key}, "
-            f"typing: {self.typing_key}, receipt: {self.receipt_key}, "
-            f"account_data: {self.account_data_key}, push_rules: {self.push_rules_key}, "
-            f"to_device: {self.to_device_key}, device_list: {self.device_list_key}, "
-            f"groups: {self.groups_key}, un_partial_stated_rooms: {self.un_partial_stated_rooms_key})"
-        )
-
 
 StreamToken.START = StreamToken(
     RoomStreamToken(stream=0), 0, 0, MultiWriterStreamToken(stream=0), 0, 0, 0, 0, 0, 0
@@ -1242,12 +1170,11 @@ class ReadReceipt:
 @attr.s(slots=True, frozen=True, auto_attribs=True)
 class DeviceListUpdates:
     """
-    An object containing a diff of information regarding other users' device lists,
-    intended for a recipient to carry out device list tracking.
+    An object containing a diff of information regarding other users' device lists, intended for
+    a recipient to carry out device list tracking.
 
     Attributes:
-        changed: A set of users who have updated their device identity or
-            cross-signing keys, or who now share an encrypted room with.
+        changed: A set of users whose device lists have changed recently.
         left: A set of users who the recipient no longer needs to track the device lists of.
             Typically when those users no longer share any end-to-end encryption enabled rooms.
     """

synapse/types/handlers/__init__.py

@@ -18,7 +18,7 @@
 #
 #
 from enum import Enum
-from typing import TYPE_CHECKING, Dict, Final, List, Mapping, Optional, Sequence, Tuple
+from typing import TYPE_CHECKING, Dict, Final, List, Optional, Tuple
 
 import attr
 from typing_extensions import TypedDict
@@ -31,7 +31,7 @@ else:
     from pydantic import Extra
 
 from synapse.events import EventBase
-from synapse.types import DeviceListUpdates, JsonDict, JsonMapping, StreamToken, UserID
+from synapse.types import JsonDict, JsonMapping, StreamToken, UserID
 from synapse.types.rest.client import SlidingSyncBody
 
 if TYPE_CHECKING:
@@ -156,8 +156,6 @@ class SlidingSyncResult:
             avatar: Room avatar
             heroes: List of stripped membership events (containing `user_id` and optionally
                 `avatar_url` and `displayname`) for the users used to calculate the room name.
-            is_dm: Flag to specify whether the room is a direct-message room (most likely
-                between two people).
             initial: Flag which is set when this is the first time the server is sending this
                 data on this connection. Clients can use this flag to replace or update
                 their local state. When there is an update, servers MUST omit this flag
@@ -169,6 +167,8 @@ class SlidingSyncResult:
                 the timeline events above. This allows clients to show accurate reaction
                 counts (or edits, threads), even if some of the reaction events were skipped
                 over in a gappy sync.
+            is_dm: Flag to specify whether the room is a direct-message room (most likely
+                between two people).
             stripped_state: Stripped state events (for rooms where the usre is
                 invited/knocked). Same as `rooms.invite.$room_id.invite_state` in sync v2,
                 absent on joined/left rooms
@@ -176,20 +176,6 @@ class SlidingSyncResult:
                 `/rooms/<room_id>/messages` API to retrieve earlier messages.
             limited: True if their are more events than fit between the given position and now.
                 Sync again to get more.
-            num_live: The number of timeline events which have just occurred and are not historical.
-                The last N events are 'live' and should be treated as such. This is mostly
-                useful to determine whether a given @mention event should make a noise or not.
-                Clients cannot rely solely on the absence of `initial: true` to determine live
-                events because if a room not in the sliding window bumps into the window because
-                of an @mention it will have `initial: true` yet contain a single live event
-                (with potentially other old events in the timeline).
-            bump_stamp: The `stream_ordering` of the last event according to the
-                `bump_event_types`. This helps clients sort more readily without them
-                needing to pull in a bunch of the timeline to determine the last activity.
-                `bump_event_types` is a thing because for example, we don't want display
-                name changes to mark the room as unread and bump it to the top. For
-                encrypted rooms, we just have to consider any activity as a bump because we
-                can't see the content and the client has to figure it out for themselves.
             joined_count: The number of users with membership of join, including the client's
                 own user ID. (same as sync `v2 m.joined_member_count`)
             invited_count: The number of users with membership of invite. (same as sync v2
@@ -198,37 +184,37 @@ class SlidingSyncResult:
                 as sync v2)
             highlight_count: The number of unread notifications for this room with the highlight
                 flag set. (same as sync v2)
+            num_live: The number of timeline events which have just occurred and are not historical.
+                The last N events are 'live' and should be treated as such. This is mostly
+                useful to determine whether a given @mention event should make a noise or not.
+                Clients cannot rely solely on the absence of `initial: true` to determine live
+                events because if a room not in the sliding window bumps into the window because
+                of an @mention it will have `initial: true` yet contain a single live event
+                (with potentially other old events in the timeline).
         """
 
-        @attr.s(slots=True, frozen=True, auto_attribs=True)
-        class StrippedHero:
-            user_id: str
-            display_name: Optional[str]
-            avatar_url: Optional[str]
-
         name: Optional[str]
         avatar: Optional[str]
-        heroes: Optional[List[StrippedHero]]
-        is_dm: bool
+        heroes: Optional[List[EventBase]]
         initial: bool
-        # Should be empty for invite/knock rooms with `stripped_state`
-        required_state: List[EventBase]
-        # Should be empty for invite/knock rooms with `stripped_state`
-        timeline_events: List[EventBase]
+        # Only optional because it won't be included for invite/knock rooms with `stripped_state`
+        required_state: Optional[List[EventBase]]
+        # Only optional because it won't be included for invite/knock rooms with `stripped_state`
+        timeline_events: Optional[List[EventBase]]
         bundled_aggregations: Optional[Dict[str, "BundledAggregations"]]
+        is_dm: bool
         # Optional because it's only relevant to invite/knock rooms
-        stripped_state: List[JsonDict]
+        stripped_state: Optional[List[JsonDict]]
         # Only optional because it won't be included for invite/knock rooms with `stripped_state`
         prev_batch: Optional[StreamToken]
         # Only optional because it won't be included for invite/knock rooms with `stripped_state`
         limited: Optional[bool]
-        # Only optional because it won't be included for invite/knock rooms with `stripped_state`
-        num_live: Optional[int]
-        bump_stamp: int
         joined_count: int
         invited_count: int
         notification_count: int
         highlight_count: int
+        # Only optional because it won't be included for invite/knock rooms with `stripped_state`
+        num_live: Optional[int]
 
     @attr.s(slots=True, frozen=True, auto_attribs=True)
     class SlidingWindowList:
@@ -258,81 +244,10 @@ class SlidingSyncResult:
         count: int
         ops: List[Operation]
 
-    @attr.s(slots=True, frozen=True, auto_attribs=True)
-    class Extensions:
-        """Responses for extensions
-
-        Attributes:
-            to_device: The to-device extension (MSC3885)
-            e2ee: The E2EE device extension (MSC3884)
-        """
-
-        @attr.s(slots=True, frozen=True, auto_attribs=True)
-        class ToDeviceExtension:
-            """The to-device extension (MSC3885)
-
-            Attributes:
-                next_batch: The to-device stream token the client should use
-                    to get more results
-                events: A list of to-device messages for the client
-            """
-
-            next_batch: str
-            events: Sequence[JsonMapping]
-
-            def __bool__(self) -> bool:
-                return bool(self.events)
-
-        @attr.s(slots=True, frozen=True, auto_attribs=True)
-        class E2eeExtension:
-            """The E2EE device extension (MSC3884)
-
-            Attributes:
-                device_list_updates: List of user_ids whose devices have changed or left (only
-                    present on incremental syncs).
-                device_one_time_keys_count: Map from key algorithm to the number of
-                    unclaimed one-time keys currently held on the server for this device. If
-                    an algorithm is unlisted, the count for that algorithm is assumed to be
-                    zero. If this entire parameter is missing, the count for all algorithms
-                    is assumed to be zero.
-                device_unused_fallback_key_types: List of unused fallback key algorithms
-                    for this device.
-            """
-
-            # Only present on incremental syncs
-            device_list_updates: Optional[DeviceListUpdates]
-            device_one_time_keys_count: Mapping[str, int]
-            device_unused_fallback_key_types: Sequence[str]
-
-            def __bool__(self) -> bool:
-                # Note that "signed_curve25519" is always returned in key count responses
-                # regardless of whether we uploaded any keys for it. This is necessary until
-                # https://github.com/matrix-org/matrix-doc/issues/3298 is fixed.
-                #
-                # Also related:
-                # https://github.com/element-hq/element-android/issues/3725 and
-                # https://github.com/matrix-org/synapse/issues/10456
-                default_otk = self.device_one_time_keys_count.get("signed_curve25519")
-                more_than_default_otk = len(self.device_one_time_keys_count) > 1 or (
-                    default_otk is not None and default_otk > 0
-                )
-
-                return bool(
-                    more_than_default_otk
-                    or self.device_list_updates
-                    or self.device_unused_fallback_key_types
-                )
-
-        to_device: Optional[ToDeviceExtension] = None
-        e2ee: Optional[E2eeExtension] = None
-
-        def __bool__(self) -> bool:
-            return bool(self.to_device or self.e2ee)
-
     next_pos: StreamToken
     lists: Dict[str, SlidingWindowList]
     rooms: Dict[str, RoomResult]
-    extensions: Extensions
+    extensions: JsonMapping
 
     def __bool__(self) -> bool:
         """Make the result appear empty if there are no updates. This is used
@@ -348,5 +263,5 @@ class SlidingSyncResult:
             next_pos=next_pos,
             lists={},
             rooms={},
-            extensions=SlidingSyncResult.Extensions(),
+            extensions={},
         )

synapse/types/rest/client/__init__.py

@@ -200,6 +200,9 @@ class SlidingSyncBody(RequestBodyModel):
                     }
 
             timeline_limit: The maximum number of timeline events to return per response.
+            include_heroes: Return a stripped variant of membership events (containing
+                `user_id` and optionally `avatar_url` and `displayname`) for the users used
+                to calculate the room name.
             filters: Filters to apply to the list before sorting.
         """
 
@@ -267,63 +270,16 @@ class SlidingSyncBody(RequestBodyModel):
         else:
             ranges: Optional[List[Tuple[conint(ge=0, strict=True), conint(ge=0, strict=True)]]] = None  # type: ignore[valid-type]
         slow_get_all_rooms: Optional[StrictBool] = False
+        include_heroes: Optional[StrictBool] = False
         filters: Optional[Filters] = None
 
     class RoomSubscription(CommonRoomParameters):
         pass
 
-    class Extensions(RequestBodyModel):
-        """The extensions section of the request.
-
-        Extensions MUST have an `enabled` flag which defaults to `false`. If a client
-        sends an unknown extension name, the server MUST ignore it (or else backwards
-        compatibility between clients and servers is broken when a newer client tries to
-        communicate with an older server).
-        """
-
-        class ToDeviceExtension(RequestBodyModel):
-            """The to-device extension (MSC3885)
-
-            Attributes:
-                enabled
-                limit: Maximum number of to-device messages to return
-                since: The `next_batch` from the previous sync response
-            """
-
-            enabled: Optional[StrictBool] = False
-            limit: StrictInt = 100
-            since: Optional[StrictStr] = None
-
-            @validator("since")
-            def since_token_check(
-                cls, value: Optional[StrictStr]
-            ) -> Optional[StrictStr]:
-                # `since` comes in as an opaque string token but we know that it's just
-                # an integer representing the position in the device inbox stream. We
-                # want to pre-validate it to make sure it works fine in downstream code.
-                if value is None:
-                    return value
-
-                try:
-                    int(value)
-                except ValueError:
-                    raise ValueError(
-                        "'extensions.to_device.since' is invalid (should look like an int)"
-                    )
-
-                return value
-
-        class E2eeExtension(RequestBodyModel):
-            """The E2EE device extension (MSC3884)
-
-            Attributes:
-                enabled
-            """
-
-            enabled: Optional[StrictBool] = False
-
-        to_device: Optional[ToDeviceExtension] = None
-        e2ee: Optional[E2eeExtension] = None
+    class Extension(RequestBodyModel):
+        enabled: Optional[StrictBool] = False
+        lists: Optional[List[StrictStr]] = None
+        rooms: Optional[List[StrictStr]] = None
 
     # mypy workaround via https://github.com/pydantic/pydantic/issues/156#issuecomment-1130883884
     if TYPE_CHECKING:
@@ -331,7 +287,7 @@ class SlidingSyncBody(RequestBodyModel):
     else:
         lists: Optional[Dict[constr(max_length=64, strict=True), SlidingSyncList]] = None  # type: ignore[valid-type]
     room_subscriptions: Optional[Dict[StrictStr, RoomSubscription]] = None
-    extensions: Optional[Extensions] = None
+    extensions: Optional[Dict[StrictStr, Extension]] = None
 
     @validator("lists")
     def lists_length_check(

synapse/util/caches/stream_change_cache.py

@@ -327,7 +327,7 @@ class StreamChangeCache:
             for entity in r:
                 self._entity_to_key.pop(entity, None)
 
-    def get_max_pos_of_last_change(self, entity: EntityType) -> Optional[int]:
+    def get_max_pos_of_last_change(self, entity: EntityType) -> int:
         """Returns an upper bound of the stream id of the last change to an
         entity.
 
@@ -335,11 +335,7 @@ class StreamChangeCache:
             entity: The entity to check.
 
         Return:
-            The stream position of the latest change for the given entity, if
-            known
+            The stream position of the latest change for the given entity or
+            the earliest known stream position if the entitiy is unknown.
         """
-        return self._entity_to_key.get(entity)
-
-    def get_earliest_known_position(self) -> int:
-        """Returns the earliest position in the cache."""
-        return self._earliest_known_stream_pos
+        return self._entity_to_key.get(entity, self._earliest_known_stream_pos)

tests/federation/test_federation_media.py

@@ -35,7 +35,6 @@ from synapse.types import UserID
 from synapse.util import Clock
 
 from tests import unittest
-from tests.media.test_media_storage import small_png
 from tests.test_utils import SMALL_PNG
 
 
@@ -147,112 +146,3 @@ class FederationMediaDownloadsTest(unittest.FederatingHomeserverTestCase):
         # check that the png file exists and matches what was uploaded
         found_file = any(SMALL_PNG in field for field in stripped_bytes)
         self.assertTrue(found_file)
-
-
-class FederationThumbnailTest(unittest.FederatingHomeserverTestCase):
-
-    def prepare(self, reactor: MemoryReactor, clock: Clock, hs: HomeServer) -> None:
-        super().prepare(reactor, clock, hs)
-        self.test_dir = tempfile.mkdtemp(prefix="synapse-tests-")
-        self.addCleanup(shutil.rmtree, self.test_dir)
-        self.primary_base_path = os.path.join(self.test_dir, "primary")
-        self.secondary_base_path = os.path.join(self.test_dir, "secondary")
-
-        hs.config.media.media_store_path = self.primary_base_path
-
-        storage_providers = [
-            StorageProviderWrapper(
-                FileStorageProviderBackend(hs, self.secondary_base_path),
-                store_local=True,
-                store_remote=False,
-                store_synchronous=True,
-            )
-        ]
-
-        self.filepaths = MediaFilePaths(self.primary_base_path)
-        self.media_storage = MediaStorage(
-            hs, self.primary_base_path, self.filepaths, storage_providers
-        )
-        self.media_repo = hs.get_media_repository()
-
-    def test_thumbnail_download_scaled(self) -> None:
-        content = io.BytesIO(small_png.data)
-        content_uri = self.get_success(
-            self.media_repo.create_content(
-                "image/png",
-                "test_png_thumbnail",
-                content,
-                67,
-                UserID.from_string("@user_id:whatever.org"),
-            )
-        )
-        # test with an image file
-        channel = self.make_signed_federation_request(
-            "GET",
-            f"/_matrix/federation/v1/media/thumbnail/{content_uri.media_id}?width=32&height=32&method=scale",
-        )
-        self.pump()
-        self.assertEqual(200, channel.code)
-
-        content_type = channel.headers.getRawHeaders("content-type")
-        assert content_type is not None
-        assert "multipart/mixed" in content_type[0]
-        assert "boundary" in content_type[0]
-
-        # extract boundary
-        boundary = content_type[0].split("boundary=")[1]
-        # split on boundary and check that json field and expected value exist
-        body = channel.result.get("body")
-        assert body is not None
-        stripped_bytes = body.split(b"\r\n" + b"--" + boundary.encode("utf-8"))
-        found_json = any(
-            b"\r\nContent-Type: application/json\r\n\r\n{}" in field
-            for field in stripped_bytes
-        )
-        self.assertTrue(found_json)
-
-        # check that the png file exists and matches the expected scaled bytes
-        found_file = any(small_png.expected_scaled in field for field in stripped_bytes)
-        self.assertTrue(found_file)
-
-    def test_thumbnail_download_cropped(self) -> None:
-        content = io.BytesIO(small_png.data)
-        content_uri = self.get_success(
-            self.media_repo.create_content(
-                "image/png",
-                "test_png_thumbnail",
-                content,
-                67,
-                UserID.from_string("@user_id:whatever.org"),
-            )
-        )
-        # test with an image file
-        channel = self.make_signed_federation_request(
-            "GET",
-            f"/_matrix/federation/v1/media/thumbnail/{content_uri.media_id}?width=32&height=32&method=crop",
-        )
-        self.pump()
-        self.assertEqual(200, channel.code)
-
-        content_type = channel.headers.getRawHeaders("content-type")
-        assert content_type is not None
-        assert "multipart/mixed" in content_type[0]
-        assert "boundary" in content_type[0]
-
-        # extract boundary
-        boundary = content_type[0].split("boundary=")[1]
-        # split on boundary and check that json field and expected value exist
-        body = channel.result.get("body")
-        assert body is not None
-        stripped_bytes = body.split(b"\r\n" + b"--" + boundary.encode("utf-8"))
-        found_json = any(
-            b"\r\nContent-Type: application/json\r\n\r\n{}" in field
-            for field in stripped_bytes
-        )
-        self.assertTrue(found_json)
-
-        # check that the png file exists and matches the expected cropped bytes
-        found_file = any(
-            small_png.expected_cropped in field for field in stripped_bytes
-        )
-        self.assertTrue(found_file)

tests/handlers/test_deactivate_account.py

@@ -461,25 +461,3 @@ class DeactivateAccountTestCase(HomeserverTestCase):
         # Validate that there is no displayname in any of the events
         for event in events:
             self.assertTrue("displayname" not in event.content)
-
-    def test_rooms_forgotten_upon_deactivation(self) -> None:
-        """
-        Tests that the user 'forgets' the rooms they left upon deactivation.
-        """
-        # Create a room
-        room_id = self.helper.create_room_as(
-            self.user,
-            is_public=True,
-            tok=self.token,
-        )
-
-        # Deactivate the account
-        self._deactivate_my_account()
-
-        # Get all of the user's forgotten rooms
-        forgotten_rooms = self.get_success(
-            self._store.get_forgotten_rooms_for_user(self.user)
-        )
-
-        # Validate that the created room is forgotten
-        self.assertTrue(room_id in forgotten_rooms)

tests/handlers/test_sync.py

@@ -210,8 +210,8 @@ class SyncTestCase(tests.unittest.HomeserverTestCase):
             )
 
         # Blow away caches (supported room versions can only change due to a restart).
+        self.store.get_rooms_for_user_with_stream_ordering.invalidate_all()
         self.store.get_rooms_for_user.invalidate_all()
-        self.store._get_rooms_for_local_user_where_membership_is_inner.invalidate_all()
         self.store._get_event_cache.clear()
         self.store._event_ref.clear()
 

tests/media/test_media_storage.py

@@ -18,6 +18,7 @@
 # [This file includes modifications made by New Vector Limited]
 #
 #
+import itertools
 import os
 import shutil
 import tempfile
@@ -226,15 +227,19 @@ test_images = [
     empty_file,
     SVG,
 ]
-input_values = [(x,) for x in test_images]
+urls = [
+    "_matrix/media/r0/thumbnail",
+    "_matrix/client/unstable/org.matrix.msc3916/media/thumbnail",
+]
 
 
-@parameterized_class(("test_image",), input_values)
+@parameterized_class(("test_image", "url"), itertools.product(test_images, urls))
 class MediaRepoTests(unittest.HomeserverTestCase):
     servlets = [media.register_servlets]
     test_image: ClassVar[TestImage]
     hijack_auth = True
     user_id = "@test:user"
+    url: ClassVar[str]
 
     def make_homeserver(self, reactor: MemoryReactor, clock: Clock) -> HomeServer:
         self.fetches: List[
@@ -299,6 +304,7 @@ class MediaRepoTests(unittest.HomeserverTestCase):
             "config": {"directory": self.storage_path},
         }
         config["media_storage_providers"] = [provider_config]
+        config["experimental_features"] = {"msc3916_authenticated_media_enabled": True}
 
         hs = self.setup_test_homeserver(config=config, federation_http_client=client)
 
@@ -503,7 +509,7 @@ class MediaRepoTests(unittest.HomeserverTestCase):
         params = "?width=32&height=32&method=scale"
         channel = self.make_request(
             "GET",
-            f"/_matrix/media/r0/thumbnail/{self.media_id}{params}",
+            f"/{self.url}/{self.media_id}{params}",
             shorthand=False,
             await_result=False,
         )
@@ -531,7 +537,7 @@ class MediaRepoTests(unittest.HomeserverTestCase):
 
         channel = self.make_request(
             "GET",
-            f"/_matrix/media/r0/thumbnail/{self.media_id}{params}",
+            f"/{self.url}/{self.media_id}{params}",
             shorthand=False,
             await_result=False,
         )
@@ -567,7 +573,7 @@ class MediaRepoTests(unittest.HomeserverTestCase):
         params = "?width=32&height=32&method=" + method
         channel = self.make_request(
             "GET",
-            f"/_matrix/media/r0/thumbnail/{self.media_id}{params}",
+            f"/{self.url}/{self.media_id}{params}",
             shorthand=False,
             await_result=False,
         )
@@ -602,7 +608,7 @@ class MediaRepoTests(unittest.HomeserverTestCase):
                 channel.json_body,
                 {
                     "errcode": "M_UNKNOWN",
-                    "error": "Cannot find any thumbnails for the requested media ('/_matrix/media/r0/thumbnail/example.com/12345'). This might mean the media is not a supported_media_format=(image/jpeg, image/jpg, image/webp, image/gif, image/png) or that thumbnailing failed for some other reason. (Dynamic thumbnails are disabled on this server.)",
+                    "error": f"Cannot find any thumbnails for the requested media ('/{self.url}/example.com/12345'). This might mean the media is not a supported_media_format=(image/jpeg, image/jpg, image/webp, image/gif, image/png) or that thumbnailing failed for some other reason. (Dynamic thumbnails are disabled on this server.)",
                 },
             )
         else:
@@ -612,7 +618,7 @@ class MediaRepoTests(unittest.HomeserverTestCase):
                 channel.json_body,
                 {
                     "errcode": "M_NOT_FOUND",
-                    "error": "Not found '/_matrix/media/r0/thumbnail/example.com/12345'",
+                    "error": f"Not found '/{self.url}/example.com/12345'",
                 },
             )
 
@@ -1057,15 +1063,13 @@ class RemoteDownloadLimiterTestCase(unittest.HomeserverTestCase):
         )
         assert channel.code == 200
 
-    @override_config({"remote_media_download_burst_count": "87M"})
     @patch(
         "synapse.http.matrixfederationclient.read_body_with_max_size",
         read_body_with_max_size_30MiB,
     )
-    def test_download_ratelimit_unknown_length(self) -> None:
+    def test_download_ratelimit_max_size_sub(self) -> None:
         """
-        Test that if no content-length is provided, ratelimit will still be applied after
-        download once length is known
+        Test that if no content-length is provided, the default max size is applied instead
         """
 
         # mock out actually sending the request
@@ -1079,48 +1083,19 @@ class RemoteDownloadLimiterTestCase(unittest.HomeserverTestCase):
 
         self.client._send_request = _send_request  # type: ignore
 
-        # 3 requests should go through (note 3rd one would technically violate ratelimit but
-        # is applied *after* download - the next one will be ratelimited)
-        for i in range(3):
-            channel = self.make_request(
+        # ten requests should go through using the max size (500MB/50MB)
+        for i in range(10):
+            channel2 = self.make_request(
                 "GET",
                 f"/_matrix/media/v3/download/remote.org/abcdefghijklmnopqrstuvwxy{i}",
                 shorthand=False,
             )
-            assert channel.code == 200
+            assert channel2.code == 200
 
-        # 4th will hit ratelimit
-        channel2 = self.make_request(
+        # eleventh will hit ratelimit
+        channel3 = self.make_request(
             "GET",
             "/_matrix/media/v3/download/remote.org/abcdefghijklmnopqrstuvwxyx",
             shorthand=False,
         )
-        assert channel2.code == 429
-
-    @override_config({"max_upload_size": "29M"})
-    @patch(
-        "synapse.http.matrixfederationclient.read_body_with_max_size",
-        read_body_with_max_size_30MiB,
-    )
-    def test_max_download_respected(self) -> None:
-        """
-        Test that the max download size is enforced - note that max download size is determined
-        by the max_upload_size
-        """
-
-        # mock out actually sending the request
-        async def _send_request(*args: Any, **kwargs: Any) -> IResponse:
-            resp = MagicMock(spec=IResponse)
-            resp.code = 200
-            resp.length = 31457280
-            resp.headers = Headers({"Content-Type": ["application/octet-stream"]})
-            resp.phrase = b"OK"
-            return resp
-
-        self.client._send_request = _send_request  # type: ignore
-
-        channel = self.make_request(
-            "GET", "/_matrix/media/v3/download/remote.org/abcd", shorthand=False
-        )
-        assert channel.code == 502
-        assert channel.json_body["errcode"] == "M_TOO_LARGE"
+        assert channel3.code == 429

tests/push/test_http.py

@@ -26,8 +26,7 @@ from twisted.test.proto_helpers import MemoryReactor
 import synapse.rest.admin
 from synapse.logging.context import make_deferred_yieldable
 from synapse.push import PusherConfig, PusherConfigException
-from synapse.rest.admin.experimental_features import ExperimentalFeature
-from synapse.rest.client import login, push_rule, pusher, receipts, room, versions
+from synapse.rest.client import login, push_rule, pusher, receipts, room
 from synapse.server import HomeServer
 from synapse.types import JsonDict
 from synapse.util import Clock
@@ -43,7 +42,6 @@ class HTTPPusherTests(HomeserverTestCase):
         receipts.register_servlets,
         push_rule.register_servlets,
         pusher.register_servlets,
-        versions.register_servlets,
     ]
     user_id = True
     hijack_auth = False
@@ -971,84 +969,6 @@ class HTTPPusherTests(HomeserverTestCase):
             lookup_result.device_id,
         )
 
-    def test_device_id_feature_flag(self) -> None:
-        """Tests that a pusher created with a given device ID shows that device ID in
-        GET /pushers requests when feature is enabled for the user
-        """
-        user_id = self.register_user("user", "pass")
-        access_token = self.login("user", "pass")
-
-        # We create the pusher with an HTTP request rather than with
-        # _make_user_with_pusher so that we can test the device ID is correctly set when
-        # creating a pusher via an API call.
-        self.make_request(
-            method="POST",
-            path="/pushers/set",
-            content={
-                "kind": "http",
-                "app_id": "m.http",
-                "app_display_name": "HTTP Push Notifications",
-                "device_display_name": "pushy push",
-                "pushkey": "a@example.com",
-                "lang": "en",
-                "data": {"url": "http://example.com/_matrix/push/v1/notify"},
-            },
-            access_token=access_token,
-        )
-
-        # Look up the user info for the access token so we can compare the device ID.
-        store = self.hs.get_datastores().main
-        lookup_result = self.get_success(store.get_user_by_access_token(access_token))
-        assert lookup_result is not None
-
-        # Check field is not there before we enable the feature flag
-        channel = self.make_request("GET", "/pushers", access_token=access_token)
-        self.assertEqual(channel.code, 200)
-        self.assertEqual(len(channel.json_body["pushers"]), 1)
-        self.assertNotIn(
-            "org.matrix.msc3881.device_id", channel.json_body["pushers"][0]
-        )
-
-        self.get_success(
-            store.set_features_for_user(user_id, {ExperimentalFeature.MSC3881: True})
-        )
-
-        # Get the user's devices and check it has the correct device ID.
-        channel = self.make_request("GET", "/pushers", access_token=access_token)
-        self.assertEqual(channel.code, 200)
-        self.assertEqual(len(channel.json_body["pushers"]), 1)
-        self.assertEqual(
-            channel.json_body["pushers"][0]["org.matrix.msc3881.device_id"],
-            lookup_result.device_id,
-        )
-
-    def test_msc3881_client_versions_flag(self) -> None:
-        """Tests that MSC3881 only appears in /versions if user has it enabled."""
-
-        user_id = self.register_user("user", "pass")
-        access_token = self.login("user", "pass")
-
-        # Check feature is disabled in /versions
-        channel = self.make_request(
-            "GET", "/_matrix/client/versions", access_token=access_token
-        )
-        self.assertEqual(channel.code, 200)
-        self.assertFalse(channel.json_body["unstable_features"]["org.matrix.msc3881"])
-
-        # Enable feature for user
-        self.get_success(
-            self.hs.get_datastores().main.set_features_for_user(
-                user_id, {ExperimentalFeature.MSC3881: True}
-            )
-        )
-
-        # Check feature is now enabled in /versions for user
-        channel = self.make_request(
-            "GET", "/_matrix/client/versions", access_token=access_token
-        )
-        self.assertEqual(channel.code, 200)
-        self.assertTrue(channel.json_body["unstable_features"]["org.matrix.msc3881"])
-
     @override_config({"push": {"jitter_delay": "10s"}})
     def test_jitter(self) -> None:
         """Tests that enabling jitter actually delays sending push."""

tests/replication/storage/test_events.py

@@ -30,16 +30,19 @@ from synapse.api.constants import ReceiptTypes
 from synapse.api.room_versions import RoomVersions
 from synapse.events import EventBase, make_event_from_dict
 from synapse.events.snapshot import EventContext
+from synapse.handlers.room import RoomEventSource
 from synapse.server import HomeServer
 from synapse.storage.databases.main.event_push_actions import (
     NotifCounts,
     RoomNotifCounts,
 )
 from synapse.storage.databases.main.events_worker import EventsWorkerStore
-from synapse.storage.roommember import RoomsForUser
+from synapse.storage.roommember import GetRoomsForUserWithStreamOrdering, RoomsForUser
 from synapse.types import PersistedEventPosition
 from synapse.util import Clock
 
+from tests.server import FakeTransport
+
 from ._base import BaseWorkerStoreTestCase
 
 USER_ID = "@feeling:test"
@@ -218,6 +221,125 @@ class EventsWorkerStoreTestCase(BaseWorkerStoreTestCase):
             ),
         )
 
+    def test_get_rooms_for_user_with_stream_ordering(self) -> None:
+        """Check that the cache on get_rooms_for_user_with_stream_ordering is invalidated
+        by rows in the events stream
+        """
+        self.persist(type="m.room.create", key="", creator=USER_ID)
+        self.persist(type="m.room.member", key=USER_ID, membership="join")
+        self.replicate()
+        self.check("get_rooms_for_user_with_stream_ordering", (USER_ID_2,), set())
+
+        j2 = self.persist(
+            type="m.room.member", sender=USER_ID_2, key=USER_ID_2, membership="join"
+        )
+        assert j2.internal_metadata.instance_name is not None
+        assert j2.internal_metadata.stream_ordering is not None
+        self.replicate()
+
+        expected_pos = PersistedEventPosition(
+            j2.internal_metadata.instance_name, j2.internal_metadata.stream_ordering
+        )
+        self.check(
+            "get_rooms_for_user_with_stream_ordering",
+            (USER_ID_2,),
+            {GetRoomsForUserWithStreamOrdering(ROOM_ID, expected_pos)},
+        )
+
+    def test_get_rooms_for_user_with_stream_ordering_with_multi_event_persist(
+        self,
+    ) -> None:
+        """Check that current_state invalidation happens correctly with multiple events
+        in the persistence batch.
+
+        This test attempts to reproduce a race condition between the event persistence
+        loop and a worker-based Sync handler.
+
+        The problem occurred when the master persisted several events in one batch. It
+        only updates the current_state at the end of each batch, so the obvious thing
+        to do is then to issue a current_state_delta stream update corresponding to the
+        last stream_id in the batch.
+
+        However, that raises the possibility that a worker will see the replication
+        notification for a join event before the current_state caches are invalidated.
+
+        The test involves:
+         * creating a join and a message event for a user, and persisting them in the
+           same batch
+
+         * controlling the replication stream so that updates are sent gradually
+
+         * between each bunch of replication updates, check that we see a consistent
+           snapshot of the state.
+        """
+        self.persist(type="m.room.create", key="", creator=USER_ID)
+        self.persist(type="m.room.member", key=USER_ID, membership="join")
+        self.replicate()
+        self.check("get_rooms_for_user_with_stream_ordering", (USER_ID_2,), set())
+
+        # limit the replication rate
+        repl_transport = self._server_transport
+        assert isinstance(repl_transport, FakeTransport)
+        repl_transport.autoflush = False
+
+        # build the join and message events and persist them in the same batch.
+        logger.info("----- build test events ------")
+        j2, j2ctx = self.build_event(
+            type="m.room.member", sender=USER_ID_2, key=USER_ID_2, membership="join"
+        )
+        msg, msgctx = self.build_event()
+        self.get_success(self.persistance.persist_events([(j2, j2ctx), (msg, msgctx)]))
+        self.replicate()
+        assert j2.internal_metadata.instance_name is not None
+        assert j2.internal_metadata.stream_ordering is not None
+
+        event_source = RoomEventSource(self.hs)
+        event_source.store = self.worker_store
+        current_token = event_source.get_current_key()
+
+        # gradually stream out the replication
+        while repl_transport.buffer:
+            logger.info("------ flush ------")
+            repl_transport.flush(30)
+            self.pump(0)
+
+            prev_token = current_token
+            current_token = event_source.get_current_key()
+
+            # attempt to replicate the behaviour of the sync handler.
+            #
+            # First, we get a list of the rooms we are joined to
+            joined_rooms = self.get_success(
+                self.worker_store.get_rooms_for_user_with_stream_ordering(USER_ID_2)
+            )
+
+            # Then, we get a list of the events since the last sync
+            membership_changes = self.get_success(
+                self.worker_store.get_membership_changes_for_user(
+                    USER_ID_2, prev_token, current_token
+                )
+            )
+
+            logger.info(
+                "%s->%s: joined_rooms=%r membership_changes=%r",
+                prev_token,
+                current_token,
+                joined_rooms,
+                membership_changes,
+            )
+
+            # the membership change is only any use to us if the room is in the
+            # joined_rooms list.
+            if membership_changes:
+                expected_pos = PersistedEventPosition(
+                    j2.internal_metadata.instance_name,
+                    j2.internal_metadata.stream_ordering,
+                )
+                self.assertEqual(
+                    joined_rooms,
+                    {GetRoomsForUserWithStreamOrdering(ROOM_ID, expected_pos)},
+                )
+
     event_id = 0
 
     def persist(self, backfill: bool = False, **kwargs: Any) -> EventBase:

tests/rest/admin/test_admin.py

@@ -384,7 +384,7 @@ class ExperimentalFeaturesTestCase(unittest.HomeserverTestCase):
             "PUT",
             url,
             content={
-                "features": {"msc3881": True},
+                "features": {"msc3026": True, "msc3881": True},
             },
             access_token=self.admin_user_tok,
         )
@@ -399,6 +399,10 @@ class ExperimentalFeaturesTestCase(unittest.HomeserverTestCase):
             access_token=self.admin_user_tok,
         )
         self.assertEqual(channel.code, 200)
+        self.assertEqual(
+            True,
+            channel.json_body["features"]["msc3026"],
+        )
         self.assertEqual(
             True,
             channel.json_body["features"]["msc3881"],
@@ -409,7 +413,7 @@ class ExperimentalFeaturesTestCase(unittest.HomeserverTestCase):
         channel = self.make_request(
             "PUT",
             url,
-            content={"features": {"msc3881": False}},
+            content={"features": {"msc3026": False}},
             access_token=self.admin_user_tok,
         )
         self.assertEqual(channel.code, 200)
@@ -425,6 +429,10 @@ class ExperimentalFeaturesTestCase(unittest.HomeserverTestCase):
         self.assertEqual(channel.code, 200)
         self.assertEqual(
             False,
+            channel.json_body["features"]["msc3026"],
+        )
+        self.assertEqual(
+            True,
             channel.json_body["features"]["msc3881"],
         )
 
@@ -433,7 +441,7 @@ class ExperimentalFeaturesTestCase(unittest.HomeserverTestCase):
         channel = self.make_request(
             "PUT",
             url,
-            content={"features": {"msc3881": False}},
+            content={"features": {"msc3026": False}},
             access_token=self.admin_user_tok,
         )
         self.assertEqual(channel.code, 200)

tests/rest/client/test_login.py

@@ -969,8 +969,9 @@ class CASTestCase(unittest.HomeserverTestCase):
         # Test that the response is HTML.
         self.assertEqual(channel.code, 200, channel.result)
         content_type_header_value = ""
-        for header in channel.headers.getRawHeaders("Content-Type", []):
-            content_type_header_value = header
+        for header in channel.result.get("headers", []):
+            if header[0] == b"Content-Type":
+                content_type_header_value = header[1].decode("utf8")
 
         self.assertTrue(content_type_header_value.startswith("text/html"))
 

tests/rest/client/test_media.py

@@ -23,15 +23,12 @@ import io
 import json
 import os
 import re
-import shutil
-from typing import Any, BinaryIO, Dict, List, Optional, Sequence, Tuple, Type
+from typing import Any, BinaryIO, ClassVar, Dict, List, Optional, Sequence, Tuple, Type
 from unittest.mock import MagicMock, Mock, patch
 from urllib import parse
 from urllib.parse import quote, urlencode
 
-from parameterized import parameterized, parameterized_class
-from PIL import Image as Image
-from typing_extensions import ClassVar
+from parameterized import parameterized_class
 
 from twisted.internet import defer
 from twisted.internet._resolver import HostResolution
@@ -51,8 +48,7 @@ from synapse.config.oembed import OEmbedEndpointConfig
 from synapse.http.client import MultipartResponse
 from synapse.http.types import QueryParams
 from synapse.logging.context import make_deferred_yieldable
-from synapse.media._base import FileInfo, ThumbnailInfo
-from synapse.media.thumbnailer import ThumbnailProvider
+from synapse.media._base import FileInfo
 from synapse.media.url_previewer import IMAGE_CACHE_EXPIRY_MS
 from synapse.rest import admin
 from synapse.rest.client import login, media
@@ -80,7 +76,7 @@ except ImportError:
     lxml = None  # type: ignore[assignment]
 
 
-class MediaDomainBlockingTests(unittest.HomeserverTestCase):
+class UnstableMediaDomainBlockingTests(unittest.HomeserverTestCase):
     remote_media_id = "doesnotmatter"
     remote_server_name = "evil.com"
     servlets = [
@@ -148,6 +144,7 @@ class MediaDomainBlockingTests(unittest.HomeserverTestCase):
             # Should result in a 404.
             "prevent_media_downloads_from": ["evil.com"],
             "dynamic_thumbnails": True,
+            "experimental_features": {"msc3916_authenticated_media_enabled": True},
         }
     )
     def test_cannot_download_blocked_media_thumbnail(self) -> None:
@@ -156,7 +153,7 @@ class MediaDomainBlockingTests(unittest.HomeserverTestCase):
         """
         response = self.make_request(
             "GET",
-            f"/_matrix/client/v1/media/thumbnail/evil.com/{self.remote_media_id}?width=100&height=100",
+            f"/_matrix/client/unstable/org.matrix.msc3916/media/thumbnail/evil.com/{self.remote_media_id}?width=100&height=100",
             shorthand=False,
             content={"width": 100, "height": 100},
             access_token=self.tok,
@@ -169,6 +166,7 @@ class MediaDomainBlockingTests(unittest.HomeserverTestCase):
             # This proves we haven't broken anything.
             "prevent_media_downloads_from": ["not-listed.com"],
             "dynamic_thumbnails": True,
+            "experimental_features": {"msc3916_authenticated_media_enabled": True},
         }
     )
     def test_remote_media_thumbnail_normally_unblocked(self) -> None:
@@ -177,14 +175,14 @@ class MediaDomainBlockingTests(unittest.HomeserverTestCase):
         """
         response = self.make_request(
             "GET",
-            f"/_matrix/client/v1/media/thumbnail/evil.com/{self.remote_media_id}?width=100&height=100",
+            f"/_matrix/client/unstable/org.matrix.msc3916/media/thumbnail/evil.com/{self.remote_media_id}?width=100&height=100",
             shorthand=False,
             access_token=self.tok,
         )
         self.assertEqual(response.code, 200)
 
 
-class URLPreviewTests(unittest.HomeserverTestCase):
+class UnstableURLPreviewTests(unittest.HomeserverTestCase):
     if not lxml:
         skip = "url preview feature requires lxml"
 
@@ -200,6 +198,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
     def make_homeserver(self, reactor: MemoryReactor, clock: Clock) -> HomeServer:
         config = self.default_config()
+        config["experimental_features"] = {"msc3916_authenticated_media_enabled": True}
         config["url_preview_enabled"] = True
         config["max_spider_size"] = 9999999
         config["url_preview_ip_range_blacklist"] = (
@@ -285,6 +284,18 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
         self.reactor.nameResolver = Resolver()  # type: ignore[assignment]
 
+    def create_resource_dict(self) -> Dict[str, Resource]:
+        """Create a resource tree for the test server
+
+        A resource tree is a mapping from path to twisted.web.resource.
+
+        The default implementation creates a JsonResource and calls each function in
+        `servlets` to register servlets against it.
+        """
+        resources = super().create_resource_dict()
+        resources["/_matrix/media"] = self.hs.get_media_repository_resource()
+        return resources
+
     def _assert_small_png(self, json_body: JsonDict) -> None:
         """Assert properties from the SMALL_PNG test image."""
         self.assertTrue(json_body["og:image"].startswith("mxc://"))
@@ -298,7 +309,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=http://matrix.org",
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url=http://matrix.org",
             shorthand=False,
             await_result=False,
         )
@@ -323,7 +334,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
         # Check the cache returns the correct response
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=http://matrix.org",
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url=http://matrix.org",
             shorthand=False,
         )
 
@@ -341,7 +352,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
         # Check the database cache returns the correct response
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=http://matrix.org",
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url=http://matrix.org",
             shorthand=False,
         )
 
@@ -364,7 +375,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=http://matrix.org",
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url=http://matrix.org",
             shorthand=False,
             await_result=False,
         )
@@ -394,7 +405,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=http://matrix.org",
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url=http://matrix.org",
             shorthand=False,
             await_result=False,
         )
@@ -430,7 +441,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=http://matrix.org",
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url=http://matrix.org",
             shorthand=False,
             await_result=False,
         )
@@ -471,7 +482,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=http://matrix.org",
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url=http://matrix.org",
             shorthand=False,
             await_result=False,
         )
@@ -506,7 +517,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=http://matrix.org",
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url=http://matrix.org",
             shorthand=False,
             await_result=False,
         )
@@ -539,7 +550,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=http://example.com",
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url=http://example.com",
             shorthand=False,
             await_result=False,
         )
@@ -569,7 +580,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=http://example.com",
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url=http://example.com",
             shorthand=False,
         )
 
@@ -592,7 +603,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=http://example.com",
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url=http://example.com",
             shorthand=False,
         )
 
@@ -611,7 +622,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
         """
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=http://192.168.1.1",
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url=http://192.168.1.1",
             shorthand=False,
         )
 
@@ -629,7 +640,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
         """
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=http://1.1.1.2",
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url=http://1.1.1.2",
             shorthand=False,
         )
 
@@ -648,7 +659,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=http://example.com",
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url=http://example.com",
             shorthand=False,
             await_result=False,
         )
@@ -685,7 +696,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=http://example.com",
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url=http://example.com",
             shorthand=False,
         )
         self.assertEqual(channel.code, 502)
@@ -707,7 +718,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=http://example.com",
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url=http://example.com",
             shorthand=False,
         )
 
@@ -730,7 +741,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=http://example.com",
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url=http://example.com",
             shorthand=False,
         )
 
@@ -749,7 +760,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
         """
         channel = self.make_request(
             "OPTIONS",
-            "/_matrix/client/v1/media/preview_url?url=http://example.com",
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url=http://example.com",
             shorthand=False,
         )
         self.assertEqual(channel.code, 204)
@@ -763,7 +774,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
         # Build and make a request to the server
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=http://example.com",
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url=http://example.com",
             shorthand=False,
             await_result=False,
         )
@@ -816,7 +827,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=http://matrix.org",
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url=http://matrix.org",
             shorthand=False,
             await_result=False,
         )
@@ -866,7 +877,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=http://matrix.org",
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url=http://matrix.org",
             shorthand=False,
             await_result=False,
         )
@@ -908,7 +919,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=http://matrix.org",
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url=http://matrix.org",
             shorthand=False,
             await_result=False,
         )
@@ -948,7 +959,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=http://matrix.org",
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url=http://matrix.org",
             shorthand=False,
             await_result=False,
         )
@@ -989,7 +1000,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
         channel = self.make_request(
             "GET",
-            f"/_matrix/client/v1/media/preview_url?{query_params}",
+            f"/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?{query_params}",
             shorthand=False,
         )
         self.pump()
@@ -1010,7 +1021,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=http://matrix.org",
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url=http://matrix.org",
             shorthand=False,
             await_result=False,
         )
@@ -1047,7 +1058,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=http://twitter.com/matrixdotorg/status/12345",
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url=http://twitter.com/matrixdotorg/status/12345",
             shorthand=False,
             await_result=False,
         )
@@ -1107,7 +1118,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=http://twitter.com/matrixdotorg/status/12345",
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url=http://twitter.com/matrixdotorg/status/12345",
             shorthand=False,
             await_result=False,
         )
@@ -1156,7 +1167,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=http://www.hulu.com/watch/12345",
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url=http://www.hulu.com/watch/12345",
             shorthand=False,
             await_result=False,
         )
@@ -1201,7 +1212,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=http://twitter.com/matrixdotorg/status/12345",
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url=http://twitter.com/matrixdotorg/status/12345",
             shorthand=False,
             await_result=False,
         )
@@ -1230,7 +1241,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=http://www.twitter.com/matrixdotorg/status/12345",
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url=http://www.twitter.com/matrixdotorg/status/12345",
             shorthand=False,
             await_result=False,
         )
@@ -1322,7 +1333,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=http://www.twitter.com/matrixdotorg/status/12345",
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url=http://www.twitter.com/matrixdotorg/status/12345",
             shorthand=False,
             await_result=False,
         )
@@ -1363,7 +1374,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=http://cdn.twitter.com/matrixdotorg",
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url=http://cdn.twitter.com/matrixdotorg",
             shorthand=False,
             await_result=False,
         )
@@ -1405,7 +1416,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
         # Check fetching
         channel = self.make_request(
             "GET",
-            f"/_matrix/client/v1/media/download/{host}/{media_id}",
+            f"/_matrix/media/v3/download/{host}/{media_id}",
             shorthand=False,
             await_result=False,
         )
@@ -1418,7 +1429,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
         channel = self.make_request(
             "GET",
-            f"/_matrix/client/v1/download/{host}/{media_id}",
+            f"/_matrix/media/v3/download/{host}/{media_id}",
             shorthand=False,
             await_result=False,
         )
@@ -1453,7 +1464,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
         # Check fetching
         channel = self.make_request(
             "GET",
-            f"/_matrix/client/v1/media/thumbnail/{host}/{media_id}?width=32&height=32&method=scale",
+            f"/_matrix/client/unstable/org.matrix.msc3916/media/thumbnail/{host}/{media_id}?width=32&height=32&method=scale",
             shorthand=False,
             await_result=False,
         )
@@ -1471,7 +1482,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
         channel = self.make_request(
             "GET",
-            f"/_matrix/client/v1/media/thumbnail/{host}/{media_id}?width=32&height=32&method=scale",
+            f"/_matrix/client/unstable/org.matrix.msc3916/media/thumbnail/{host}/{media_id}?width=32&height=32&method=scale",
             shorthand=False,
             await_result=False,
         )
@@ -1521,7 +1532,8 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=" + bad_url,
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url="
+            + bad_url,
             shorthand=False,
             await_result=False,
         )
@@ -1530,7 +1542,8 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=" + good_url,
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url="
+            + good_url,
             shorthand=False,
             await_result=False,
         )
@@ -1562,7 +1575,8 @@ class URLPreviewTests(unittest.HomeserverTestCase):
 
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/preview_url?url=" + bad_url,
+            "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url?url="
+            + bad_url,
             shorthand=False,
             await_result=False,
         )
@@ -1570,7 +1584,7 @@ class URLPreviewTests(unittest.HomeserverTestCase):
         self.assertEqual(channel.code, 403, channel.result)
 
 
-class MediaConfigTest(unittest.HomeserverTestCase):
+class UnstableMediaConfigTest(unittest.HomeserverTestCase):
     servlets = [
         media.register_servlets,
         admin.register_servlets,
@@ -1581,6 +1595,7 @@ class MediaConfigTest(unittest.HomeserverTestCase):
         self, reactor: ThreadedMemoryReactorClock, clock: Clock
     ) -> HomeServer:
         config = self.default_config()
+        config["experimental_features"] = {"msc3916_authenticated_media_enabled": True}
 
         self.storage_path = self.mktemp()
         self.media_store_path = self.mktemp()
@@ -1607,7 +1622,7 @@ class MediaConfigTest(unittest.HomeserverTestCase):
     def test_media_config(self) -> None:
         channel = self.make_request(
             "GET",
-            "/_matrix/client/v1/media/config",
+            "/_matrix/client/unstable/org.matrix.msc3916/media/config",
             shorthand=False,
             access_token=self.tok,
         )
@@ -1810,19 +1825,13 @@ class RemoteDownloadLimiterTestCase(unittest.HomeserverTestCase):
         )
         assert channel.code == 200
 
-    @override_config(
-        {
-            "remote_media_download_burst_count": "87M",
-        }
-    )
     @patch(
         "synapse.http.matrixfederationclient.read_multipart_response",
         read_multipart_response_30MiB,
     )
-    def test_download_ratelimit_unknown_length(self) -> None:
+    def test_download_ratelimit_max_size_sub(self) -> None:
         """
-        Test that if no content-length is provided, ratelimiting is still applied after
-        media is downloaded and length is known
+        Test that if no content-length is provided, the default max size is applied instead
         """
 
         # mock out actually sending the request
@@ -1838,9 +1847,8 @@ class RemoteDownloadLimiterTestCase(unittest.HomeserverTestCase):
 
         self.client._send_request = _send_request  # type: ignore
 
-        # first 3 will go through (note that 3rd request technically violates rate limit but
-        # that since the ratelimiting is applied *after* download it goes through, but next one fails)
-        for i in range(3):
+        # ten requests should go through using the max size (500MB/50MB)
+        for i in range(10):
             channel2 = self.make_request(
                 "GET",
                 f"/_matrix/client/v1/media/download/remote.org/abc{i}",
@@ -1849,7 +1857,7 @@ class RemoteDownloadLimiterTestCase(unittest.HomeserverTestCase):
             )
             assert channel2.code == 200
 
-        # 4th will hit ratelimit
+        # eleventh will hit ratelimit
         channel3 = self.make_request(
             "GET",
             "/_matrix/client/v1/media/download/remote.org/abcd",
@@ -1858,39 +1866,6 @@ class RemoteDownloadLimiterTestCase(unittest.HomeserverTestCase):
         )
         assert channel3.code == 429
 
-    @override_config({"max_upload_size": "29M"})
-    @patch(
-        "synapse.http.matrixfederationclient.read_multipart_response",
-        read_multipart_response_30MiB,
-    )
-    def test_max_download_respected(self) -> None:
-        """
-        Test that the max download size is enforced - note that max download size is determined
-        by the max_upload_size
-        """
-
-        # mock out actually sending the request, returns a 30MiB response
-        async def _send_request(*args: Any, **kwargs: Any) -> IResponse:
-            resp = MagicMock(spec=IResponse)
-            resp.code = 200
-            resp.length = 31457280
-            resp.headers = Headers(
-                {"Content-Type": ["multipart/mixed; boundary=gc0p4Jq0M2Yt08jU534c0p"]}
-            )
-            resp.phrase = b"OK"
-            return resp
-
-        self.client._send_request = _send_request  # type: ignore
-
-        channel = self.make_request(
-            "GET",
-            "/_matrix/client/v1/media/download/remote.org/abcd",
-            shorthand=False,
-            access_token=self.tok,
-        )
-        assert channel.code == 502
-        assert channel.json_body["errcode"] == "M_TOO_LARGE"
-
     def test_file_download(self) -> None:
         content = io.BytesIO(b"file_to_stream")
         content_uri = self.get_success(
@@ -1924,7 +1899,7 @@ input_values = [(x,) for x in test_images]
 
 
 @parameterized_class(("test_image",), input_values)
-class DownloadAndThumbnailTestCase(unittest.HomeserverTestCase):
+class DownloadTestCase(unittest.HomeserverTestCase):
     test_image: ClassVar[TestImage]
     servlets = [
         media.register_servlets,
@@ -2030,6 +2005,7 @@ class DownloadAndThumbnailTestCase(unittest.HomeserverTestCase):
             "config": {"directory": self.storage_path},
         }
         config["media_storage_providers"] = [provider_config]
+        config["experimental_features"] = {"msc3916_authenticated_media_enabled": True}
 
         hs = self.setup_test_homeserver(config=config, federation_http_client=client)
 
@@ -2188,7 +2164,7 @@ class DownloadAndThumbnailTestCase(unittest.HomeserverTestCase):
 
     def test_unknown_federation_endpoint(self) -> None:
         """
-        Test that if the download request to remote federation endpoint returns a 404
+        Test that if the downloadd request to remote federation endpoint returns a 404
         we fall back to the _matrix/media endpoint
         """
         channel = self.make_request(
@@ -2234,444 +2210,3 @@ class DownloadAndThumbnailTestCase(unittest.HomeserverTestCase):
 
         self.pump()
         self.assertEqual(channel.code, 200)
-
-    def test_thumbnail_crop(self) -> None:
-        """Test that a cropped remote thumbnail is available."""
-        self._test_thumbnail(
-            "crop",
-            self.test_image.expected_cropped,
-            expected_found=self.test_image.expected_found,
-            unable_to_thumbnail=self.test_image.unable_to_thumbnail,
-        )
-
-    def test_thumbnail_scale(self) -> None:
-        """Test that a scaled remote thumbnail is available."""
-        self._test_thumbnail(
-            "scale",
-            self.test_image.expected_scaled,
-            expected_found=self.test_image.expected_found,
-            unable_to_thumbnail=self.test_image.unable_to_thumbnail,
-        )
-
-    def test_invalid_type(self) -> None:
-        """An invalid thumbnail type is never available."""
-        self._test_thumbnail(
-            "invalid",
-            None,
-            expected_found=False,
-            unable_to_thumbnail=self.test_image.unable_to_thumbnail,
-        )
-
-    @unittest.override_config(
-        {"thumbnail_sizes": [{"width": 32, "height": 32, "method": "scale"}]}
-    )
-    def test_no_thumbnail_crop(self) -> None:
-        """
-        Override the config to generate only scaled thumbnails, but request a cropped one.
-        """
-        self._test_thumbnail(
-            "crop",
-            None,
-            expected_found=False,
-            unable_to_thumbnail=self.test_image.unable_to_thumbnail,
-        )
-
-    @unittest.override_config(
-        {"thumbnail_sizes": [{"width": 32, "height": 32, "method": "crop"}]}
-    )
-    def test_no_thumbnail_scale(self) -> None:
-        """
-        Override the config to generate only cropped thumbnails, but request a scaled one.
-        """
-        self._test_thumbnail(
-            "scale",
-            None,
-            expected_found=False,
-            unable_to_thumbnail=self.test_image.unable_to_thumbnail,
-        )
-
-    def test_thumbnail_repeated_thumbnail(self) -> None:
-        """Test that fetching the same thumbnail works, and deleting the on disk
-        thumbnail regenerates it.
-        """
-        self._test_thumbnail(
-            "scale",
-            self.test_image.expected_scaled,
-            expected_found=self.test_image.expected_found,
-            unable_to_thumbnail=self.test_image.unable_to_thumbnail,
-        )
-
-        if not self.test_image.expected_found:
-            return
-
-        # Fetching again should work, without re-requesting the image from the
-        # remote.
-        params = "?width=32&height=32&method=scale"
-        channel = self.make_request(
-            "GET",
-            f"/_matrix/client/v1/media/thumbnail/{self.remote}/{self.media_id}{params}",
-            shorthand=False,
-            await_result=False,
-            access_token=self.tok,
-        )
-        self.pump()
-
-        self.assertEqual(channel.code, 200)
-        if self.test_image.expected_scaled:
-            self.assertEqual(
-                channel.result["body"],
-                self.test_image.expected_scaled,
-                channel.result["body"],
-            )
-
-        # Deleting the thumbnail on disk then re-requesting it should work as
-        # Synapse should regenerate missing thumbnails.
-        info = self.get_success(
-            self.store.get_cached_remote_media(self.remote, self.media_id)
-        )
-        assert info is not None
-        file_id = info.filesystem_id
-
-        thumbnail_dir = self.media_repo.filepaths.remote_media_thumbnail_dir(
-            self.remote, file_id
-        )
-        shutil.rmtree(thumbnail_dir, ignore_errors=True)
-
-        channel = self.make_request(
-            "GET",
-            f"/_matrix/client/v1/media/thumbnail/{self.remote}/{self.media_id}{params}",
-            shorthand=False,
-            await_result=False,
-            access_token=self.tok,
-        )
-        self.pump()
-
-        self.assertEqual(channel.code, 200)
-        if self.test_image.expected_scaled:
-            self.assertEqual(
-                channel.result["body"],
-                self.test_image.expected_scaled,
-                channel.result["body"],
-            )
-
-    def _test_thumbnail(
-        self,
-        method: str,
-        expected_body: Optional[bytes],
-        expected_found: bool,
-        unable_to_thumbnail: bool = False,
-    ) -> None:
-        """Test the given thumbnailing method works as expected.
-
-        Args:
-            method: The thumbnailing method to use (crop, scale).
-            expected_body: The expected bytes from thumbnailing, or None if
-                test should just check for a valid image.
-            expected_found: True if the file should exist on the server, or False if
-                a 404/400 is expected.
-            unable_to_thumbnail: True if we expect the thumbnailing to fail (400), or
-                False if the thumbnailing should succeed or a normal 404 is expected.
-        """
-
-        params = "?width=32&height=32&method=" + method
-        channel = self.make_request(
-            "GET",
-            f"/_matrix/client/v1/media/thumbnail/{self.remote}/{self.media_id}{params}",
-            shorthand=False,
-            await_result=False,
-            access_token=self.tok,
-        )
-        self.pump()
-        headers = {
-            b"Content-Length": [b"%d" % (len(self.test_image.data))],
-            b"Content-Type": [self.test_image.content_type],
-        }
-        self.fetches[0][0].callback(
-            (self.test_image.data, (len(self.test_image.data), headers))
-        )
-        self.pump()
-        if expected_found:
-            self.assertEqual(channel.code, 200)
-
-            self.assertEqual(
-                channel.headers.getRawHeaders(b"Cross-Origin-Resource-Policy"),
-                [b"cross-origin"],
-            )
-
-            if expected_body is not None:
-                self.assertEqual(
-                    channel.result["body"], expected_body, channel.result["body"]
-                )
-            else:
-                # ensure that the result is at least some valid image
-                Image.open(io.BytesIO(channel.result["body"]))
-        elif unable_to_thumbnail:
-            # A 400 with a JSON body.
-            self.assertEqual(channel.code, 400)
-            self.assertEqual(
-                channel.json_body,
-                {
-                    "errcode": "M_UNKNOWN",
-                    "error": "Cannot find any thumbnails for the requested media ('/_matrix/client/v1/media/thumbnail/example.com/12345'). This might mean the media is not a supported_media_format=(image/jpeg, image/jpg, image/webp, image/gif, image/png) or that thumbnailing failed for some other reason. (Dynamic thumbnails are disabled on this server.)",
-                },
-            )
-        else:
-            # A 404 with a JSON body.
-            self.assertEqual(channel.code, 404)
-            self.assertEqual(
-                channel.json_body,
-                {
-                    "errcode": "M_NOT_FOUND",
-                    "error": "Not found '/_matrix/client/v1/media/thumbnail/example.com/12345'",
-                },
-            )
-
-    @parameterized.expand([("crop", 16), ("crop", 64), ("scale", 16), ("scale", 64)])
-    def test_same_quality(self, method: str, desired_size: int) -> None:
-        """Test that choosing between thumbnails with the same quality rating succeeds.
-
-        We are not particular about which thumbnail is chosen."""
-
-        content_type = self.test_image.content_type.decode()
-        media_repo = self.hs.get_media_repository()
-        thumbnail_provider = ThumbnailProvider(
-            self.hs, media_repo, media_repo.media_storage
-        )
-
-        self.assertIsNotNone(
-            thumbnail_provider._select_thumbnail(
-                desired_width=desired_size,
-                desired_height=desired_size,
-                desired_method=method,
-                desired_type=content_type,
-                # Provide two identical thumbnails which are guaranteed to have the same
-                # quality rating.
-                thumbnail_infos=[
-                    ThumbnailInfo(
-                        width=32,
-                        height=32,
-                        method=method,
-                        type=content_type,
-                        length=256,
-                    ),
-                    ThumbnailInfo(
-                        width=32,
-                        height=32,
-                        method=method,
-                        type=content_type,
-                        length=256,
-                    ),
-                ],
-                file_id=f"image{self.test_image.extension.decode()}",
-                url_cache=False,
-                server_name=None,
-            )
-        )
-
-
-configs = [
-    {"extra_config": {"dynamic_thumbnails": True}},
-    {"extra_config": {"dynamic_thumbnails": False}},
-]
-
-
-@parameterized_class(configs)
-class AuthenticatedMediaTestCase(unittest.HomeserverTestCase):
-    extra_config: Dict[str, Any]
-    servlets = [
-        media.register_servlets,
-        login.register_servlets,
-        admin.register_servlets,
-    ]
-
-    def make_homeserver(self, reactor: MemoryReactor, clock: Clock) -> HomeServer:
-        config = self.default_config()
-
-        self.clock = clock
-        self.storage_path = self.mktemp()
-        self.media_store_path = self.mktemp()
-        os.mkdir(self.storage_path)
-        os.mkdir(self.media_store_path)
-        config["media_store_path"] = self.media_store_path
-        config["enable_authenticated_media"] = True
-
-        provider_config = {
-            "module": "synapse.media.storage_provider.FileStorageProviderBackend",
-            "store_local": True,
-            "store_synchronous": False,
-            "store_remote": True,
-            "config": {"directory": self.storage_path},
-        }
-
-        config["media_storage_providers"] = [provider_config]
-        config.update(self.extra_config)
-
-        return self.setup_test_homeserver(config=config)
-
-    def prepare(self, reactor: MemoryReactor, clock: Clock, hs: HomeServer) -> None:
-        self.repo = hs.get_media_repository()
-        self.client = hs.get_federation_http_client()
-        self.store = hs.get_datastores().main
-        self.user = self.register_user("user", "pass")
-        self.tok = self.login("user", "pass")
-
-    def create_resource_dict(self) -> Dict[str, Resource]:
-        resources = super().create_resource_dict()
-        resources["/_matrix/media"] = self.hs.get_media_repository_resource()
-        return resources
-
-    def test_authenticated_media(self) -> None:
-        # upload some local media with authentication on
-        channel = self.make_request(
-            "POST",
-            "_matrix/media/v3/upload?filename=test_png_upload",
-            SMALL_PNG,
-            self.tok,
-            shorthand=False,
-            content_type=b"image/png",
-            custom_headers=[("Content-Length", str(67))],
-        )
-        self.assertEqual(channel.code, 200)
-        res = channel.json_body.get("content_uri")
-        assert res is not None
-        uri = res.split("mxc://")[1]
-
-        # request media over authenticated endpoint, should be found
-        channel2 = self.make_request(
-            "GET",
-            f"_matrix/client/v1/media/download/{uri}",
-            access_token=self.tok,
-            shorthand=False,
-        )
-        self.assertEqual(channel2.code, 200)
-
-        # request same media over unauthenticated media, should raise 404 not found
-        channel3 = self.make_request(
-            "GET", f"_matrix/media/v3/download/{uri}", shorthand=False
-        )
-        self.assertEqual(channel3.code, 404)
-
-        # check thumbnails as well
-        params = "?width=32&height=32&method=crop"
-        channel4 = self.make_request(
-            "GET",
-            f"/_matrix/client/v1/media/thumbnail/{uri}{params}",
-            shorthand=False,
-            access_token=self.tok,
-        )
-        self.assertEqual(channel4.code, 200)
-
-        params = "?width=32&height=32&method=crop"
-        channel5 = self.make_request(
-            "GET",
-            f"/_matrix/media/r0/thumbnail/{uri}{params}",
-            shorthand=False,
-            access_token=self.tok,
-        )
-        self.assertEqual(channel5.code, 404)
-
-        # Inject a piece of remote media.
-        file_id = "abcdefg12345"
-        file_info = FileInfo(server_name="lonelyIsland", file_id=file_id)
-
-        media_storage = self.hs.get_media_repository().media_storage
-
-        ctx = media_storage.store_into_file(file_info)
-        (f, fname) = self.get_success(ctx.__aenter__())
-        f.write(SMALL_PNG)
-        self.get_success(ctx.__aexit__(None, None, None))
-
-        # we write the authenticated status when storing media, so this should pick up
-        # config and authenticate the media
-        self.get_success(
-            self.store.store_cached_remote_media(
-                origin="lonelyIsland",
-                media_id="52",
-                media_type="image/png",
-                media_length=1,
-                time_now_ms=self.clock.time_msec(),
-                upload_name="remote_test.png",
-                filesystem_id=file_id,
-            )
-        )
-
-        # ensure we have thumbnails for the non-dynamic code path
-        if self.extra_config == {"dynamic_thumbnails": False}:
-            self.get_success(
-                self.repo._generate_thumbnails(
-                    "lonelyIsland", "52", file_id, "image/png"
-                )
-            )
-
-        channel6 = self.make_request(
-            "GET",
-            "_matrix/client/v1/media/download/lonelyIsland/52",
-            access_token=self.tok,
-            shorthand=False,
-        )
-        self.assertEqual(channel6.code, 200)
-
-        channel7 = self.make_request(
-            "GET", f"_matrix/media/v3/download/{uri}", shorthand=False
-        )
-        self.assertEqual(channel7.code, 404)
-
-        params = "?width=32&height=32&method=crop"
-        channel8 = self.make_request(
-            "GET",
-            f"/_matrix/client/v1/media/thumbnail/lonelyIsland/52{params}",
-            shorthand=False,
-            access_token=self.tok,
-        )
-        self.assertEqual(channel8.code, 200)
-
-        channel9 = self.make_request(
-            "GET",
-            f"/_matrix/media/r0/thumbnail/lonelyIsland/52{params}",
-            shorthand=False,
-            access_token=self.tok,
-        )
-        self.assertEqual(channel9.code, 404)
-
-        # Inject a piece of local media that isn't authenticated
-        file_id = "abcdefg123456"
-        file_info = FileInfo(None, file_id=file_id)
-
-        ctx = media_storage.store_into_file(file_info)
-        (f, fname) = self.get_success(ctx.__aenter__())
-        f.write(SMALL_PNG)
-        self.get_success(ctx.__aexit__(None, None, None))
-
-        self.get_success(
-            self.store.db_pool.simple_insert(
-                "local_media_repository",
-                {
-                    "media_id": "abcdefg123456",
-                    "media_type": "image/png",
-                    "created_ts": self.clock.time_msec(),
-                    "upload_name": "test_local",
-                    "media_length": 1,
-                    "user_id": "someone",
-                    "url_cache": None,
-                    "authenticated": False,
-                },
-                desc="store_local_media",
-            )
-        )
-
-        # check that unauthenticated media is still available over both endpoints
-        channel9 = self.make_request(
-            "GET",
-            "/_matrix/client/v1/media/download/test/abcdefg123456",
-            shorthand=False,
-            access_token=self.tok,
-        )
-        self.assertEqual(channel9.code, 200)
-
-        channel10 = self.make_request(
-            "GET",
-            "/_matrix/media/r0/download/test/abcdefg123456",
-            shorthand=False,
-            access_token=self.tok,
-        )
-        self.assertEqual(channel10.code, 200)

tests/server.py

@@ -198,35 +198,17 @@ class FakeChannel:
     def headers(self) -> Headers:
         if not self.result:
             raise Exception("No result yet.")
-
-        h = self.result["headers"]
-        assert isinstance(h, Headers)
+        h = Headers()
+        for i in self.result["headers"]:
+            h.addRawHeader(*i)
         return h
 
     def writeHeaders(
-        self,
-        version: bytes,
-        code: bytes,
-        reason: bytes,
-        headers: Union[Headers, List[Tuple[bytes, bytes]]],
+        self, version: bytes, code: bytes, reason: bytes, headers: Headers
     ) -> None:
         self.result["version"] = version
         self.result["code"] = code
         self.result["reason"] = reason
-
-        if isinstance(headers, list):
-            # Support prior to Twisted 24.7.0rc1
-            new_headers = Headers()
-            for k, v in headers:
-                assert isinstance(k, bytes), f"key is not of type bytes: {k!r}"
-                assert isinstance(v, bytes), f"value is not of type bytes: {v!r}"
-                new_headers.addRawHeader(k, v)
-            headers = new_headers
-
-        assert isinstance(
-            headers, Headers
-        ), f"headers are of the wrong type: {headers!r}"
-
         self.result["headers"] = headers
 
     def write(self, data: bytes) -> None:
@@ -307,6 +289,10 @@ class FakeChannel:
         self._reactor.run()
 
         while not self.is_finished():
+            # If there's a producer, tell it to resume producing so we get content
+            if self._producer:
+                self._producer.resumeProducing()
+
             if self._reactor.seconds() > end_time:
                 raise TimedOutException("Timed out waiting for request to finish.")
 
@@ -960,7 +946,7 @@ def connect_client(
 
 
 class TestHomeServer(HomeServer):
-    DATASTORE_CLASS = DataStore
+    DATASTORE_CLASS = DataStore  # type: ignore[assignment]
 
 
 def setup_test_homeserver(

tests/storage/test_roommember.py

@@ -19,28 +19,20 @@
 # [This file includes modifications made by New Vector Limited]
 #
 #
-import logging
 from typing import List, Optional, Tuple, cast
 
 from twisted.test.proto_helpers import MemoryReactor
 
-from synapse.api.constants import EventTypes, JoinRules, Membership
-from synapse.api.room_versions import RoomVersions
-from synapse.rest import admin
+from synapse.api.constants import Membership
 from synapse.rest.admin import register_servlets_for_client_rest_resource
-from synapse.rest.client import knock, login, room
+from synapse.rest.client import login, room
 from synapse.server import HomeServer
-from synapse.storage.databases.main.roommember import extract_heroes_from_room_summary
-from synapse.storage.roommember import MemberSummary
 from synapse.types import UserID, create_requester
 from synapse.util import Clock
 
 from tests import unittest
 from tests.server import TestHomeServer
 from tests.test_utils import event_injection
-from tests.unittest import skip_unless
-
-logger = logging.getLogger(__name__)
 
 
 class RoomMemberStoreTestCase(unittest.HomeserverTestCase):
@@ -248,397 +240,6 @@ class RoomMemberStoreTestCase(unittest.HomeserverTestCase):
         )
 
 
-class RoomSummaryTestCase(unittest.HomeserverTestCase):
-    """
-    Test `/sync` room summary related logic like `get_room_summary(...)` and
-    `extract_heroes_from_room_summary(...)`
-    """
-
-    servlets = [
-        admin.register_servlets,
-        knock.register_servlets,
-        login.register_servlets,
-        room.register_servlets,
-    ]
-
-    def prepare(self, reactor: MemoryReactor, clock: Clock, hs: HomeServer) -> None:
-        self.sliding_sync_handler = self.hs.get_sliding_sync_handler()
-        self.store = self.hs.get_datastores().main
-
-    def _assert_member_summary(
-        self,
-        actual_member_summary: MemberSummary,
-        expected_member_list: List[str],
-        *,
-        expected_member_count: Optional[int] = None,
-    ) -> None:
-        """
-        Assert that the `MemberSummary` object has the expected members.
-        """
-        self.assertListEqual(
-            [
-                user_id
-                for user_id, _membership_event_id in actual_member_summary.members
-            ],
-            expected_member_list,
-        )
-        self.assertEqual(
-            actual_member_summary.count,
-            (
-                expected_member_count
-                if expected_member_count is not None
-                else len(expected_member_list)
-            ),
-        )
-
-    def test_get_room_summary_membership(self) -> None:
-        """
-        Test that `get_room_summary(...)` gets every kind of membership when there
-        aren't that many members in the room.
-        """
-        user1_id = self.register_user("user1", "pass")
-        user1_tok = self.login(user1_id, "pass")
-        user2_id = self.register_user("user2", "pass")
-        user2_tok = self.login(user2_id, "pass")
-        user3_id = self.register_user("user3", "pass")
-        _user3_tok = self.login(user3_id, "pass")
-        user4_id = self.register_user("user4", "pass")
-        user4_tok = self.login(user4_id, "pass")
-        user5_id = self.register_user("user5", "pass")
-        user5_tok = self.login(user5_id, "pass")
-
-        # Setup a room (user1 is the creator and is joined to the room)
-        room_id = self.helper.create_room_as(user1_id, tok=user1_tok)
-
-        # User2 is banned
-        self.helper.join(room_id, user2_id, tok=user2_tok)
-        self.helper.ban(room_id, src=user1_id, targ=user2_id, tok=user1_tok)
-
-        # User3 is invited by user1
-        self.helper.invite(room_id, targ=user3_id, tok=user1_tok)
-
-        # User4 leaves
-        self.helper.join(room_id, user4_id, tok=user4_tok)
-        self.helper.leave(room_id, user4_id, tok=user4_tok)
-
-        # User5 joins
-        self.helper.join(room_id, user5_id, tok=user5_tok)
-
-        room_membership_summary = self.get_success(self.store.get_room_summary(room_id))
-        empty_ms = MemberSummary([], 0)
-
-        self._assert_member_summary(
-            room_membership_summary.get(Membership.JOIN, empty_ms),
-            [user1_id, user5_id],
-        )
-        self._assert_member_summary(
-            room_membership_summary.get(Membership.INVITE, empty_ms), [user3_id]
-        )
-        self._assert_member_summary(
-            room_membership_summary.get(Membership.LEAVE, empty_ms), [user4_id]
-        )
-        self._assert_member_summary(
-            room_membership_summary.get(Membership.BAN, empty_ms), [user2_id]
-        )
-        self._assert_member_summary(
-            room_membership_summary.get(Membership.KNOCK, empty_ms),
-            [
-                # No one knocked
-            ],
-        )
-
-    def test_get_room_summary_membership_order(self) -> None:
-        """
-        Test that `get_room_summary(...)` stacks our limit of 6 in this order: joins ->
-        invites -> leave -> everything else (bans/knocks)
-        """
-        user1_id = self.register_user("user1", "pass")
-        user1_tok = self.login(user1_id, "pass")
-        user2_id = self.register_user("user2", "pass")
-        user2_tok = self.login(user2_id, "pass")
-        user3_id = self.register_user("user3", "pass")
-        _user3_tok = self.login(user3_id, "pass")
-        user4_id = self.register_user("user4", "pass")
-        user4_tok = self.login(user4_id, "pass")
-        user5_id = self.register_user("user5", "pass")
-        user5_tok = self.login(user5_id, "pass")
-        user6_id = self.register_user("user6", "pass")
-        user6_tok = self.login(user6_id, "pass")
-        user7_id = self.register_user("user7", "pass")
-        user7_tok = self.login(user7_id, "pass")
-
-        # Setup the room (user1 is the creator and is joined to the room)
-        room_id = self.helper.create_room_as(user1_id, tok=user1_tok)
-
-        # We expect the order to be joins -> invites -> leave -> bans so setup the users
-        # *NOT* in that same order to make sure we're actually sorting them.
-
-        # User2 is banned
-        self.helper.join(room_id, user2_id, tok=user2_tok)
-        self.helper.ban(room_id, src=user1_id, targ=user2_id, tok=user1_tok)
-
-        # User3 is invited by user1
-        self.helper.invite(room_id, targ=user3_id, tok=user1_tok)
-
-        # User4 leaves
-        self.helper.join(room_id, user4_id, tok=user4_tok)
-        self.helper.leave(room_id, user4_id, tok=user4_tok)
-
-        # User5, User6, User7 joins
-        self.helper.join(room_id, user5_id, tok=user5_tok)
-        self.helper.join(room_id, user6_id, tok=user6_tok)
-        self.helper.join(room_id, user7_id, tok=user7_tok)
-
-        room_membership_summary = self.get_success(self.store.get_room_summary(room_id))
-        empty_ms = MemberSummary([], 0)
-
-        self._assert_member_summary(
-            room_membership_summary.get(Membership.JOIN, empty_ms),
-            [user1_id, user5_id, user6_id, user7_id],
-        )
-        self._assert_member_summary(
-            room_membership_summary.get(Membership.INVITE, empty_ms), [user3_id]
-        )
-        self._assert_member_summary(
-            room_membership_summary.get(Membership.LEAVE, empty_ms), [user4_id]
-        )
-        self._assert_member_summary(
-            room_membership_summary.get(Membership.BAN, empty_ms),
-            [
-                # The banned user is not in the summary because the summary can only fit
-                # 6 members and prefers everything else before bans
-                #
-                # user2_id
-            ],
-            # But we still see the count of banned users
-            expected_member_count=1,
-        )
-        self._assert_member_summary(
-            room_membership_summary.get(Membership.KNOCK, empty_ms),
-            [
-                # No one knocked
-            ],
-        )
-
-    def test_extract_heroes_from_room_summary_excludes_self(self) -> None:
-        """
-        Test that `extract_heroes_from_room_summary(...)` does not include the user
-        itself.
-        """
-        user1_id = self.register_user("user1", "pass")
-        user1_tok = self.login(user1_id, "pass")
-        user2_id = self.register_user("user2", "pass")
-        user2_tok = self.login(user2_id, "pass")
-
-        # Setup the room (user1 is the creator and is joined to the room)
-        room_id = self.helper.create_room_as(user1_id, tok=user1_tok)
-
-        # User2 joins
-        self.helper.join(room_id, user2_id, tok=user2_tok)
-
-        room_membership_summary = self.get_success(self.store.get_room_summary(room_id))
-
-        # We first ask from the perspective of a random fake user
-        hero_user_ids = extract_heroes_from_room_summary(
-            room_membership_summary, me="@fakeuser"
-        )
-
-        # Make sure user1 is in the room (ensure our test setup is correct)
-        self.assertListEqual(hero_user_ids, [user1_id, user2_id])
-
-        # Now, we ask for the room summary from the perspective of user1
-        hero_user_ids = extract_heroes_from_room_summary(
-            room_membership_summary, me=user1_id
-        )
-
-        # User1 should not be included in the list of heroes because they are the one
-        # asking
-        self.assertListEqual(hero_user_ids, [user2_id])
-
-    def test_extract_heroes_from_room_summary_first_five_joins(self) -> None:
-        """
-        Test that `extract_heroes_from_room_summary(...)` returns the first 5 joins.
-        """
-        user1_id = self.register_user("user1", "pass")
-        user1_tok = self.login(user1_id, "pass")
-        user2_id = self.register_user("user2", "pass")
-        user2_tok = self.login(user2_id, "pass")
-        user3_id = self.register_user("user3", "pass")
-        user3_tok = self.login(user3_id, "pass")
-        user4_id = self.register_user("user4", "pass")
-        user4_tok = self.login(user4_id, "pass")
-        user5_id = self.register_user("user5", "pass")
-        user5_tok = self.login(user5_id, "pass")
-        user6_id = self.register_user("user6", "pass")
-        user6_tok = self.login(user6_id, "pass")
-        user7_id = self.register_user("user7", "pass")
-        user7_tok = self.login(user7_id, "pass")
-
-        # Setup the room (user1 is the creator and is joined to the room)
-        room_id = self.helper.create_room_as(user1_id, tok=user1_tok)
-
-        # User2 -> User7 joins
-        self.helper.join(room_id, user2_id, tok=user2_tok)
-        self.helper.join(room_id, user3_id, tok=user3_tok)
-        self.helper.join(room_id, user4_id, tok=user4_tok)
-        self.helper.join(room_id, user5_id, tok=user5_tok)
-        self.helper.join(room_id, user6_id, tok=user6_tok)
-        self.helper.join(room_id, user7_id, tok=user7_tok)
-
-        room_membership_summary = self.get_success(self.store.get_room_summary(room_id))
-
-        hero_user_ids = extract_heroes_from_room_summary(
-            room_membership_summary, me="@fakuser"
-        )
-
-        # First 5 users to join the room
-        self.assertListEqual(
-            hero_user_ids, [user1_id, user2_id, user3_id, user4_id, user5_id]
-        )
-
-    def test_extract_heroes_from_room_summary_membership_order(self) -> None:
-        """
-        Test that `extract_heroes_from_room_summary(...)` prefers joins/invites over
-        everything else.
-        """
-        user1_id = self.register_user("user1", "pass")
-        user1_tok = self.login(user1_id, "pass")
-        user2_id = self.register_user("user2", "pass")
-        user2_tok = self.login(user2_id, "pass")
-        user3_id = self.register_user("user3", "pass")
-        _user3_tok = self.login(user3_id, "pass")
-        user4_id = self.register_user("user4", "pass")
-        user4_tok = self.login(user4_id, "pass")
-        user5_id = self.register_user("user5", "pass")
-        user5_tok = self.login(user5_id, "pass")
-
-        # Setup the room (user1 is the creator and is joined to the room)
-        room_id = self.helper.create_room_as(user1_id, tok=user1_tok)
-
-        # We expect the order to be joins -> invites -> leave -> bans so setup the users
-        # *NOT* in that same order to make sure we're actually sorting them.
-
-        # User2 is banned
-        self.helper.join(room_id, user2_id, tok=user2_tok)
-        self.helper.ban(room_id, src=user1_id, targ=user2_id, tok=user1_tok)
-
-        # User3 is invited by user1
-        self.helper.invite(room_id, targ=user3_id, tok=user1_tok)
-
-        # User4 leaves
-        self.helper.join(room_id, user4_id, tok=user4_tok)
-        self.helper.leave(room_id, user4_id, tok=user4_tok)
-
-        # User5 joins
-        self.helper.join(room_id, user5_id, tok=user5_tok)
-
-        room_membership_summary = self.get_success(self.store.get_room_summary(room_id))
-
-        hero_user_ids = extract_heroes_from_room_summary(
-            room_membership_summary, me="@fakeuser"
-        )
-
-        # Prefer joins -> invites, over everything else
-        self.assertListEqual(
-            hero_user_ids,
-            [
-                # The joins
-                user1_id,
-                user5_id,
-                # The invites
-                user3_id,
-            ],
-        )
-
-    @skip_unless(
-        False,
-        "Test is not possible because when everyone leaves the room, "
-        + "the server is `no_longer_in_room` and we don't have any `current_state_events` to query",
-    )
-    def test_extract_heroes_from_room_summary_fallback_leave_ban(self) -> None:
-        """
-        Test that `extract_heroes_from_room_summary(...)` falls back to leave/ban if
-        there aren't any joins/invites.
-        """
-        user1_id = self.register_user("user1", "pass")
-        user1_tok = self.login(user1_id, "pass")
-        user2_id = self.register_user("user2", "pass")
-        user2_tok = self.login(user2_id, "pass")
-        user3_id = self.register_user("user3", "pass")
-        user3_tok = self.login(user3_id, "pass")
-
-        # Setup the room (user1 is the creator and is joined to the room)
-        room_id = self.helper.create_room_as(user1_id, tok=user1_tok)
-
-        # User2 is banned
-        self.helper.join(room_id, user2_id, tok=user2_tok)
-        self.helper.ban(room_id, src=user1_id, targ=user2_id, tok=user1_tok)
-
-        # User3 leaves
-        self.helper.join(room_id, user3_id, tok=user3_tok)
-        self.helper.leave(room_id, user3_id, tok=user3_tok)
-
-        # User1 leaves (we're doing this last because they're the room creator)
-        self.helper.leave(room_id, user1_id, tok=user1_tok)
-
-        room_membership_summary = self.get_success(self.store.get_room_summary(room_id))
-
-        hero_user_ids = extract_heroes_from_room_summary(
-            room_membership_summary, me="@fakeuser"
-        )
-
-        # Fallback to people who left -> banned
-        self.assertListEqual(
-            hero_user_ids,
-            [user3_id, user1_id, user3_id],
-        )
-
-    def test_extract_heroes_from_room_summary_excludes_knocks(self) -> None:
-        """
-        People who knock on the room have (potentially) never been in the room before
-        and are total outsiders. Plus the spec doesn't mention them at all for heroes.
-        """
-        user1_id = self.register_user("user1", "pass")
-        user1_tok = self.login(user1_id, "pass")
-        user2_id = self.register_user("user2", "pass")
-        user2_tok = self.login(user2_id, "pass")
-
-        # Setup the knock room (user1 is the creator and is joined to the room)
-        knock_room_id = self.helper.create_room_as(
-            user1_id, tok=user1_tok, room_version=RoomVersions.V7.identifier
-        )
-        self.helper.send_state(
-            knock_room_id,
-            EventTypes.JoinRules,
-            {"join_rule": JoinRules.KNOCK},
-            tok=user1_tok,
-        )
-
-        # User2 knocks on the room
-        knock_channel = self.make_request(
-            "POST",
-            "/_matrix/client/r0/knock/%s" % (knock_room_id,),
-            b"{}",
-            user2_tok,
-        )
-        self.assertEqual(knock_channel.code, 200, knock_channel.result)
-
-        room_membership_summary = self.get_success(
-            self.store.get_room_summary(knock_room_id)
-        )
-
-        hero_user_ids = extract_heroes_from_room_summary(
-            room_membership_summary, me="@fakeuser"
-        )
-
-        # user1 is the creator and is joined to the room (should show up as a hero)
-        # user2 is knocking on the room (should not show up as a hero)
-        self.assertListEqual(
-            hero_user_ids,
-            [user1_id],
-        )
-
-
 class CurrentStateMembershipUpdateTestCase(unittest.HomeserverTestCase):
     def prepare(self, reactor: MemoryReactor, clock: Clock, hs: HomeServer) -> None:
         self.store = hs.get_datastores().main

tests/storage/test_stream.py

@@ -556,47 +556,6 @@ class GetLastEventInRoomBeforeStreamOrderingTestCase(HomeserverTestCase):
             ),
         )
 
-    def test_restrict_event_types(self) -> None:
-        """
-        Test that we only consider given `event_types` when finding the last event
-        before a token.
-        """
-        user1_id = self.register_user("user1", "pass")
-        user1_tok = self.login(user1_id, "pass")
-
-        room_id1 = self.helper.create_room_as(user1_id, tok=user1_tok, is_public=True)
-        event_response = self.helper.send_event(
-            room_id1,
-            type="org.matrix.special_message",
-            content={"body": "before1, target!"},
-            tok=user1_tok,
-        )
-        self.helper.send(room_id1, "before2", tok=user1_tok)
-
-        after_room_token = self.event_sources.get_current_token()
-
-        # Send some events after the token
-        self.helper.send_event(
-            room_id1,
-            type="org.matrix.special_message",
-            content={"body": "after1"},
-            tok=user1_tok,
-        )
-        self.helper.send(room_id1, "after2", tok=user1_tok)
-
-        last_event_result = self.get_success(
-            self.store.get_last_event_pos_in_room_before_stream_ordering(
-                room_id=room_id1,
-                end_token=after_room_token.room_key,
-                event_types=["org.matrix.special_message"],
-            )
-        )
-        assert last_event_result is not None
-        last_event_id, _ = last_event_result
-
-        # Make sure it's the last event before the token
-        self.assertEqual(last_event_id, event_response["event_id"])
-
 
 class GetCurrentStateDeltaMembershipChangesForUserTestCase(HomeserverTestCase):
     """