Newsfile

.github/workflows/tests.yml

@@ -21,7 +21,6 @@ jobs:
       trial: ${{ !startsWith(github.ref, 'refs/pull/') || steps.filter.outputs.trial }}
       integration: ${{ !startsWith(github.ref, 'refs/pull/') || steps.filter.outputs.integration }}
       linting: ${{ !startsWith(github.ref, 'refs/pull/') || steps.filter.outputs.linting }}
-      linting_readme: ${{ !startsWith(github.ref, 'refs/pull/') || steps.filter.outputs.linting_readme }}
     steps:
     - uses: dorny/paths-filter@v3
       id: filter
@@ -73,9 +72,6 @@ jobs:
             - 'pyproject.toml'
             - 'poetry.lock'
             - '.github/workflows/tests.yml'
-          
-          linting_readme:
-            - 'README.rst'
 
   check-sampleconfig:
     runs-on: ubuntu-latest
@@ -273,20 +269,6 @@ jobs:
 
       - run: cargo fmt --check
 
-  # This is to detect issues with the rst file, which can otherwise cause issues
-  # when uploading packages to PyPi.
-  lint-readme:
-    runs-on: ubuntu-latest
-    needs: changes
-    if: ${{ needs.changes.outputs.linting_readme == 'true' }}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: "3.x"
-      - run: "pip install rstcheck"
-      - run: "rstcheck --report-level=WARNING README.rst"
-
   # Dummy step to gate other tests on without repeating the whole list
   linting-done:
     if: ${{ !cancelled() }} # Run this even if prior jobs were skipped
@@ -302,7 +284,6 @@ jobs:
       - lint-clippy
       - lint-clippy-nightly
       - lint-rustfmt
-      - lint-readme
     runs-on: ubuntu-latest
     steps:
       - uses: matrix-org/done-action@v2
@@ -320,7 +301,6 @@ jobs:
             lint-clippy
             lint-clippy-nightly
             lint-rustfmt
-            lint-readme
 
 
   calculate-test-jobs:

CHANGES.md

@@ -1,115 +1,3 @@
-# Synapse 1.110.0 (2024-07-03)
-
-No significant changes since 1.110.0rc3.
-
-
-
-
-# Synapse 1.110.0rc3 (2024-07-02)
-
-### Bugfixes
-
-- Fix bug where `/sync` requests could get blocked indefinitely after an upgrade from Synapse versions before v1.109.0. ([\#17386](https://github.com/element-hq/synapse/issues/17386), [\#17391](https://github.com/element-hq/synapse/issues/17391))
-
-### Internal Changes
-
-- Limit size of presence EDUs to 50 entries. ([\#17371](https://github.com/element-hq/synapse/issues/17371))
-- Fix building debian package for debian sid. ([\#17389](https://github.com/element-hq/synapse/issues/17389))
-
-
-
-
-# Synapse 1.110.0rc2 (2024-06-26)
-
-### Internal Changes
-
-- Fix uploading packages to PyPi. ([\#17363](https://github.com/element-hq/synapse/issues/17363))
-
-
-
-
-# Synapse 1.110.0rc1 (2024-06-26)
-
-### Features
-
-- Add initial implementation of an experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint. ([\#17187](https://github.com/element-hq/synapse/issues/17187))
-- Add experimental support for [MSC3823](https://github.com/matrix-org/matrix-spec-proposals/pull/3823) - Account suspension. ([\#17255](https://github.com/element-hq/synapse/issues/17255))
-- Improve ratelimiting in Synapse. ([\#17256](https://github.com/element-hq/synapse/issues/17256))
-- Add support for the unstable [MSC4151](https://github.com/matrix-org/matrix-spec-proposals/pull/4151) report room API. ([\#17270](https://github.com/element-hq/synapse/issues/17270), [\#17296](https://github.com/element-hq/synapse/issues/17296))
-- Filter for public and empty rooms added to Admin-API [List Room API](https://element-hq.github.io/synapse/latest/admin_api/rooms.html#list-room-api). ([\#17276](https://github.com/element-hq/synapse/issues/17276))
-- Add `is_dm` filtering to experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint. ([\#17277](https://github.com/element-hq/synapse/issues/17277))
-- Add `is_encrypted` filtering to experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint. ([\#17281](https://github.com/element-hq/synapse/issues/17281))
-- Include user membership in events served to clients, per [MSC4115](https://github.com/matrix-org/matrix-spec-proposals/pull/4115). ([\#17282](https://github.com/element-hq/synapse/issues/17282))
-- Do not require user-interactive authentication for uploading cross-signing keys for the first time, per [MSC3967](https://github.com/matrix-org/matrix-spec-proposals/pull/3967). ([\#17284](https://github.com/element-hq/synapse/issues/17284))
-- Add `stream_ordering` sort to experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint. ([\#17293](https://github.com/element-hq/synapse/issues/17293))
-- `register_new_matrix_user` now supports a --password-file flag, which
-  is useful for scripting. ([\#17294](https://github.com/element-hq/synapse/issues/17294))
-- `register_new_matrix_user` now supports a --exists-ok flag to allow registration of users that already exist in the database.
-  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/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
-
-- Fix searching for users with their exact localpart whose ID includes a hyphen. ([\#17254](https://github.com/element-hq/synapse/issues/17254))
-- Fix wrong retention policy being used when filtering events. ([\#17272](https://github.com/element-hq/synapse/issues/17272))
-- Fix bug where OTKs were not always included in `/sync` response when using workers. ([\#17275](https://github.com/element-hq/synapse/issues/17275))
-- Fix a long-standing bug where an invalid 'from' parameter to [`/notifications`](https://spec.matrix.org/v1.10/client-server-api/#get_matrixclientv3notifications) would result in an Internal Server Error. ([\#17283](https://github.com/element-hq/synapse/issues/17283))
-- Fix edge case in `/sync` returning the wrong the state when using sharded event persisters. ([\#17295](https://github.com/element-hq/synapse/issues/17295))
-- Add initial implementation of an experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint. ([\#17301](https://github.com/element-hq/synapse/issues/17301))
-- Fix email notification subject when invited to a space. ([\#17336](https://github.com/element-hq/synapse/issues/17336))
-
-### Improved Documentation
-
-- Add missing quotes for example for `exclude_rooms_from_sync`. ([\#17308](https://github.com/element-hq/synapse/issues/17308))
-- Update header in the README to visually fix the the auto-generated table of contents. ([\#17329](https://github.com/element-hq/synapse/issues/17329))
-- Fix stale references to the Foundation's Security Disclosure Policy. ([\#17341](https://github.com/element-hq/synapse/issues/17341))
-- Add default values for `rc_invites.per_issuer` to docs. ([\#17347](https://github.com/element-hq/synapse/issues/17347))
-- Fix an error in the docs for `search_all_users` parameter under `user_directory`. ([\#17348](https://github.com/element-hq/synapse/issues/17348))
-
-### Internal Changes
-
-- Remove unused `expire_access_token` option in the Synapse Docker config file. Contributed by @AaronDewes. ([\#17198](https://github.com/element-hq/synapse/issues/17198))
-- Use fully-qualified `PersistedEventPosition` when returning `RoomsForUser` to facilitate proper comparisons and `RoomStreamToken` generation. ([\#17265](https://github.com/element-hq/synapse/issues/17265))
-- Add debug logging for when room keys are uploaded, including whether they are replacing other room keys. ([\#17266](https://github.com/element-hq/synapse/issues/17266))
-- Handle OTK uploads off master. ([\#17271](https://github.com/element-hq/synapse/issues/17271))
-- Don't try and resync devices for remote users whose servers are marked as down. ([\#17273](https://github.com/element-hq/synapse/issues/17273))
-- Re-organize Pydantic models and types used in handlers. ([\#17279](https://github.com/element-hq/synapse/issues/17279))
-- Expose the worker instance that persisted the event on `event.internal_metadata.instance_name`. ([\#17300](https://github.com/element-hq/synapse/issues/17300))
-- Update the README with Element branding, improve headers and fix the #synapse:matrix.org support room link rendering. ([\#17324](https://github.com/element-hq/synapse/issues/17324))
-- Change path of the experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync implementation to `/org.matrix.simplified_msc3575/sync` since our simplified API is slightly incompatible with what's in the current MSC. ([\#17331](https://github.com/element-hq/synapse/issues/17331))
-- Handle device lists notifications for large accounts more efficiently in worker mode. ([\#17333](https://github.com/element-hq/synapse/issues/17333), [\#17358](https://github.com/element-hq/synapse/issues/17358))
-- Do not block event sending/receiving while calculating large event auth chains. ([\#17338](https://github.com/element-hq/synapse/issues/17338))
-- Tidy up `parse_integer` docs and call sites to reflect the fact that they require non-negative integers by default, and bring `parse_integer_from_args` default in alignment. Contributed by Denis Kasak (@dkasak). ([\#17339](https://github.com/element-hq/synapse/issues/17339))
-
-
-
-### Updates to locked dependencies
-
-* Bump authlib from 1.3.0 to 1.3.1. ([\#17343](https://github.com/element-hq/synapse/issues/17343))
-* Bump dawidd6/action-download-artifact from 3.1.4 to 5. ([\#17289](https://github.com/element-hq/synapse/issues/17289))
-* Bump dawidd6/action-download-artifact from 5 to 6. ([\#17313](https://github.com/element-hq/synapse/issues/17313))
-* Bump docker/build-push-action from 5 to 6. ([\#17312](https://github.com/element-hq/synapse/issues/17312))
-* Bump jinja2 from 3.1.3 to 3.1.4. ([\#17287](https://github.com/element-hq/synapse/issues/17287))
-* Bump lazy_static from 1.4.0 to 1.5.0. ([\#17355](https://github.com/element-hq/synapse/issues/17355))
-* Bump msgpack from 1.0.7 to 1.0.8. ([\#17317](https://github.com/element-hq/synapse/issues/17317))
-* Bump netaddr from 1.2.1 to 1.3.0. ([\#17353](https://github.com/element-hq/synapse/issues/17353))
-* Bump packaging from 24.0 to 24.1. ([\#17352](https://github.com/element-hq/synapse/issues/17352))
-* Bump phonenumbers from 8.13.37 to 8.13.39. ([\#17315](https://github.com/element-hq/synapse/issues/17315))
-* Bump regex from 1.10.4 to 1.10.5. ([\#17290](https://github.com/element-hq/synapse/issues/17290))
-* Bump requests from 2.31.0 to 2.32.2. ([\#17345](https://github.com/element-hq/synapse/issues/17345))
-* Bump sentry-sdk from 2.1.1 to 2.3.1. ([\#17263](https://github.com/element-hq/synapse/issues/17263))
-* Bump sentry-sdk from 2.3.1 to 2.6.0. ([\#17351](https://github.com/element-hq/synapse/issues/17351))
-* Bump tornado from 6.4 to 6.4.1. ([\#17344](https://github.com/element-hq/synapse/issues/17344))
-* Bump mypy from 1.8.0 to 1.9.0. ([\#17297](https://github.com/element-hq/synapse/issues/17297))
-* Bump types-jsonschema from 4.21.0.20240311 to 4.22.0.20240610. ([\#17288](https://github.com/element-hq/synapse/issues/17288))
-* Bump types-netaddr from 1.2.0.20240219 to 1.3.0.20240530. ([\#17314](https://github.com/element-hq/synapse/issues/17314))
-* Bump types-pillow from 10.2.0.20240423 to 10.2.0.20240520. ([\#17285](https://github.com/element-hq/synapse/issues/17285))
-* Bump types-pyyaml from 6.0.12.12 to 6.0.12.20240311. ([\#17316](https://github.com/element-hq/synapse/issues/17316))
-* Bump typing-extensions from 4.11.0 to 4.12.2. ([\#17354](https://github.com/element-hq/synapse/issues/17354))
-* Bump urllib3 from 2.0.7 to 2.2.2. ([\#17346](https://github.com/element-hq/synapse/issues/17346))
-
 # Synapse 1.109.0 (2024-06-18)
 
 ### Internal Changes

Cargo.lock

@@ -234,9 +234,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "memchr"
@@ -505,9 +505,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.119"
+version = "1.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8eddb61f0697cc3989c5d64b452f5488e2b8a60fd7d5076a3045076ffef8cb0"
+checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
 dependencies = [
  "itoa",
  "ryu",

README.rst

@@ -5,9 +5,9 @@
 
 |support| |development| |documentation| |license| |pypi| |python|
 
-Synapse is an open source `Matrix <https://matrix.org>`__ homeserver
+Synapse is an open source `Matrix <https://matrix.org>`_ homeserver
 implementation, written and maintained by `Element <https://element.io>`_.
-`Matrix <https://github.com/matrix-org>`__ is the open standard for
+`Matrix <https://github.com/matrix-org>`_ is the open standard for
 secure and interoperable real time communications. You can directly run
 and manage the source code in this repository, available under an AGPL
 license. There is no support provided from Element unless you have a
@@ -119,7 +119,7 @@ impact to other applications will be minimal.
 
 
 🧪 Testing a new installation
-=============================
+============================
 
 The easiest way to try out your new Synapse installation is by connecting to it
 from a web client.
@@ -173,10 +173,10 @@ As when logging in, you will need to specify a "Custom server".  Specify your
 desired ``localpart`` in the 'User name' box.
 
 🎯 Troubleshooting and support
-==============================
+=============================
 
 🚀 Professional support
------------------------
+----------------------
 
 Enterprise quality support for Synapse including SLAs is available as part of an
 `Element Server Suite (ESS) <https://element.io/pricing>` subscription.
@@ -185,7 +185,7 @@ If you are an existing ESS subscriber then you can raise a `support request <htt
 and access the `knowledge base <https://ems-docs.element.io>`.
 
 🤝 Community support
---------------------
+-------------------
 
 The `Admin FAQ <https://element-hq.github.io/synapse/latest/usage/administration/admin_faq.html>`_
 includes tips on dealing with some common problems. For more details, see
@@ -202,7 +202,7 @@ issues for support requests, only for bug reports and feature requests.
 .. _docs: docs
 
 🪪 Identity Servers
-===================
+==================
 
 Identity servers have the job of mapping email addresses and other 3rd Party
 IDs (3PIDs) to Matrix user IDs, as well as verifying the ownership of 3PIDs

changelog.d/17187.feature

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

changelog.d/17198.misc

@@ -0,0 +1 @@
+Remove unused `expire_access_token` option in the Synapse Docker config file. Contributed by @AaronDewes.

changelog.d/17254.bugfix

@@ -0,0 +1 @@
+Fix searching for users with their exact localpart whose ID includes a hyphen.

changelog.d/17255.feature

@@ -0,0 +1 @@
+Add support for [MSC823](https://github.com/matrix-org/matrix-spec-proposals/pull/3823) - Account suspension.

changelog.d/17256.feature

@@ -0,0 +1 @@
+ Improve ratelimiting in Synapse (#17256).

changelog.d/17265.misc

@@ -0,0 +1 @@
+Use fully-qualified `PersistedEventPosition` when returning `RoomsForUser` to facilitate proper comparisons and `RoomStreamToken` generation.

changelog.d/17266.misc

@@ -0,0 +1 @@
+Add debug logging for when room keys are uploaded, including whether they are replacing other room keys.

changelog.d/17270.feature

@@ -0,0 +1 @@
+Add support for the unstable [MSC4151](https://github.com/matrix-org/matrix-spec-proposals/pull/4151) report room API.

changelog.d/17271.misc

@@ -0,0 +1 @@
+Handle OTK uploads off master.

changelog.d/17272.bugfix

@@ -0,0 +1 @@
+Fix wrong retention policy being used when filtering events.

changelog.d/17273.misc

@@ -0,0 +1 @@
+Don't try and resync devices for remote users whose servers are marked as down.

changelog.d/17275.bugfix

@@ -0,0 +1 @@
+Fix bug where OTKs were not always included in `/sync` response when using workers.

changelog.d/17276.feature

@@ -0,0 +1 @@
+Filter for public and empty rooms added to Admin-API [List Room API](https://element-hq.github.io/synapse/latest/admin_api/rooms.html#list-room-api).

changelog.d/17277.feature

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

changelog.d/17279.misc

@@ -0,0 +1 @@
+Re-organize Pydantic models and types used in handlers.

changelog.d/17281.feature

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

changelog.d/17282.feature

@@ -0,0 +1 @@
+Include user membership in events served to clients, per MSC4115.

changelog.d/17283.bugfix

@@ -0,0 +1 @@
+Fix a long-standing bug where an invalid 'from' parameter to [`/notifications`](https://spec.matrix.org/v1.10/client-server-api/#get_matrixclientv3notifications) would result in an Internal Server Error.

changelog.d/17284.feature

@@ -0,0 +1 @@
+Do not require user-interactive authentication for uploading cross-signing keys for the first time, per MSC3967.

changelog.d/17293.feature

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

changelog.d/17294.feature

@@ -0,0 +1,2 @@
+`register_new_matrix_user` now supports a --password-file flag, which
+is useful for scripting.

changelog.d/17295.bugfix

@@ -0,0 +1 @@
+Fix edge case in `/sync` returning the wrong the state when using sharded event persisters.

changelog.d/17296.feature

@@ -0,0 +1 @@
+Add support for the unstable [MSC4151](https://github.com/matrix-org/matrix-spec-proposals/pull/4151) report room API.

changelog.d/17297.misc

@@ -0,0 +1 @@
+Bump `mypy` from 1.8.0 to 1.9.0.

changelog.d/17300.misc

@@ -0,0 +1 @@
+Expose the worker instance that persisted the event on `event.internal_metadata.instance_name`.

changelog.d/17301.bugfix

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

changelog.d/17304.feature

@@ -0,0 +1,2 @@
+`register_new_matrix_user` now supports a --exists-ok flag to allow registration of users that already exist in the database.
+This is useful for scripts that bootstrap user accounts with initial passwords.

changelog.d/17308.doc

@@ -0,0 +1 @@
+Add missing quotes for example for `exclude_rooms_from_sync`.

changelog.d/17320.feature

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

changelog.d/17322.feature

@@ -0,0 +1 @@
+Add support for via query parameter from MSC415.

changelog.d/17324.misc

@@ -0,0 +1 @@
+Update the README with Element branding, improve headers and fix the #synapse:matrix.org support room link rendering.

changelog.d/17325.misc

@@ -0,0 +1 @@
+This is a changelog so tests will run.

changelog.d/17329.doc

@@ -0,0 +1 @@
+Update header in the README to visually fix the the auto-generated table of contents.

changelog.d/17331.misc

@@ -0,0 +1 @@
+Change path of the experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync implementation to `/org.matrix.simplified_msc3575/sync` since our simplified API is slightly incompatible with what's in the current MSC.

changelog.d/17333.misc

@@ -0,0 +1 @@
+Handle device lists notifications for large accounts more efficiently in worker mode.

changelog.d/17335.feature

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

changelog.d/17336.bugfix

@@ -0,0 +1 @@
+Fix email notification subject when invited to a space.

changelog.d/17337.feature

@@ -1 +0,0 @@
-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/17338.misc

@@ -0,0 +1 @@
+Do not block event sending/receiving while calculating large event auth chains.

changelog.d/17339.misc

@@ -0,0 +1 @@
+Tidy up `parse_integer` docs and call sites to reflect the fact that they require non-negative integers by default, and bring `parse_integer_from_args` default in alignment. Contributed by Denis Kasak (@dkasak).

changelog.d/17341.doc

@@ -0,0 +1 @@
+Fix stale references to the Foundation's Security Disclosure Policy.

changelog.d/17347.doc

@@ -0,0 +1 @@
+Add default values for `rc_invites.per_issuer` to docs.

changelog.d/17348.doc

@@ -0,0 +1 @@
+Fix an error in the docs for `search_all_users` parameter under `user_directory`.

changelog.d/17350.feature

@@ -1 +1,2 @@
-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.
+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.

changelog.d/17356.doc

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

changelog.d/17358.misc

@@ -0,0 +1 @@
+Handle device lists notifications for large accounts more efficiently in worker mode.

changelog.d/17363.misc

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

changelog.d/17367.misc

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

changelog.d/17390.misc

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

changelog.d/17396.misc

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

debian/changelog

@@ -1,27 +1,8 @@
-matrix-synapse-py3 (1.110.0) stable; urgency=medium
-
-  * New Synapse release 1.110.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Wed, 03 Jul 2024 09:08:59 -0600
-
-matrix-synapse-py3 (1.110.0~rc3) stable; urgency=medium
-
-  * New Synapse release 1.110.0rc3.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 02 Jul 2024 08:28:56 -0600
-
-matrix-synapse-py3 (1.110.0~rc2) stable; urgency=medium
-
-  * New Synapse release 1.110.0rc2.
-
- -- Synapse Packaging team <packages@matrix.org>  Wed, 26 Jun 2024 18:14:48 +0200
-
-matrix-synapse-py3 (1.110.0~rc1) stable; urgency=medium
+matrix-synapse-py3 (1.109.0+nmu1) UNRELEASED; urgency=medium
 
   * `register_new_matrix_user` now supports a --password-file and a --exists-ok flag.
-  * New Synapse release 1.110.0rc1.
 
- -- Synapse Packaging team <packages@matrix.org>  Wed, 26 Jun 2024 14:07:56 +0200
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 18 Jun 2024 13:29:36 +0100
 
 matrix-synapse-py3 (1.109.0) stable; urgency=medium
 

docker/Dockerfile-dhvirtualenv

@@ -73,8 +73,6 @@ RUN apt-get update -qq -o Acquire::Languages=none \
     curl \
     debhelper \
     devscripts \
-    # Required for building cffi from source.
-    libffi-dev \
     libsystemd-dev \
     lsb-release \
     pkg-config \

docker/build_debian.sh

@@ -11,9 +11,6 @@ DIST=$(cut -d ':' -f2 <<< "${distro:?}")
 cp -aT /synapse/source /synapse/build
 cd /synapse/build
 
-# Delete any existing `.so` files to ensure a clean build.
-rm -f /synapse/build/synapse/*.so
-
 # if this is a prerelease, set the Section accordingly.
 #
 # When the package is later added to the package repo, reprepro will use the

docker/configure_workers_and_start.py

@@ -117,7 +117,7 @@ WORKERS_CONFIG: Dict[str, Dict[str, Any]] = {
     },
     "media_repository": {
         "app": "synapse.app.generic_worker",
-        "listener_resources": ["media", "client"],
+        "listener_resources": ["media"],
         "endpoint_patterns": [
             "^/_matrix/media/",
             "^/_synapse/admin/v1/purge_media_cache$",
@@ -125,7 +125,6 @@ WORKERS_CONFIG: Dict[str, Dict[str, Any]] = {
             "^/_synapse/admin/v1/user/.*/media.*$",
             "^/_synapse/admin/v1/media/.*$",
             "^/_synapse/admin/v1/quarantine_media/.*$",
-            "^/_matrix/client/v1/media/.*$",
         ],
         # The first configured media worker will run the media background jobs
         "shared_extra_conf": {

docs/upgrade.md

@@ -117,19 +117,6 @@ each upgrade are complete before moving on to the next upgrade, to avoid
 stacking them up. You can monitor the currently running background updates with
 [the Admin API](usage/administration/admin_api/background_updates.html#status).
 
-# Upgrading to v1.111.0
-
-## New worker endpoints for authenticated client media
-
-[Media repository workers](./workers.md#synapseappmedia_repository) handling
-Media APIs can now handle the following endpoint pattern:
-
-```
-^/_matrix/client/v1/media/.*$
-```
-
-Please update your reverse proxy configuration.
-
 # Upgrading to v1.106.0
 
 ## Minimum supported Rust version

docs/usage/configuration/config_documentation.md

@@ -1976,10 +1976,9 @@ This will not prevent the listed domains from accessing media themselves.
 It simply prevents users on this server from downloading media originating
 from the listed servers.
 
-This will have no effect on media originating from the local server. This only
-affects media downloaded from other Matrix servers, to control URL previews see
-[`url_preview_ip_range_blacklist`](#url_preview_ip_range_blacklist) or
-[`url_preview_url_blacklist`](#url_preview_url_blacklist).
+This will have no effect on media originating from the local server.
+This only affects media downloaded from other Matrix servers, to
+block domains from URL previews see [`url_preview_url_blacklist`](#url_preview_url_blacklist).
 
 Defaults to an empty list (nothing blocked).
 
@@ -2131,14 +2130,12 @@ url_preview_ip_range_whitelist:
 ---
 ### `url_preview_url_blacklist`
 
-Optional list of URL matches that the URL preview spider is denied from
-accessing.  This is a usability feature, not a security one. You should use
-`url_preview_ip_range_blacklist` in preference to this, otherwise someone could
-define a public DNS entry that points to a private IP address and circumvent
-the blacklist. Applications that perform redirects or serve different content
-when detecting that Synapse is accessing them can also bypass the blacklist.
-This is more useful if you know there is an entire shape of URL that you know
-that you do not want Synapse to preview.
+Optional list of URL matches that the URL preview spider is
+denied from accessing.  You should use `url_preview_ip_range_blacklist`
+in preference to this, otherwise someone could define a public DNS
+entry that points to a private IP address and circumvent the blacklist.
+This is more useful if you know there is an entire shape of URL that
+you know that will never want synapse to try to spider.
 
 Each list entry is a dictionary of url component attributes as returned
 by urlparse.urlsplit as applied to the absolute form of the URL.  See

docs/workers.md

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

mypy.ini

@@ -96,6 +96,3 @@ ignore_missing_imports = True
 # https://github.com/twisted/treq/pull/366
 [mypy-treq.*]
 ignore_missing_imports = True
-
-[mypy-multipart.*]
-ignore_missing_imports = True

poetry.lock

@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.5.1 and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand.
 
 [[package]]
 name = "annotated-types"
@@ -403,43 +403,43 @@ files = [
 
 [[package]]
 name = "cryptography"
-version = "42.0.8"
+version = "42.0.7"
 description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "cryptography-42.0.8-cp37-abi3-macosx_10_12_universal2.whl", hash = "sha256:81d8a521705787afe7a18d5bfb47ea9d9cc068206270aad0b96a725022e18d2e"},
-    {file = "cryptography-42.0.8-cp37-abi3-macosx_10_12_x86_64.whl", hash = "sha256:961e61cefdcb06e0c6d7e3a1b22ebe8b996eb2bf50614e89384be54c48c6b63d"},
-    {file = "cryptography-42.0.8-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e3ec3672626e1b9e55afd0df6d774ff0e953452886e06e0f1eb7eb0c832e8902"},
-    {file = "cryptography-42.0.8-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e599b53fd95357d92304510fb7bda8523ed1f79ca98dce2f43c115950aa78801"},
-    {file = "cryptography-42.0.8-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:5226d5d21ab681f432a9c1cf8b658c0cb02533eece706b155e5fbd8a0cdd3949"},
-    {file = "cryptography-42.0.8-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:6b7c4f03ce01afd3b76cf69a5455caa9cfa3de8c8f493e0d3ab7d20611c8dae9"},
-    {file = "cryptography-42.0.8-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:2346b911eb349ab547076f47f2e035fc8ff2c02380a7cbbf8d87114fa0f1c583"},
-    {file = "cryptography-42.0.8-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:ad803773e9df0b92e0a817d22fd8a3675493f690b96130a5e24f1b8fabbea9c7"},
-    {file = "cryptography-42.0.8-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:2f66d9cd9147ee495a8374a45ca445819f8929a3efcd2e3df6428e46c3cbb10b"},
-    {file = "cryptography-42.0.8-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:d45b940883a03e19e944456a558b67a41160e367a719833c53de6911cabba2b7"},
-    {file = "cryptography-42.0.8-cp37-abi3-win32.whl", hash = "sha256:a0c5b2b0585b6af82d7e385f55a8bc568abff8923af147ee3c07bd8b42cda8b2"},
-    {file = "cryptography-42.0.8-cp37-abi3-win_amd64.whl", hash = "sha256:57080dee41209e556a9a4ce60d229244f7a66ef52750f813bfbe18959770cfba"},
-    {file = "cryptography-42.0.8-cp39-abi3-macosx_10_12_universal2.whl", hash = "sha256:dea567d1b0e8bc5764b9443858b673b734100c2871dc93163f58c46a97a83d28"},
-    {file = "cryptography-42.0.8-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c4783183f7cb757b73b2ae9aed6599b96338eb957233c58ca8f49a49cc32fd5e"},
-    {file = "cryptography-42.0.8-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a0608251135d0e03111152e41f0cc2392d1e74e35703960d4190b2e0f4ca9c70"},
-    {file = "cryptography-42.0.8-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:dc0fdf6787f37b1c6b08e6dfc892d9d068b5bdb671198c72072828b80bd5fe4c"},
-    {file = "cryptography-42.0.8-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:9c0c1716c8447ee7dbf08d6db2e5c41c688544c61074b54fc4564196f55c25a7"},
-    {file = "cryptography-42.0.8-cp39-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:fff12c88a672ab9c9c1cf7b0c80e3ad9e2ebd9d828d955c126be4fd3e5578c9e"},
-    {file = "cryptography-42.0.8-cp39-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:cafb92b2bc622cd1aa6a1dce4b93307792633f4c5fe1f46c6b97cf67073ec961"},
-    {file = "cryptography-42.0.8-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:31f721658a29331f895a5a54e7e82075554ccfb8b163a18719d342f5ffe5ecb1"},
-    {file = "cryptography-42.0.8-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:b297f90c5723d04bcc8265fc2a0f86d4ea2e0f7ab4b6994459548d3a6b992a14"},
-    {file = "cryptography-42.0.8-cp39-abi3-win32.whl", hash = "sha256:2f88d197e66c65be5e42cd72e5c18afbfae3f741742070e3019ac8f4ac57262c"},
-    {file = "cryptography-42.0.8-cp39-abi3-win_amd64.whl", hash = "sha256:fa76fbb7596cc5839320000cdd5d0955313696d9511debab7ee7278fc8b5c84a"},
-    {file = "cryptography-42.0.8-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:ba4f0a211697362e89ad822e667d8d340b4d8d55fae72cdd619389fb5912eefe"},
-    {file = "cryptography-42.0.8-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:81884c4d096c272f00aeb1f11cf62ccd39763581645b0812e99a91505fa48e0c"},
-    {file = "cryptography-42.0.8-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:c9bb2ae11bfbab395bdd072985abde58ea9860ed84e59dbc0463a5d0159f5b71"},
-    {file = "cryptography-42.0.8-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:7016f837e15b0a1c119d27ecd89b3515f01f90a8615ed5e9427e30d9cdbfed3d"},
-    {file = "cryptography-42.0.8-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:5a94eccb2a81a309806027e1670a358b99b8fe8bfe9f8d329f27d72c094dde8c"},
-    {file = "cryptography-42.0.8-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:dec9b018df185f08483f294cae6ccac29e7a6e0678996587363dc352dc65c842"},
-    {file = "cryptography-42.0.8-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:343728aac38decfdeecf55ecab3264b015be68fc2816ca800db649607aeee648"},
-    {file = "cryptography-42.0.8-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:013629ae70b40af70c9a7a5db40abe5d9054e6f4380e50ce769947b73bf3caad"},
-    {file = "cryptography-42.0.8.tar.gz", hash = "sha256:8d09d05439ce7baa8e9e95b07ec5b6c886f548deb7e0f69ef25f64b3bce842f2"},
+    {file = "cryptography-42.0.7-cp37-abi3-macosx_10_12_universal2.whl", hash = "sha256:a987f840718078212fdf4504d0fd4c6effe34a7e4740378e59d47696e8dfb477"},
+    {file = "cryptography-42.0.7-cp37-abi3-macosx_10_12_x86_64.whl", hash = "sha256:bd13b5e9b543532453de08bcdc3cc7cebec6f9883e886fd20a92f26940fd3e7a"},
+    {file = "cryptography-42.0.7-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a79165431551042cc9d1d90e6145d5d0d3ab0f2d66326c201d9b0e7f5bf43604"},
+    {file = "cryptography-42.0.7-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a47787a5e3649008a1102d3df55424e86606c9bae6fb77ac59afe06d234605f8"},
+    {file = "cryptography-42.0.7-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:02c0eee2d7133bdbbc5e24441258d5d2244beb31da5ed19fbb80315f4bbbff55"},
+    {file = "cryptography-42.0.7-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:5e44507bf8d14b36b8389b226665d597bc0f18ea035d75b4e53c7b1ea84583cc"},
+    {file = "cryptography-42.0.7-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:7f8b25fa616d8b846aef64b15c606bb0828dbc35faf90566eb139aa9cff67af2"},
+    {file = "cryptography-42.0.7-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:93a3209f6bb2b33e725ed08ee0991b92976dfdcf4e8b38646540674fc7508e13"},
+    {file = "cryptography-42.0.7-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:e6b8f1881dac458c34778d0a424ae5769de30544fc678eac51c1c8bb2183e9da"},
+    {file = "cryptography-42.0.7-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:3de9a45d3b2b7d8088c3fbf1ed4395dfeff79d07842217b38df14ef09ce1d8d7"},
+    {file = "cryptography-42.0.7-cp37-abi3-win32.whl", hash = "sha256:789caea816c6704f63f6241a519bfa347f72fbd67ba28d04636b7c6b7da94b0b"},
+    {file = "cryptography-42.0.7-cp37-abi3-win_amd64.whl", hash = "sha256:8cb8ce7c3347fcf9446f201dc30e2d5a3c898d009126010cbd1f443f28b52678"},
+    {file = "cryptography-42.0.7-cp39-abi3-macosx_10_12_universal2.whl", hash = "sha256:a3a5ac8b56fe37f3125e5b72b61dcde43283e5370827f5233893d461b7360cd4"},
+    {file = "cryptography-42.0.7-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:779245e13b9a6638df14641d029add5dc17edbef6ec915688f3acb9e720a5858"},
+    {file = "cryptography-42.0.7-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0d563795db98b4cd57742a78a288cdbdc9daedac29f2239793071fe114f13785"},
+    {file = "cryptography-42.0.7-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:31adb7d06fe4383226c3e963471f6837742889b3c4caa55aac20ad951bc8ffda"},
+    {file = "cryptography-42.0.7-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:efd0bf5205240182e0f13bcaea41be4fdf5c22c5129fc7ced4a0282ac86998c9"},
+    {file = "cryptography-42.0.7-cp39-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:a9bc127cdc4ecf87a5ea22a2556cab6c7eda2923f84e4f3cc588e8470ce4e42e"},
+    {file = "cryptography-42.0.7-cp39-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:3577d029bc3f4827dd5bf8bf7710cac13527b470bbf1820a3f394adb38ed7d5f"},
+    {file = "cryptography-42.0.7-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:2e47577f9b18723fa294b0ea9a17d5e53a227867a0a4904a1a076d1646d45ca1"},
+    {file = "cryptography-42.0.7-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:1a58839984d9cb34c855197043eaae2c187d930ca6d644612843b4fe8513c886"},
+    {file = "cryptography-42.0.7-cp39-abi3-win32.whl", hash = "sha256:e6b79d0adb01aae87e8a44c2b64bc3f3fe59515280e00fb6d57a7267a2583cda"},
+    {file = "cryptography-42.0.7-cp39-abi3-win_amd64.whl", hash = "sha256:16268d46086bb8ad5bf0a2b5544d8a9ed87a0e33f5e77dd3c3301e63d941a83b"},
+    {file = "cryptography-42.0.7-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:2954fccea107026512b15afb4aa664a5640cd0af630e2ee3962f2602693f0c82"},
+    {file = "cryptography-42.0.7-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:362e7197754c231797ec45ee081f3088a27a47c6c01eff2ac83f60f85a50fe60"},
+    {file = "cryptography-42.0.7-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:4f698edacf9c9e0371112792558d2f705b5645076cc0aaae02f816a0171770fd"},
+    {file = "cryptography-42.0.7-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:5482e789294854c28237bba77c4c83be698be740e31a3ae5e879ee5444166582"},
+    {file = "cryptography-42.0.7-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:e9b2a6309f14c0497f348d08a065d52f3020656f675819fc405fb63bbcd26562"},
+    {file = "cryptography-42.0.7-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:d8e3098721b84392ee45af2dd554c947c32cc52f862b6a3ae982dbb90f577f14"},
+    {file = "cryptography-42.0.7-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:c65f96dad14f8528a447414125e1fc8feb2ad5a272b8f68477abbcc1ea7d94b9"},
+    {file = "cryptography-42.0.7-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:36017400817987670037fbb0324d71489b6ead6231c9604f8fc1f7d008087c68"},
+    {file = "cryptography-42.0.7.tar.gz", hash = "sha256:ecbfbc00bf55888edda9868a4cf927205de8499e7fabe6c050322298382953f2"},
 ]
 
 [package.dependencies]
@@ -2039,20 +2039,6 @@ files = [
 [package.dependencies]
 six = ">=1.5"
 
-[[package]]
-name = "python-multipart"
-version = "0.0.9"
-description = "A streaming multipart parser for Python"
-optional = false
-python-versions = ">=3.8"
-files = [
-    {file = "python_multipart-0.0.9-py3-none-any.whl", hash = "sha256:97ca7b8ea7b05f977dc3849c3ba99d51689822fab725c3703af7c866a0c2b215"},
-    {file = "python_multipart-0.0.9.tar.gz", hash = "sha256:03f54688c663f1b7977105f021043b0793151e4cb1c1a9d4a11fc13d622c4026"},
-]
-
-[package.extras]
-dev = ["atomicwrites (==1.4.1)", "attrs (==23.2.0)", "coverage (==7.4.1)", "hatch", "invoke (==2.2.0)", "more-itertools (==10.2.0)", "pbr (==6.0.0)", "pluggy (==1.4.0)", "py (==1.11.0)", "pytest (==8.0.0)", "pytest-cov (==4.1.0)", "pytest-timeout (==2.2.0)", "pyyaml (==6.0.1)", "ruff (==0.2.1)"]
-
 [[package]]
 name = "pytz"
 version = "2022.7.1"
@@ -2920,13 +2906,13 @@ urllib3 = ">=2"
 
 [[package]]
 name = "types-setuptools"
-version = "70.1.0.20240627"
+version = "69.5.0.20240423"
 description = "Typing stubs for setuptools"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "types-setuptools-70.1.0.20240627.tar.gz", hash = "sha256:385907a47b5cf302b928ce07953cd91147d5de6f3da604c31905fdf0ec309e83"},
-    {file = "types_setuptools-70.1.0.20240627-py3-none-any.whl", hash = "sha256:c7bdf05cd0a8b66868b4774c7b3c079d01ae025d8c9562bfc8bf2ff44d263c9c"},
+    {file = "types-setuptools-69.5.0.20240423.tar.gz", hash = "sha256:a7ba908f1746c4337d13f027fa0f4a5bcad6d1d92048219ba792b3295c58586d"},
+    {file = "types_setuptools-69.5.0.20240423-py3-none-any.whl", hash = "sha256:a4381e041510755a6c9210e26ad55b1629bc10237aeb9cb8b6bd24996b73db48"},
 ]
 
 [[package]]
@@ -3201,4 +3187,4 @@ user-search = ["pyicu"]
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.8.0"
-content-hash = "e8d5806e10eb69bc06900fde18ea3df38f38490ab6baa73fe4a563dfb6abacba"
+content-hash = "107c8fb5c67360340854fbdba3c085fc5f9c7be24bcb592596a914eea621faea"

pyproject.toml

@@ -96,7 +96,7 @@ module-name = "synapse.synapse_rust"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.110.0"
+version = "1.109.0"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "AGPL-3.0-or-later"
@@ -224,8 +224,6 @@ pydantic = ">=1.7.4, <3"
 # needed.
 setuptools_rust = ">=1.3"
 
-# This is used for parsing multipart responses
-python-multipart = ">=0.0.9"
 
 # Optional Dependencies
 # ---------------------

scripts-dev/release.py

@@ -71,8 +71,6 @@ def cli() -> None:
 
       - A checkout of the sytest repository at ../sytest
 
-      - A checkout of the complement repository at ../complement
-
     Then to use:
 
         ./scripts-dev/release.py prepare
@@ -114,12 +112,10 @@ def _prepare() -> None:
     # Make sure we're in a git repo.
     synapse_repo = get_repo_and_check_clean_checkout()
     sytest_repo = get_repo_and_check_clean_checkout("../sytest", "sytest")
-    complement_repo = get_repo_and_check_clean_checkout("../complement", "complement")
 
-    click.secho("Updating Synapse, Sytest and Complement git repos...")
+    click.secho("Updating Synapse and Sytest git repos...")
     synapse_repo.remote().fetch()
     sytest_repo.remote().fetch()
-    complement_repo.remote().fetch()
 
     # Get the current version and AST from root Synapse module.
     current_version = get_package_version()
@@ -203,28 +199,16 @@ 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"
 
-        sy_branch_name = click.prompt(
+        branch_name = click.prompt(
             "Which branch should the release be based on?", default=default
         )
 
-        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():
+        for repo_name, repo in {"synapse": synapse_repo, "sytest": sytest_repo}.items():
             base_branch = find_ref(repo, branch_name)
             if not base_branch:
                 print(f"Could not find base branch {branch_name} for {repo_name}!")
@@ -246,11 +230,6 @@ 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)
-        # 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
-            )
 
     # Switch to the release branch and ensure it's up to date.
     synapse_repo.git.checkout(release_branch_name)
@@ -651,9 +630,6 @@ def _merge_back() -> None:
     else:
         # Full release
         sytest_repo = get_repo_and_check_clean_checkout("../sytest", "sytest")
-        complement_repo = get_repo_and_check_clean_checkout(
-            "../complement", "complement"
-        )
 
         if click.confirm(f"Merge {branch_name} → master?", default=True):
             _merge_into(synapse_repo, branch_name, "master")
@@ -667,9 +643,6 @@ def _merge_back() -> None:
         if click.confirm("On SyTest, merge master → develop?", default=True):
             _merge_into(sytest_repo, "master", "develop")
 
-        if click.confirm(f"On Complement, merge {branch_name} → main?", default=True):
-            _merge_into(complement_repo, branch_name, "main")
-
 
 @cli.command()
 def announce() -> None:

synapse/api/ratelimiting.py

@@ -130,8 +130,7 @@ class Ratelimiter:
                 Overrides the value set during instantiation if set.
             burst_count: How many actions that can be performed before being limited.
                 Overrides the value set during instantiation if set.
-            update: Whether to count this check as performing the action. If the action
-                cannot be performed, the user's action count is not incremented at all.
+            update: Whether to count this check as performing the action
             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.

synapse/events/utils.py

@@ -836,21 +836,3 @@ def maybe_upsert_event_field(
             del container[key]
 
     return upsert_okay
-
-
-def strip_event(event: EventBase) -> JsonDict:
-    """
-    Used for "stripped state" events which provide a simplified view of the state of a
-    room intended to help a potential joiner identify the room (relevant when the user
-    is invited or knocked).
-
-    Stripped state events can only have the `sender`, `type`, `state_key` and `content`
-    properties present.
-    """
-
-    return {
-        "type": event.type,
-        "state_key": event.state_key,
-        "content": event.content,
-        "sender": event.sender,
-    }

synapse/federation/federation_client.py

@@ -1871,52 +1871,6 @@ class FederationClient(FederationBase):
 
         return filtered_statuses, filtered_failures
 
-    async def federation_download_media(
-        self,
-        destination: str,
-        media_id: str,
-        output_stream: BinaryIO,
-        max_size: int,
-        max_timeout_ms: int,
-        download_ratelimiter: Ratelimiter,
-        ip_address: str,
-    ) -> Union[
-        Tuple[int, Dict[bytes, List[bytes]], bytes],
-        Tuple[int, Dict[bytes, List[bytes]]],
-    ]:
-        try:
-            return await self.transport_layer.federation_download_media(
-                destination,
-                media_id,
-                output_stream=output_stream,
-                max_size=max_size,
-                max_timeout_ms=max_timeout_ms,
-                download_ratelimiter=download_ratelimiter,
-                ip_address=ip_address,
-            )
-        except HttpResponseException as e:
-            # If an error is received that is due to an unrecognised endpoint,
-            # fallback to the _matrix/media/v3/download endpoint. Otherwise, consider it a legitimate error
-            # and raise.
-            if not is_unknown_endpoint(e):
-                raise
-
-        logger.debug(
-            "Couldn't download media %s/%s over _matrix/federation/v1/media/download, falling back to _matrix/media/v3/download path",
-            destination,
-            media_id,
-        )
-
-        return await self.transport_layer.download_media_v3(
-            destination,
-            media_id,
-            output_stream=output_stream,
-            max_size=max_size,
-            max_timeout_ms=max_timeout_ms,
-            download_ratelimiter=download_ratelimiter,
-            ip_address=ip_address,
-        )
-
     async def download_media(
         self,
         destination: str,

synapse/federation/sender/per_destination_queue.py

@@ -21,7 +21,6 @@
 #
 import datetime
 import logging
-from collections import OrderedDict
 from types import TracebackType
 from typing import TYPE_CHECKING, Dict, Hashable, Iterable, List, Optional, Tuple, Type
 
@@ -69,10 +68,6 @@ sent_edus_by_type = Counter(
 # If the retry interval is larger than this then we enter "catchup" mode
 CATCHUP_RETRY_INTERVAL = 60 * 60 * 1000
 
-# Limit how many presence states we add to each presence EDU, to ensure that
-# they are bounded in size.
-MAX_PRESENCE_STATES_PER_EDU = 50
-
 
 class PerDestinationQueue:
     """
@@ -149,7 +144,7 @@ class PerDestinationQueue:
 
         # Map of user_id -> UserPresenceState of pending presence to be sent to this
         # destination
-        self._pending_presence: OrderedDict[str, UserPresenceState] = OrderedDict()
+        self._pending_presence: Dict[str, UserPresenceState] = {}
 
         # List of room_id -> receipt_type -> user_id -> receipt_dict,
         #
@@ -404,7 +399,7 @@ class PerDestinationQueue:
                 # through another mechanism, because this is all volatile!
                 self._pending_edus = []
                 self._pending_edus_keyed = {}
-                self._pending_presence.clear()
+                self._pending_presence = {}
                 self._pending_receipt_edus = []
 
                 self._start_catching_up()
@@ -726,26 +721,22 @@ class _TransactionQueueManager:
 
         # Add presence EDU.
         if self.queue._pending_presence:
-            # Only send max 50 presence entries in the EDU, to bound the amount
-            # of data we're sending.
-            presence_to_add: List[JsonDict] = []
-            while (
-                self.queue._pending_presence
-                and len(presence_to_add) < MAX_PRESENCE_STATES_PER_EDU
-            ):
-                _, presence = self.queue._pending_presence.popitem(last=False)
-                presence_to_add.append(
-                    format_user_presence_state(presence, self.queue._clock.time_msec())
-                )
-
             pending_edus.append(
                 Edu(
                     origin=self.queue._server_name,
                     destination=self.queue._destination,
                     edu_type=EduTypes.PRESENCE,
-                    content={"push": presence_to_add},
+                    content={
+                        "push": [
+                            format_user_presence_state(
+                                presence, self.queue._clock.time_msec()
+                            )
+                            for presence in self.queue._pending_presence.values()
+                        ]
+                    },
                 )
             )
+            self.queue._pending_presence = {}
 
         # Add read receipt EDUs.
         pending_edus.extend(self.queue._get_receipt_edus(force_flush=False, limit=5))

synapse/federation/transport/client.py

@@ -824,6 +824,7 @@ class TransportLayerClient:
         ip_address: str,
     ) -> Tuple[int, Dict[bytes, List[bytes]]]:
         path = f"/_matrix/media/r0/download/{destination}/{media_id}"
+
         return await self.client.get_file(
             destination,
             path,
@@ -851,6 +852,7 @@ class TransportLayerClient:
         ip_address: str,
     ) -> Tuple[int, Dict[bytes, List[bytes]]]:
         path = f"/_matrix/media/v3/download/{destination}/{media_id}"
+
         return await self.client.get_file(
             destination,
             path,
@@ -871,29 +873,6 @@ class TransportLayerClient:
             ip_address=ip_address,
         )
 
-    async def federation_download_media(
-        self,
-        destination: str,
-        media_id: str,
-        output_stream: BinaryIO,
-        max_size: int,
-        max_timeout_ms: int,
-        download_ratelimiter: Ratelimiter,
-        ip_address: str,
-    ) -> Tuple[int, Dict[bytes, List[bytes]], bytes]:
-        path = f"/_matrix/federation/v1/media/download/{media_id}"
-        return await self.client.federation_get_file(
-            destination,
-            path,
-            output_stream=output_stream,
-            max_size=max_size,
-            args={
-                "timeout_ms": str(max_timeout_ms),
-            },
-            download_ratelimiter=download_ratelimiter,
-            ip_address=ip_address,
-        )
-
 
 def _create_path(federation_prefix: str, path: str, *args: str) -> str:
     """

synapse/federation/transport/server/__init__.py

@@ -32,8 +32,8 @@ from synapse.federation.transport.server._base import (
 from synapse.federation.transport.server.federation import (
     FEDERATION_SERVLET_CLASSES,
     FederationAccountStatusServlet,
-    FederationMediaDownloadServlet,
     FederationUnstableClientKeysClaimServlet,
+    FederationUnstableMediaDownloadServlet,
 )
 from synapse.http.server import HttpServer, JsonResource
 from synapse.http.servlet import (
@@ -316,8 +316,11 @@ def register_servlets(
             ):
                 continue
 
-            if servletclass == FederationMediaDownloadServlet:
-                if not hs.config.server.enable_media_repo:
+            if servletclass == FederationUnstableMediaDownloadServlet:
+                if (
+                    not hs.config.server.enable_media_repo
+                    or not hs.config.experimental.msc3916_authenticated_media_enabled
+                ):
                     continue
 
             servletclass(

synapse/federation/transport/server/_base.py

@@ -362,7 +362,7 @@ class BaseFederationServlet:
                                 return None
                             if (
                                 func.__self__.__class__.__name__  # type: ignore
-                                == "FederationMediaDownloadServlet"
+                                == "FederationUnstableMediaDownloadServlet"
                             ):
                                 response = await func(
                                     origin, content, request, *args, **kwargs
@@ -374,7 +374,7 @@ class BaseFederationServlet:
                     else:
                         if (
                             func.__self__.__class__.__name__  # type: ignore
-                            == "FederationMediaDownloadServlet"
+                            == "FederationUnstableMediaDownloadServlet"
                         ):
                             response = await func(
                                 origin, content, request, *args, **kwargs

synapse/federation/transport/server/federation.py

@@ -790,7 +790,7 @@ class FederationAccountStatusServlet(BaseFederationServerServlet):
         return 200, {"account_statuses": statuses, "failures": failures}
 
 
-class FederationMediaDownloadServlet(BaseFederationServerServlet):
+class FederationUnstableMediaDownloadServlet(BaseFederationServerServlet):
     """
     Implementation of new federation media `/download` endpoint outlined in MSC3916. Returns
     a multipart/mixed response consisting of a JSON object and the requested media
@@ -798,6 +798,7 @@ class FederationMediaDownloadServlet(BaseFederationServerServlet):
     """
 
     PATH = "/media/download/(?P<media_id>[^/]*)"
+    PREFIX = FEDERATION_UNSTABLE_PREFIX + "/org.matrix.msc3916"
     RATELIMIT = True
 
     def __init__(
@@ -857,5 +858,5 @@ FEDERATION_SERVLET_CLASSES: Tuple[Type[BaseFederationServlet], ...] = (
     FederationV1SendKnockServlet,
     FederationMakeKnockServlet,
     FederationAccountStatusServlet,
-    FederationMediaDownloadServlet,
+    FederationUnstableMediaDownloadServlet,
 )

synapse/handlers/sliding_sync.py

@@ -18,34 +18,22 @@
 #
 #
 import logging
-from typing import TYPE_CHECKING, Any, Dict, List, Optional, Set, Tuple
+from typing import TYPE_CHECKING, Dict, List, Optional, Tuple
 
-import attr
 from immutabledict import immutabledict
 
-from synapse.api.constants import (
-    AccountDataTypes,
-    Direction,
-    EventContentFields,
-    EventTypes,
-    Membership,
-)
+from synapse.api.constants import AccountDataTypes, EventTypes, Membership
 from synapse.events import EventBase
-from synapse.events.utils import strip_event
-from synapse.handlers.relations import BundledAggregations
-from synapse.storage.databases.main.stream import CurrentStateDeltaMembership
+from synapse.storage.roommember import RoomsForUser
 from synapse.types import (
-    JsonDict,
     PersistedEventPosition,
     Requester,
     RoomStreamToken,
-    StreamKeyType,
     StreamToken,
     UserID,
 )
 from synapse.types.handlers import OperationType, SlidingSyncConfig, SlidingSyncResult
 from synapse.types.state import StateFilter
-from synapse.visibility import filter_events_for_client
 
 if TYPE_CHECKING:
     from synapse.server import HomeServer
@@ -53,9 +41,28 @@ if TYPE_CHECKING:
 logger = logging.getLogger(__name__)
 
 
-def filter_membership_for_sync(
-    *, membership: str, user_id: str, sender: Optional[str]
-) -> bool:
+def convert_event_to_rooms_for_user(event: EventBase) -> RoomsForUser:
+    """
+    Quick helper to convert an event to a `RoomsForUser` object.
+    """
+    # These fields should be present for all persisted events
+    assert event.internal_metadata.stream_ordering is not None
+    assert event.internal_metadata.instance_name is not None
+
+    return RoomsForUser(
+        room_id=event.room_id,
+        sender=event.sender,
+        membership=event.membership,
+        event_id=event.event_id,
+        event_pos=PersistedEventPosition(
+            event.internal_metadata.instance_name,
+            event.internal_metadata.stream_ordering,
+        ),
+        room_version_id=event.room_version.identifier,
+    )
+
+
+def filter_membership_for_sync(*, membership: str, user_id: str, sender: str) -> bool:
     """
     Returns True if the membership event should be included in the sync response,
     otherwise False.
@@ -72,54 +79,7 @@ def filter_membership_for_sync(
     #
     # This logic includes kicks (leave events where the sender is not the same user) and
     # can be read as "anything that isn't a leave or a leave with a different sender".
-    #
-    # When `sender=None` and `membership=Membership.LEAVE`, it means that a state reset
-    # happened that removed the user from the room, or the user was the last person
-    # locally to leave the room which caused the server to leave the room. In both
-    # cases, we can just remove the rooms since they are no longer relevant to the user.
-    # They could still be added back later if they are `newly_left`.
-    return membership != Membership.LEAVE or sender not in (user_id, None)
-
-
-# We can't freeze this class because we want to update it in place with the
-# de-duplicated data.
-@attr.s(slots=True, auto_attribs=True)
-class RoomSyncConfig:
-    """
-    Holds the config for what data we should fetch for a room in the sync response.
-
-    Attributes:
-        timeline_limit: The maximum number of events to return in the timeline.
-        required_state: The set of state events requested for the room. The
-            values are close to `StateKey` but actually use a syntax where you can
-            provide `*` wildcard and `$LAZY` for lazy room members as the `state_key` part
-            of the tuple (type, state_key).
-    """
-
-    timeline_limit: int
-    required_state: Set[Tuple[str, str]]
-
-
-@attr.s(slots=True, frozen=True, auto_attribs=True)
-class _RoomMembershipForUser:
-    """
-    Attributes:
-        event_id: The event ID of the membership event
-        event_pos: The stream position of the membership event
-        membership: The membership state of the user in the room
-        sender: The person who sent the membership event
-        newly_joined: Whether the user newly joined the room during the given token
-            range
-    """
-
-    event_id: Optional[str]
-    event_pos: PersistedEventPosition
-    membership: str
-    sender: Optional[str]
-    newly_joined: bool
-
-    def copy_and_replace(self, **kwds: Any) -> "_RoomMembershipForUser":
-        return attr.evolve(self, **kwds)
+    return membership != Membership.LEAVE or sender != user_id
 
 
 class SlidingSyncHandler:
@@ -130,7 +90,6 @@ class SlidingSyncHandler:
         self.auth_blocking = hs.get_auth_blocking()
         self.notifier = hs.get_notifier()
         self.event_sources = hs.get_event_sources()
-        self.relations_handler = hs.get_relations_handler()
         self.rooms_to_exclude_globally = hs.config.server.rooms_to_exclude_from_sync
 
     async def wait_for_sync_for_user(
@@ -242,7 +201,6 @@ class SlidingSyncHandler:
 
         # Assemble sliding window lists
         lists: Dict[str, SlidingSyncResult.SlidingWindowList] = {}
-        relevant_room_map: Dict[str, RoomSyncConfig] = {}
         if sync_config.lists:
             # Get all of the room IDs that the user should be able to see in the sync
             # response
@@ -267,67 +225,29 @@ class SlidingSyncHandler:
                 ops: List[SlidingSyncResult.SlidingWindowList.Operation] = []
                 if list_config.ranges:
                     for range in list_config.ranges:
-                        sliced_room_ids = [
-                            room_id
-                            # Both sides of range are inclusive
-                            for room_id, _ in sorted_room_info[range[0] : range[1] + 1]
-                        ]
-
                         ops.append(
                             SlidingSyncResult.SlidingWindowList.Operation(
                                 op=OperationType.SYNC,
                                 range=range,
-                                room_ids=sliced_room_ids,
+                                room_ids=[
+                                    room_id
+                                    for room_id, _ in sorted_room_info[
+                                        range[0] : range[1]
+                                    ]
+                                ],
                             )
                         )
 
-                        # Take the superset of the `RoomSyncConfig` for each room
-                        for room_id in sliced_room_ids:
-                            if relevant_room_map.get(room_id) is not None:
-                                # Take the highest timeline limit
-                                if (
-                                    relevant_room_map[room_id].timeline_limit
-                                    < list_config.timeline_limit
-                                ):
-                                    relevant_room_map[room_id].timeline_limit = (
-                                        list_config.timeline_limit
-                                    )
-
-                                # Union the required state
-                                relevant_room_map[room_id].required_state.update(
-                                    list_config.required_state
-                                )
-                            else:
-                                relevant_room_map[room_id] = RoomSyncConfig(
-                                    timeline_limit=list_config.timeline_limit,
-                                    required_state=set(list_config.required_state),
-                                )
-
                 lists[list_key] = SlidingSyncResult.SlidingWindowList(
                     count=len(sorted_room_info),
                     ops=ops,
                 )
 
-        # TODO: if (sync_config.room_subscriptions):
-
-        # Fetch room data
-        rooms: Dict[str, SlidingSyncResult.RoomResult] = {}
-        for room_id, room_sync_config in relevant_room_map.items():
-            room_sync_result = await self.get_room_sync_data(
-                user=sync_config.user,
-                room_id=room_id,
-                room_sync_config=room_sync_config,
-                rooms_membership_for_user_at_to_token=sync_room_map[room_id],
-                from_token=from_token,
-                to_token=to_token,
-            )
-
-            rooms[room_id] = room_sync_result
-
         return SlidingSyncResult(
             next_pos=to_token,
             lists=lists,
-            rooms=rooms,
+            # TODO: Gather room data for rooms in lists and `sync_config.room_subscriptions`
+            rooms={},
             extensions={},
         )
 
@@ -336,7 +256,7 @@ class SlidingSyncHandler:
         user: UserID,
         to_token: StreamToken,
         from_token: Optional[StreamToken] = None,
-    ) -> Dict[str, _RoomMembershipForUser]:
+    ) -> Dict[str, RoomsForUser]:
         """
         Fetch room IDs that should be listed for this user in the sync response (the
         full room list that will be filtered, sorted, and sliced).
@@ -385,17 +305,13 @@ class SlidingSyncHandler:
 
         # Our working list of rooms that can show up in the sync response
         sync_room_id_set = {
-            # Note: The `room_for_user` we're assigning here will need to be fixed up
-            # (below) because they are potentially from the current snapshot time
-            # instead from the time of the `to_token`.
-            room_for_user.room_id: _RoomMembershipForUser(
-                event_id=room_for_user.event_id,
-                event_pos=room_for_user.event_pos,
-                membership=room_for_user.membership,
-                sender=room_for_user.sender,
-                newly_joined=False,
-            )
+            room_for_user.room_id: room_for_user
             for room_for_user in room_for_user_list
+            if filter_membership_for_sync(
+                membership=room_for_user.membership,
+                user_id=user_id,
+                sender=room_for_user.sender,
+            )
         }
 
         # Get the `RoomStreamToken` that represents the spot we queried up to when we got
@@ -430,9 +346,14 @@ class SlidingSyncHandler:
         #
         # - 1a) Remove rooms that the user joined after the `to_token`
         # - 1b) Add back rooms that the user left after the `to_token`
-        # - 1c) Update room membership events to the point in time of the `to_token`
         # - 2) Add back newly_left rooms (> `from_token` and <= `to_token`)
-        # - 3) Figure out which rooms are `newly_joined`
+        #
+        # Below, we're doing two separate lookups for membership changes. We could
+        # request everything for both fixups in one range, [`from_token.room_key`,
+        # `membership_snapshot_token`), but we want to avoid raw `stream_ordering`
+        # comparison without `instance_name` (which is flawed). We could refactor
+        # `event.internal_metadata` to include `instance_name` but it might turn out a
+        # little difficult and a bigger, broader Synapse change than we want to make.
 
         # 1) -----------------------------------------------------
 
@@ -442,198 +363,159 @@ class SlidingSyncHandler:
         # If our `to_token` is already the same or ahead of the latest room membership
         # for the user, we don't need to do any "2)" fix-ups and can just straight-up
         # use the room list from the snapshot as a base (nothing has changed)
-        current_state_delta_membership_changes_after_to_token = []
+        membership_change_events_after_to_token = []
         if not membership_snapshot_token.is_before_or_eq(to_token.room_key):
-            current_state_delta_membership_changes_after_to_token = (
-                await self.store.get_current_state_delta_membership_changes_for_user(
+            membership_change_events_after_to_token = (
+                await self.store.get_membership_changes_for_user(
                     user_id,
                     from_key=to_token.room_key,
                     to_key=membership_snapshot_token,
-                    excluded_room_ids=self.rooms_to_exclude_globally,
+                    excluded_rooms=self.rooms_to_exclude_globally,
                 )
             )
 
-        # 1) Assemble a list of the first membership event after the `to_token` so we can
-        # step backward to the previous membership that would apply to the from/to
-        # range.
-        first_membership_change_by_room_id_after_to_token: Dict[
-            str, CurrentStateDeltaMembership
-        ] = {}
-        for membership_change in current_state_delta_membership_changes_after_to_token:
+        # 1) Assemble a list of the last membership events in some given ranges. Someone
+        # could have left and joined multiple times during the given range but we only
+        # care about end-result so we grab the last one.
+        last_membership_change_by_room_id_after_to_token: Dict[str, EventBase] = {}
+        # We also need the first membership event after the `to_token` so we can step
+        # backward to the previous membership that would apply to the from/to range.
+        first_membership_change_by_room_id_after_to_token: Dict[str, EventBase] = {}
+        for event in membership_change_events_after_to_token:
+            last_membership_change_by_room_id_after_to_token[event.room_id] = event
             # Only set if we haven't already set it
             first_membership_change_by_room_id_after_to_token.setdefault(
-                membership_change.room_id, membership_change
+                event.room_id, event
             )
 
         # 1) Fixup
-        #
-        # Since we fetched a snapshot of the users room list at some point in time after
-        # the from/to tokens, we need to revert/rewind some membership changes to match
-        # the point in time of the `to_token`.
         for (
-            room_id,
-            first_membership_change_after_to_token,
-        ) in first_membership_change_by_room_id_after_to_token.items():
-            # 1a) Remove rooms that the user joined after the `to_token`
-            if first_membership_change_after_to_token.prev_event_id is None:
-                sync_room_id_set.pop(room_id, None)
-            # 1b) 1c) From the first membership event after the `to_token`, step backward to the
-            # previous membership that would apply to the from/to range.
-            else:
-                # We don't expect these fields to be `None` if we have a `prev_event_id`
-                # but we're being defensive since it's possible that the prev event was
-                # culled from the database.
-                if (
-                    first_membership_change_after_to_token.prev_event_pos is not None
-                    and first_membership_change_after_to_token.prev_membership
-                    is not None
-                ):
-                    sync_room_id_set[room_id] = _RoomMembershipForUser(
-                        event_id=first_membership_change_after_to_token.prev_event_id,
-                        event_pos=first_membership_change_after_to_token.prev_event_pos,
-                        membership=first_membership_change_after_to_token.prev_membership,
-                        sender=first_membership_change_after_to_token.prev_sender,
-                        newly_joined=False,
-                    )
-                else:
-                    # If we can't find the previous membership event, we shouldn't
-                    # include the room in the sync response since we can't determine the
-                    # exact membership state and shouldn't rely on the current snapshot.
-                    sync_room_id_set.pop(room_id, None)
+            last_membership_change_after_to_token
+        ) in last_membership_change_by_room_id_after_to_token.values():
+            room_id = last_membership_change_after_to_token.room_id
 
-        # Filter the rooms that that we have updated room membership events to the point
-        # in time of the `to_token` (from the "1)" fixups)
-        filtered_sync_room_id_set = {
-            room_id: room_membership_for_user
-            for room_id, room_membership_for_user in sync_room_id_set.items()
-            if filter_membership_for_sync(
-                membership=room_membership_for_user.membership,
-                user_id=user_id,
-                sender=room_membership_for_user.sender,
+            # We want to find the first membership change after the `to_token` then step
+            # backward to know the membership in the from/to range.
+            first_membership_change_after_to_token = (
+                first_membership_change_by_room_id_after_to_token.get(room_id)
             )
-        }
+            assert first_membership_change_after_to_token is not None, (
+                "If there was a `last_membership_change_after_to_token` that we're iterating over, "
+                + "then there should be corresponding a first change. For example, even if there "
+                + "is only one event after the `to_token`, the first and last event will be same event. "
+                + "This is probably a mistake in assembling the `last_membership_change_by_room_id_after_to_token`"
+                + "/`first_membership_change_by_room_id_after_to_token` dicts above."
+            )
+            # TODO: Instead of reading from `unsigned`, refactor this to use the
+            # `current_state_delta_stream` table in the future. Probably a new
+            # `get_membership_changes_for_user()` function that uses
+            # `current_state_delta_stream` with a join to `room_memberships`. This would
+            # help in state reset scenarios since `prev_content` is looking at the
+            # current branch vs the current room state. This is all just data given to
+            # the client so no real harm to data integrity, but we'd like to be nice to
+            # the client. Since the `current_state_delta_stream` table is new, it
+            # doesn't have all events in it. Since this is Sliding Sync, if we ever need
+            # to, we can signal the client to throw all of their state away by sending
+            # "operation: RESET".
+            prev_content = first_membership_change_after_to_token.unsigned.get(
+                "prev_content", {}
+            )
+            prev_membership = prev_content.get("membership", None)
+            prev_sender = first_membership_change_after_to_token.unsigned.get(
+                "prev_sender", None
+            )
+
+            # Check if the previous membership (membership that applies to the from/to
+            # range) should be included in our `sync_room_id_set`
+            should_prev_membership_be_included = (
+                prev_membership is not None
+                and prev_sender is not None
+                and filter_membership_for_sync(
+                    membership=prev_membership,
+                    user_id=user_id,
+                    sender=prev_sender,
+                )
+            )
+
+            # Check if the last membership (membership that applies to our snapshot) was
+            # already included in our `sync_room_id_set`
+            was_last_membership_already_included = filter_membership_for_sync(
+                membership=last_membership_change_after_to_token.membership,
+                user_id=user_id,
+                sender=last_membership_change_after_to_token.sender,
+            )
+
+            # 1a) Add back rooms that the user left after the `to_token`
+            #
+            # For example, if the last membership event after the `to_token` is a leave
+            # event, then the room was excluded from `sync_room_id_set` when we first
+            # crafted it above. We should add these rooms back as long as the user also
+            # was part of the room before the `to_token`.
+            if (
+                not was_last_membership_already_included
+                and should_prev_membership_be_included
+            ):
+                sync_room_id_set[room_id] = convert_event_to_rooms_for_user(
+                    last_membership_change_after_to_token
+                )
+            # 1b) Remove rooms that the user joined (hasn't left) after the `to_token`
+            #
+            # For example, if the last membership event after the `to_token` is a "join"
+            # event, then the room was included `sync_room_id_set` when we first crafted
+            # it above. We should remove these rooms as long as the user also wasn't
+            # part of the room before the `to_token`.
+            elif (
+                was_last_membership_already_included
+                and not should_prev_membership_be_included
+            ):
+                del sync_room_id_set[room_id]
 
         # 2) -----------------------------------------------------
         # We fix-up newly_left rooms after the first fixup because it may have removed
-        # some left rooms that we can figure out are newly_left in the following code
+        # some left rooms that we can figure out our newly_left in the following code
 
         # 2) Fetch membership changes that fall in the range from `from_token` up to `to_token`
-        current_state_delta_membership_changes_in_from_to_range = []
+        membership_change_events_in_from_to_range = []
         if from_token:
-            current_state_delta_membership_changes_in_from_to_range = (
-                await self.store.get_current_state_delta_membership_changes_for_user(
+            membership_change_events_in_from_to_range = (
+                await self.store.get_membership_changes_for_user(
                     user_id,
                     from_key=from_token.room_key,
                     to_key=to_token.room_key,
-                    excluded_room_ids=self.rooms_to_exclude_globally,
+                    excluded_rooms=self.rooms_to_exclude_globally,
                 )
             )
 
         # 2) Assemble a list of the last membership events in some given ranges. Someone
         # could have left and joined multiple times during the given range but we only
         # care about end-result so we grab the last one.
-        last_membership_change_by_room_id_in_from_to_range: Dict[
-            str, CurrentStateDeltaMembership
-        ] = {}
-        # We also want to assemble a list of the first membership events during the token
-        # range so we can step backward to the previous membership that would apply to
-        # before the token range to see if we have `newly_joined` the room.
-        first_membership_change_by_room_id_in_from_to_range: Dict[
-            str, CurrentStateDeltaMembership
-        ] = {}
-        # Keep track if the room has a non-join event in the token range so we can later
-        # tell if it was a `newly_joined` room. If the last membership event in the
-        # token range is a join and there is also some non-join in the range, we know
-        # they `newly_joined`.
-        has_non_join_event_by_room_id_in_from_to_range: Dict[str, bool] = {}
-        for (
-            membership_change
-        ) in current_state_delta_membership_changes_in_from_to_range:
-            room_id = membership_change.room_id
-
-            last_membership_change_by_room_id_in_from_to_range[room_id] = (
-                membership_change
-            )
-            # Only set if we haven't already set it
-            first_membership_change_by_room_id_in_from_to_range.setdefault(
-                room_id, membership_change
-            )
-
-            if membership_change.membership != Membership.JOIN:
-                has_non_join_event_by_room_id_in_from_to_range[room_id] = True
+        last_membership_change_by_room_id_in_from_to_range: Dict[str, EventBase] = {}
+        for event in membership_change_events_in_from_to_range:
+            last_membership_change_by_room_id_in_from_to_range[event.room_id] = event
 
         # 2) Fixup
-        #
-        # 3) We also want to assemble a list of possibly newly joined rooms. Someone
-        # could have left and joined multiple times during the given range but we only
-        # care about whether they are joined at the end of the token range so we are
-        # working with the last membership even in the token range.
-        possibly_newly_joined_room_ids = set()
         for (
             last_membership_change_in_from_to_range
         ) in last_membership_change_by_room_id_in_from_to_range.values():
             room_id = last_membership_change_in_from_to_range.room_id
 
-            # 3)
-            if last_membership_change_in_from_to_range.membership == Membership.JOIN:
-                possibly_newly_joined_room_ids.add(room_id)
-
             # 2) Add back newly_left rooms (> `from_token` and <= `to_token`). We
             # include newly_left rooms because the last event that the user should see
             # is their own leave event
             if last_membership_change_in_from_to_range.membership == Membership.LEAVE:
-                filtered_sync_room_id_set[room_id] = _RoomMembershipForUser(
-                    event_id=last_membership_change_in_from_to_range.event_id,
-                    event_pos=last_membership_change_in_from_to_range.event_pos,
-                    membership=last_membership_change_in_from_to_range.membership,
-                    sender=last_membership_change_in_from_to_range.sender,
-                    newly_joined=False,
+                sync_room_id_set[room_id] = convert_event_to_rooms_for_user(
+                    last_membership_change_in_from_to_range
                 )
 
-        # 3) Figure out `newly_joined`
-        for room_id in possibly_newly_joined_room_ids:
-            has_non_join_in_from_to_range = (
-                has_non_join_event_by_room_id_in_from_to_range.get(room_id, False)
-            )
-            # If the last membership event in the token range is a join and there is
-            # also some non-join in the range, we know they `newly_joined`.
-            if has_non_join_in_from_to_range:
-                # We found a `newly_joined` room (we left and joined within the token range)
-                filtered_sync_room_id_set[room_id] = filtered_sync_room_id_set[
-                    room_id
-                ].copy_and_replace(newly_joined=True)
-            else:
-                prev_event_id = first_membership_change_by_room_id_in_from_to_range[
-                    room_id
-                ].prev_event_id
-                prev_membership = first_membership_change_by_room_id_in_from_to_range[
-                    room_id
-                ].prev_membership
-
-                if prev_event_id is None:
-                    # We found a `newly_joined` room (we are joining the room for the
-                    # first time within the token range)
-                    filtered_sync_room_id_set[room_id] = filtered_sync_room_id_set[
-                        room_id
-                    ].copy_and_replace(newly_joined=True)
-                # Last resort, we need to step back to the previous membership event
-                # just before the token range to see if we're joined then or not.
-                elif prev_membership != Membership.JOIN:
-                    # We found a `newly_joined` room (we left before the token range
-                    # and joined within the token range)
-                    filtered_sync_room_id_set[room_id] = filtered_sync_room_id_set[
-                        room_id
-                    ].copy_and_replace(newly_joined=True)
-
-        return filtered_sync_room_id_set
+        return sync_room_id_set
 
     async def filter_rooms(
         self,
         user: UserID,
-        sync_room_map: Dict[str, _RoomMembershipForUser],
+        sync_room_map: Dict[str, RoomsForUser],
         filters: SlidingSyncConfig.SlidingSyncList.Filters,
         to_token: StreamToken,
-    ) -> Dict[str, _RoomMembershipForUser]:
+    ) -> Dict[str, RoomsForUser]:
         """
         Filter rooms based on the sync request.
 
@@ -701,10 +583,6 @@ class SlidingSyncHandler:
                     state_filter=StateFilter.from_types(
                         [(EventTypes.RoomEncryption, "")]
                     ),
-                    # Partially stated rooms should have all state events except for the
-                    # membership events so we don't need to wait. Plus we don't want to
-                    # block the whole sync waiting for this one room.
-                    await_full_state=False,
                 )
                 is_encrypted = state_at_to_token.get((EventTypes.RoomEncryption, ""))
 
@@ -731,26 +609,11 @@ class SlidingSyncHandler:
                 ):
                     filtered_room_id_set.remove(room_id)
 
-        # Filter by room type (space vs room, etc). A room must match one of the types
-        # provided in the list. `None` is a valid type for rooms which do not have a
-        # room type.
-        if filters.room_types is not None or filters.not_room_types is not None:
-            # Make a copy so we don't run into an error: `Set changed size during
-            # iteration`, when we filter out and remove items
-            for room_id in list(filtered_room_id_set):
-                create_event = await self.store.get_create_event_for_room(room_id)
-                room_type = create_event.content.get(EventContentFields.ROOM_TYPE)
-                if (
-                    filters.room_types is not None
-                    and room_type not in filters.room_types
-                ):
-                    filtered_room_id_set.remove(room_id)
+        if filters.room_types:
+            raise NotImplementedError()
 
-                if (
-                    filters.not_room_types is not None
-                    and room_type in filters.not_room_types
-                ):
-                    filtered_room_id_set.remove(room_id)
+        if filters.not_room_types:
+            raise NotImplementedError()
 
         if filters.room_name_like:
             raise NotImplementedError()
@@ -766,9 +629,9 @@ class SlidingSyncHandler:
 
     async def sort_rooms(
         self,
-        sync_room_map: Dict[str, _RoomMembershipForUser],
+        sync_room_map: Dict[str, RoomsForUser],
         to_token: StreamToken,
-    ) -> List[Tuple[str, _RoomMembershipForUser]]:
+    ) -> List[Tuple[str, RoomsForUser]]:
         """
         Sort by `stream_ordering` of the last event that the user should see in the
         room. `stream_ordering` is unique so we get a stable sort.
@@ -815,229 +678,3 @@ class SlidingSyncHandler:
             # We want descending order
             reverse=True,
         )
-
-    async def get_room_sync_data(
-        self,
-        user: UserID,
-        room_id: str,
-        room_sync_config: RoomSyncConfig,
-        rooms_membership_for_user_at_to_token: _RoomMembershipForUser,
-        from_token: Optional[StreamToken],
-        to_token: StreamToken,
-    ) -> SlidingSyncResult.RoomResult:
-        """
-        Fetch room data for the sync response.
-
-        We fetch data according to the token range (> `from_token` and <= `to_token`).
-
-        Args:
-            user: User to fetch data for
-            room_id: The room ID to fetch data for
-            room_sync_config: Config for what data we should fetch for a room in the
-                sync response.
-            rooms_membership_for_user_at_to_token: Membership information for the user
-                in the room at the time of `to_token`.
-            from_token: The point in the stream to sync from.
-            to_token: The point in the stream to sync up to.
-        """
-
-        # Assemble the list of timeline events
-        #
-        # It would be nice to make the `rooms` response more uniform regardless of
-        # membership. Currently, we have to make all of these optional because
-        # `invite`/`knock` rooms only have `stripped_state`. See
-        # https://github.com/matrix-org/matrix-spec-proposals/pull/3575#discussion_r1653045932
-        timeline_events: Optional[List[EventBase]] = None
-        bundled_aggregations: Optional[Dict[str, BundledAggregations]] = None
-        limited: Optional[bool] = None
-        prev_batch_token: Optional[StreamToken] = None
-        num_live: Optional[int] = None
-        if (
-            room_sync_config.timeline_limit > 0
-            # No timeline for invite/knock rooms (just `stripped_state`)
-            and rooms_membership_for_user_at_to_token.membership
-            not in (Membership.INVITE, Membership.KNOCK)
-        ):
-            limited = False
-            # We want to start off using the `to_token` (vs `from_token`) because we look
-            # backwards from the `to_token` up to the `timeline_limit` and we might not
-            # reach the `from_token` before we hit the limit. We will update the room stream
-            # position once we've fetched the events to point to the earliest event fetched.
-            prev_batch_token = to_token
-
-            # We're going to paginate backwards from the `to_token`
-            from_bound = to_token.room_key
-            # People shouldn't see past their leave/ban event
-            if rooms_membership_for_user_at_to_token.membership in (
-                Membership.LEAVE,
-                Membership.BAN,
-            ):
-                from_bound = (
-                    rooms_membership_for_user_at_to_token.event_pos.to_room_stream_token()
-                )
-
-            # Determine whether we should limit the timeline to the token range.
-            #
-            # We should return historical messages (before token range) in the
-            # following cases because we want clients to be able to show a basic
-            # screen of information:
-            #  - Initial sync (because no `from_token` to limit us anyway)
-            #  - When users `newly_joined`
-            #  - TODO: For an incremental sync where we haven't sent it down this
-            #    connection before
-            to_bound = (
-                from_token.room_key
-                if from_token is not None
-                and not rooms_membership_for_user_at_to_token.newly_joined
-                else None
-            )
-
-            timeline_events, new_room_key = await self.store.paginate_room_events(
-                room_id=room_id,
-                from_key=from_bound,
-                to_key=to_bound,
-                direction=Direction.BACKWARDS,
-                # We add one so we can determine if there are enough events to saturate
-                # the limit or not (see `limited`)
-                limit=room_sync_config.timeline_limit + 1,
-                event_filter=None,
-            )
-
-            # We want to return the events in ascending order (the last event is the
-            # most recent).
-            timeline_events.reverse()
-
-            # Determine our `limited` status based on the timeline. We do this before
-            # filtering the events so we can accurately determine if there is more to
-            # paginate even if we filter out some/all events.
-            if len(timeline_events) > room_sync_config.timeline_limit:
-                limited = True
-                # Get rid of that extra "+ 1" event because we only used it to determine
-                # if we hit the limit or not
-                timeline_events = timeline_events[-room_sync_config.timeline_limit :]
-                assert timeline_events[0].internal_metadata.stream_ordering
-                new_room_key = RoomStreamToken(
-                    stream=timeline_events[0].internal_metadata.stream_ordering - 1
-                )
-
-            # Make sure we don't expose any events that the client shouldn't see
-            timeline_events = await filter_events_for_client(
-                self.storage_controllers,
-                user.to_string(),
-                timeline_events,
-                is_peeking=rooms_membership_for_user_at_to_token.membership
-                != Membership.JOIN,
-                filter_send_to_client=True,
-            )
-            # TODO: Filter out `EventTypes.CallInvite` in public rooms,
-            # see https://github.com/element-hq/synapse/issues/17359
-
-            # TODO: Handle timeline gaps (`get_timeline_gaps()`)
-
-            # Determine how many "live" events we have (events within the given token range).
-            #
-            # 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)
-            num_live = 0
-            if from_token is not None:
-                for timeline_event in reversed(timeline_events):
-                    # This fields should be present for all persisted events
-                    assert timeline_event.internal_metadata.stream_ordering is not None
-                    assert timeline_event.internal_metadata.instance_name is not None
-
-                    persisted_position = PersistedEventPosition(
-                        instance_name=timeline_event.internal_metadata.instance_name,
-                        stream=timeline_event.internal_metadata.stream_ordering,
-                    )
-                    if persisted_position.persisted_after(from_token.room_key):
-                        num_live += 1
-                    else:
-                        # Since we're iterating over the timeline events in
-                        # reverse-chronological order, we can break once we hit an event
-                        # that's not live. In the future, we could potentially optimize
-                        # this more with a binary search (bisect).
-                        break
-
-            # If the timeline is `limited=True`, the client does not have all events
-            # necessary to calculate aggregations themselves.
-            if limited:
-                bundled_aggregations = (
-                    await self.relations_handler.get_bundled_aggregations(
-                        timeline_events, user.to_string()
-                    )
-                )
-
-            # Update the `prev_batch_token` to point to the position that allows us to
-            # keep paginating backwards from the oldest event we return in the timeline.
-            prev_batch_token = prev_batch_token.copy_and_replace(
-                StreamKeyType.ROOM, new_room_key
-            )
-
-        # Figure out any stripped state events for invite/knocks. This allows the
-        # potential joiner to identify the room.
-        stripped_state: List[JsonDict] = []
-        if rooms_membership_for_user_at_to_token.membership in (
-            Membership.INVITE,
-            Membership.KNOCK,
-        ):
-            # This should never happen. If someone is invited/knocked on room, then
-            # there should be an event for it.
-            assert rooms_membership_for_user_at_to_token.event_id is not None
-
-            invite_or_knock_event = await self.store.get_event(
-                rooms_membership_for_user_at_to_token.event_id
-            )
-
-            stripped_state = []
-            if invite_or_knock_event.membership == Membership.INVITE:
-                stripped_state.extend(
-                    invite_or_knock_event.unsigned.get("invite_room_state", [])
-                )
-            elif invite_or_knock_event.membership == Membership.KNOCK:
-                stripped_state.extend(
-                    invite_or_knock_event.unsigned.get("knock_room_state", [])
-                )
-
-            stripped_state.append(strip_event(invite_or_knock_event))
-
-        # TODO: Handle state resets. For example, if we see
-        # `rooms_membership_for_user_at_to_token.membership = Membership.LEAVE` but
-        # `required_state` doesn't include it, we should indicate to the client that a
-        # state reset happened. Perhaps we should indicate this by setting `initial:
-        # True` and empty `required_state`.
-
-        return SlidingSyncResult.RoomResult(
-            # TODO: Dummy value
-            name=None,
-            # TODO: Dummy value
-            avatar=None,
-            # TODO: Dummy value
-            heroes=None,
-            # TODO: Since we can't determine whether we've already sent a room down this
-            # Sliding Sync connection before (we plan to add this optimization in the
-            # future), we're always returning the requested room state instead of
-            # updates.
-            initial=True,
-            # TODO: Dummy value
-            required_state=[],
-            timeline_events=timeline_events,
-            bundled_aggregations=bundled_aggregations,
-            # TODO: Dummy value
-            is_dm=False,
-            stripped_state=stripped_state,
-            prev_batch=prev_batch_token,
-            limited=limited,
-            # TODO: Dummy values
-            joined_count=0,
-            invited_count=0,
-            # TODO: These are just dummy values. We could potentially just remove these
-            # since notifications can only really be done correctly on the client anyway
-            # (encrypted rooms).
-            notification_count=0,
-            highlight_count=0,
-            num_live=num_live,
-        )

synapse/http/client.py

@@ -35,8 +35,6 @@ from typing import (
     Union,
 )
 
-import attr
-import multipart
 import treq
 from canonicaljson import encode_canonical_json
 from netaddr import AddrFormatError, IPAddress, IPSet
@@ -1008,130 +1006,6 @@ class _DiscardBodyWithMaxSizeProtocol(protocol.Protocol):
         self._maybe_fail()
 
 
-@attr.s(auto_attribs=True, slots=True)
-class MultipartResponse:
-    """
-    A small class to hold parsed values of a multipart response.
-    """
-
-    json: bytes = b"{}"
-    length: Optional[int] = None
-    content_type: Optional[bytes] = None
-    disposition: Optional[bytes] = None
-    url: Optional[bytes] = None
-
-
-class _MultipartParserProtocol(protocol.Protocol):
-    """
-    Protocol to read and parse a MSC3916 multipart/mixed response
-    """
-
-    transport: Optional[ITCPTransport] = None
-
-    def __init__(
-        self,
-        stream: ByteWriteable,
-        deferred: defer.Deferred,
-        boundary: str,
-        max_length: Optional[int],
-    ) -> None:
-        self.stream = stream
-        self.deferred = deferred
-        self.boundary = boundary
-        self.max_length = max_length
-        self.parser = None
-        self.multipart_response = MultipartResponse()
-        self.has_redirect = False
-        self.in_json = False
-        self.json_done = False
-        self.file_length = 0
-        self.total_length = 0
-        self.in_disposition = False
-        self.in_content_type = False
-
-    def dataReceived(self, incoming_data: bytes) -> None:
-        if self.deferred.called:
-            return
-
-        # we don't have a parser yet, instantiate it
-        if not self.parser:
-
-            def on_header_field(data: bytes, start: int, end: int) -> None:
-                if data[start:end] == b"Location":
-                    self.has_redirect = True
-                if data[start:end] == b"Content-Disposition":
-                    self.in_disposition = True
-                if data[start:end] == b"Content-Type":
-                    self.in_content_type = True
-
-            def on_header_value(data: bytes, start: int, end: int) -> None:
-                # the first header should be content-type for application/json
-                if not self.in_json and not self.json_done:
-                    assert data[start:end] == b"application/json"
-                    self.in_json = True
-                elif self.has_redirect:
-                    self.multipart_response.url = data[start:end]
-                elif self.in_content_type:
-                    self.multipart_response.content_type = data[start:end]
-                    self.in_content_type = False
-                elif self.in_disposition:
-                    self.multipart_response.disposition = data[start:end]
-                    self.in_disposition = False
-
-            def on_part_data(data: bytes, start: int, end: int) -> None:
-                # we've seen json header but haven't written the json data
-                if self.in_json and not self.json_done:
-                    self.multipart_response.json = data[start:end]
-                    self.json_done = True
-                # we have a redirect header rather than a file, and have already captured it
-                elif self.has_redirect:
-                    return
-                # otherwise we are in the file part
-                else:
-                    logger.info("Writing multipart file data to stream")
-                    try:
-                        self.stream.write(data[start:end])
-                    except Exception as e:
-                        logger.warning(
-                            f"Exception encountered writing file data to stream: {e}"
-                        )
-                        self.deferred.errback()
-                    self.file_length += end - start
-
-            callbacks = {
-                "on_header_field": on_header_field,
-                "on_header_value": on_header_value,
-                "on_part_data": on_part_data,
-            }
-            self.parser = multipart.MultipartParser(self.boundary, callbacks)
-
-        self.total_length += len(incoming_data)
-        if self.max_length is not None and self.total_length >= self.max_length:
-            self.deferred.errback(BodyExceededMaxSize())
-            # Close the connection (forcefully) since all the data will get
-            # discarded anyway.
-            assert self.transport is not None
-            self.transport.abortConnection()
-
-        try:
-            self.parser.write(incoming_data)  # type: ignore[attr-defined]
-        except Exception as e:
-            logger.warning(f"Exception writing to multipart parser: {e}")
-            self.deferred.errback()
-            return
-
-    def connectionLost(self, reason: Failure = connectionDone) -> None:
-        # If the maximum size was already exceeded, there's nothing to do.
-        if self.deferred.called:
-            return
-
-        if reason.check(ResponseDone):
-            self.multipart_response.length = self.file_length
-            self.deferred.callback(self.multipart_response)
-        else:
-            self.deferred.errback(reason)
-
-
 class _ReadBodyWithMaxSizeProtocol(protocol.Protocol):
     """A protocol which reads body to a stream, erroring if the body exceeds a maximum size."""
 
@@ -1217,32 +1091,6 @@ def read_body_with_max_size(
     return d
 
 
-def read_multipart_response(
-    response: IResponse, stream: ByteWriteable, boundary: str, max_length: Optional[int]
-) -> "defer.Deferred[MultipartResponse]":
-    """
-    Reads a MSC3916 multipart/mixed response and parses it, reading the file part (if it contains one) into
-    the stream passed in and returning a deferred resolving to a MultipartResponse
-
-    Args:
-        response: The HTTP response to read from.
-        stream: The file-object to write to.
-        boundary: the multipart/mixed boundary string
-        max_length: maximum allowable length of the response
-    """
-    d: defer.Deferred[MultipartResponse] = defer.Deferred()
-
-    # If the Content-Length header gives a size larger than the maximum allowed
-    # size, do not bother downloading the body.
-    if max_length is not None and response.length != UNKNOWN_LENGTH:
-        if response.length > max_length:
-            response.deliverBody(_DiscardBodyWithMaxSizeProtocol(d))
-            return d
-
-    response.deliverBody(_MultipartParserProtocol(stream, d, boundary, max_length))
-    return d
-
-
 def encode_query_args(args: Optional[QueryParams]) -> bytes:
     """
     Encodes a map of query arguments to bytes which can be appended to a URL.

synapse/http/matrixfederationclient.py

@@ -75,11 +75,9 @@ from synapse.http.client import (
     BlocklistingAgentWrapper,
     BodyExceededMaxSize,
     ByteWriteable,
-    SimpleHttpClient,
     _make_scheduler,
     encode_query_args,
     read_body_with_max_size,
-    read_multipart_response,
 )
 from synapse.http.connectproxyclient import BearerProxyCredentials
 from synapse.http.federation.matrix_federation_agent import MatrixFederationAgent
@@ -468,13 +466,6 @@ class MatrixFederationHttpClient:
 
         self._sleeper = AwakenableSleeper(self.reactor)
 
-        self._simple_http_client = SimpleHttpClient(
-            hs,
-            ip_blocklist=hs.config.server.federation_ip_range_blocklist,
-            ip_allowlist=hs.config.server.federation_ip_range_allowlist,
-            use_proxy=True,
-        )
-
     def wake_destination(self, destination: str) -> None:
         """Called when the remote server may have come back online."""
 
@@ -1562,189 +1553,6 @@ class MatrixFederationHttpClient:
         )
         return length, headers
 
-    async def federation_get_file(
-        self,
-        destination: str,
-        path: str,
-        output_stream: BinaryIO,
-        download_ratelimiter: Ratelimiter,
-        ip_address: str,
-        max_size: int,
-        args: Optional[QueryParams] = None,
-        retry_on_dns_fail: bool = True,
-        ignore_backoff: bool = False,
-    ) -> Tuple[int, Dict[bytes, List[bytes]], bytes]:
-        """GETs a file from a given homeserver over the federation /download endpoint
-        Args:
-            destination: The remote server to send the HTTP request to.
-            path: The HTTP path to GET.
-            output_stream: File to write the response body to.
-            download_ratelimiter: a ratelimiter to limit remote media downloads, keyed to
-                requester IP
-            ip_address: IP address of the requester
-            max_size: maximum allowable size in bytes of the file
-            args: Optional dictionary used to create the query string.
-            ignore_backoff: true to ignore the historical backoff data
-                and try the request anyway.
-
-        Returns:
-            Resolves to an (int, dict, bytes) tuple of
-            the file length, a dict of the response headers, and the file json
-
-        Raises:
-            HttpResponseException: If we get an HTTP response code >= 300
-                (except 429).
-            NotRetryingDestination: If we are not yet ready to retry this
-                server.
-            FederationDeniedError: If this destination is not on our
-                federation whitelist
-            RequestSendFailed: If there were problems connecting to the
-                remote, due to e.g. DNS failures, connection timeouts etc.
-            SynapseError: If the requested file exceeds ratelimits or the response from the
-            remote server is not a multipart response
-            AssertionError: if the resolved multipart response's length is None
-        """
-        request = MatrixFederationRequest(
-            method="GET", destination=destination, path=path, query=args
-        )
-
-        # check for a minimum balance of 1MiB in ratelimiter before initiating request
-        send_req, _ = await download_ratelimiter.can_do_action(
-            requester=None, key=ip_address, n_actions=1048576, update=False
-        )
-
-        if not send_req:
-            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)
-
-        response = await self._send_request(
-            request,
-            retry_on_dns_fail=retry_on_dns_fail,
-            ignore_backoff=ignore_backoff,
-        )
-
-        headers = dict(response.headers.getAllRawHeaders())
-
-        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
-            logger.debug(
-                f"File size unknown, assuming file is max allowable size: {max_size}"
-            )
-
-        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:
-            raw_content_type = headers.get(b"Content-Type")
-            assert raw_content_type is not None
-            content_type = raw_content_type[0].decode("UTF-8")
-            content_type_parts = content_type.split("boundary=")
-            boundary = content_type_parts[1]
-        except Exception:
-            msg = "Remote response is malformed: expected Content-Type of multipart/mixed with a boundary present."
-            logger.warning(
-                "{%s} [%s] %s",
-                request.txn_id,
-                request.destination,
-                msg,
-            )
-            raise SynapseError(HTTPStatus.BAD_GATEWAY, msg)
-
-        try:
-            # 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(
-                "{%s} [%s] %s",
-                request.txn_id,
-                request.destination,
-                msg,
-            )
-            raise SynapseError(HTTPStatus.BAD_GATEWAY, msg, Codes.TOO_LARGE)
-        except defer.TimeoutError as e:
-            logger.warning(
-                "{%s} [%s] Timed out reading response - %s %s",
-                request.txn_id,
-                request.destination,
-                request.method,
-                request.uri.decode("ascii"),
-            )
-            raise RequestSendFailed(e, can_retry=True) from e
-        except ResponseFailed as e:
-            logger.warning(
-                "{%s} [%s] Failed to read response - %s %s",
-                request.txn_id,
-                request.destination,
-                request.method,
-                request.uri.decode("ascii"),
-            )
-            raise RequestSendFailed(e, can_retry=True) from e
-        except Exception as e:
-            logger.warning(
-                "{%s} [%s] Error reading response: %s",
-                request.txn_id,
-                request.destination,
-                e,
-            )
-            raise
-
-        multipart_response = await make_deferred_yieldable(deferred)
-        if not multipart_response.url:
-            assert multipart_response.length is not None
-            length = multipart_response.length
-            headers[b"Content-Type"] = [multipart_response.content_type]
-            headers[b"Content-Disposition"] = [multipart_response.disposition]
-
-        # the response contained a redirect url to download the file from
-        else:
-            str_url = multipart_response.url.decode("utf-8")
-            logger.info(
-                "{%s} [%s] File download redirected, now downloading from: %s",
-                request.txn_id,
-                request.destination,
-                str_url,
-            )
-            length, headers, _, _ = await self._simple_http_client.get_file(
-                str_url, output_stream, expected_size
-            )
-
-        logger.info(
-            "{%s} [%s] Completed: %d %s [%d bytes] %s %s",
-            request.txn_id,
-            request.destination,
-            response.code,
-            response.phrase.decode("ascii", errors="replace"),
-            length,
-            request.method,
-            request.uri.decode("ascii"),
-        )
-        return length, headers, multipart_response.json
-
 
 def _flatten_response_never_received(e: BaseException) -> str:
     if hasattr(e, "reasons"):

synapse/media/_base.py

@@ -221,7 +221,6 @@ def add_file_headers(
     # select private. don't bother setting Expires as all our
     # clients are smart enough to be happy with Cache-Control
     request.setHeader(b"Cache-Control", b"public,max-age=86400,s-maxage=86400")
-
     if file_size is not None:
         request.setHeader(b"Content-Length", b"%d" % (file_size,))
 
@@ -303,37 +302,12 @@ async def respond_with_multipart_responder(
             )
             return
 
-        if media_info.media_type.lower().split(";", 1)[0] in INLINE_CONTENT_TYPES:
-            disposition = "inline"
-        else:
-            disposition = "attachment"
-
-        def _quote(x: str) -> str:
-            return urllib.parse.quote(x.encode("utf-8"))
-
-        if media_info.upload_name:
-            if _can_encode_filename_as_token(media_info.upload_name):
-                disposition = "%s; filename=%s" % (
-                    disposition,
-                    media_info.upload_name,
-                )
-            else:
-                disposition = "%s; filename*=utf-8''%s" % (
-                    disposition,
-                    _quote(media_info.upload_name),
-                )
-
         from synapse.media.media_storage import MultipartFileConsumer
 
         # note that currently the json_object is just {}, this will change when linked media
         # is implemented
         multipart_consumer = MultipartFileConsumer(
-            clock,
-            request,
-            media_info.media_type,
-            {},
-            disposition,
-            media_info.media_length,
+            clock, request, media_info.media_type, {}, media_info.media_length
         )
 
         logger.debug("Responding to media request with responder %s", responder)

synapse/media/media_repository.py

@@ -480,7 +480,6 @@ class MediaRepository:
         name: Optional[str],
         max_timeout_ms: int,
         ip_address: str,
-        use_federation_endpoint: bool,
     ) -> None:
         """Respond to requests for remote media.
 
@@ -493,8 +492,6 @@ class MediaRepository:
             max_timeout_ms: the maximum number of milliseconds to wait for the
                 media to be uploaded.
             ip_address: the IP address of the requester
-            use_federation_endpoint: whether to request the remote media over the new
-                federation `/download` endpoint
 
         Returns:
             Resolves once a response has successfully been written to request
@@ -525,7 +522,6 @@ class MediaRepository:
                 max_timeout_ms,
                 self.download_ratelimiter,
                 ip_address,
-                use_federation_endpoint,
             )
 
         # We deliberately stream the file outside the lock
@@ -573,7 +569,6 @@ class MediaRepository:
                 max_timeout_ms,
                 self.download_ratelimiter,
                 ip_address,
-                False,
             )
 
         # Ensure we actually use the responder so that it releases resources
@@ -590,7 +585,6 @@ class MediaRepository:
         max_timeout_ms: int,
         download_ratelimiter: Ratelimiter,
         ip_address: str,
-        use_federation_endpoint: bool,
     ) -> Tuple[Optional[Responder], RemoteMedia]:
         """Looks for media in local cache, if not there then attempt to
         download from remote server.
@@ -604,8 +598,6 @@ class MediaRepository:
             download_ratelimiter: a ratelimiter limiting remote media downloads, keyed to
                 requester IP.
             ip_address: the IP address of the requester
-            use_federation_endpoint: whether to request the remote media over the new federation
-            /download endpoint
 
         Returns:
             A tuple of responder and the media info of the file.
@@ -637,23 +629,9 @@ class MediaRepository:
         # Failed to find the file anywhere, lets download it.
 
         try:
-            if not use_federation_endpoint:
-                media_info = await self._download_remote_file(
-                    server_name,
-                    media_id,
-                    max_timeout_ms,
-                    download_ratelimiter,
-                    ip_address,
-                )
-            else:
-                media_info = await self._federation_download_remote_file(
-                    server_name,
-                    media_id,
-                    max_timeout_ms,
-                    download_ratelimiter,
-                    ip_address,
-                )
-
+            media_info = await self._download_remote_file(
+                server_name, media_id, max_timeout_ms, download_ratelimiter, ip_address
+            )
         except SynapseError:
             raise
         except Exception as e:
@@ -797,129 +775,6 @@ class MediaRepository:
             quarantined_by=None,
         )
 
-    async def _federation_download_remote_file(
-        self,
-        server_name: str,
-        media_id: str,
-        max_timeout_ms: int,
-        download_ratelimiter: Ratelimiter,
-        ip_address: str,
-    ) -> RemoteMedia:
-        """Attempt to download the remote file from the given server name.
-        Uses the given file_id as the local id and downloads the file over the federation
-        v1 download endpoint
-
-        Args:
-            server_name: Originating server
-            media_id: The media ID of the content (as defined by the
-                remote server). This is different than the file_id, which is
-                locally generated.
-            max_timeout_ms: the maximum number of milliseconds to wait for the
-                media to be uploaded.
-            download_ratelimiter: a ratelimiter limiting remote media downloads, keyed to
-                requester IP
-            ip_address: the IP address of the requester
-
-        Returns:
-            The media info of the file.
-        """
-
-        file_id = random_string(24)
-
-        file_info = FileInfo(server_name=server_name, file_id=file_id)
-
-        async with self.media_storage.store_into_file(file_info) as (f, fname):
-            try:
-                res = await self.client.federation_download_media(
-                    server_name,
-                    media_id,
-                    output_stream=f,
-                    max_size=self.max_upload_size,
-                    max_timeout_ms=max_timeout_ms,
-                    download_ratelimiter=download_ratelimiter,
-                    ip_address=ip_address,
-                )
-                # if we had to fall back to the _matrix/media endpoint it will only return
-                # the headers and length, check the length of the tuple before unpacking
-                if len(res) == 3:
-                    length, headers, json = res
-                else:
-                    length, headers = res
-            except RequestSendFailed as e:
-                logger.warning(
-                    "Request failed fetching remote media %s/%s: %r",
-                    server_name,
-                    media_id,
-                    e,
-                )
-                raise SynapseError(502, "Failed to fetch remote media")
-
-            except HttpResponseException as e:
-                logger.warning(
-                    "HTTP error fetching remote media %s/%s: %s",
-                    server_name,
-                    media_id,
-                    e.response,
-                )
-                if e.code == twisted.web.http.NOT_FOUND:
-                    raise e.to_synapse_error()
-                raise SynapseError(502, "Failed to fetch remote media")
-
-            except SynapseError:
-                logger.warning(
-                    "Failed to fetch remote media %s/%s", server_name, media_id
-                )
-                raise
-            except NotRetryingDestination:
-                logger.warning("Not retrying destination %r", server_name)
-                raise SynapseError(502, "Failed to fetch remote media")
-            except Exception:
-                logger.exception(
-                    "Failed to fetch remote media %s/%s", server_name, media_id
-                )
-                raise SynapseError(502, "Failed to fetch remote media")
-
-            if b"Content-Type" in headers:
-                media_type = headers[b"Content-Type"][0].decode("ascii")
-            else:
-                media_type = "application/octet-stream"
-            upload_name = get_filename_from_headers(headers)
-            time_now_ms = self.clock.time_msec()
-
-            # Multiple remote media download requests can race (when using
-            # multiple media repos), so this may throw a violation constraint
-            # exception. If it does we'll delete the newly downloaded file from
-            # disk (as we're in the ctx manager).
-            #
-            # However: we've already called `finish()` so we may have also
-            # written to the storage providers. This is preferable to the
-            # alternative where we call `finish()` *after* this, where we could
-            # end up having an entry in the DB but fail to write the files to
-            # the storage providers.
-            await self.store.store_cached_remote_media(
-                origin=server_name,
-                media_id=media_id,
-                media_type=media_type,
-                time_now_ms=time_now_ms,
-                upload_name=upload_name,
-                media_length=length,
-                filesystem_id=file_id,
-            )
-
-        logger.debug("Stored remote media in file %r", fname)
-
-        return RemoteMedia(
-            media_origin=server_name,
-            media_id=media_id,
-            media_type=media_type,
-            media_length=length,
-            upload_name=upload_name,
-            created_ts=time_now_ms,
-            filesystem_id=file_id,
-            last_access_ts=time_now_ms,
-            quarantined_by=None,
-        )
-
     def _get_thumbnail_requirements(
         self, media_type: str
     ) -> Tuple[ThumbnailRequirement, ...]:

synapse/media/media_storage.py

@@ -401,14 +401,13 @@ class MultipartFileConsumer:
         wrapped_consumer: interfaces.IConsumer,
         file_content_type: str,
         json_object: JsonDict,
-        disposition: str,
-        content_length: Optional[int],
+        content_length: Optional[int] = None,
     ) -> None:
         self.clock = clock
         self.wrapped_consumer = wrapped_consumer
         self.json_field = json_object
         self.json_field_written = False
-        self.file_headers_written = False
+        self.content_type_written = False
         self.file_content_type = file_content_type
         self.boundary = uuid4().hex.encode("ascii")
 
@@ -421,7 +420,6 @@ class MultipartFileConsumer:
         self.paused = False
 
         self.length = content_length
-        self.disposition = disposition
 
     ### IConsumer APIs ###
 
@@ -490,13 +488,11 @@ class MultipartFileConsumer:
             self.json_field_written = True
 
         # if we haven't written the content type yet, do so
-        if not self.file_headers_written:
+        if not self.content_type_written:
             type = self.file_content_type.encode("utf-8")
             content_type = Header(b"Content-Type", type)
-            self.wrapped_consumer.write(bytes(content_type) + CRLF)
-            disp_header = Header(b"Content-Disposition", self.disposition)
-            self.wrapped_consumer.write(bytes(disp_header) + CRLF + CRLF)
-            self.file_headers_written = True
+            self.wrapped_consumer.write(bytes(content_type) + CRLF + CRLF)
+            self.content_type_written = True
 
         self.wrapped_consumer.write(data)
 
@@ -510,6 +506,7 @@ class MultipartFileConsumer:
         producing data for good.
         """
         assert self.producer is not None
+
         self.paused = True
         self.producer.stopProducing()
 
@@ -521,6 +518,7 @@ class MultipartFileConsumer:
         the time being, and to stop until C{resumeProducing()} is called.
         """
         assert self.producer is not None
+
         self.paused = True
 
         if self.streaming:
@@ -551,7 +549,7 @@ class MultipartFileConsumer:
         """
         if not self.length:
             return None
-        # calculate length of json field and content-type, disposition headers
+        # calculate length of json field and content-type header
         json_field = json.dumps(self.json_field)
         json_bytes = json_field.encode("utf-8")
         json_length = len(json_bytes)
@@ -560,13 +558,9 @@ class MultipartFileConsumer:
         content_type = Header(b"Content-Type", type)
         type_length = len(bytes(content_type))
 
-        disp = self.disposition.encode("utf-8")
-        disp_header = Header(b"Content-Disposition", disp)
-        disp_length = len(bytes(disp_header))
-
-        # 156 is the length of the elements that aren't variable, ie
+        # 154 is the length of the elements that aren't variable, ie
         # CRLFs and boundary strings, etc
-        self.length += json_length + type_length + disp_length + 156
+        self.length += json_length + type_length + 154
 
         return self.length
 
@@ -575,6 +569,7 @@ class MultipartFileConsumer:
     async def _resumeProducingRepeatedly(self) -> None:
         assert self.producer is not None
         assert not self.streaming
+
         producer = cast("interfaces.IPullProducer", self.producer)
 
         self.paused = False

synapse/notifier.py

@@ -764,13 +764,6 @@ class Notifier:
 
     async def wait_for_stream_token(self, stream_token: StreamToken) -> bool:
         """Wait for this worker to catch up with the given stream token."""
-        current_token = self.event_sources.get_current_token()
-        if stream_token.is_before_or_eq(current_token):
-            return True
-
-        # Work around a bug where older Synapse versions gave out tokens "from
-        # the future", i.e. that are ahead of the tokens persisted in the DB.
-        stream_token = await self.event_sources.bound_future_token(stream_token)
 
         start = self.clock.time_msec()
         while True:

synapse/rest/__init__.py

@@ -145,10 +145,6 @@ 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.server.enable_media_repo:
-            from synapse.rest.client import media
-
-            media.register_servlets(hs, client_resource)
 
         # moving to /_synapse/admin
         if is_main_process:

synapse/rest/client/media.py

@@ -22,7 +22,6 @@
 
 import logging
 import re
-from typing import Optional
 
 from synapse.http.server import (
     HttpServer,
@@ -195,76 +194,14 @@ class UnstableThumbnailResource(RestServlet):
             self.media_repo.mark_recently_accessed(server_name, media_id)
 
 
-class DownloadResource(RestServlet):
-    PATTERNS = [
-        re.compile(
-            "/_matrix/client/v1/media/download/(?P<server_name>[^/]*)/(?P<media_id>[^/]*)(/(?P<file_name>[^/]*))?$"
-        )
-    ]
-
-    def __init__(self, hs: "HomeServer", media_repo: "MediaRepository"):
-        super().__init__()
-        self.media_repo = media_repo
-        self._is_mine_server_name = hs.is_mine_server_name
-        self.auth = hs.get_auth()
-
-    async def on_GET(
-        self,
-        request: SynapseRequest,
-        server_name: str,
-        media_id: str,
-        file_name: Optional[str] = None,
-    ) -> None:
-        # Validate the server name, raising if invalid
-        parse_and_validate_server_name(server_name)
-
-        await self.auth.get_user_by_req(request)
-
-        set_cors_headers(request)
-        set_corp_headers(request)
-        request.setHeader(
-            b"Content-Security-Policy",
-            b"sandbox;"
-            b" default-src 'none';"
-            b" script-src 'none';"
-            b" plugin-types application/pdf;"
-            b" style-src 'unsafe-inline';"
-            b" media-src 'self';"
-            b" object-src 'self';",
-        )
-        # Limited non-standard form of CSP for IE11
-        request.setHeader(b"X-Content-Security-Policy", b"sandbox;")
-        request.setHeader(b"Referrer-Policy", b"no-referrer")
-        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._is_mine_server_name(server_name):
-            await self.media_repo.get_local_media(
-                request, media_id, file_name, max_timeout_ms
-            )
-        else:
-            ip_address = request.getClientAddress().host
-            await self.media_repo.get_remote_media(
-                request,
-                server_name,
-                media_id,
-                file_name,
-                max_timeout_ms,
-                ip_address,
-                True,
-            )
-
-
 def register_servlets(hs: "HomeServer", http_server: HttpServer) -> None:
-    media_repo = hs.get_media_repository()
-    if hs.config.media.url_preview_enabled:
-        UnstablePreviewURLServlet(hs, media_repo, media_repo.media_storage).register(
+    if hs.config.experimental.msc3916_authenticated_media_enabled:
+        media_repo = hs.get_media_repository()
+        if hs.config.media.url_preview_enabled:
+            UnstablePreviewURLServlet(
+                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
         )
-    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/sync.py

@@ -761,6 +761,7 @@ class SlidingSyncRestServlet(RestServlet):
             "lists": {
                 "foo-list": {
                     "ranges": [ [0, 99] ],
+                    "sort": [ "by_notification_level", "by_recency", "by_name" ],
                     "required_state": [
                         ["m.room.join_rules", ""],
                         ["m.room.history_visibility", ""],
@@ -770,6 +771,7 @@ class SlidingSyncRestServlet(RestServlet):
                     "filters": {
                         "is_dm": true
                     },
+                    "bump_event_types": [ "m.room.message", "m.room.encrypted" ],
                 }
             },
             // Room Subscriptions API
@@ -777,6 +779,10 @@ class SlidingSyncRestServlet(RestServlet):
                 "!sub1:bar": {
                     "required_state": [ ["*","*"] ],
                     "timeline_limit": 10,
+                    "include_old_rooms": {
+                        "timeline_limit": 1,
+                        "required_state": [ ["m.room.tombstone", ""], ["m.room.create", ""] ],
+                    }
                 }
             },
             // Extensions API
@@ -785,7 +791,7 @@ class SlidingSyncRestServlet(RestServlet):
 
     Response JSON::
         {
-            "pos": "s58_224_0_13_10_1_1_16_0_1",
+            "next_pos": "s58_224_0_13_10_1_1_16_0_1",
             "lists": {
                 "foo-list": {
                     "count": 1337,
@@ -824,8 +830,7 @@ class SlidingSyncRestServlet(RestServlet):
                     "joined_count": 41,
                     "invited_count": 1,
                     "notification_count": 1,
-                    "highlight_count": 0,
-                    "num_live": 2"
+                    "highlight_count": 0
                 },
                 // rooms from list
                 "!foo:bar": {
@@ -850,8 +855,7 @@ class SlidingSyncRestServlet(RestServlet):
                     "joined_count": 4,
                     "invited_count": 0,
                     "notification_count": 54,
-                    "highlight_count": 3,
-                    "num_live": 1,
+                    "highlight_count": 3
                 },
                  // ... 99 more items
             },
@@ -867,11 +871,10 @@ class SlidingSyncRestServlet(RestServlet):
         super().__init__()
         self.auth = hs.get_auth()
         self.store = hs.get_datastores().main
-        self.clock = hs.get_clock()
         self.filtering = hs.get_filtering()
         self.sliding_sync_handler = hs.get_sliding_sync_handler()
-        self.event_serializer = hs.get_event_client_serializer()
 
+    # TODO: Update this to `on_GET` once we figure out how we want to handle params
     async def on_POST(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
         requester = await self.auth.get_user_by_req(request, allow_guest=True)
         user = requester.user
@@ -917,25 +920,22 @@ class SlidingSyncRestServlet(RestServlet):
             logger.info("Client has disconnected; not serializing response.")
             return 200, {}
 
-        response_content = await self.encode_response(requester, sliding_sync_results)
+        response_content = await self.encode_response(sliding_sync_results)
 
         return 200, response_content
 
     # TODO: Is there a better way to encode things?
     async def encode_response(
         self,
-        requester: Requester,
         sliding_sync_result: SlidingSyncResult,
     ) -> JsonDict:
         response: JsonDict = defaultdict(dict)
 
-        response["pos"] = await sliding_sync_result.next_pos.to_string(self.store)
+        response["next_pos"] = await sliding_sync_result.next_pos.to_string(self.store)
         serialized_lists = self.encode_lists(sliding_sync_result.lists)
         if serialized_lists:
             response["lists"] = serialized_lists
-        response["rooms"] = await self.encode_rooms(
-            requester, sliding_sync_result.rooms
-        )
+        response["rooms"] = {}  # TODO: sliding_sync_result.rooms
         response["extensions"] = {}  # TODO: sliding_sync_result.extensions
 
         return response
@@ -961,92 +961,6 @@ class SlidingSyncRestServlet(RestServlet):
 
         return serialized_lists
 
-    async def encode_rooms(
-        self,
-        requester: Requester,
-        rooms: Dict[str, SlidingSyncResult.RoomResult],
-    ) -> JsonDict:
-        time_now = self.clock.time_msec()
-
-        serialize_options = SerializeEventConfig(
-            event_format=format_event_for_client_v2_without_room_id,
-            requester=requester,
-        )
-
-        serialized_rooms: Dict[str, JsonDict] = {}
-        for room_id, room_result in rooms.items():
-            serialized_rooms[room_id] = {
-                "joined_count": room_result.joined_count,
-                "invited_count": room_result.invited_count,
-                "notification_count": room_result.notification_count,
-                "highlight_count": room_result.highlight_count,
-            }
-
-            if room_result.name:
-                serialized_rooms[room_id]["name"] = room_result.name
-
-            if room_result.avatar:
-                serialized_rooms[room_id]["avatar"] = room_result.avatar
-
-            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 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,
-                        time_now,
-                        config=serialize_options,
-                    )
-                )
-                serialized_rooms[room_id]["required_state"] = serialized_required_state
-
-            # 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,
-                    config=serialize_options,
-                    bundle_aggregations=room_result.bundled_aggregations,
-                )
-                serialized_rooms[room_id]["timeline"] = serialized_timeline
-
-            # 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 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 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
-
-            # Field should be absent on non-DM rooms
-            if room_result.is_dm:
-                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:
-                # TODO: `knocked_state` but that isn't specced yet.
-                #
-                # TODO: Instead of adding `knocked_state`, it would be good to rename
-                # this to `stripped_state` so it can be shared between invite and knock
-                # rooms, see
-                # https://github.com/matrix-org/matrix-spec-proposals/pull/3575#discussion_r1117629919
-                serialized_rooms[room_id]["invite_state"] = room_result.stripped_state
-
-        return serialized_rooms
-
 
 def register_servlets(hs: "HomeServer", http_server: HttpServer) -> None:
     SyncRestServlet(hs).register(http_server)

synapse/rest/media/download_resource.py

@@ -105,5 +105,4 @@ class DownloadResource(RestServlet):
                 file_name,
                 max_timeout_ms,
                 ip_address,
-                False,
             )

synapse/storage/controllers/state.py

@@ -436,9 +436,6 @@ class StateStorageController:
             )
         )
 
-        # FIXME: This will return incorrect results when there are timeline gaps. For
-        # example, when you try to get a point in the room we haven't backfilled before.
-
         if last_event_id:
             state = await self.get_state_after_event(
                 last_event_id,

synapse/storage/databases/main/account_data.py

@@ -43,7 +43,10 @@ from synapse.storage.database import (
 )
 from synapse.storage.databases.main.cache import CacheInvalidationWorkerStore
 from synapse.storage.databases.main.push_rule import PushRulesWorkerStore
-from synapse.storage.util.id_generators import MultiWriterIdGenerator
+from synapse.storage.util.id_generators import (
+    AbstractStreamIdGenerator,
+    MultiWriterIdGenerator,
+)
 from synapse.types import JsonDict, JsonMapping
 from synapse.util import json_encoder
 from synapse.util.caches.descriptors import cached
@@ -68,7 +71,7 @@ class AccountDataWorkerStore(PushRulesWorkerStore, CacheInvalidationWorkerStore)
             self._instance_name in hs.config.worker.writers.account_data
         )
 
-        self._account_data_id_gen: MultiWriterIdGenerator
+        self._account_data_id_gen: AbstractStreamIdGenerator
 
         self._account_data_id_gen = MultiWriterIdGenerator(
             db_conn=db_conn,
@@ -110,9 +113,6 @@ class AccountDataWorkerStore(PushRulesWorkerStore, CacheInvalidationWorkerStore)
         """
         return self._account_data_id_gen.get_current_token()
 
-    def get_account_data_id_generator(self) -> MultiWriterIdGenerator:
-        return self._account_data_id_gen
-
     @cached()
     async def get_global_account_data_for_user(
         self, user_id: str

synapse/storage/databases/main/deviceinbox.py

@@ -50,7 +50,10 @@ from synapse.storage.database import (
     LoggingTransaction,
     make_in_list_sql_clause,
 )
-from synapse.storage.util.id_generators import MultiWriterIdGenerator
+from synapse.storage.util.id_generators import (
+    AbstractStreamIdGenerator,
+    MultiWriterIdGenerator,
+)
 from synapse.types import JsonDict
 from synapse.util import json_encoder
 from synapse.util.caches.expiringcache import ExpiringCache
@@ -89,7 +92,7 @@ class DeviceInboxWorkerStore(SQLBaseStore):
             self._instance_name in hs.config.worker.writers.to_device
         )
 
-        self._to_device_msg_id_gen: MultiWriterIdGenerator = MultiWriterIdGenerator(
+        self._to_device_msg_id_gen: AbstractStreamIdGenerator = MultiWriterIdGenerator(
             db_conn=db_conn,
             db=database,
             notifier=hs.get_replication_notifier(),
@@ -166,9 +169,6 @@ class DeviceInboxWorkerStore(SQLBaseStore):
     def get_to_device_stream_token(self) -> int:
         return self._to_device_msg_id_gen.get_current_token()
 
-    def get_to_device_id_generator(self) -> MultiWriterIdGenerator:
-        return self._to_device_msg_id_gen
-
     async def get_messages_for_user_devices(
         self,
         user_ids: Collection[str],

synapse/storage/databases/main/devices.py

@@ -243,9 +243,6 @@ class DeviceWorkerStore(RoomMemberWorkerStore, EndToEndKeyWorkerStore):
     def get_device_stream_token(self) -> int:
         return self._device_list_id_gen.get_current_token()
 
-    def get_device_stream_id_generator(self) -> MultiWriterIdGenerator:
-        return self._device_list_id_gen
-
     async def count_devices_by_users(
         self, user_ids: Optional[Collection[str]] = None
     ) -> int:

synapse/storage/databases/main/events_worker.py

@@ -55,7 +55,7 @@ from synapse.api.room_versions import (
 )
 from synapse.events import EventBase, make_event_from_dict
 from synapse.events.snapshot import EventContext
-from synapse.events.utils import prune_event, strip_event
+from synapse.events.utils import prune_event
 from synapse.logging.context import (
     PreserveLoggingContext,
     current_context,
@@ -192,8 +192,8 @@ class EventsWorkerStore(SQLBaseStore):
     ):
         super().__init__(database, db_conn, hs)
 
-        self._stream_id_gen: MultiWriterIdGenerator
-        self._backfill_id_gen: MultiWriterIdGenerator
+        self._stream_id_gen: AbstractStreamIdGenerator
+        self._backfill_id_gen: AbstractStreamIdGenerator
 
         self._stream_id_gen = MultiWriterIdGenerator(
             db_conn=db_conn,
@@ -1025,7 +1025,15 @@ class EventsWorkerStore(SQLBaseStore):
 
         state_to_include = await self.get_events(selected_state_ids.values())
 
-        return [strip_event(e) for e in state_to_include.values()]
+        return [
+            {
+                "type": e.type,
+                "state_key": e.state_key,
+                "content": e.content,
+                "sender": e.sender,
+            }
+            for e in state_to_include.values()
+        ]
 
     def _maybe_start_fetch_thread(self) -> None:
         """Starts an event fetch thread if we are not yet at the maximum number."""

synapse/storage/databases/main/presence.py

@@ -42,7 +42,10 @@ from synapse.storage.database import (
 from synapse.storage.databases.main.cache import CacheInvalidationWorkerStore
 from synapse.storage.engines._base import IsolationLevel
 from synapse.storage.types import Connection
-from synapse.storage.util.id_generators import MultiWriterIdGenerator
+from synapse.storage.util.id_generators import (
+    AbstractStreamIdGenerator,
+    MultiWriterIdGenerator,
+)
 from synapse.util.caches.descriptors import cached, cachedList
 from synapse.util.caches.stream_change_cache import StreamChangeCache
 from synapse.util.iterutils import batch_iter
@@ -80,7 +83,7 @@ class PresenceStore(PresenceBackgroundUpdateStore, CacheInvalidationWorkerStore)
         super().__init__(database, db_conn, hs)
 
         self._instance_name = hs.get_instance_name()
-        self._presence_id_gen: MultiWriterIdGenerator
+        self._presence_id_gen: AbstractStreamIdGenerator
 
         self._can_persist_presence = (
             self._instance_name in hs.config.worker.writers.presence
@@ -452,9 +455,6 @@ class PresenceStore(PresenceBackgroundUpdateStore, CacheInvalidationWorkerStore)
     def get_current_presence_token(self) -> int:
         return self._presence_id_gen.get_current_token()
 
-    def get_presence_stream_id_gen(self) -> MultiWriterIdGenerator:
-        return self._presence_id_gen
-
     def _get_active_presence(self, db_conn: Connection) -> List[UserPresenceState]:
         """Fetch non-offline presence from the database so that we can register
         the appropriate time outs.

synapse/storage/databases/main/push_rule.py

@@ -178,9 +178,6 @@ class PushRulesWorkerStore(
         """
         return self._push_rules_stream_id_gen.get_current_token()
 
-    def get_push_rules_stream_id_gen(self) -> MultiWriterIdGenerator:
-        return self._push_rules_stream_id_gen
-
     def process_replication_rows(
         self, stream_name: str, instance_name: str, token: int, rows: Iterable[Any]
     ) -> None:

synapse/storage/databases/main/receipts.py

@@ -45,7 +45,10 @@ from synapse.storage.database import (
     LoggingTransaction,
 )
 from synapse.storage.engines._base import IsolationLevel
-from synapse.storage.util.id_generators import MultiWriterIdGenerator
+from synapse.storage.util.id_generators import (
+    AbstractStreamIdGenerator,
+    MultiWriterIdGenerator,
+)
 from synapse.types import (
     JsonDict,
     JsonMapping,
@@ -73,7 +76,7 @@ class ReceiptsWorkerStore(SQLBaseStore):
 
         # In the worker store this is an ID tracker which we overwrite in the non-worker
         # class below that is used on the main process.
-        self._receipts_id_gen: MultiWriterIdGenerator
+        self._receipts_id_gen: AbstractStreamIdGenerator
 
         self._can_write_to_receipts = (
             self._instance_name in hs.config.worker.writers.receipts
@@ -133,9 +136,6 @@ class ReceiptsWorkerStore(SQLBaseStore):
     def get_receipt_stream_id_for_instance(self, instance_name: str) -> int:
         return self._receipts_id_gen.get_current_token_for_writer(instance_name)
 
-    def get_receipts_stream_id_gen(self) -> MultiWriterIdGenerator:
-        return self._receipts_id_gen
-
     def get_last_unthreaded_receipt_for_user_txn(
         self,
         txn: LoggingTransaction,

synapse/storage/databases/main/room.py

@@ -59,7 +59,11 @@ from synapse.storage.database import (
 )
 from synapse.storage.databases.main.cache import CacheInvalidationWorkerStore
 from synapse.storage.types import Cursor
-from synapse.storage.util.id_generators import IdGenerator, MultiWriterIdGenerator
+from synapse.storage.util.id_generators import (
+    AbstractStreamIdGenerator,
+    IdGenerator,
+    MultiWriterIdGenerator,
+)
 from synapse.types import JsonDict, RetentionPolicy, StrCollection, ThirdPartyInstanceID
 from synapse.util import json_encoder
 from synapse.util.caches.descriptors import cached, cachedList
@@ -147,7 +151,7 @@ class RoomWorkerStore(CacheInvalidationWorkerStore):
 
         self.config: HomeServerConfig = hs.config
 
-        self._un_partial_stated_rooms_stream_id_gen: MultiWriterIdGenerator
+        self._un_partial_stated_rooms_stream_id_gen: AbstractStreamIdGenerator
 
         self._un_partial_stated_rooms_stream_id_gen = MultiWriterIdGenerator(
             db_conn=db_conn,
@@ -1405,9 +1409,6 @@ class RoomWorkerStore(CacheInvalidationWorkerStore):
             instance_name
         )
 
-    def get_un_partial_stated_rooms_id_generator(self) -> MultiWriterIdGenerator:
-        return self._un_partial_stated_rooms_stream_id_gen
-
     async def get_un_partial_stated_rooms_between(
         self, last_id: int, current_id: int, room_ids: Collection[str]
     ) -> Set[str]:

synapse/storage/databases/main/stream.py

@@ -44,7 +44,6 @@ what sort order was used:
 import logging
 from typing import (
     TYPE_CHECKING,
-    AbstractSet,
     Any,
     Collection,
     Dict,
@@ -63,7 +62,7 @@ from typing_extensions import Literal
 
 from twisted.internet import defer
 
-from synapse.api.constants import Direction, EventTypes, Membership
+from synapse.api.constants import Direction
 from synapse.api.filtering import Filter
 from synapse.events import EventBase
 from synapse.logging.context import make_deferred_yieldable, run_in_background
@@ -112,32 +111,6 @@ class _EventsAround:
     end: RoomStreamToken
 
 
-@attr.s(slots=True, frozen=True, auto_attribs=True)
-class CurrentStateDeltaMembership:
-    """
-    Attributes:
-        event_id: The "current" membership event ID in this room.
-        event_pos: The position of the "current" membership event in the event stream.
-        prev_event_id: The previous membership event in this room that was replaced by
-            the "current" one. May be `None` if there was no previous membership event.
-        room_id: The room ID of the membership event.
-        membership: The membership state of the user in the room
-        sender: The person who sent the membership event
-    """
-
-    room_id: str
-    # Event
-    event_id: Optional[str]
-    event_pos: PersistedEventPosition
-    membership: str
-    sender: Optional[str]
-    # Prev event
-    prev_event_id: Optional[str]
-    prev_event_pos: Optional[PersistedEventPosition]
-    prev_membership: Optional[str]
-    prev_sender: Optional[str]
-
-
 def generate_pagination_where_clause(
     direction: Direction,
     column_names: Tuple[str, str],
@@ -417,43 +390,6 @@ def _filter_results(
     return True
 
 
-def _filter_results_by_stream(
-    lower_token: Optional[RoomStreamToken],
-    upper_token: Optional[RoomStreamToken],
-    instance_name: str,
-    stream_ordering: int,
-) -> bool:
-    """
-    This function only works with "live" tokens with `stream_ordering` only. See
-    `_filter_results(...)` if you want to work with all tokens.
-
-    Returns True if the event persisted by the given instance at the given
-    stream_ordering falls between the two tokens (taking a None
-    token to mean unbounded).
-
-    Used to filter results from fetching events in the DB against the given
-    tokens. This is necessary to handle the case where the tokens include
-    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).
-    """
-    if lower_token:
-        assert lower_token.topological is None
-
-        # If these are live tokens we compare the stream ordering against the
-        # writers stream position.
-        if stream_ordering <= lower_token.get_stream_pos_for_instance(instance_name):
-            return False
-
-    if upper_token:
-        assert upper_token.topological is None
-
-        if upper_token.get_stream_pos_for_instance(instance_name) < stream_ordering:
-            return False
-
-    return True
-
-
 def filter_to_clause(event_filter: Optional[Filter]) -> Tuple[str, List[str]]:
     # NB: This may create SQL clauses that don't optimise well (and we don't
     # have indices on all possible clauses). E.g. it may create
@@ -641,9 +577,6 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
 
         return RoomStreamToken(stream=min_pos, instance_map=immutabledict(positions))
 
-    def get_events_stream_id_generator(self) -> MultiWriterIdGenerator:
-        return self._stream_id_gen
-
     async def get_room_events_stream_for_rooms(
         self,
         room_ids: Collection[str],
@@ -798,191 +731,6 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
 
         return ret, key
 
-    async def get_current_state_delta_membership_changes_for_user(
-        self,
-        user_id: str,
-        from_key: RoomStreamToken,
-        to_key: RoomStreamToken,
-        excluded_room_ids: Optional[List[str]] = None,
-    ) -> List[CurrentStateDeltaMembership]:
-        """
-        Fetch membership events (and the previous event that was replaced by that one)
-        for a given user.
-
-        Note: This function only works with "live" tokens with `stream_ordering` only.
-
-        We're looking for membership changes in the token range (> `from_key` and <=
-        `to_key`).
-
-        Please be mindful to only use this with `from_key` and `to_key` tokens that are
-        recent enough to be after when the first local user joined the room. Otherwise,
-        the results may be incomplete or too greedy. For example, if you use a token
-        range before the first local user joined the room, you will see 0 events since
-        `current_state_delta_stream` tracks what the server thinks is the current state
-        of the room as time goes. It does not track how state progresses from the
-        beginning of the room. So for example, when you remotely join a room, the first
-        rows will just be the state when you joined and progress from there.
-
-        You can probably reasonably use this with `/sync` because the `to_key` passed in
-        will be the "current" now token and the range will cover when the user joined
-        the room.
-
-        Args:
-            user_id: The user ID to fetch membership events for.
-            from_key: The point in the stream to sync from (fetching events > this point).
-            to_key: The token to fetch rooms up to (fetching events <= this point).
-            excluded_room_ids: Optional list of room IDs to exclude from the results.
-
-        Returns:
-            All membership changes to the current state in the token range. Events are
-            sorted by `stream_ordering` ascending.
-        """
-        # Start by ruling out cases where a DB query is not necessary.
-        if from_key == to_key:
-            return []
-
-        if from_key:
-            has_changed = self._membership_stream_cache.has_entity_changed(
-                user_id, int(from_key.stream)
-            )
-            if not has_changed:
-                return []
-
-        def f(txn: LoggingTransaction) -> List[CurrentStateDeltaMembership]:
-            # To handle tokens with a non-empty instance_map we fetch more
-            # results than necessary and then filter down
-            min_from_id = from_key.stream
-            max_to_id = to_key.get_max_stream_pos()
-
-            args: List[Any] = [min_from_id, max_to_id, EventTypes.Member, user_id]
-
-            # TODO: It would be good to assert that the `from_token`/`to_token` is >=
-            # the first row in `current_state_delta_stream` for the rooms we're
-            # interested in. Otherwise, we will end up with empty results and not know
-            # it.
-
-            # We could `COALESCE(e.stream_ordering, s.stream_id)` to get more accurate
-            # stream positioning when available but given our usages, we can avoid the
-            # complexity. Between two (valid) stream tokens, we will still get all of
-            # the state changes. Since those events are persisted in a batch, valid
-            # tokens will either be before or after the batch of events.
-            #
-            # `stream_ordering` from the `events` table is more accurate when available
-            # since the `current_state_delta_stream` table only tracks that the current
-            # state is at this stream position (not what stream position the state event
-            # was added) and uses the *minimum* stream position for batches of events.
-            sql = """
-                SELECT
-                    s.room_id,
-                    e.event_id,
-                    s.instance_name,
-                    s.stream_id,
-                    m.membership,
-                    e.sender,
-                    s.prev_event_id,
-                    e_prev.instance_name AS prev_instance_name,
-                    e_prev.stream_ordering AS prev_stream_ordering,
-                    m_prev.membership AS prev_membership,
-                    e_prev.sender AS prev_sender
-                FROM current_state_delta_stream AS s
-                    LEFT JOIN events AS e ON e.event_id = s.event_id
-                    LEFT JOIN room_memberships AS m ON m.event_id = s.event_id
-                    LEFT JOIN events AS e_prev ON e_prev.event_id = s.prev_event_id
-                    LEFT JOIN room_memberships AS m_prev ON m_prev.event_id = s.prev_event_id
-                WHERE s.stream_id > ? AND s.stream_id <= ?
-                    AND s.type = ?
-                    AND s.state_key = ?
-                ORDER BY s.stream_id ASC
-            """
-
-            txn.execute(sql, args)
-
-            membership_changes: List[CurrentStateDeltaMembership] = []
-            for (
-                room_id,
-                event_id,
-                instance_name,
-                stream_ordering,
-                membership,
-                sender,
-                prev_event_id,
-                prev_instance_name,
-                prev_stream_ordering,
-                prev_membership,
-                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(
-                    from_key,
-                    to_key,
-                    instance_name,
-                    stream_ordering,
-                ):
-                    # When the server leaves a room, it will insert new rows into the
-                    # `current_state_delta_stream` table with `event_id = null` for all
-                    # current state. This means we might already have a row for the
-                    # leave event and then another for the same leave where the
-                    # `event_id=null` but the `prev_event_id` is pointing back at the
-                    # earlier leave event. We don't want to report the leave, if we
-                    # already have a leave event.
-                    if event_id is None and prev_membership == Membership.LEAVE:
-                        continue
-
-                    membership_change = CurrentStateDeltaMembership(
-                        room_id=room_id,
-                        # Event
-                        event_id=event_id,
-                        event_pos=PersistedEventPosition(
-                            instance_name=instance_name,
-                            stream=stream_ordering,
-                        ),
-                        # When `s.event_id = null`, we won't be able to get respective
-                        # `room_membership` but can assume the user has left the room
-                        # because this only happens when the server leaves a room
-                        # (meaning everyone locally left) or a state reset which removed
-                        # the person from the room.
-                        membership=(
-                            membership if membership is not None else Membership.LEAVE
-                        ),
-                        sender=sender,
-                        # Prev event
-                        prev_event_id=prev_event_id,
-                        prev_event_pos=(
-                            PersistedEventPosition(
-                                instance_name=prev_instance_name,
-                                stream=prev_stream_ordering,
-                            )
-                            if (
-                                prev_instance_name is not None
-                                and prev_stream_ordering is not None
-                            )
-                            else None
-                        ),
-                        prev_membership=prev_membership,
-                        prev_sender=prev_sender,
-                    )
-
-                    membership_changes.append(membership_change)
-
-            return membership_changes
-
-        membership_changes = await self.db_pool.runInteraction(
-            "get_current_state_delta_membership_changes_for_user", f
-        )
-
-        room_ids_to_exclude: AbstractSet[str] = set()
-        if excluded_room_ids is not None:
-            room_ids_to_exclude = set(excluded_room_ids)
-
-        return [
-            membership_change
-            for membership_change in membership_changes
-            if membership_change.room_id not in room_ids_to_exclude
-        ]
-
     @cancellable
     async def get_membership_changes_for_user(
         self,
@@ -1018,11 +766,10 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
 
             ignore_room_clause = ""
             if excluded_rooms is not None and len(excluded_rooms) > 0:
-                ignore_room_clause, ignore_room_args = make_in_list_sql_clause(
-                    txn.database_engine, "e.room_id", excluded_rooms, negative=True
+                ignore_room_clause = "AND e.room_id NOT IN (%s)" % ",".join(
+                    "?" for _ in excluded_rooms
                 )
-                ignore_room_clause = f"AND {ignore_room_clause}"
-                args += ignore_room_args
+                args = args + excluded_rooms
 
             sql = """
                 SELECT m.event_id, instance_name, topological_ordering, stream_ordering
@@ -1804,9 +1551,6 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
     ) -> Tuple[List[EventBase], RoomStreamToken]:
         """Returns list of events before or after a given token.
 
-        When Direction.FORWARDS: from_key < x <= to_key
-        When Direction.BACKWARDS: from_key >= x > to_key
-
         Args:
             room_id
             from_key: The token used to stream from
@@ -1823,27 +1567,6 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
             and `to_key`).
         """
 
-        # We can bail early if we're looking forwards, and our `to_key` is already
-        # before our `from_key`.
-        if (
-            direction == Direction.FORWARDS
-            and to_key is not None
-            and to_key.is_before_or_eq(from_key)
-        ):
-            # Token selection matches what we do in `_paginate_room_events_txn` if there
-            # are no rows
-            return [], to_key if to_key else from_key
-        # Or vice-versa, if we're looking backwards and our `from_key` is already before
-        # our `to_key`.
-        elif (
-            direction == Direction.BACKWARDS
-            and to_key is not None
-            and from_key.is_before_or_eq(to_key)
-        ):
-            # Token selection matches what we do in `_paginate_room_events_txn` if there
-            # are no rows
-            return [], to_key if to_key else from_key
-
         rows, token = await self.db_pool.runInteraction(
             "paginate_room_events",
             self._paginate_room_events_txn,

synapse/storage/schema/main/delta/42/current_state_delta.sql

@@ -32,10 +32,7 @@
  * limitations under the License.
  */
 
--- Tracks what the server thinks is the current state of the room as time goes. It does
--- not track how state progresses from the beginning of the room. So for example, when
--- you remotely join a room, the first rows will just be the state when you joined and
--- progress from there.
+
 CREATE TABLE current_state_delta_stream (
     stream_id BIGINT NOT NULL,
     room_id TEXT NOT NULL,

synapse/storage/util/id_generators.py

@@ -812,11 +812,6 @@ class MultiWriterIdGenerator(AbstractStreamIdGenerator):
         pos = self.get_current_token_for_writer(self._instance_name)
         txn.execute(sql, (self._stream_name, self._instance_name, pos))
 
-    async def get_max_allocated_token(self) -> int:
-        return await self._db.runInteraction(
-            "get_max_allocated_token", self._sequence_gen.get_max_allocated
-        )
-
 
 @attr.s(frozen=True, auto_attribs=True)
 class _AsyncCtxManagerWrapper(Generic[T]):

synapse/storage/util/sequence.py

@@ -88,10 +88,6 @@ class SequenceGenerator(metaclass=abc.ABCMeta):
         """
         ...
 
-    @abc.abstractmethod
-    def get_max_allocated(self, txn: Cursor) -> int:
-        """Get the maximum ID that we have allocated"""
-
 
 class PostgresSequenceGenerator(SequenceGenerator):
     """An implementation of SequenceGenerator which uses a postgres sequence"""
@@ -194,17 +190,6 @@ class PostgresSequenceGenerator(SequenceGenerator):
                 % {"seq": self._sequence_name, "stream_name": stream_name}
             )
 
-    def get_max_allocated(self, txn: Cursor) -> int:
-        # We just read from the sequence what the last value we fetched was.
-        txn.execute(f"SELECT last_value, is_called FROM {self._sequence_name}")
-        row = txn.fetchone()
-        assert row is not None
-
-        last_value, is_called = row
-        if not is_called:
-            last_value -= 1
-        return last_value
-
 
 GetFirstCallbackType = Callable[[Cursor], int]
 
@@ -263,15 +248,6 @@ class LocalSequenceGenerator(SequenceGenerator):
         # There is nothing to do for in memory sequences
         pass
 
-    def get_max_allocated(self, txn: Cursor) -> int:
-        with self._lock:
-            if self._current_max_id is None:
-                assert self._callback is not None
-                self._current_max_id = self._callback(txn)
-                self._callback = None
-
-            return self._current_max_id
-
 
 def build_sequence_generator(
     db_conn: "LoggingDatabaseConnection",

synapse/streams/events.py

@@ -19,7 +19,6 @@
 #
 #
 
-import logging
 from typing import TYPE_CHECKING, Sequence, Tuple
 
 import attr
@@ -31,20 +30,12 @@ from synapse.handlers.room import RoomEventSource
 from synapse.handlers.typing import TypingNotificationEventSource
 from synapse.logging.opentracing import trace
 from synapse.streams import EventSource
-from synapse.types import (
-    AbstractMultiWriterStreamToken,
-    MultiWriterStreamToken,
-    StreamKeyType,
-    StreamToken,
-)
+from synapse.types import MultiWriterStreamToken, StreamKeyType, StreamToken
 
 if TYPE_CHECKING:
     from synapse.server import HomeServer
 
 
-logger = logging.getLogger(__name__)
-
-
 @attr.s(frozen=True, slots=True, auto_attribs=True)
 class _EventSourcesInner:
     room: RoomEventSource
@@ -100,77 +91,6 @@ class EventSources:
         )
         return token
 
-    async def bound_future_token(self, token: StreamToken) -> StreamToken:
-        """Bound a token that is ahead of the current token to the maximum
-        persisted values.
-
-        This ensures that if we wait for the given token we know the stream will
-        eventually advance to that point.
-
-        This works around a bug where older Synapse versions will give out
-        tokens for streams, and then after a restart will give back tokens where
-        the stream has "gone backwards".
-        """
-
-        current_token = self.get_current_token()
-
-        stream_key_to_id_gen = {
-            StreamKeyType.ROOM: self.store.get_events_stream_id_generator(),
-            StreamKeyType.PRESENCE: self.store.get_presence_stream_id_gen(),
-            StreamKeyType.RECEIPT: self.store.get_receipts_stream_id_gen(),
-            StreamKeyType.ACCOUNT_DATA: self.store.get_account_data_id_generator(),
-            StreamKeyType.PUSH_RULES: self.store.get_push_rules_stream_id_gen(),
-            StreamKeyType.TO_DEVICE: self.store.get_to_device_id_generator(),
-            StreamKeyType.DEVICE_LIST: self.store.get_device_stream_id_generator(),
-            StreamKeyType.UN_PARTIAL_STATED_ROOMS: self.store.get_un_partial_stated_rooms_id_generator(),
-        }
-
-        for _, key in StreamKeyType.__members__.items():
-            if key == StreamKeyType.TYPING:
-                # Typing stream is allowed to "reset", and so comparisons don't
-                # really make sense as is.
-                # TODO: Figure out a better way of tracking resets.
-                continue
-
-            token_value = token.get_field(key)
-            current_value = current_token.get_field(key)
-
-            if isinstance(token_value, AbstractMultiWriterStreamToken):
-                assert type(current_value) is type(token_value)
-
-                if not token_value.is_before_or_eq(current_value):  # type: ignore[arg-type]
-                    max_token = await stream_key_to_id_gen[
-                        key
-                    ].get_max_allocated_token()
-
-                    if max_token < token_value.get_max_stream_pos():
-                        logger.error(
-                            "Bounding token from the future '%s': token: %s, bound: %s",
-                            key,
-                            token_value,
-                            max_token,
-                        )
-                        token = token.copy_and_replace(
-                            key, token_value.bound_stream_token(max_token)
-                        )
-            else:
-                assert isinstance(current_value, int)
-                if current_value < token_value:
-                    max_token = await stream_key_to_id_gen[
-                        key
-                    ].get_max_allocated_token()
-
-                    if max_token < token_value:
-                        logger.error(
-                            "Bounding token from the future '%s': token: %s, bound: %s",
-                            key,
-                            token_value,
-                            max_token,
-                        )
-                        token = token.copy_and_replace(key, max_token)
-
-        return token
-
     @trace
     async def get_start_token_for_pagination(self, room_id: str) -> StreamToken:
         """Get the start token for a given room to be used to paginate

synapse/types/__init__.py

@@ -536,16 +536,6 @@ class AbstractMultiWriterStreamToken(metaclass=abc.ABCMeta):
 
         return True
 
-    def bound_stream_token(self, max_stream: int) -> "Self":
-        """Bound the stream positions to a maximum value"""
-
-        return type(self)(
-            stream=min(self.stream, max_stream),
-            instance_map=immutabledict(
-                {k: min(s, max_stream) for k, s in self.instance_map.items()}
-            ),
-        )
-
 
 @attr.s(frozen=True, slots=True, order=False)
 class RoomStreamToken(AbstractMultiWriterStreamToken):
@@ -732,14 +722,6 @@ class RoomStreamToken(AbstractMultiWriterStreamToken):
         else:
             return "s%d" % (self.stream,)
 
-    def bound_stream_token(self, max_stream: int) -> "RoomStreamToken":
-        """See super class"""
-
-        # This only makes sense for stream tokens.
-        assert self.topological is None
-
-        return super().bound_stream_token(max_stream)
-
 
 @attr.s(frozen=True, slots=True, order=False)
 class MultiWriterStreamToken(AbstractMultiWriterStreamToken):
@@ -1096,9 +1078,6 @@ class PersistedPosition:
     stream: int
 
     def persisted_after(self, token: AbstractMultiWriterStreamToken) -> bool:
-        """
-        Checks whether this position happened after the token
-        """
         return token.get_stream_pos_for_instance(self.instance_name) < self.stream
 
 

synapse/types/handlers/__init__.py

@@ -31,12 +31,9 @@ else:
     from pydantic import Extra
 
 from synapse.events import EventBase
-from synapse.types import JsonDict, JsonMapping, StreamToken, UserID
+from synapse.types import JsonMapping, StreamToken, UserID
 from synapse.types.rest.client import SlidingSyncBody
 
-if TYPE_CHECKING:
-    from synapse.handlers.relations import BundledAggregations
-
 
 class ShutdownRoomParams(TypedDict):
     """
@@ -162,16 +159,11 @@ class SlidingSyncResult:
                 entirely and NOT send "initial":false as this is wasteful on bandwidth. The
                 absence of this flag means 'false'.
             required_state: The current state of the room
-            timeline: Latest events in the room. The last event is the most recent.
-            bundled_aggregations: A mapping of event ID to the bundled aggregations for
-                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.
+            timeline: Latest events in the room. The last event is the most recent
             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
+            invite_state: Stripped state events. Same as `rooms.invite.$room_id.invite_state`
+                in sync v2, absent on joined/left rooms
             prev_batch: A token that can be passed as a start parameter to the
                 `/rooms/<room_id>/messages` API to retrieve earlier messages.
             limited: True if their are more events than fit between the given position and now.
@@ -193,28 +185,21 @@ class SlidingSyncResult:
                 (with potentially other old events in the timeline).
         """
 
-        name: Optional[str]
+        name: str
         avatar: Optional[str]
         heroes: Optional[List[EventBase]]
         initial: bool
-        # 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"]]
+        required_state: List[EventBase]
+        timeline: List[EventBase]
         is_dm: bool
-        # Optional because it's only relevant to invite/knock rooms
-        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]
+        invite_state: List[EventBase]
+        prev_batch: StreamToken
+        limited: bool
         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]
+        num_live: int
 
     @attr.s(slots=True, frozen=True, auto_attribs=True)
     class SlidingWindowList: