Attempt

.ci/scripts/calculate_jobs.py

@@ -47,7 +47,7 @@ if not IS_PR:
             "database": "sqlite",
             "extras": "all",
         }
-        for version in ("3.9", "3.10", "3.11", "3.12")
+        for version in ("3.9", "3.10", "3.11", "3.12.0-rc.2")
     )
 
 trial_postgres_tests = [
@@ -62,7 +62,7 @@ trial_postgres_tests = [
 if not IS_PR:
     trial_postgres_tests.append(
         {
-            "python-version": "3.12",
+            "python-version": "3.11",
             "database": "postgres",
             "postgres-version": "16",
             "extras": "all",

.git-blame-ignore-revs

@@ -8,21 +8,21 @@
 # If ignoring a pull request that was not squash merged, only the merge
 # commit needs to be put here. Child commits will be resolved from it.
 
-# Run black (https://github.com/matrix-org/synapse/pull/3679).
+# Run black (#3679).
 8b3d9b6b199abb87246f982d5db356f1966db925
 
-# Black reformatting (https://github.com/matrix-org/synapse/pull/5482).
+# Black reformatting (#5482).
 32e7c9e7f20b57dd081023ac42d6931a8da9b3a3
 
-# Target Python 3.5 with black (https://github.com/matrix-org/synapse/pull/8664).
+# Target Python 3.5 with black (#8664).
 aff1eb7c671b0a3813407321d2702ec46c71fa56
 
-# Update black to 20.8b1 (https://github.com/matrix-org/synapse/pull/9381).
+# Update black to 20.8b1 (#9381).
 0a00b7ff14890987f09112a2ae696c61001e6cf1
 
-# Convert tests/rest/admin/test_room.py to unix file endings (https://github.com/matrix-org/synapse/pull/7953).
+# Convert tests/rest/admin/test_room.py to unix file endings (#7953).
 c4268e3da64f1abb5b31deaeb5769adb6510c0a7
 
-# Update black to 23.1.0 (https://github.com/matrix-org/synapse/pull/15103)
+# Update black to 23.1.0 (#15103)
 9bb2eac71962970d02842bca441f4bcdbbf93a11
 

.github/workflows/latest_deps.yml

@@ -197,14 +197,11 @@ jobs:
         with:
           path: synapse
 
+      - uses: actions/setup-go@v4
+
       - name: Prepare Complement's Prerequisites
         run: synapse/.ci/scripts/setup_complement_prerequisites.sh
 
-      - uses: actions/setup-go@v4
-        with:
-          cache-dependency-path: complement/go.sum
-          go-version-file: complement/go.mod
-
       - run: |
           set -o pipefail
           TEST_ONLY_IGNORE_POETRY_LOCKFILE=1 POSTGRES=${{ (matrix.database == 'Postgres') && 1 || '' }} WORKERS=${{ (matrix.arrangement == 'workers') && 1 || '' }} COMPLEMENT_DIR=`pwd`/complement synapse/scripts-dev/complement.sh -json 2>&1 | synapse/.ci/scripts/gotestfmt

.github/workflows/tests.yml

@@ -37,18 +37,15 @@ jobs:
             - 'Cargo.toml'
             - 'Cargo.lock'
             - '.rustfmt.toml'
-            - '.github/workflows/tests.yml'
 
           trial:
             - 'synapse/**'
             - 'tests/**'
             - 'rust/**'
-            - '.ci/scripts/calculate_jobs.py'
             - 'Cargo.toml'
             - 'Cargo.lock'
             - 'pyproject.toml'
             - 'poetry.lock'
-            - '.github/workflows/tests.yml'
 
           integration:
             - 'synapse/**'
@@ -59,9 +56,6 @@ jobs:
             - 'pyproject.toml'
             - 'poetry.lock'
             - 'docker/**'
-            - '.ci/**'
-            - 'scripts-dev/complement.sh'
-            - '.github/workflows/tests.yml'
 
           linting:
             - 'synapse/**'
@@ -75,7 +69,6 @@ jobs:
             - 'mypy.ini'
             - 'pyproject.toml'
             - 'poetry.lock'
-            - '.github/workflows/tests.yml'
 
   check-sampleconfig:
     runs-on: ubuntu-latest
@@ -287,6 +280,7 @@ jobs:
       - check-lockfile
       - lint-clippy
       - lint-rustfmt
+      - check-signoff
     runs-on: ubuntu-latest
     steps:
       - run: "true"
@@ -633,18 +627,14 @@ jobs:
         uses: dtolnay/rust-toolchain@1.61.0
       - uses: Swatinem/rust-cache@v2
 
+      - uses: actions/setup-go@v4
+
       - name: Prepare Complement's Prerequisites
         run: synapse/.ci/scripts/setup_complement_prerequisites.sh
 
-      - uses: actions/setup-go@v4
-        with:
-          cache-dependency-path: complement/go.sum
-          go-version-file: complement/go.mod
-
-        # use p=1 concurrency as GHA boxes are underpowered and don't like running tons of synapses at once.
       - run: |
           set -o pipefail
-          COMPLEMENT_DIR=`pwd`/complement synapse/scripts-dev/complement.sh -p 1 -json 2>&1 | synapse/.ci/scripts/gotestfmt
+          COMPLEMENT_DIR=`pwd`/complement synapse/scripts-dev/complement.sh -json 2>&1 | synapse/.ci/scripts/gotestfmt
         shell: bash
         env:
           POSTGRES: ${{ (matrix.database == 'Postgres') && 1 || '' }}

.github/workflows/twisted_trunk.yml

@@ -168,14 +168,11 @@ jobs:
         with:
           path: synapse
 
+      - uses: actions/setup-go@v4
+
       - name: Prepare Complement's Prerequisites
         run: synapse/.ci/scripts/setup_complement_prerequisites.sh
 
-      - uses: actions/setup-go@v4
-        with:
-          cache-dependency-path: complement/go.sum
-          go-version-file: complement/go.mod
-
       # This step is specific to the 'Twisted trunk' test run:
       - name: Patch dependencies
         run: |

CHANGES.md

@@ -1,203 +1,3 @@
-# Synapse 1.96.0rc1 (2023-10-31)
-
-### Features
-
-- Add experimental support to allow multiple workers to write to receipts stream. ([\#16432](https://github.com/matrix-org/synapse/issues/16432))
-- Add a new module API for controller presence. ([\#16544](https://github.com/matrix-org/synapse/issues/16544))
-- Add a new module API callback that allows adding extra fields to events' unsigned section when sent down to clients. ([\#16549](https://github.com/matrix-org/synapse/issues/16549))
-- Improve the performance of claiming encryption keys. ([\#16565](https://github.com/matrix-org/synapse/issues/16565), [\#16570](https://github.com/matrix-org/synapse/issues/16570))
-
-### Bugfixes
-
-- Fixed a bug in the example Grafana dashboard that prevents it from finding the correct datasource. Contributed by @MichaelSasser. ([\#16471](https://github.com/matrix-org/synapse/issues/16471))
-- Fix a long-standing, exceedingly rare edge case where the first event persisted by a new event persister worker might not be sent down `/sync`. ([\#16473](https://github.com/matrix-org/synapse/issues/16473), [\#16557](https://github.com/matrix-org/synapse/issues/16557), [\#16561](https://github.com/matrix-org/synapse/issues/16561), [\#16578](https://github.com/matrix-org/synapse/issues/16578), [\#16580](https://github.com/matrix-org/synapse/issues/16580))
-- Fix long-standing bug where `/sync` incorrectly did not mark a room as `limited` in a sync requests when there were missing remote events. ([\#16485](https://github.com/matrix-org/synapse/issues/16485))
-- Fix a bug introduced in Synapse 1.41 where HTTP(S) forward proxy authorization would fail when using basic HTTP authentication with a long `username:password` string. ([\#16504](https://github.com/matrix-org/synapse/issues/16504))
-- Force TLS certificate verification in user registration script. ([\#16530](https://github.com/matrix-org/synapse/issues/16530))
-- Fix long-standing bug where `/sync` could tightloop after restart when using SQLite. ([\#16540](https://github.com/matrix-org/synapse/issues/16540))
-- Fix ratelimiting of message sending when using workers, where the ratelimit would only be applied after most of the work has been done. ([\#16558](https://github.com/matrix-org/synapse/issues/16558))
-- Fix a long-standing bug where invited/knocking users would not leave during a room purge. ([\#16559](https://github.com/matrix-org/synapse/issues/16559))
-
-### Improved Documentation
-
-- Improve documentation of presence router. ([\#16529](https://github.com/matrix-org/synapse/issues/16529))
-- Add a sentence to the [opentracing docs](https://matrix-org.github.io/synapse/latest/opentracing.html) on how you can have jaeger in a different place than synapse. ([\#16531](https://github.com/matrix-org/synapse/issues/16531))
-- Correctly describe the meaning of unspecified rule lists in the [`alias_creation_rules`](https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#alias_creation_rules) and [`room_list_publication_rules`](https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#room_list_publication_rules) config options and improve their descriptions more generally. ([\#16541](https://github.com/matrix-org/synapse/issues/16541))
-- Pin the recommended poetry version in [contributors' guide](https://matrix-org.github.io/synapse/latest/development/contributing_guide.html). ([\#16550](https://github.com/matrix-org/synapse/issues/16550))
-- Fix a broken link to the [client breakdown](https://matrix.org/ecosystem/clients/) in the README. ([\#16569](https://github.com/matrix-org/synapse/issues/16569))
-
-### Internal Changes
-
-- Improve performance of delete device messages query, cf issue [16479](https://github.com/matrix-org/synapse/issues/16479). ([\#16492](https://github.com/matrix-org/synapse/issues/16492))
-- Reduce memory allocations. ([\#16505](https://github.com/matrix-org/synapse/issues/16505))
-- Improve replication performance when purging rooms. ([\#16510](https://github.com/matrix-org/synapse/issues/16510))
-- Run tests against Python 3.12. ([\#16511](https://github.com/matrix-org/synapse/issues/16511))
-- Run trial & integration tests in continuous integration when `.ci` directory is modified. ([\#16512](https://github.com/matrix-org/synapse/issues/16512))
-- Remove duplicate call to mark remote server 'awake' when using a federation sending worker. ([\#16515](https://github.com/matrix-org/synapse/issues/16515))
-- Enable dirty runs on Complement CI, which is significantly faster. ([\#16520](https://github.com/matrix-org/synapse/issues/16520))
-- Stop deleting from an unused table. ([\#16521](https://github.com/matrix-org/synapse/issues/16521))
-- Improve type hints. ([\#16526](https://github.com/matrix-org/synapse/issues/16526), [\#16551](https://github.com/matrix-org/synapse/issues/16551))
-- Fix running unit tests on Twisted trunk. ([\#16528](https://github.com/matrix-org/synapse/issues/16528))
-- Reduce some spurious logging in worker mode. ([\#16555](https://github.com/matrix-org/synapse/issues/16555))
-- Stop porting a table in port db that we're going to nuke and rebuild anyway. ([\#16563](https://github.com/matrix-org/synapse/issues/16563))
-- Deal with warnings from running complement in CI. ([\#16567](https://github.com/matrix-org/synapse/issues/16567))
-- Allow building with `setuptools_rust` 1.8.0. ([\#16574](https://github.com/matrix-org/synapse/issues/16574))
-
-### Updates to locked dependencies
-
-* Bump black from 23.10.0 to 23.10.1. ([\#16575](https://github.com/matrix-org/synapse/issues/16575))
-* Bump black from 23.9.1 to 23.10.0. ([\#16538](https://github.com/matrix-org/synapse/issues/16538))
-* Bump cryptography from 41.0.4 to 41.0.5. ([\#16572](https://github.com/matrix-org/synapse/issues/16572))
-* Bump gitpython from 3.1.37 to 3.1.40. ([\#16534](https://github.com/matrix-org/synapse/issues/16534))
-* Bump phonenumbers from 8.13.22 to 8.13.23. ([\#16576](https://github.com/matrix-org/synapse/issues/16576))
-* Bump pygithub from 1.59.1 to 2.1.1. ([\#16535](https://github.com/matrix-org/synapse/issues/16535))
-- Bump matrix-synapse-ldap3 from 0.2.2 to 0.3.0. ([\#16539](https://github.com/matrix-org/synapse/issues/16539))
-* Bump serde from 1.0.189 to 1.0.190. ([\#16577](https://github.com/matrix-org/synapse/issues/16577))
-* Bump setuptools-rust from 1.7.0 to 1.8.0. ([\#16574](https://github.com/matrix-org/synapse/issues/16574))
-* Bump types-pillow from 10.0.0.3 to 10.1.0.0. ([\#16536](https://github.com/matrix-org/synapse/issues/16536))
-* Bump types-psycopg2 from 2.9.21.14 to 2.9.21.15. ([\#16573](https://github.com/matrix-org/synapse/issues/16573))
-* Bump types-requests from 2.31.0.2 to 2.31.0.10. ([\#16537](https://github.com/matrix-org/synapse/issues/16537))
-* Bump urllib3 from 1.26.17 to 1.26.18. ([\#16516](https://github.com/matrix-org/synapse/issues/16516))
-
-# Synapse 1.95.1 (2023-10-31)
-
-## Security advisory
-
-The following issue is fixed in 1.95.1.
-
-- [GHSA-mp92-3jfm-3575](https://github.com/matrix-org/synapse/security/advisories/GHSA-mp92-3jfm-3575) / [CVE-2023-43796](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-43796) — Moderate Severity
-
-  Cached device information of remote users can be queried from Synapse. This can be used to enumerate the remote users known to a homeserver.
-
-See the advisory for more details. If you have any questions, email security@matrix.org.
-
-
-
-# Synapse 1.95.0 (2023-10-24)
-
-### Internal Changes
-
-- Build Debian packages for [Ubuntu 23.10 Mantic Minotaur](https://canonical.com/blog/canonical-releases-ubuntu-23-10-mantic-minotaur). ([\#16524](https://github.com/matrix-org/synapse/issues/16524))
-
-
-# Synapse 1.95.0rc1 (2023-10-17)
-
-### Bugfixes
-
-- Remove legacy unspecced `knock_state_events` field returned in some responses. ([\#16403](https://github.com/matrix-org/synapse/issues/16403))
-- Fix a bug introduced in Synapse 1.81.0 where an `AttributeError` would be raised when `_matrix/client/v3/account/whoami` is called over a unix socket. Contributed by @Sir-Photch. ([\#16404](https://github.com/matrix-org/synapse/issues/16404))
-- Properly return inline media when content types have parameters. ([\#16440](https://github.com/matrix-org/synapse/issues/16440))
-- Prevent the purging of large rooms from timing out when Postgres is in use. The timeout which causes this issue was introduced in Synapse 1.88.0. ([\#16455](https://github.com/matrix-org/synapse/issues/16455))
-- Improve the performance of purging rooms, particularly encrypted rooms. ([\#16457](https://github.com/matrix-org/synapse/issues/16457))
-- Fix a bug introduced in Synapse 1.59.0 where servers could be incorrectly marked as available after an error response was received. ([\#16506](https://github.com/matrix-org/synapse/issues/16506))
-
-### Improved Documentation
-
-- Document internal background update mechanism. ([\#16420](https://github.com/matrix-org/synapse/issues/16420))
-- Fix a typo in the sql for [useful SQL for admins document](https://matrix-org.github.io/synapse/latest/usage/administration/useful_sql_for_admins.html). ([\#16477](https://github.com/matrix-org/synapse/issues/16477))
-
-### Internal Changes
-
-- Bump pyo3 from 0.17.1 to 0.19.2. ([\#16162](https://github.com/matrix-org/synapse/issues/16162))
-- Update registration of media repository URLs. ([\#16419](https://github.com/matrix-org/synapse/issues/16419))
-- Improve type hints. ([\#16421](https://github.com/matrix-org/synapse/issues/16421), [\#16468](https://github.com/matrix-org/synapse/issues/16468), [\#16469](https://github.com/matrix-org/synapse/issues/16469), [\#16507](https://github.com/matrix-org/synapse/issues/16507))
-- Refactor some code to simplify and better type receipts stream adjacent code. ([\#16426](https://github.com/matrix-org/synapse/issues/16426))
-- Factor out `MultiWriter` token from `RoomStreamToken`. ([\#16427](https://github.com/matrix-org/synapse/issues/16427))
-- Improve code comments. ([\#16428](https://github.com/matrix-org/synapse/issues/16428))
-- Reduce memory allocations. ([\#16429](https://github.com/matrix-org/synapse/issues/16429), [\#16431](https://github.com/matrix-org/synapse/issues/16431), [\#16433](https://github.com/matrix-org/synapse/issues/16433), [\#16434](https://github.com/matrix-org/synapse/issues/16434), [\#16438](https://github.com/matrix-org/synapse/issues/16438), [\#16444](https://github.com/matrix-org/synapse/issues/16444))
-- Remove unused method. ([\#16435](https://github.com/matrix-org/synapse/issues/16435))
-- Improve rate limiting logic. ([\#16441](https://github.com/matrix-org/synapse/issues/16441))
-- Do not block running of CI behind the check for sign-off on PRs. ([\#16454](https://github.com/matrix-org/synapse/issues/16454))
-- Update the release script to remind releaser to check for special release notes. ([\#16461](https://github.com/matrix-org/synapse/issues/16461))
-- Update complement.sh to match new public API shape. ([\#16466](https://github.com/matrix-org/synapse/issues/16466))
-- Clean up logging on event persister endpoints. ([\#16488](https://github.com/matrix-org/synapse/issues/16488))
-- Remove useless async job to delete device messages on sync, since we only deliver (and hence delete) up to 100 device messages at a time. ([\#16491](https://github.com/matrix-org/synapse/issues/16491))
-
-### Updates to locked dependencies
-
-* Bump bleach from 6.0.0 to 6.1.0. ([\#16451](https://github.com/matrix-org/synapse/issues/16451))
-* Bump jsonschema from 4.19.0 to 4.19.1. ([\#16500](https://github.com/matrix-org/synapse/issues/16500))
-* Bump netaddr from 0.8.0 to 0.9.0. ([\#16453](https://github.com/matrix-org/synapse/issues/16453))
-* Bump packaging from 23.1 to 23.2. ([\#16497](https://github.com/matrix-org/synapse/issues/16497))
-* Bump pillow from 10.0.1 to 10.1.0. ([\#16498](https://github.com/matrix-org/synapse/issues/16498))
-* Bump psycopg2 from 2.9.8 to 2.9.9. ([\#16452](https://github.com/matrix-org/synapse/issues/16452))
-* Bump pyo3-log from 0.8.3 to 0.8.4. ([\#16495](https://github.com/matrix-org/synapse/issues/16495))
-* Bump ruff from 0.0.290 to 0.0.292. ([\#16449](https://github.com/matrix-org/synapse/issues/16449))
-* Bump sentry-sdk from 1.31.0 to 1.32.0. ([\#16496](https://github.com/matrix-org/synapse/issues/16496))
-* Bump serde from 1.0.188 to 1.0.189. ([\#16494](https://github.com/matrix-org/synapse/issues/16494))
-* Bump types-bleach from 6.0.0.4 to 6.1.0.0. ([\#16450](https://github.com/matrix-org/synapse/issues/16450))
-* Bump types-jsonschema from 4.17.0.10 to 4.19.0.3. ([\#16499](https://github.com/matrix-org/synapse/issues/16499))
-
-# Synapse 1.94.0 (2023-10-10)
-
-No significant changes since 1.94.0rc1.
-However, please take note of the security advisory that follows.
-
-## Security advisory
-
-The following issue is fixed in 1.94.0 (and RC).
-
-- [GHSA-5chr-wjw5-3gq4](https://github.com/matrix-org/synapse/security/advisories/GHSA-5chr-wjw5-3gq4) / [CVE-2023-45129](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-45129) — Moderate Severity
-
-  A malicious server ACL event can impact performance temporarily or permanently leading to a persistent denial of service.
-
-  Homeservers running on a closed federation (which presumably do not need to use server ACLs) are not affected.
-
-See the advisory for more details. If you have any questions, email security@matrix.org.
-
-
-# Synapse 1.94.0rc1 (2023-10-03)
-
-### Features
-
-- Render plain, CSS, CSV, JSON and common image formats in the browser (inline) when requested through the /download endpoint. ([\#15988](https://github.com/matrix-org/synapse/issues/15988))
-- Add experimental support for [MSC4028](https://github.com/matrix-org/matrix-spec-proposals/pull/4028) to push all encrypted events to clients. ([\#16361](https://github.com/matrix-org/synapse/issues/16361))
-- Minor performance improvement when sending presence to federated servers. ([\#16385](https://github.com/matrix-org/synapse/issues/16385))
-- Minor performance improvement by caching server ACL checking. ([\#16360](https://github.com/matrix-org/synapse/issues/16360))
-
-### Improved Documentation
-
-- Add developer documentation concerning gradual schema migrations with column alterations. ([\#15691](https://github.com/matrix-org/synapse/issues/15691))
-- Improve documentation of the user directory search algorithm. ([\#16320](https://github.com/matrix-org/synapse/issues/16320))
-- Fix rendering of user admin API documentation around deactivation. This was broken in Synapse 1.91.0. ([\#16355](https://github.com/matrix-org/synapse/issues/16355))
-- Update documentation around message retention policies. ([\#16382](https://github.com/matrix-org/synapse/issues/16382))
-- Add note to `federation_domain_whitelist` config option to clarify its usage. ([\#16416](https://github.com/matrix-org/synapse/issues/16416))
-- Improve legacy release notes. ([\#16418](https://github.com/matrix-org/synapse/issues/16418))
-
-### Deprecations and Removals
-
-- Remove Python version from `/_synapse/admin/v1/server_version`. ([\#16380](https://github.com/matrix-org/synapse/issues/16380))
-
-### Internal Changes
-
-- Avoid running CI steps when the files they check have not been changed. ([\#14745](https://github.com/matrix-org/synapse/issues/14745), [\#16387](https://github.com/matrix-org/synapse/issues/16387))
-- Improve type hints. ([\#14911](https://github.com/matrix-org/synapse/issues/14911), [\#16350](https://github.com/matrix-org/synapse/issues/16350), [\#16356](https://github.com/matrix-org/synapse/issues/16356), [\#16395](https://github.com/matrix-org/synapse/issues/16395))
-- Added support for pydantic v2 in addition to pydantic v1. Contributed by Maxwell G (@gotmax23). ([\#16332](https://github.com/matrix-org/synapse/issues/16332))
-- Get CI to check PRs have been signed-off. ([\#16348](https://github.com/matrix-org/synapse/issues/16348))
-- Add missing licence header. ([\#16359](https://github.com/matrix-org/synapse/issues/16359))
-- Improve type hints, and bump types-psycopg2 from 2.9.21.11 to 2.9.21.14. ([\#16381](https://github.com/matrix-org/synapse/issues/16381))
-- Improve comments in `StateGroupBackgroundUpdateStore`. ([\#16383](https://github.com/matrix-org/synapse/issues/16383))
-- Update maturin configuration. ([\#16394](https://github.com/matrix-org/synapse/issues/16394))
-- Downgrade replication stream time out error log lines to warning. ([\#16401](https://github.com/matrix-org/synapse/issues/16401))
-
-### Updates to locked dependencies
-
-* Bump actions/checkout from 3 to 4. ([\#16250](https://github.com/matrix-org/synapse/issues/16250))
-* Bump cryptography from 41.0.3 to 41.0.4. ([\#16362](https://github.com/matrix-org/synapse/issues/16362))
-* Bump dawidd6/action-download-artifact from 2.27.0 to 2.28.0. ([\#16374](https://github.com/matrix-org/synapse/issues/16374))
-* Bump docker/setup-buildx-action from 2 to 3. ([\#16375](https://github.com/matrix-org/synapse/issues/16375))
-* Bump gitpython from 3.1.35 to 3.1.37. ([\#16376](https://github.com/matrix-org/synapse/issues/16376))
-* Bump msgpack from 1.0.5 to 1.0.6. ([\#16377](https://github.com/matrix-org/synapse/issues/16377))
-* Bump msgpack from 1.0.6 to 1.0.7. ([\#16412](https://github.com/matrix-org/synapse/issues/16412))
-* Bump phonenumbers from 8.13.19 to 8.13.22. ([\#16413](https://github.com/matrix-org/synapse/issues/16413))
-* Bump psycopg2 from 2.9.7 to 2.9.8. ([\#16409](https://github.com/matrix-org/synapse/issues/16409))
-* Bump pydantic from 2.3.0 to 2.4.2. ([\#16410](https://github.com/matrix-org/synapse/issues/16410))
-* Bump regex from 1.9.5 to 1.9.6. ([\#16408](https://github.com/matrix-org/synapse/issues/16408))
-* Bump sentry-sdk from 1.30.0 to 1.31.0. ([\#16378](https://github.com/matrix-org/synapse/issues/16378))
-* Bump types-netaddr from 0.8.0.9 to 0.9.0.1. ([\#16411](https://github.com/matrix-org/synapse/issues/16411))
-* Bump types-psycopg2 from 2.9.21.11 to 2.9.21.14. ([\#16381](https://github.com/matrix-org/synapse/issues/16381))
-* Bump urllib3 from 1.26.15 to 1.26.17. ([\#16422](https://github.com/matrix-org/synapse/issues/16422))
-
 # Synapse 1.93.0 (2023-09-26)
 
 No significant changes since 1.93.0rc1.

Cargo.lock

@@ -144,9 +144,9 @@ checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
 
 [[package]]
 name = "memoffset"
-version = "0.9.0"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
 dependencies = [
  "autocfg",
 ]
@@ -191,9 +191,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.19.2"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e681a6cfdc4adcc93b4d3cf993749a4552018ee0a9b65fc0ccfad74352c72a38"
+checksum = "268be0c73583c183f2b14052337465768c07726936a260f480f0857cb95ba543"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -209,9 +209,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.19.2"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "076c73d0bc438f7a4ef6fdd0c3bb4732149136abd952b110ac93e4edb13a6ba5"
+checksum = "28fcd1e73f06ec85bf3280c48c67e731d8290ad3d730f8be9dc07946923005c8"
 dependencies = [
  "once_cell",
  "target-lexicon",
@@ -219,9 +219,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.19.2"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e53cee42e77ebe256066ba8aa77eff722b3bb91f3419177cf4cd0f304d3284d9"
+checksum = "0f6cb136e222e49115b3c51c32792886defbfb0adead26a688142b346a0b9ffc"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -229,9 +229,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-log"
-version = "0.8.4"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c09c2b349b6538d8a73d436ca606dab6ce0aaab4dad9e6b7bdd57a4f556c3bc3"
+checksum = "f47b0777feb17f61eea78667d61103758b243a871edc09a7786500a50467b605"
 dependencies = [
  "arc-swap",
  "log",
@@ -240,9 +240,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.19.2"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfeb4c99597e136528c6dd7d5e3de5434d1ceaf487436a3f03b2d56b6fc9efd1"
+checksum = "94144a1266e236b1c932682136dc35a9dee8d3589728f68130c7c3861ef96b28"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -252,9 +252,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.19.2"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "947dc12175c254889edc0c02e399476c2f652b4b9ebd123aa655c224de259536"
+checksum = "c8df9be978a2d2f0cdebabb03206ed73b11314701a5bfe71b0d753b81997777f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -263,9 +263,9 @@ dependencies = [
 
 [[package]]
 name = "pythonize"
-version = "0.19.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e35b716d430ace57e2d1b4afb51c9e5b7c46d2bce72926e07f9be6a98ced03e"
+checksum = "0f7f0c136f5fbc01868185eef462800e49659eb23acca83b9e884367a006acb6"
 dependencies = [
  "pyo3",
  "serde",
@@ -291,9 +291,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.9.6"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff"
+checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -303,9 +303,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.3.9"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9"
+checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -332,18 +332,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "serde"
-version = "1.0.192"
+version = "1.0.188"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001"
+checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.192"
+version = "1.0.188"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1"
+checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -352,9 +352,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.108"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
+checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
 dependencies = [
  "itoa",
  "ryu",

README.rst

@@ -122,7 +122,7 @@ You will need to change the server you are logging into from ``matrix.org``
 and instead specify a Homeserver URL of ``https://<server_name>:8448``
 (or just ``https://<server_name>`` if you are using a reverse proxy).
 If you prefer to use another client, refer to our
-`client breakdown <https://matrix.org/ecosystem/clients/>`_.
+`client breakdown <https://matrix.org/docs/projects/clients-matrix>`_.
 
 If all goes well you should at least be able to log in, create a room, and
 start sending messages.

build_rust.py

@@ -1,23 +0,0 @@
-# A build script for poetry that adds the rust extension.
-
-import os
-from typing import Any, Dict
-
-from setuptools_rust import Binding, RustExtension
-
-
-def build(setup_kwargs: Dict[str, Any]) -> None:
-    original_project_dir = os.path.dirname(os.path.realpath(__file__))
-    cargo_toml_path = os.path.join(original_project_dir, "rust", "Cargo.toml")
-
-    extension = RustExtension(
-        target="synapse.synapse_rust",
-        path=cargo_toml_path,
-        binding=Binding.PyO3,
-        py_limited_api=True,
-        # We force always building in release mode, as we can't tell the
-        # difference between using `poetry` in development vs production.
-        debug=False,
-    )
-    setup_kwargs.setdefault("rust_extensions", []).append(extension)
-    setup_kwargs["zip_safe"] = False

changelog.d/14745.misc

@@ -0,0 +1 @@
+Avoid running CI steps when the files they check have not been changed.

changelog.d/15503.feature

@@ -1 +0,0 @@
-Add support for asynchronous uploads as defined by [MSC2246](https://github.com/matrix-org/matrix-spec-proposals/pull/2246). Contributed by @sumnerevans at @beeper.

changelog.d/15691.doc

@@ -0,0 +1 @@
+Add developer documentation concerning gradual schema migrations with column alterations.

changelog.d/16051.misc

@@ -1 +0,0 @@
-Remove whole table locks on push rule modifications. Contributed by Nick @ Beeper (@fizzadar).

changelog.d/16320.doc

@@ -0,0 +1 @@
+Improve documentation of the user directory search algorithm.

changelog.d/16332.misc

@@ -0,0 +1 @@
+Added support for pydantic v2 in addition to pydantic v1. Contributed by Maxwell G (@gotmax23).

changelog.d/16348.misc

@@ -0,0 +1 @@
+Get CI to check PRs have been signed-off.

changelog.d/16355.doc

@@ -0,0 +1 @@
+Fix rendering of user admin API documentation around deactivation. This was broken in Synapse 1.91.0.

changelog.d/16359.misc

@@ -0,0 +1 @@
+Add missing licence header.

changelog.d/16360.misc

@@ -0,0 +1 @@
+Cache server ACL checking.

changelog.d/16361.feature

@@ -0,0 +1 @@
+Experimental support for [MSC4028](https://github.com/matrix-org/matrix-spec-proposals/pull/4028) to push all encrypted events to clients.

changelog.d/16381.misc

@@ -0,0 +1 @@
+Improve type hints, and bump types-psycopg2 from 2.9.21.11 to 2.9.21.14.

changelog.d/16383.misc

@@ -0,0 +1 @@
+Improve comments in `StateGroupBackgroundUpdateStore`.

changelog.d/16385.misc

@@ -0,0 +1 @@
+Minor performance improvement when sending presence to federated servers.

changelog.d/16387.misc

@@ -0,0 +1 @@
+Avoid running CI steps when the files they check have not been changed.

changelog.d/16456.misc

@@ -1 +0,0 @@
-Add a Postgres `REPLICA IDENTITY` to tables that do not have an implicit one. This should allow use of Postgres logical replication.

changelog.d/16532.misc

@@ -1 +0,0 @@
-Support reactor tick timings on more types of event loops.

changelog.d/16583.misc

@@ -1 +0,0 @@
-Avoid executing no-op queries.

changelog.d/16584.misc

@@ -1 +0,0 @@
-Simplify persistance code to be per-room.

changelog.d/16585.misc

@@ -1 +0,0 @@
-Use standard SQL helpers in persistence code.

changelog.d/16586.misc

@@ -1 +0,0 @@
-Avoid updating the stream cache unnecessarily.

changelog.d/16588.misc

@@ -1 +0,0 @@
-Bump twisted from 23.8.0 to 23.10.0.

changelog.d/16589.misc

@@ -1 +0,0 @@
-Improve performance when using opentracing.

changelog.d/16590.misc

@@ -1 +0,0 @@
-Run push rule evaluator setup in parallel.

changelog.d/16596.misc

@@ -1 +0,0 @@
-Improve tests of the SQL generator.

changelog.d/16605.misc

@@ -1 +0,0 @@
-Bump setuptools-rust from 1.8.0 to 1.8.1.

changelog.d/16609.bugfix

@@ -1 +0,0 @@
-Fix a long-standing bug where some queries updated the same row twice. Introduced in Synapse 1.57.0.

changelog.d/16612.misc

@@ -1 +0,0 @@
-Improve type hints.

changelog.d/16613.feature

@@ -1 +0,0 @@
-Improve the performance of some operations in multi-worker deployments.

changelog.d/16615.misc

@@ -1 +0,0 @@
-Use more generic database methods.

changelog.d/16616.feature

@@ -1 +0,0 @@
-Improve the performance of some operations in multi-worker deployments.

changelog.d/16617.bugfix

@@ -1 +0,0 @@
-Fix a long-standing bug where Synapse would not unbind third-party identifiers for Application Service users when deactivated and would not emit a compliant response.

changelog.d/16618.misc

@@ -1 +0,0 @@
-Use `dbname` instead of the deprecated `database` connection parameter for psycopg2.

changelog.d/16628.doc

@@ -1 +0,0 @@
-Note that the option [`outbound_federation_restricted_to`](https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#outbound_federation_restricted_to) was added in Synapse 1.89.0, and fix a nearby formatting error.

changelog.d/16631.doc

@@ -1 +0,0 @@
-Update parameter information for the `/timestamp_to_event` admin API.

changelog.d/16634.misc

@@ -1 +0,0 @@
-Add an internal [Admin API endpoint](https://matrix-org.github.io/synapse/v1.97/usage/configuration/config_documentation.html#allow-replacing-master-cross-signing-key-without-user-interactive-auth) to temporarily grant the ability to update an existing cross-signing key without UIA.

changelog.d/16637.misc

@@ -1 +0,0 @@
-Improve references to GitHub issues.

changelog.d/16638.misc

@@ -1 +0,0 @@
-Improve references to GitHub issues.

debian/changelog

@@ -1,39 +1,3 @@
-matrix-synapse-py3 (1.96.0~rc1) stable; urgency=medium
-
-  * New Synapse release 1.96.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 31 Oct 2023 14:09:09 +0000
-
-matrix-synapse-py3 (1.95.1) stable; urgency=medium
-
-  * New Synapse release 1.95.1.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 31 Oct 2023 14:00:00 +0000
-
-matrix-synapse-py3 (1.95.0) stable; urgency=medium
-
-  * New Synapse release 1.95.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 24 Oct 2023 13:00:46 +0100
-
-matrix-synapse-py3 (1.95.0~rc1) stable; urgency=medium
-
-  * New synapse release 1.95.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 17 Oct 2023 15:50:17 +0000
-
-matrix-synapse-py3 (1.94.0) stable; urgency=medium
-
-  * New Synapse release 1.94.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 10 Oct 2023 10:57:41 +0100
-
-matrix-synapse-py3 (1.94.0~rc1) stable; urgency=medium
-
-  * New Synapse release 1.94.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 03 Oct 2023 11:48:18 +0100
-
 matrix-synapse-py3 (1.93.0) stable; urgency=medium
 
   * New Synapse release 1.93.0.
@@ -1637,7 +1601,7 @@ matrix-synapse-py3 (0.99.3.1) stable; urgency=medium
 matrix-synapse-py3 (0.99.3) stable; urgency=medium
 
   [ Richard van der Hoff ]
-  * Fix warning during preconfiguration. (Fixes: https://github.com/matrix-org/synapse/issues/4819)
+  * Fix warning during preconfiguration. (Fixes: #4819)
 
   [ Synapse Packaging team ]
   * New synapse release 0.99.3.

docker/complement/conf/start_for_complement.sh

@@ -68,11 +68,6 @@ if [[ -n "$SYNAPSE_COMPLEMENT_USE_WORKERS" ]]; then
 
   fi
   log "Workers requested: $SYNAPSE_WORKER_TYPES"
-  # adjust connection pool limits on worker mode as otherwise running lots of worker synapses
-  # can make docker unhappy (in GHA)
-  export POSTGRES_CP_MIN=1
-  export POSTGRES_CP_MAX=3
-  echo "using reduced connection pool limits for worker mode"
   # Improve startup times by using a launcher based on fork()
   export SYNAPSE_USE_EXPERIMENTAL_FORKING_LAUNCHER=1
 else

docker/conf/homeserver.yaml

@@ -67,8 +67,8 @@ database:
     host: "{{ POSTGRES_HOST or "db" }}"
     port: "{{ POSTGRES_PORT or "5432" }}"
 {% endif %}
-    cp_min: {{ POSTGRES_CP_MIN or 5 }}
-    cp_max: {{ POSTGRES_CP_MAX or 10 }}
+    cp_min: 5
+    cp_max: 10
 {% else %}
 database:
   name: "sqlite3"

docs/SUMMARY.md

@@ -19,7 +19,7 @@
 # Usage
   - [Federation](federate.md)
   - [Configuration](usage/configuration/README.md)
-    - [Configuration Manual](usage/configuration/config_documentation.md)
+    - [Configuration Manual](usage/configuration/config_documentation.md) 
     - [Homeserver Sample Config File](usage/configuration/homeserver_sample_config.md)
     - [Logging Sample Config File](usage/configuration/logging_sample_config.md)
     - [Structured Logging](structured_logging.md)
@@ -48,7 +48,6 @@
         - [Password auth provider callbacks](modules/password_auth_provider_callbacks.md)
         - [Background update controller callbacks](modules/background_update_controller_callbacks.md)
         - [Account data callbacks](modules/account_data_callbacks.md)
-        - [Add extra fields to client events unsigned section callbacks](modules/add_extra_fields_to_client_events_unsigned.md)
         - [Porting a legacy module to the new interface](modules/porting_legacy_module.md)
     - [Workers](workers.md)
       - [Using `synctl` with Workers](synctl_workers.md)

docs/admin_api/rooms.md

@@ -536,8 +536,7 @@ The following query parameters are available:
 
 **Response**
 
-* `event_id` - The event ID closest to the given timestamp.
-* `origin_server_ts` - The timestamp of the event in milliseconds since the Unix epoch.
+* `event_id` - converted from timestamp
 
 # Block Room API
 The Block Room admin API allows server admins to block and unblock rooms,

docs/admin_api/user_admin_api.md

@@ -773,43 +773,6 @@ Note: The token will expire if the *admin* user calls `/logout/all` from any
 of their devices, but the token will *not* expire if the target user does the
 same.
 
-## Allow replacing master cross-signing key without User-Interactive Auth
-
-This endpoint is not intended for server administrator usage;
-we describe it here for completeness.
-
-This API temporarily permits a user to replace their master cross-signing key
-without going through
-[user-interactive authentication](https://spec.matrix.org/v1.8/client-server-api/#user-interactive-authentication-api) (UIA).
-This is useful when Synapse has delegated its authentication to the
-[Matrix Authentication Service](https://github.com/matrix-org/matrix-authentication-service/);
-as Synapse cannot perform UIA is not possible in these circumstances.
-
-The API is
-
-```http request
-POST /_synapse/admin/v1/users/<user_id>/_allow_cross_signing_replacement_without_uia
-{}
-```
-
-If the user does not exist, or does exist but has no master cross-signing key,
-this will return with status code `404 Not Found`.
-
-Otherwise, a response body like the following is returned, with status `200 OK`:
-
-```json
-{
-    "updatable_without_uia_before_ms": 1234567890
-}
-```
-
-The response body is a JSON object with a single field:
-
-- `updatable_without_uia_before_ms`: integer. The timestamp in milliseconds
-  before which the user is permitted to replace their cross-signing key without
-  going through UIA.
-
-_Added in Synapse 1.97.0._
 
 ## User devices
 

docs/admin_api/version_api.md

@@ -1,7 +1,7 @@
 # Version API
 
-This API returns the running Synapse version.
-This is useful when a Synapse instance
+This API returns the running Synapse version and the Python version
+on which Synapse is being run. This is useful when a Synapse instance
 is behind a proxy that does not forward the 'Server' header (which also
 contains Synapse version information).
 
@@ -15,9 +15,7 @@ It returns a JSON body like the following:
 
 ```json
 {
-    "server_version": "0.99.2rc1 (b=develop, abcdef123)"
+    "server_version": "0.99.2rc1 (b=develop, abcdef123)",
+    "python_version": "3.7.8"
 }
 ```
-
-*Changed in Synapse 1.94.0:* The `python_version` key was removed from the
-response body.

docs/development/contributing_guide.md

@@ -66,7 +66,7 @@ Of their installation methods, we recommend
 
 ```shell
 pip install --user pipx
-pipx install poetry==1.5.2  # Problems with Poetry 1.6, see https://github.com/matrix-org/synapse/issues/16147
+pipx install poetry
 ```
 
 but see poetry's [installation instructions](https://python-poetry.org/docs/#installation)

docs/development/database_schema.md

@@ -150,67 +150,6 @@ def run_upgrade(
     ...
 ```
 
-## Background updates
-
-It is sometimes appropriate to perform database migrations as part of a background
-process (instead of blocking Synapse until the migration is done). In particular,
-this is useful for migrating data when adding new columns or tables.
-
-Pending background updates stored in the `background_updates` table and are denoted
-by a unique name, the current status (stored in JSON), and some dependency information:
-
-* Whether the update requires a previous update to be complete.
-* A rough ordering for which to complete updates.
-
-A new background updates needs to be added to the `background_updates` table:
-
-```sql
-INSERT INTO background_updates (ordering, update_name, depends_on, progress_json) VALUES
-  (7706, 'my_background_update', 'a_previous_background_update' '{}');
-```
-
-And then needs an associated handler in the appropriate datastore:
-
-```python
-self.db_pool.updates.register_background_update_handler(
-    "my_background_update",
-    update_handler=self._my_background_update,
-)
-```
-
-There are a few types of updates that can be performed, see the `BackgroundUpdater`:
-
-* `register_background_update_handler`: A generic handler for custom SQL
-* `register_background_index_update`: Create an index in the background
-* `register_background_validate_constraint`: Validate a constraint in the background
-  (PostgreSQL-only)
-* `register_background_validate_constraint_and_delete_rows`: Similar to
-  `register_background_validate_constraint`, but deletes rows which don't fit
-  the constraint.
-
-For `register_background_update_handler`, the generic handler must track progress
-and then finalize the background update:
-
-```python
-async def _my_background_update(self, progress: JsonDict, batch_size: int) -> int:
-    def _do_something(txn: LoggingTransaction) -> int:
-        ...
-        self.db_pool.updates._background_update_progress_txn(
-            txn, "my_background_update", {"last_processed": last_processed}
-        )
-        return last_processed - prev_last_processed
-
-    num_processed = await self.db_pool.runInteraction("_do_something", _do_something)
-    await self.db_pool.updates._end_background_update("my_background_update")
-
-    return num_processed
-```
-
-Synapse will attempt to rate-limit how often background updates are run via the
-given batch-size and the returned number of processed entries (and how long the
-function took to run). See
-[background update controller callbacks](../modules/background_update_controller_callbacks.md).
-
 ## Boolean columns
 
 Boolean columns require special treatment, since SQLite treats booleans the

docs/development/synapse_architecture/streams.md

@@ -51,24 +51,17 @@ will be inserted with that ID.
 
 For any given stream reader (including writers themselves), we may define a per-writer current stream ID:
 
-> A current stream ID _for a writer W_ is the largest stream ID such that
+> The current stream ID _for a writer W_ is the largest stream ID such that
 > all transactions added by W with equal or smaller ID have completed.
 
 Similarly, there is a "linear" notion of current stream ID:
 
-> A "linear" current stream ID is the largest stream ID such that
+> The "linear" current stream ID is the largest stream ID such that
 > all facts (added by any writer) with equal or smaller ID have completed.
 
 Because different stream readers A and B learn about new facts at different times, A and B may disagree about current stream IDs.
 Put differently: we should think of stream readers as being independent of each other, proceeding through a stream of facts at different rates.
 
-The above definition does not give a unique current stream ID, in fact there can
-be a range of current stream IDs. Synapse uses both the minimum and maximum IDs
-for different purposes. Most often the maximum is used, as its generally
-beneficial for workers to advance their IDs as soon as possible. However, the
-minimum is used in situations where e.g. another worker is going to wait until
-the stream advances past a position.
-
 **NB.** For both senses of "current", that if a writer opens a transaction that never completes, the current stream ID will never advance beyond that writer's last written stream ID.
 
 For single-writer streams, the per-writer current ID and the linear current ID are the same.
@@ -121,7 +114,7 @@ Writers need to track:
  - track their current position (i.e. its own per-writer stream ID).
  - their facts currently awaiting completion.
 
-At startup,
+At startup, 
  - the current position of that writer can be found by querying the database (which suggests that facts need to be written to the database atomically, in a transaction); and
  - there are no facts awaiting completion.
 

docs/message_retention_policies.md

@@ -8,7 +8,8 @@ and allow server and room admins to configure how long messages should
 be kept in a homeserver's database before being purged from it.
 **Please note that, as this feature isn't part of the Matrix
 specification yet, this implementation is to be considered as
-experimental.**
+experimental. There are known bugs which may cause database corruption.
+Proceed with caution.** 
 
 A message retention policy is mainly defined by its `max_lifetime`
 parameter, which defines how long a message can be kept around after

docs/modules/add_extra_fields_to_client_events_unsigned.md

@@ -1,32 +0,0 @@
-# Add extra fields to client events unsigned section callbacks
-
-_First introduced in Synapse v1.96.0_
-
-This callback allows modules to add extra fields to the unsigned section of
-events when they get sent down to clients.
-
-These get called *every* time an event is to be sent to clients, so care should
-be taken to ensure with respect to performance.
-
-### API
-
-To register the callback, use
-`register_add_extra_fields_to_unsigned_client_event_callbacks` on the
-`ModuleApi`.
-
-The callback should be of the form
-
-```python
-async def add_field_to_unsigned(
-    event: EventBase,
-) -> JsonDict:
-```
-
-where the extra fields to add to the event's unsigned section is returned.
-(Modules must not attempt to modify the `event` directly).
-
-This cannot be used to alter the "core" fields in the unsigned section emitted
-by Synapse itself.
-
-If multiple such callbacks try to add the same field to an event's unsigned
-section, the last-registered callback wins.

docs/modules/presence_router_callbacks.md

@@ -1,16 +1,8 @@
 # Presence router callbacks
 
-Presence router callbacks allow module developers to define additional users
-which receive presence updates from local users. The additional users
-can be local or remote.
-
-For example, it could be used to direct all of `@alice:example.com` (a local user)'s
-presence updates to `@bob:matrix.org` (a remote user), even though they don't share a
-room. (Note that those presence updates might not make it to `@bob:matrix.org`'s client
-unless a similar presence router is running on that homeserver.)
-
-Presence router callbacks can be registered using the module API's
-`register_presence_router_callbacks` method.
+Presence router callbacks allow module developers to specify additional users (local or remote)
+to receive certain presence updates from local users. Presence router callbacks can be 
+registered using the module API's `register_presence_router_callbacks` method.
 
 ## Callbacks
 

docs/opentracing.md

@@ -51,11 +51,6 @@ docker run -d --name jaeger \
   jaegertracing/all-in-one:1
 ```
 
-By default, Synapse will publish traces to Jaeger on localhost.
-If Jaeger is hosted elsewhere, point Synapse to the correct host by setting
-`opentracing.jaeger_config.local_agent.reporting_host` [in the Synapse configuration](usage/configuration/config_documentation.md#opentracing-1)
-or by setting the `JAEGER_AGENT_HOST` environment variable to the desired address.
-
 Latest documentation is probably at
 https://www.jaegertracing.io/docs/latest/getting-started.
 

docs/postgres.md

@@ -66,7 +66,7 @@ database:
   args:
     user: <user>
     password: <pass>
-    dbname: <db>
+    database: <db>
     host: <host>
     cp_min: 5
     cp_max: 10

docs/usage/administration/useful_sql_for_admins.md

@@ -193,7 +193,7 @@ SELECT rss.room_id, rss.name, rss.canonical_alias, rss.topic, rss.encryption,
     rsc.joined_members, rsc.local_users_in_room, rss.join_rules
   FROM room_stats_state rss
   LEFT JOIN room_stats_current rsc USING (room_id)
-  WHERE room_id IN (
+  WHERE room_id IN ( WHERE room_id IN (
     '!OGEhHVWSdvArJzumhm:matrix.org',
     '!YTvKGNlinIzlkMTVRl:matrix.org' 
   );

docs/usage/configuration/config_documentation.md

@@ -230,13 +230,6 @@ Example configuration:
 presence:
   enabled: false
 ```
-
-`enabled` can also be set to a special value of "untracked" which ignores updates
-received via clients and federation, while still accepting updates from the
-[module API](../../modules/index.md).
-
-*The "untracked" option was added in Synapse 1.96.0.*
-
 ---
 ### `require_auth_for_profile_requests`
 
@@ -1033,8 +1026,11 @@ which are older than the room's maximum retention period. Synapse will also
 filter events received over federation so that events that should have been
 purged are ignored and not stored again.
 
-The message retention policies feature is disabled by default. You can read more
-about this feature [here](../../message_retention_policies.md).
+The message retention policies feature is disabled by default. Please be advised
+that enabling this feature carries some risk. There are known bugs with the implementation
+which can cause database corruption. Setting retention to delete older history
+is less risky than deleting newer history but in general caution is advised when enabling this
+experimental feature. You can read more about this feature [here](../../message_retention_policies.md).
 
 This setting has the following sub-options:
 * `default_policy`: Default retention policy. If set, Synapse will apply it to rooms that lack the
@@ -1197,11 +1193,6 @@ inbound federation traffic as early as possible, rather than relying
 purely on this application-layer restriction.  If not specified, the
 default is to whitelist everything.
 
-Note: this does not stop a server from joining rooms that servers not on the
-whitelist are in. As such, this option is really only useful to establish a
-"private federation", where a group of servers all whitelist each other and have
-the same whitelist.
-
 Example configuration:
 ```yaml
 federation_domain_whitelist:
@@ -1447,7 +1438,7 @@ database:
   args:
     user: synapse_user
     password: secretpassword
-    dbname: synapse
+    database: synapse
     host: localhost
     port: 5432
     cp_min: 5
@@ -1526,7 +1517,7 @@ databases:
     args:
       user: synapse_user
       password: secretpassword
-      dbname: synapse_main
+      database: synapse_main
       host: localhost
       port: 5432
       cp_min: 5
@@ -1539,7 +1530,7 @@ databases:
     args:
       user: synapse_user
       password: secretpassword
-      dbname: synapse_state
+      database: synapse_state
       host: localhost
       port: 5432
       cp_min: 5
@@ -1753,19 +1744,6 @@ rc_third_party_invite:
   burst_count: 10
 ```
 ---
-### `rc_media_create`
-
-This option ratelimits creation of MXC URIs via the `/_matrix/media/v1/create`
-endpoint based on the account that's creating the media. Defaults to
-`per_second: 10`, `burst_count: 50`.
-
-Example configuration:
-```yaml
-rc_media_create:
-  per_second: 10
-  burst_count: 50
-```
----
 ### `rc_federation`
 
 Defines limits on federation requests.
@@ -1827,27 +1805,6 @@ Example configuration:
 media_store_path: "DATADIR/media_store"
 ```
 ---
-### `max_pending_media_uploads`
-
-How many *pending media uploads* can a given user have? A pending media upload
-is a created MXC URI that (a) is not expired (the `unused_expires_at` timestamp
-has not passed) and (b) the media has not yet been uploaded for. Defaults to 5.
-
-Example configuration:
-```yaml
-max_pending_media_uploads: 5
-```
----
-### `unused_expiration_time`
-
-How long to wait in milliseconds before expiring created media IDs. Defaults to
-"24h"
-
-Example configuration:
-```yaml
-unused_expiration_time: "1h"
-```
----
 ### `media_storage_providers`
 
 Media storage providers allow media to be stored in different
@@ -3838,160 +3795,62 @@ enable_room_list_search: false
 ---
 ### `alias_creation_rules`
 
-The `alias_creation_rules` option allows server admins to prevent unwanted
-alias creation on this server.
+The `alias_creation_rules` option controls who is allowed to create aliases
+on this server.
 
-This setting is an optional list of 0 or more rules. By default, no list is
-provided, meaning that all alias creations are permitted.
+The format of this option is a list of rules that contain globs that
+match against user_id, room_id and the new alias (fully qualified with
+server name). The action in the first rule that matches is taken,
+which can currently either be "allow" or "deny".
 
-Otherwise, requests to create aliases are matched against each rule in order.
-The first rule that matches decides if the request is allowed or denied. If no 
-rule matches, the request is denied. In particular, this means that configuring
-an empty list of rules will deny every alias creation request.
+Missing user_id/room_id/alias fields default to "*".
 
-Each rule is a YAML object containing four fields, each of which is an optional string:
+If no rules match the request is denied. An empty list means no one
+can create aliases.
 
-* `user_id`: a glob pattern that matches against the creator of the alias.
-* `alias`: a glob pattern that matches against the alias being created.
-* `room_id`: a glob pattern that matches against the room ID the alias is being pointed at.
-* `action`: either `allow` or `deny`. What to do with the request if the rule matches. Defaults to `allow`.
-
-Each of the glob patterns is optional, defaulting to `*` ("match anything").
-Note that the patterns match against fully qualified IDs, e.g. against 
-`@alice:example.com`, `#room:example.com` and `!abcdefghijk:example.com` instead
-of `alice`, `room` and `abcedgghijk`.
+Options for the rules include:
+* `user_id`: Matches against the creator of the alias. Defaults to "*".
+* `alias`: Matches against the alias being created. Defaults to "*".
+* `room_id`: Matches against the room ID the alias is being pointed at. Defaults to "*"
+* `action`: Whether to "allow" or "deny" the request if the rule matches. Defaults to allow.
 
 Example configuration:
-
 ```yaml
-# No rule list specified. All alias creations are allowed.
-# This is the default behaviour.
 alias_creation_rules:
-```
-
-```yaml
-# A list of one rule which allows everything.
-# This has the same effect as the previous example.
-alias_creation_rules:
-  - "action": "allow"
-```
-
-```yaml
-# An empty list of rules. All alias creations are denied.
-alias_creation_rules: []
-```
-
-```yaml
-# A list of one rule which denies everything.
-# This has the same effect as the previous example.
-alias_creation_rules:
-  - "action": "deny"
-```
-
-```yaml
-# Prevent a specific user from creating aliases.
-# Allow other users to create any alias
-alias_creation_rules:
-  - user_id: "@bad_user:example.com"
+  - user_id: "bad_user"
+    alias: "spammy_alias"
+    room_id: "*"
     action: deny
-    
-  - action: allow
 ```
-
-```yaml
-# Prevent aliases being created which point to a specific room.
-alias_creation_rules:
-  - room_id: "!forbiddenRoom:example.com"
-    action: deny
-
-  - action: allow
-```
-
 ---
 ### `room_list_publication_rules`
 
-The `room_list_publication_rules` option allows server admins to prevent
-unwanted entries from being published in the public room list.
+The `room_list_publication_rules` option controls who can publish and
+which rooms can be published in the public room list.
 
 The format of this option is the same as that for
-[`alias_creation_rules`](#alias_creation_rules): an optional list of 0 or more
-rules. By default, no list is provided, meaning that all rooms may be
-published to the room list.
+`alias_creation_rules`.
 
-Otherwise, requests to publish a room are matched against each rule in order.
-The first rule that matches decides if the request is allowed or denied. If no
-rule matches, the request is denied. In particular, this means that configuring
-an empty list of rules will deny every alias creation request.
+If the room has one or more aliases associated with it, only one of
+the aliases needs to match the alias rule. If there are no aliases
+then only rules with `alias: *` match.
 
-Each rule is a YAML object containing four fields, each of which is an optional string:
-
-* `user_id`: a glob pattern that matches against the user publishing the room.
-* `alias`: a glob pattern that matches against one of published room's aliases.
-  - If the room has no aliases, the alias match fails unless `alias` is unspecified or `*`.
-  - If the room has exactly one alias, the alias match succeeds if the `alias` pattern matches that alias.
-  - If the room has two or more aliases, the alias match succeeds if the pattern matches at least one of the aliases.
-* `room_id`: a glob pattern that matches against the room ID of the room being published.
-* `action`: either `allow` or `deny`. What to do with the request if the rule matches. Defaults to `allow`.
-
-Each of the glob patterns is optional, defaulting to `*` ("match anything").
-Note that the patterns match against fully qualified IDs, e.g. against
-`@alice:example.com`, `#room:example.com` and `!abcdefghijk:example.com` instead
-of `alice`, `room` and `abcedgghijk`.
+If no rules match the request is denied. An empty list means no one
+can publish rooms.
 
+Options for the rules include:
+* `user_id`: Matches against the creator of the alias. Defaults to "*".
+* `alias`: Matches against any current local or canonical aliases associated with the room. Defaults to "*".
+* `room_id`: Matches against the room ID being published. Defaults to "*".
+* `action`: Whether to "allow" or "deny" the request if the rule matches. Defaults to allow.
 
 Example configuration:
-
 ```yaml
-# No rule list specified. Anyone may publish any room to the public list.
-# This is the default behaviour.
 room_list_publication_rules:
-```
-
-```yaml
-# A list of one rule which allows everything.
-# This has the same effect as the previous example.
-room_list_publication_rules:
-  - "action": "allow"
-```
-
-```yaml
-# An empty list of rules. No-one may publish to the room list.
-room_list_publication_rules: []
-```
-
-```yaml
-# A list of one rule which denies everything.
-# This has the same effect as the previous example.
-room_list_publication_rules:
-  - "action": "deny"
-```
-
-```yaml
-# Prevent a specific user from publishing rooms.
-# Allow other users to publish anything.
-room_list_publication_rules:
-  - user_id: "@bad_user:example.com"
-    action: deny
-    
-  - action: allow
-```
-
-```yaml
-# Prevent publication of a specific room.
-room_list_publication_rules:
-  - room_id: "!forbiddenRoom:example.com"
-    action: deny
-
-  - action: allow
-```
-
-```yaml
-# Prevent publication of rooms with at least one alias containing the word "potato".
-room_list_publication_rules:
-  - alias: "#*potato*:example.com"
-    action: deny
-
-  - action: allow
+  - user_id: "*"
+    alias: "*"
+    room_id: "*"
+    action: allow
 ```
 
 ---
@@ -4253,9 +4112,6 @@ outbound_federation_restricted_to:
 Also see the [worker
 documentation](../../workers.md#restrict-outbound-federation-traffic-to-a-specific-set-of-workers)
 for more info.
-
-_Added in Synapse 1.89.0._
-
 ---
 ### `run_background_tasks_on`
 

docs/user_directory.md

@@ -83,7 +83,7 @@ The search term is then split into words:
   available, then the system's [default locale](https://unicode-org.github.io/icu/userguide/locale/#default-locales)
   will be used to break the search term into words. (See the
   [installation instructions](setup/installation.md) for how to install ICU.)
-* If unavailable, then runs of ASCII characters, numbers, underscores, and hyphens
+* If unavailable, then runs of ASCII characters, numbers, underscores, and hypens
   are considered words.
 
 The queries for PostgreSQL and SQLite are detailed below, by their overall goal

mypy.ini

@@ -32,13 +32,12 @@ files =
   docker/,
   scripts-dev/,
   synapse/,
-  synmark/,
   tests/,
   build_rust.py
 
 [mypy-synapse.metrics._reactor_metrics]
-# This module  pokes at the internals of OS-specific classes, to appease mypy
-# on different systems we add additional ignores.
+# This module imports select.epoll. That exists on Linux, but doesn't on macOS.
+# See https://github.com/matrix-org/synapse/pull/11771.
 warn_unused_ignores = False
 
 [mypy-synapse.util.caches.treecache]
@@ -81,9 +80,6 @@ ignore_missing_imports = True
 [mypy-pympler.*]
 ignore_missing_imports = True
 
-[mypy-pyperf.*]
-ignore_missing_imports = True
-
 [mypy-rust_python_jaeger_reporter.*]
 ignore_missing_imports = True
 

pyproject.toml

@@ -92,11 +92,10 @@ skip_gitignore = true
 
 [tool.maturin]
 manifest-path = "rust/Cargo.toml"
-module-name = "synapse.synapse_rust"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.96.0rc1"
+version = "1.93.0"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"
@@ -134,10 +133,6 @@ exclude = [
     { path = "synapse/*.so", format = "sdist"}
 ]
 
-[tool.poetry.build]
-script = "build_rust.py"
-generate-setup-file = true
-
 [tool.poetry.scripts]
 synapse_homeserver = "synapse.app.homeserver:main"
 synapse_worker = "synapse.app.generic_worker:main"
@@ -192,7 +187,7 @@ phonenumbers = ">=8.2.0"
 # we use GaugeHistogramMetric, which was added in prom-client 0.4.0.
 prometheus-client = ">=0.4.0"
 # we use `order`, which arrived in attrs 19.2.0.
-# Note: 21.1.0 broke `/sync`, see https://github.com/matrix-org/synapse/issues/9936
+# Note: 21.1.0 broke `/sync`, see #9936
 attrs = ">=19.2.0,!=21.1.0"
 netaddr = ">=0.7.18"
 # Jinja 2.x is incompatible with MarkupSafe>=2.1. To ensure that admins do not
@@ -321,7 +316,7 @@ all = [
 # This helps prevents merge conflicts when running a batch of dependabot updates.
 isort = ">=5.10.1"
 black = ">=22.7.0"
-ruff = "0.1.4"
+ruff = "0.0.290"
 # Type checking only works with the pydantic.v1 compat module from pydantic v2
 pydantic = "^2"
 
@@ -357,7 +352,7 @@ commonmark = ">=0.9.1"
 pygithub = ">=1.55"
 # The following are executed as commands by the release script.
 twine = "*"
-# Towncrier min version comes from https://github.com/matrix-org/synapse/pull/3425. Rationale unclear.
+# Towncrier min version comes from #3425. Rationale unclear.
 towncrier = ">=18.6.0rc1"
 
 # Used for checking the Poetry lockfile
@@ -377,14 +372,22 @@ furo = ">=2022.12.7,<2024.0.0"
 
 [build-system]
 # The upper bounds here are defensive, intended to prevent situations like
-# https://github.com/matrix-org/synapse/issues/13849 and
-# https://github.com/matrix-org/synapse/issues/14079 where we see buildtime or
-# runtime errors caused by build system changes.
+# #13849 and #14079 where we see buildtime or runtime errors caused by build
+# system changes.
 # We are happy to raise these upper bounds upon request,
 # provided we check that it's safe to do so (i.e. that CI passes).
-requires = ["poetry-core>=1.1.0,<=1.7.0", "setuptools_rust>=1.3,<=1.8.1"]
+requires = ["poetry-core>=1.1.0,<=1.7.0", "setuptools_rust>=1.3,<=1.7.0"]
 build-backend = "poetry.core.masonry.api"
+# Should this now be build-backend = "setuptools.build_meta"?
 
+[[tool.setuptools-rust.ext-modules]]
+target = "synapse.synapse_rust"
+path = "rust/Cargo.toml"
+binding = "PyO3"
+py-limited-api = true
+# We force always building in release mode, as we can't tell the
+# difference between using `poetry` in development vs production.
+debug = false
 
 [tool.cibuildwheel]
 # Skip unsupported platforms (by us or by Rust).

rust/Cargo.toml

@@ -15,8 +15,6 @@ name = "synapse"
 # tests/benchmarks.
 crate-type = ["lib", "cdylib"]
 
-# This is deprecated, see tool.maturin in pyproject.toml.
-# It is left here for compatibilty with maturin < 0.15.
 [package.metadata.maturin]
 # This is where we tell maturin where to place the built library.
 name = "synapse.synapse_rust"
@@ -25,14 +23,14 @@ name = "synapse.synapse_rust"
 anyhow = "1.0.63"
 lazy_static = "1.4.0"
 log = "0.4.17"
-pyo3 = { version = "0.19.2", features = [
+pyo3 = { version = "0.17.1", features = [
     "macros",
     "anyhow",
     "abi3",
-    "abi3-py38",
+    "abi3-py37",
 ] }
 pyo3-log = "0.8.1"
-pythonize = "0.19.0"
+pythonize = "0.17.0"
 regex = "1.6.0"
 serde = { version = "1.0.144", features = ["derive"] }
 serde_json = "1.0.85"

rust/src/push/evaluator.rs

@@ -105,17 +105,6 @@ impl PushRuleEvaluator {
     /// Create a new `PushRuleEvaluator`. See struct docstring for details.
     #[allow(clippy::too_many_arguments)]
     #[new]
-    #[pyo3(signature = (
-        flattened_keys,
-        has_mentions,
-        room_member_count,
-        sender_power_level,
-        notification_power_levels,
-        related_events_flattened,
-        related_event_match_enabled,
-        room_version_feature_flags,
-        msc3931_enabled,
-    ))]
     pub fn py_new(
         flattened_keys: BTreeMap<String, JsonValue>,
         has_mentions: bool,

scripts-dev/build_debian_packages.py

@@ -33,7 +33,6 @@ DISTS = (
     "ubuntu:focal",  # 20.04 LTS (EOL 2025-04) (our EOL forced by Python 3.8 is 2024-10-14)
     "ubuntu:jammy",  # 22.04 LTS (EOL 2027-04) (our EOL forced by Python 3.10 is 2026-10-04)
     "ubuntu:lunar",  # 23.04 (EOL 2024-01) (our EOL forced by Python 3.11 is 2027-10-24)
-    "ubuntu:mantic",  # 23.10 (EOL 2024-07) (our EOL forced by Python 3.11 is 2027-10-24)
     "debian:trixie",  # (EOL not specified yet)
 )
 

scripts-dev/complement.sh

@@ -214,11 +214,7 @@ fi
 
 extra_test_args=()
 
-test_packages="./tests/csapi ./tests ./tests/msc3874 ./tests/msc3890 ./tests/msc3391 ./tests/msc3930 ./tests/msc3902"
-
-# Enable dirty runs, so tests will reuse the same container where possible.
-# This significantly speeds up tests, but increases the possibility of test pollution.
-export COMPLEMENT_ENABLE_DIRTY_RUNS=1
+test_tags="synapse_blacklist,msc3874,msc3890,msc3391,msc3930,faster_joins"
 
 # All environment variables starting with PASS_ will be shared.
 # (The prefix is stripped off before reaching the container.)
@@ -278,7 +274,7 @@ fi
 export PASS_SYNAPSE_LOG_TESTING=1
 
 # Run the tests!
-echo "Images built; running complement with ${extra_test_args[@]} $@ $test_packages"
+echo "Images built; running complement"
 cd "$COMPLEMENT_DIR"
 
-go test -v -tags "synapse_blacklist" -count=1 "${extra_test_args[@]}" "$@" $test_packages
+go test -v -tags $test_tags -count=1 "${extra_test_args[@]}" "$@" ./tests/...

scripts-dev/mypy_synapse_plugin.py

@@ -16,24 +16,13 @@
 can crop up, e.g the cache descriptors.
 """
 
-from typing import Callable, Optional, Tuple, Type, Union
+from typing import Callable, Optional, Type
 
-import mypy.types
 from mypy.erasetype import remove_instance_last_known_values
-from mypy.errorcodes import ErrorCode
-from mypy.nodes import ARG_NAMED_OPT, TempNode, Var
-from mypy.plugin import FunctionSigContext, MethodSigContext, Plugin
+from mypy.nodes import ARG_NAMED_OPT
+from mypy.plugin import MethodSigContext, Plugin
 from mypy.typeops import bind_self
-from mypy.types import (
-    AnyType,
-    CallableType,
-    Instance,
-    NoneType,
-    TupleType,
-    TypeAliasType,
-    UninhabitedType,
-    UnionType,
-)
+from mypy.types import CallableType, Instance, NoneType, UnionType
 
 
 class SynapsePlugin(Plugin):
@@ -47,37 +36,9 @@ class SynapsePlugin(Plugin):
             )
         ):
             return cached_function_method_signature
-
-        if fullname in (
-            "synapse.util.caches.descriptors._CachedFunctionDescriptor.__call__",
-            "synapse.util.caches.descriptors._CachedListFunctionDescriptor.__call__",
-        ):
-            return check_is_cacheable_wrapper
-
         return None
 
 
-def _get_true_return_type(signature: CallableType) -> mypy.types.Type:
-    """
-    Get the "final" return type of a callable which might return an Awaitable/Deferred.
-    """
-    if isinstance(signature.ret_type, Instance):
-        # If a coroutine, unwrap the coroutine's return type.
-        if signature.ret_type.type.fullname == "typing.Coroutine":
-            return signature.ret_type.args[2]
-
-        # If an awaitable, unwrap the awaitable's final value.
-        elif signature.ret_type.type.fullname == "typing.Awaitable":
-            return signature.ret_type.args[0]
-
-        # If a Deferred, unwrap the Deferred's final value.
-        elif signature.ret_type.type.fullname == "twisted.internet.defer.Deferred":
-            return signature.ret_type.args[0]
-
-    # Otherwise, return the raw value of the function.
-    return signature.ret_type
-
-
 def cached_function_method_signature(ctx: MethodSigContext) -> CallableType:
     """Fixes the `CachedFunction.__call__` signature to be correct.
 
@@ -86,17 +47,16 @@ def cached_function_method_signature(ctx: MethodSigContext) -> CallableType:
         1. the `self` argument needs to be marked as "bound";
         2. any `cache_context` argument should be removed;
         3. an optional keyword argument `on_invalidated` should be added.
-        4. Wrap the return type to always be a Deferred.
     """
 
-    # 1. Mark this as a bound function signature.
-    signature: CallableType = bind_self(ctx.default_signature)
+    # First we mark this as a bound function signature.
+    signature = bind_self(ctx.default_signature)
 
-    # 2. Remove any "cache_context" args.
+    # Secondly, we remove any "cache_context" args.
     #
     # Note: We should be only doing this if `cache_context=True` is set, but if
     # it isn't then the code will raise an exception when its called anyway, so
-    # it's not the end of the world.
+    # its not the end of the world.
     context_arg_index = None
     for idx, name in enumerate(signature.arg_names):
         if name == "cache_context":
@@ -112,7 +72,7 @@ def cached_function_method_signature(ctx: MethodSigContext) -> CallableType:
         arg_names.pop(context_arg_index)
         arg_kinds.pop(context_arg_index)
 
-    # 3. Add an optional "on_invalidate" argument.
+    # Third, we add an optional "on_invalidate" argument.
     #
     # This is a either
     # - a callable which accepts no input and returns nothing, or
@@ -134,16 +94,35 @@ def cached_function_method_signature(ctx: MethodSigContext) -> CallableType:
     arg_names.append("on_invalidate")
     arg_kinds.append(ARG_NAMED_OPT)  # Arg is an optional kwarg.
 
-    # 4. Ensure the return type is a Deferred.
-    ret_arg = _get_true_return_type(signature)
+    # Finally we ensure the return type is a Deferred.
+    if (
+        isinstance(signature.ret_type, Instance)
+        and signature.ret_type.type.fullname == "twisted.internet.defer.Deferred"
+    ):
+        # If it is already a Deferred, nothing to do.
+        ret_type = signature.ret_type
+    else:
+        ret_arg = None
+        if isinstance(signature.ret_type, Instance):
+            # If a coroutine, wrap the coroutine's return type in a Deferred.
+            if signature.ret_type.type.fullname == "typing.Coroutine":
+                ret_arg = signature.ret_type.args[2]
 
-    # This should be able to use ctx.api.named_generic_type, but that doesn't seem
-    # to find the correct symbol for anything more than 1 module deep.
-    #
-    # modules is not part of CheckerPluginInterface. The following is a combination
-    # of TypeChecker.named_generic_type and TypeChecker.lookup_typeinfo.
-    sym = ctx.api.modules["twisted.internet.defer"].names.get("Deferred")  # type: ignore[attr-defined]
-    ret_type = Instance(sym.node, [remove_instance_last_known_values(ret_arg)])
+            # If an awaitable, wrap the awaitable's final value in a Deferred.
+            elif signature.ret_type.type.fullname == "typing.Awaitable":
+                ret_arg = signature.ret_type.args[0]
+
+        # Otherwise, wrap the return value in a Deferred.
+        if ret_arg is None:
+            ret_arg = signature.ret_type
+
+        # This should be able to use ctx.api.named_generic_type, but that doesn't seem
+        # to find the correct symbol for anything more than 1 module deep.
+        #
+        # modules is not part of CheckerPluginInterface. The following is a combination
+        # of TypeChecker.named_generic_type and TypeChecker.lookup_typeinfo.
+        sym = ctx.api.modules["twisted.internet.defer"].names.get("Deferred")  # type: ignore[attr-defined]
+        ret_type = Instance(sym.node, [remove_instance_last_known_values(ret_arg)])
 
     signature = signature.copy_modified(
         arg_types=arg_types,
@@ -155,198 +134,6 @@ def cached_function_method_signature(ctx: MethodSigContext) -> CallableType:
     return signature
 
 
-def check_is_cacheable_wrapper(ctx: MethodSigContext) -> CallableType:
-    """Asserts that the signature of a method returns a value which can be cached.
-
-    Makes no changes to the provided method signature.
-    """
-    # The true signature, this isn't being modified so this is what will be returned.
-    signature: CallableType = ctx.default_signature
-
-    if not isinstance(ctx.args[0][0], TempNode):
-        ctx.api.note("Cached function is not a TempNode?!", ctx.context)  # type: ignore[attr-defined]
-        return signature
-
-    orig_sig = ctx.args[0][0].type
-    if not isinstance(orig_sig, CallableType):
-        ctx.api.fail("Cached 'function' is not a callable", ctx.context)
-        return signature
-
-    check_is_cacheable(orig_sig, ctx)
-
-    return signature
-
-
-def check_is_cacheable(
-    signature: CallableType,
-    ctx: Union[MethodSigContext, FunctionSigContext],
-) -> None:
-    """
-    Check if a callable returns a type which can be cached.
-
-    Args:
-        signature: The callable to check.
-        ctx: The signature context, used for error reporting.
-    """
-    # Unwrap the true return type from the cached function.
-    return_type = _get_true_return_type(signature)
-
-    verbose = ctx.api.options.verbosity >= 1
-    # TODO Technically a cachedList only needs immutable values, but forcing them
-    # to return Mapping instead of Dict is fine.
-    ok, note = is_cacheable(return_type, signature, verbose)
-
-    if ok:
-        message = f"function {signature.name} is @cached, returning {return_type}"
-    else:
-        message = f"function {signature.name} is @cached, but has mutable return value {return_type}"
-
-    if note:
-        message += f" ({note})"
-    message = message.replace("builtins.", "").replace("typing.", "")
-
-    if ok and note:
-        ctx.api.note(message, ctx.context)  # type: ignore[attr-defined]
-    elif not ok:
-        ctx.api.fail(message, ctx.context, code=AT_CACHED_MUTABLE_RETURN)
-
-
-# Immutable simple values.
-IMMUTABLE_VALUE_TYPES = {
-    "builtins.bool",
-    "builtins.int",
-    "builtins.float",
-    "builtins.str",
-    "builtins.bytes",
-}
-
-# Types defined in Synapse which are known to be immutable.
-IMMUTABLE_CUSTOM_TYPES = {
-    "synapse.synapse_rust.acl.ServerAclEvaluator",
-    "synapse.synapse_rust.push.FilteredPushRules",
-    # This is technically not immutable, but close enough.
-    "signedjson.types.VerifyKey",
-}
-
-# Immutable containers only if the values are also immutable.
-IMMUTABLE_CONTAINER_TYPES_REQUIRING_IMMUTABLE_ELEMENTS = {
-    "builtins.frozenset",
-    "builtins.tuple",
-    "typing.AbstractSet",
-    "typing.Sequence",
-    "immutabledict.immutabledict",
-}
-
-MUTABLE_CONTAINER_TYPES = {
-    "builtins.set",
-    "builtins.list",
-    "builtins.dict",
-}
-
-AT_CACHED_MUTABLE_RETURN = ErrorCode(
-    "synapse-@cached-mutable",
-    "@cached() should have an immutable return type",
-    "General",
-)
-
-
-def is_cacheable(
-    rt: mypy.types.Type, signature: CallableType, verbose: bool
-) -> Tuple[bool, Optional[str]]:
-    """
-    Check if a particular type is cachable.
-
-    A type is cachable if it is immutable; for complex types this recurses to
-    check each type parameter.
-
-    Returns: a 2-tuple (cacheable, message).
-        - cachable: False means the type is definitely not cacheable;
-            true means anything else.
-        - Optional message.
-    """
-
-    # This should probably be done via a TypeVisitor. Apologies to the reader!
-    if isinstance(rt, AnyType):
-        return True, ("may be mutable" if verbose else None)
-
-    elif isinstance(rt, Instance):
-        if (
-            rt.type.fullname in IMMUTABLE_VALUE_TYPES
-            or rt.type.fullname in IMMUTABLE_CUSTOM_TYPES
-        ):
-            # "Simple" types are generally immutable.
-            return True, None
-
-        elif rt.type.fullname == "typing.Mapping":
-            # Generally mapping keys are immutable, but they only *have* to be
-            # hashable, which doesn't imply immutability. E.g. Mapping[K, V]
-            # is cachable iff K and V are cachable.
-            return is_cacheable(rt.args[0], signature, verbose) and is_cacheable(
-                rt.args[1], signature, verbose
-            )
-
-        elif rt.type.fullname in IMMUTABLE_CONTAINER_TYPES_REQUIRING_IMMUTABLE_ELEMENTS:
-            # E.g. Collection[T] is cachable iff T is cachable.
-            return is_cacheable(rt.args[0], signature, verbose)
-
-        elif rt.type.fullname in MUTABLE_CONTAINER_TYPES:
-            # Mutable containers are mutable regardless of their underlying type.
-            return False, None
-
-        elif "attrs" in rt.type.metadata:
-            # attrs classes are only cachable iff it is frozen (immutable itself)
-            # and all attributes are cachable.
-            frozen = rt.type.metadata["attrs"]["frozen"]
-            if frozen:
-                for attribute in rt.type.metadata["attrs"]["attributes"]:
-                    attribute_name = attribute["name"]
-                    symbol_node = rt.type.names[attribute_name].node
-                    assert isinstance(symbol_node, Var)
-                    assert symbol_node.type is not None
-                    ok, note = is_cacheable(symbol_node.type, signature, verbose)
-                    if not ok:
-                        return False, f"non-frozen attrs property: {attribute_name}"
-                # All attributes were frozen.
-                return True, None
-            else:
-                return False, "non-frozen attrs class"
-
-        else:
-            # Ensure we fail for unknown types, these generally means that the
-            # above code is not complete.
-            return (
-                False,
-                f"Don't know how to handle {rt.type.fullname} return type instance",
-            )
-
-    elif isinstance(rt, NoneType):
-        # None is cachable.
-        return True, None
-
-    elif isinstance(rt, (TupleType, UnionType)):
-        # Tuples and unions are cachable iff all their items are cachable.
-        for item in rt.items:
-            ok, note = is_cacheable(item, signature, verbose)
-            if not ok:
-                return False, note
-        # This discards notes but that's probably fine
-        return True, None
-
-    elif isinstance(rt, TypeAliasType):
-        # For a type alias, check if the underlying real type is cachable.
-        return is_cacheable(mypy.types.get_proper_type(rt), signature, verbose)
-
-    elif isinstance(rt, UninhabitedType) and rt.is_noreturn:
-        # There is no return value, just consider it cachable. This is only used
-        # in tests.
-        return True, None
-
-    else:
-        # Ensure we fail for unknown types, these generally means that the
-        # above code is not complete.
-        return False, f"Don't know how to handle {type(rt).__qualname__} return type"
-
-
 def plugin(version: str) -> Type[SynapsePlugin]:
     # This is the entry point of the plugin, and lets us deal with the fact
     # that the mypy plugin interface is *not* stable by looking at the version

scripts-dev/release.py

@@ -684,10 +684,6 @@ def full(gh_token: str) -> None:
     click.echo("1. If this is a security release, read the security wiki page.")
     click.echo("2. Check for any release blockers before proceeding.")
     click.echo("    https://github.com/matrix-org/synapse/labels/X-Release-Blocker")
-    click.echo(
-        "3. Check for any other special release notes, including announcements to add to the changelog or special deployment instructions."
-    )
-    click.echo("    See the 'Synapse Maintainer Report'.")
 
     click.confirm("Ready?", abort=True)
 

synapse/_scripts/register_new_matrix_user.py

@@ -50,7 +50,7 @@ def request_registration(
     url = "%s/_synapse/admin/v1/register" % (server_location.rstrip("/"),)
 
     # Get the nonce
-    r = requests.get(url)
+    r = requests.get(url, verify=False)
 
     if r.status_code != 200:
         _print("ERROR! Received %d %s" % (r.status_code, r.reason))
@@ -88,7 +88,7 @@ def request_registration(
     }
 
     _print("Sending registration request...")
-    r = requests.post(url, json=data)
+    r = requests.post(url, json=data, verify=False)
 
     if r.status_code != 200:
         _print("ERROR! Received %d %s" % (r.status_code, r.reason))

synapse/_scripts/synapse_port_db.py

@@ -191,7 +191,7 @@ IGNORED_TABLES = {
     "user_directory_search_stat",
     "user_directory_search_pos",
     "users_who_share_private_rooms",
-    "users_in_public_rooms",
+    "users_in_public_room",
     # UI auth sessions have foreign keys so additional care needs to be taken,
     # the sessions are transient anyway, so ignore them.
     "ui_auth_sessions",
@@ -348,7 +348,8 @@ class Porter:
                     backward_chunk = 0
                     already_ported = 0
             else:
-                forward_chunk, backward_chunk = row
+                forward_chunk = row["forward_rowid"]
+                backward_chunk = row["backward_rowid"]
 
             if total_to_port is None:
                 already_ported, total_to_port = await self._get_total_count_to_port(

synapse/api/auth/internal.py

@@ -115,7 +115,7 @@ class InternalAuth(BaseAuth):
         Once get_user_by_req has set up the opentracing span, this does the actual work.
         """
         try:
-            ip_addr = request.get_client_ip_if_available()
+            ip_addr = request.getClientAddress().host
             user_agent = get_request_user_agent(request)
 
             access_token = self.get_access_token_from_request(request)

synapse/api/errors.py

@@ -83,8 +83,6 @@ class Codes(str, Enum):
     USER_DEACTIVATED = "M_USER_DEACTIVATED"
     # USER_LOCKED = "M_USER_LOCKED"
     USER_LOCKED = "ORG_MATRIX_MSC3939_USER_LOCKED"
-    NOT_YET_UPLOADED = "M_NOT_YET_UPLOADED"
-    CANNOT_OVERWRITE_MEDIA = "M_CANNOT_OVERWRITE_MEDIA"
 
     # Part of MSC3848
     # https://github.com/matrix-org/matrix-spec-proposals/pull/3848

synapse/api/presence.py

@@ -80,6 +80,10 @@ class UserPresenceState:
     def as_dict(self) -> JsonDict:
         return attr.asdict(self)
 
+    @staticmethod
+    def from_dict(d: JsonDict) -> "UserPresenceState":
+        return UserPresenceState(**d)
+
     def copy_and_replace(self, **kwargs: Any) -> "UserPresenceState":
         return attr.evolve(self, **kwargs)
 

synapse/app/generic_worker.py

@@ -104,8 +104,8 @@ logger = logging.getLogger("synapse.app.generic_worker")
 
 
 class GenericWorkerStore(
-    # FIXME(https://github.com/matrix-org/synapse/issues/3714): We need to add
-    # UserDirectoryStore as we write directly rather than going via the correct worker.
+    # FIXME(#3714): We need to add UserDirectoryStore as we write directly
+    # rather than going via the correct worker.
     UserDirectoryStore,
     StatsStore,
     UIAuthWorkerStore,

synapse/config/ratelimiting.py

@@ -204,10 +204,3 @@ class RatelimitConfig(Config):
             "rc_third_party_invite",
             defaults={"per_second": 0.0025, "burst_count": 5},
         )
-
-        # Ratelimit create media requests:
-        self.rc_media_create = RatelimitSettings.parse(
-            config,
-            "rc_media_create",
-            defaults={"per_second": 10, "burst_count": 50},
-        )

synapse/config/repository.py

@@ -141,12 +141,6 @@ class ContentRepositoryConfig(Config):
             "prevent_media_downloads_from", []
         )
 
-        self.unused_expiration_time = self.parse_duration(
-            config.get("unused_expiration_time", "24h")
-        )
-
-        self.max_pending_media_uploads = config.get("max_pending_media_uploads", 5)
-
         self.media_store_path = self.ensure_directory(
             config.get("media_store_path", "media_store")
         )

synapse/config/server.py

@@ -368,14 +368,9 @@ class ServerConfig(Config):
 
         # Whether to enable user presence.
         presence_config = config.get("presence") or {}
-        presence_enabled = presence_config.get("enabled")
-        if presence_enabled is None:
-            presence_enabled = config.get("use_presence", True)
-
-        # Whether presence is enabled *at all*.
-        self.presence_enabled = bool(presence_enabled)
-        # Whether to internally track presence, requires that presence is enabled,
-        self.track_presence = self.presence_enabled and presence_enabled != "untracked"
+        self.use_presence = presence_config.get("enabled")
+        if self.use_presence is None:
+            self.use_presence = config.get("use_presence", True)
 
         # Custom presence router module
         # This is the legacy way of configuring it (the config should now be put in the modules section)

synapse/config/workers.py

@@ -358,9 +358,9 @@ class WorkerConfig(Config):
                 "Must only specify one instance to handle `account_data` messages."
             )
 
-        if len(self.writers.receipts) == 0:
+        if len(self.writers.receipts) != 1:
             raise ConfigError(
-                "Must specify at least one instance to handle `receipts` messages."
+                "Must only specify one instance to handle `receipts` messages."
             )
 
         if len(self.writers.events) == 0:

synapse/events/utils.py

@@ -17,7 +17,6 @@ import re
 from typing import (
     TYPE_CHECKING,
     Any,
-    Awaitable,
     Callable,
     Dict,
     Iterable,
@@ -46,7 +45,6 @@ from . import EventBase
 
 if TYPE_CHECKING:
     from synapse.handlers.relations import BundledAggregations
-    from synapse.server import HomeServer
 
 
 # Split strings on "." but not "\." (or "\\\.").
@@ -58,13 +56,6 @@ CANONICALJSON_MAX_INT = (2**53) - 1
 CANONICALJSON_MIN_INT = -CANONICALJSON_MAX_INT
 
 
-# Module API callback that allows adding fields to the unsigned section of
-# events that are sent to clients.
-ADD_EXTRA_FIELDS_TO_UNSIGNED_CLIENT_EVENT_CALLBACK = Callable[
-    [EventBase], Awaitable[JsonDict]
-]
-
-
 def prune_event(event: EventBase) -> EventBase:
     """Returns a pruned version of the given event, which removes all keys we
     don't know about or think could potentially be dodgy.
@@ -518,13 +509,7 @@ class EventClientSerializer:
     clients.
     """
 
-    def __init__(self, hs: "HomeServer") -> None:
-        self._store = hs.get_datastores().main
-        self._add_extra_fields_to_unsigned_client_event_callbacks: List[
-            ADD_EXTRA_FIELDS_TO_UNSIGNED_CLIENT_EVENT_CALLBACK
-        ] = []
-
-    async def serialize_event(
+    def serialize_event(
         self,
         event: Union[JsonDict, EventBase],
         time_now: int,
@@ -550,21 +535,10 @@ class EventClientSerializer:
 
         serialized_event = serialize_event(event, time_now, config=config)
 
-        new_unsigned = {}
-        for callback in self._add_extra_fields_to_unsigned_client_event_callbacks:
-            u = await callback(event)
-            new_unsigned.update(u)
-
-        if new_unsigned:
-            # We do the `update` this way round so that modules can't clobber
-            # existing fields.
-            new_unsigned.update(serialized_event["unsigned"])
-            serialized_event["unsigned"] = new_unsigned
-
         # Check if there are any bundled aggregations to include with the event.
         if bundle_aggregations:
             if event.event_id in bundle_aggregations:
-                await self._inject_bundled_aggregations(
+                self._inject_bundled_aggregations(
                     event,
                     time_now,
                     config,
@@ -574,7 +548,7 @@ class EventClientSerializer:
 
         return serialized_event
 
-    async def _inject_bundled_aggregations(
+    def _inject_bundled_aggregations(
         self,
         event: EventBase,
         time_now: int,
@@ -616,7 +590,7 @@ class EventClientSerializer:
             # said that we should only include the `event_id`, `origin_server_ts` and
             # `sender` of the edit; however MSC3925 proposes extending it to the whole
             # of the edit, which is what we do here.
-            serialized_aggregations[RelationTypes.REPLACE] = await self.serialize_event(
+            serialized_aggregations[RelationTypes.REPLACE] = self.serialize_event(
                 event_aggregations.replace,
                 time_now,
                 config=config,
@@ -626,7 +600,7 @@ class EventClientSerializer:
         if event_aggregations.thread:
             thread = event_aggregations.thread
 
-            serialized_latest_event = await self.serialize_event(
+            serialized_latest_event = self.serialize_event(
                 thread.latest_event,
                 time_now,
                 config=config,
@@ -649,7 +623,7 @@ class EventClientSerializer:
                 "m.relations", {}
             ).update(serialized_aggregations)
 
-    async def serialize_events(
+    def serialize_events(
         self,
         events: Iterable[Union[JsonDict, EventBase]],
         time_now: int,
@@ -671,7 +645,7 @@ class EventClientSerializer:
             The list of serialized events
         """
         return [
-            await self.serialize_event(
+            self.serialize_event(
                 event,
                 time_now,
                 config=config,
@@ -680,14 +654,6 @@ class EventClientSerializer:
             for event in events
         ]
 
-    def register_add_extra_fields_to_unsigned_client_event_callback(
-        self, callback: ADD_EXTRA_FIELDS_TO_UNSIGNED_CLIENT_EVENT_CALLBACK
-    ) -> None:
-        """Register a callback that returns additions to the unsigned section of
-        serialized events.
-        """
-        self._add_extra_fields_to_unsigned_client_event_callbacks.append(callback)
-
 
 _PowerLevel = Union[str, int]
 PowerLevelsContent = Mapping[str, Union[_PowerLevel, Mapping[str, _PowerLevel]]]

synapse/federation/federation_client.py

@@ -1402,7 +1402,7 @@ class FederationClient(FederationBase):
             The remote homeserver return some state from the room. The response
             dictionary is in the form:
 
-            {"knock_room_state": [<state event dict>, ...]}
+            {"knock_state_events": [<state event dict>, ...]}
 
             The list of state events may be empty.
 
@@ -1429,7 +1429,7 @@ class FederationClient(FederationBase):
             The remote homeserver can optionally return some state from the room. The response
             dictionary is in the form:
 
-            {"knock_room_state": [<state event dict>, ...]}
+            {"knock_state_events": [<state event dict>, ...]}
 
             The list of state events may be empty.
         """

synapse/federation/federation_server.py

@@ -84,7 +84,7 @@ from synapse.replication.http.federation import (
 from synapse.storage.databases.main.lock import Lock
 from synapse.storage.databases.main.roommember import extract_heroes_from_room_summary
 from synapse.storage.roommember import MemberSummary
-from synapse.types import JsonDict, StateMap, UserID, get_domain_from_id
+from synapse.types import JsonDict, StateMap, get_domain_from_id
 from synapse.util import unwrapFirstError
 from synapse.util.async_helpers import Linearizer, concurrently_execute, gather_results
 from synapse.util.caches.response_cache import ResponseCache
@@ -850,7 +850,14 @@ class FederationServer(FederationBase):
                 context, self._room_prejoin_state_types
             )
         )
-        return {"knock_room_state": stripped_room_state}
+        return {
+            "knock_room_state": stripped_room_state,
+            # Since v1.37, Synapse incorrectly used "knock_state_events" for this field.
+            # Thus, we also populate a 'knock_state_events' with the same content to
+            # support old instances.
+            # See https://github.com/matrix-org/synapse/issues/14088.
+            "knock_state_events": stripped_room_state,
+        }
 
     async def _on_send_membership_event(
         self, origin: str, content: JsonDict, membership_type: str, room_id: str
@@ -999,12 +1006,6 @@ class FederationServer(FederationBase):
     async def on_claim_client_keys(
         self, query: List[Tuple[str, str, str, int]], always_include_fallback_keys: bool
     ) -> Dict[str, Any]:
-        if any(
-            not self.hs.is_mine(UserID.from_string(user_id))
-            for user_id, _, _, _ in query
-        ):
-            raise SynapseError(400, "User is not hosted on this homeserver")
-
         log_kv({"message": "Claiming one time keys.", "user, device pairs": query})
         results = await self._e2e_keys_handler.claim_local_one_time_keys(
             query, always_include_fallback_keys=always_include_fallback_keys
@@ -1401,7 +1402,7 @@ class FederationHandlerRegistry:
         self._edu_type_to_instance[edu_type] = instance_names
 
     async def on_edu(self, edu_type: str, origin: str, content: dict) -> None:
-        if not self.config.server.track_presence and edu_type == EduTypes.PRESENCE:
+        if not self.config.server.use_presence and edu_type == EduTypes.PRESENCE:
             return
 
         # Check if we have a handler on this instance

synapse/federation/send_queue.py

@@ -395,7 +395,7 @@ class PresenceDestinationsRow(BaseFederationRow):
     @staticmethod
     def from_data(data: JsonDict) -> "PresenceDestinationsRow":
         return PresenceDestinationsRow(
-            state=UserPresenceState(**data["state"]), destinations=data["dests"]
+            state=UserPresenceState.from_dict(data["state"]), destinations=data["dests"]
         )
 
     def to_data(self) -> JsonDict:

synapse/federation/sender/__init__.py

@@ -67,7 +67,7 @@ The loop continues so long as there is anything to send. At each iteration of th
 
 When the `PerDestinationQueue` has the catch-up flag set, the *Catch-Up Transmission Loop*
 (`_catch_up_transmission_loop`) is used in lieu of the regular `_transaction_transmission_loop`.
-(Only once the catch-up mode has been exited can the regular transaction transmission behaviour
+(Only once the catch-up mode has been exited can the regular tranaction transmission behaviour
 be resumed.)
 
 *Catch-Up Mode*, entered upon Synapse startup or once a homeserver has fallen behind due to
@@ -581,14 +581,14 @@ class FederationSender(AbstractFederationSender):
                                 "get_joined_hosts", str(sg)
                             )
                             if destinations is None:
-                                # Add logging to help track down https://github.com/matrix-org/synapse/issues/13444
+                                # Add logging to help track down #13444
                                 logger.info(
                                     "Unexpectedly did not have cached destinations for %s / %s",
                                     sg,
                                     event.event_id,
                                 )
                         else:
-                            # Add logging to help track down https://github.com/matrix-org/synapse/issues/13444
+                            # Add logging to help track down #13444
                             logger.info(
                                 "Unexpectedly did not have cached prev group for %s",
                                 event.event_id,
@@ -844,7 +844,7 @@ class FederationSender(AbstractFederationSender):
         destinations (list[str])
         """
 
-        if not states or not self.hs.config.server.track_presence:
+        if not states or not self.hs.config.server.use_presence:
             # No-op if presence is disabled.
             return
 

synapse/federation/transport/client.py

@@ -431,7 +431,7 @@ class TransportLayerClient:
             The remote homeserver can optionally return some state from the room. The response
             dictionary is in the form:
 
-            {"knock_room_state": [<state event dict>, ...]}
+            {"knock_state_events": [<state event dict>, ...]}
 
             The list of state events may be empty.
         """

synapse/handlers/account_validity.py

@@ -212,8 +212,8 @@ class AccountValidityHandler:
 
         addresses = []
         for threepid in threepids:
-            if threepid.medium == "email":
-                addresses.append(threepid.address)
+            if threepid["medium"] == "email":
+                addresses.append(threepid["address"])
 
         return addresses
 

synapse/handlers/admin.py

@@ -16,8 +16,6 @@ import abc
 import logging
 from typing import TYPE_CHECKING, Any, Dict, List, Mapping, Optional, Sequence, Set
 
-import attr
-
 from synapse.api.constants import Direction, Membership
 from synapse.events import EventBase
 from synapse.types import JsonMapping, RoomStreamToken, StateMap, UserID, UserInfo
@@ -95,7 +93,7 @@ class AdminHandler:
         ]
         user_info_dict["displayname"] = profile.display_name
         user_info_dict["avatar_url"] = profile.avatar_url
-        user_info_dict["threepids"] = [attr.asdict(t) for t in threepids]
+        user_info_dict["threepids"] = threepids
         user_info_dict["external_ids"] = external_ids
         user_info_dict["erased"] = await self._store.is_user_erased(user.to_string())
 
@@ -173,8 +171,8 @@ class AdminHandler:
             else:
                 stream_ordering = room.stream_ordering
 
-            from_key = RoomStreamToken(topological=0, stream=0)
-            to_key = RoomStreamToken(stream=stream_ordering)
+            from_key = RoomStreamToken(0, 0)
+            to_key = RoomStreamToken(None, stream_ordering)
 
             # Events that we've processed in this room
             written_events: Set[str] = set()
@@ -283,7 +281,7 @@ class AdminHandler:
                 start, limit, user_id
             )
             for media in media_ids:
-                writer.write_media_id(media.media_id, attr.asdict(media))
+                writer.write_media_id(media["media_id"], media)
 
             logger.info(
                 "[%s] Written %d media_ids of %s",

synapse/handlers/appservice.py

@@ -47,7 +47,6 @@ from synapse.types import (
     DeviceListUpdates,
     JsonDict,
     JsonMapping,
-    MultiWriterStreamToken,
     RoomAlias,
     RoomStreamToken,
     StreamKeyType,
@@ -217,8 +216,8 @@ class ApplicationServicesHandler:
 
     def notify_interested_services_ephemeral(
         self,
-        stream_key: StreamKeyType,
-        new_token: Union[int, RoomStreamToken, MultiWriterStreamToken],
+        stream_key: str,
+        new_token: Union[int, RoomStreamToken],
         users: Collection[Union[str, UserID]],
     ) -> None:
         """
@@ -260,6 +259,19 @@ class ApplicationServicesHandler:
         ):
             return
 
+        # Assert that new_token is an integer (and not a RoomStreamToken).
+        # All of the supported streams that this function handles use an
+        # integer to track progress (rather than a RoomStreamToken - a
+        # vector clock implementation) as they don't support multiple
+        # stream writers.
+        #
+        # As a result, we simply assert that new_token is an integer.
+        # If we do end up needing to pass a RoomStreamToken down here
+        # in the future, using RoomStreamToken.stream (the minimum stream
+        # position) to convert to an ascending integer value should work.
+        # Additional context: https://github.com/matrix-org/synapse/pull/11137
+        assert isinstance(new_token, int)
+
         # Ignore to-device messages if the feature flag is not enabled
         if (
             stream_key == StreamKeyType.TO_DEVICE
@@ -274,9 +286,6 @@ class ApplicationServicesHandler:
         ):
             return
 
-        # We know we're not a `RoomStreamToken` at this point.
-        assert not isinstance(new_token, RoomStreamToken)
-
         # Check whether there are any appservices which have registered to receive
         # ephemeral events.
         #
@@ -317,8 +326,8 @@ class ApplicationServicesHandler:
     async def _notify_interested_services_ephemeral(
         self,
         services: List[ApplicationService],
-        stream_key: StreamKeyType,
-        new_token: Union[int, MultiWriterStreamToken],
+        stream_key: str,
+        new_token: int,
         users: Collection[Union[str, UserID]],
     ) -> None:
         logger.debug("Checking interested services for %s", stream_key)
@@ -331,7 +340,6 @@ class ApplicationServicesHandler:
                     #
                     # Instead we simply grab the latest typing updates in _handle_typing
                     # and, if they apply to this application service, send it off.
-                    assert isinstance(new_token, int)
                     events = await self._handle_typing(service, new_token)
                     if events:
                         self.scheduler.enqueue_for_appservice(service, ephemeral=events)
@@ -342,23 +350,15 @@ class ApplicationServicesHandler:
                     (service.id, stream_key)
                 ):
                     if stream_key == StreamKeyType.RECEIPT:
-                        assert isinstance(new_token, MultiWriterStreamToken)
-
-                        # We store appservice tokens as integers, so we ignore
-                        # the `instance_map` components and instead simply
-                        # follow the base stream position.
-                        new_token = MultiWriterStreamToken(stream=new_token.stream)
-
                         events = await self._handle_receipts(service, new_token)
                         self.scheduler.enqueue_for_appservice(service, ephemeral=events)
 
                         # Persist the latest handled stream token for this appservice
                         await self.store.set_appservice_stream_type_pos(
-                            service, "read_receipt", new_token.stream
+                            service, "read_receipt", new_token
                         )
 
                     elif stream_key == StreamKeyType.PRESENCE:
-                        assert isinstance(new_token, int)
                         events = await self._handle_presence(service, users, new_token)
                         self.scheduler.enqueue_for_appservice(service, ephemeral=events)
 
@@ -368,7 +368,6 @@ class ApplicationServicesHandler:
                         )
 
                     elif stream_key == StreamKeyType.TO_DEVICE:
-                        assert isinstance(new_token, int)
                         # Retrieve a list of to-device message events, as well as the
                         # maximum stream token of the messages we were able to retrieve.
                         to_device_messages = await self._get_to_device_messages(
@@ -384,7 +383,6 @@ class ApplicationServicesHandler:
                         )
 
                     elif stream_key == StreamKeyType.DEVICE_LIST:
-                        assert isinstance(new_token, int)
                         device_list_summary = await self._get_device_list_summary(
                             service, new_token
                         )
@@ -434,7 +432,7 @@ class ApplicationServicesHandler:
         return typing
 
     async def _handle_receipts(
-        self, service: ApplicationService, new_token: MultiWriterStreamToken
+        self, service: ApplicationService, new_token: int
     ) -> List[JsonMapping]:
         """
         Return the latest read receipts that the given application service should receive.
@@ -457,17 +455,15 @@ class ApplicationServicesHandler:
         from_key = await self.store.get_type_stream_id_for_appservice(
             service, "read_receipt"
         )
-        if new_token is not None and new_token.stream <= from_key:
+        if new_token is not None and new_token <= from_key:
             logger.debug(
                 "Rejecting token lower than or equal to stored: %s" % (new_token,)
             )
             return []
 
-        from_token = MultiWriterStreamToken(stream=from_key)
-
         receipts_source = self.event_sources.sources.receipt
         receipts, _ = await receipts_source.get_new_events_as(
-            service=service, from_key=from_token, to_key=new_token
+            service=service, from_key=from_key, to_key=new_token
         )
         return receipts
 

synapse/handlers/deactivate_account.py

@@ -103,10 +103,10 @@ class DeactivateAccountHandler:
         # Attempt to unbind any known bound threepids to this account from identity
         # server(s).
         bound_threepids = await self.store.user_get_bound_threepids(user_id)
-        for medium, address in bound_threepids:
+        for threepid in bound_threepids:
             try:
                 result = await self._identity_handler.try_unbind_threepid(
-                    user_id, medium, address, id_server
+                    user_id, threepid["medium"], threepid["address"], id_server
                 )
             except Exception:
                 # Do we want this to be a fatal error or should we carry on?
@@ -117,9 +117,9 @@ class DeactivateAccountHandler:
 
         # Remove any local threepid associations for this account.
         local_threepids = await self.store.user_get_threepids(user_id)
-        for local_threepid in local_threepids:
+        for threepid in local_threepids:
             await self._auth_handler.delete_local_threepid(
-                user_id, local_threepid.medium, local_threepid.address
+                user_id, threepid["medium"], threepid["address"]
             )
 
         # delete any devices belonging to the user, which will also

synapse/handlers/device.py

@@ -14,7 +14,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import logging
-from typing import TYPE_CHECKING, Dict, Iterable, List, Mapping, Optional, Set, Tuple
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Dict,
+    Iterable,
+    List,
+    Mapping,
+    Optional,
+    Set,
+    Tuple,
+)
 
 from synapse.api import errors
 from synapse.api.constants import EduTypes, EventTypes
@@ -31,7 +41,6 @@ from synapse.metrics.background_process_metrics import (
     run_as_background_process,
     wrap_as_background_process,
 )
-from synapse.storage.databases.main.client_ips import DeviceLastConnectionInfo
 from synapse.types import (
     JsonDict,
     JsonMapping,
@@ -328,9 +337,6 @@ class DeviceWorkerHandler:
         return result
 
     async def on_federation_query_user_devices(self, user_id: str) -> JsonDict:
-        if not self.hs.is_mine(UserID.from_string(user_id)):
-            raise SynapseError(400, "User is not hosted on this homeserver")
-
         stream_id, devices = await self.store.get_e2e_device_keys_for_federation_query(
             user_id
         )
@@ -595,8 +601,6 @@ class DeviceHandler(DeviceWorkerHandler):
                 )
 
             # Delete device messages asynchronously and in batches using the task scheduler
-            # We specify an upper stream id to avoid deleting non delivered messages
-            # if an user re-uses a device ID.
             await self._task_scheduler.schedule_task(
                 DELETE_DEVICE_MSGS_TASK_NAME,
                 resource_id=device_id,
@@ -841,6 +845,7 @@ class DeviceHandler(DeviceWorkerHandler):
                     else:
                         assert max_stream_id == stream_id
                         # Avoid moving `room_id` backwards.
+                        pass
 
                     if self._handle_new_device_update_new_data:
                         continue
@@ -1004,14 +1009,14 @@ class DeviceHandler(DeviceWorkerHandler):
 
 
 def _update_device_from_client_ips(
-    device: JsonDict, client_ips: Mapping[Tuple[str, str], DeviceLastConnectionInfo]
+    device: JsonDict, client_ips: Mapping[Tuple[str, str], Mapping[str, Any]]
 ) -> None:
-    ip = client_ips.get((device["user_id"], device["device_id"]))
+    ip = client_ips.get((device["user_id"], device["device_id"]), {})
     device.update(
         {
-            "last_seen_user_agent": ip.user_agent if ip else None,
-            "last_seen_ts": ip.last_seen if ip else None,
-            "last_seen_ip": ip.ip if ip else None,
+            "last_seen_user_agent": ip.get("user_agent"),
+            "last_seen_ts": ip.get("last_seen"),
+            "last_seen_ip": ip.get("ip"),
         }
     )
 

synapse/handlers/e2e_keys.py

@@ -542,12 +542,6 @@ class E2eKeysHandler:
         device_keys_query: Dict[str, Optional[List[str]]] = query_body.get(
             "device_keys", {}
         )
-        if any(
-            not self.is_mine(UserID.from_string(user_id))
-            for user_id in device_keys_query
-        ):
-            raise SynapseError(400, "User is not hosted on this homeserver")
-
         res = await self.query_local_devices(
             device_keys_query,
             include_displaynames=(
@@ -665,20 +659,6 @@ class E2eKeysHandler:
         timeout: Optional[int],
         always_include_fallback_keys: bool,
     ) -> JsonDict:
-        """
-        Args:
-            query: A chain of maps from (user_id, device_id, algorithm) to the requested
-                number of keys to claim.
-            user: The user who is claiming these keys.
-            timeout: How long to wait for any federation key claim requests before
-                giving up.
-            always_include_fallback_keys: always include a fallback key for local users'
-                devices, even if we managed to claim a one-time-key.
-
-        Returns: a heterogeneous dict with two keys:
-            one_time_keys: chain of maps user ID -> device ID -> key ID -> key.
-            failures: map from remote destination to a JsonDict describing the error.
-        """
         local_query: List[Tuple[str, str, str, int]] = []
         remote_queries: Dict[str, Dict[str, Dict[str, Dict[str, int]]]] = {}
 
@@ -759,16 +739,6 @@ class E2eKeysHandler:
     async def upload_keys_for_user(
         self, user_id: str, device_id: str, keys: JsonDict
     ) -> JsonDict:
-        """
-        Args:
-            user_id: user whose keys are being uploaded.
-            device_id: device whose keys are being uploaded.
-            keys: the body of a /keys/upload request.
-
-        Returns a dictionary with one field:
-            "one_time_keys": A mapping from algorithm to number of keys for that
-                algorithm, including those previously persisted.
-        """
         # This can only be called from the main process.
         assert isinstance(self.device_handler, DeviceHandler)
 
@@ -1450,25 +1420,19 @@ class E2eKeysHandler:
 
         return desired_key_data
 
-    async def check_cross_signing_setup(self, user_id: str) -> Tuple[bool, bool]:
+    async def is_cross_signing_set_up_for_user(self, user_id: str) -> bool:
         """Checks if the user has cross-signing set up
 
         Args:
             user_id: The user to check
 
-        Returns: a 2-tuple of booleans
-            - whether the user has cross-signing set up, and
-            - whether the user's master cross-signing key may be replaced without UIA.
+        Returns:
+            True if the user has cross-signing set up, False otherwise
         """
-        (
-            exists,
-            ts_replacable_without_uia_before,
-        ) = await self.store.get_master_cross_signing_key_updatable_before(user_id)
-
-        if ts_replacable_without_uia_before is None:
-            return exists, False
-        else:
-            return exists, self.clock.time_msec() < ts_replacable_without_uia_before
+        existing_master_key = await self.store.get_e2e_cross_signing_key(
+            user_id, "master"
+        )
+        return existing_master_key is not None
 
 
 def _check_cross_signing_key(