Get encryption state at the time

Co-authored-by: Eric Eastwood <eric.eastwood@beta.gouv.fr>

.ci/scripts/calculate_jobs.py

@@ -53,7 +53,7 @@ if not IS_PR:
             "database": "sqlite",
             "extras": "all",
         }
-        for version in ("3.9", "3.10", "3.11", "3.12", "3.13")
+        for version in ("3.9", "3.10", "3.11", "3.12")
     )
 
 trial_postgres_tests = [
@@ -68,9 +68,9 @@ trial_postgres_tests = [
 if not IS_PR:
     trial_postgres_tests.append(
         {
-            "python-version": "3.13",
+            "python-version": "3.12",
             "database": "postgres",
-            "postgres-version": "17",
+            "postgres-version": "16",
             "extras": "all",
         }
     )

.github/workflows/docker.yml

@@ -30,7 +30,7 @@ jobs:
         run: docker buildx inspect
 
       - name: Install Cosign
-        uses: sigstore/cosign-installer@v3.7.0
+        uses: sigstore/cosign-installer@v3.6.0
 
       - name: Checkout repository
         uses: actions/checkout@v4

.github/workflows/fix_lint.yaml

@@ -29,13 +29,17 @@ jobs:
         with:
           install-project: "false"
 
-      - name: Run ruff check
+      - name: Import order (isort)
         continue-on-error: true
-        run: poetry run ruff check --fix .
+        run: poetry run isort .
 
-      - name: Run ruff format
+      - name: Code style (black)
         continue-on-error: true
-        run: poetry run ruff format --quiet .
+        run: poetry run black .
+
+      - name: Semantic checks (ruff)
+        continue-on-error: true
+        run: poetry run ruff --fix .
 
       - run: cargo clippy --all-features --fix -- -D warnings
         continue-on-error: true
@@ -45,4 +49,4 @@ jobs:
 
       - uses: stefanzweifel/git-auto-commit-action@v5
         with:
-          commit_message: "Attempt to fix linting"
+            commit_message: "Attempt to fix linting"

.github/workflows/tests.yml

@@ -131,11 +131,15 @@ jobs:
         with:
           install-project: "false"
 
-      - name: Run ruff check
-        run: poetry run ruff check --output-format=github .
+      - name: Import order (isort)
+        run: poetry run isort --check --diff .
 
-      - name: Run ruff format
-        run: poetry run ruff format --check .
+      - name: Code style (black)
+        run: poetry run black --check --diff .
+
+      - name: Semantic checks (ruff)
+        # --quiet suppresses the update check.
+        run: poetry run ruff check --quiet .
 
   lint-mypy:
     runs-on: ubuntu-latest

CHANGES.md

@@ -1,322 +1,3 @@
-# Synapse 1.118.0 (2024-10-29)
-
-No significant changes since 1.118.0rc1.
-
-### Python 3.8 support will be dropped in the next release
-
-Python 3.8 is now [end-of-life](https://devguide.python.org/versions/). As per our [Deprecation Policy for Platform Dependencies](https://element-hq.github.io/synapse/latest/deprecation_policy.html#policy), Synapse will be dropping support for Python 3.8 in the next release; Synapse 1.119.0.
-
-Synapse 1.118.x will be the final release to support Python 3.8. If you are running Synapse with Python 3.8, please upgrade before the 1.119.0 release, due in less than one month.
-
-### Python 3.13 and PostgreSQL 17 support
-
-On the other end of the spectrum, Synapse 1.118.0 is the first release to support [Python 3.13](https://www.python.org/downloads/release/python-3130/)! [PostgreSQL 17](https://www.postgresql.org/about/news/postgresql-17-released-2936/) is also supported as of this release.
-
-
-# Synapse 1.118.0rc1 (2024-10-22)
-
-### Features
-
-- Added the `display_name_claim` option to the JWT configuration. This option allows specifying the claim key that contains the user's display name in the JWT payload. ([\#17708](https://github.com/element-hq/synapse/issues/17708))
-- Implement [MSC4210](https://github.com/matrix-org/matrix-spec-proposals/pull/4210): Remove legacy mentions. Contributed by @tulir @ Beeper. ([\#17783](https://github.com/element-hq/synapse/issues/17783))
-
-### Bugfixes
-
-- Fix saving of PNG thumbnails, when the original image is in the CMYK color space. ([\#17736](https://github.com/element-hq/synapse/issues/17736))
-- Fix bug with sliding sync where the server would not return state that was added to the `required_state` config. ([\#17785](https://github.com/element-hq/synapse/issues/17785), [\#17805](https://github.com/element-hq/synapse/issues/17805))
-- Fix a bug in [MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186) Sliding Sync that would cause rooms to stay forgotten and hidden even after rejoining. ([\#17835](https://github.com/element-hq/synapse/issues/17835))
-
-### Improved Documentation
-
-- Clarify when the `user_may_invite` and `user_may_send_3pid_invite` module callbacks are called. ([\#17627](https://github.com/element-hq/synapse/issues/17627))
-- Correct documentation to refer to the `--config-path` argument instead of `--config-file`. ([\#17802](https://github.com/element-hq/synapse/issues/17802))
-- Fix typo in `target_cache_memory_usage` docs. ([\#17825](https://github.com/element-hq/synapse/issues/17825))
-
-### Internal Changes
-
-- Slight optimization when fetching state/events for Sliding Sync. ([\#17718](https://github.com/element-hq/synapse/issues/17718))
-- Add Python 3.13 and Postgres 17 to the test matrix. ([\#17752](https://github.com/element-hq/synapse/issues/17752))
-- Test github token before running release script steps. ([\#17803](https://github.com/element-hq/synapse/issues/17803))
-- Build debian packages for new Ubuntu versions, and stop building for no longer supported versions. ([\#17824](https://github.com/element-hq/synapse/issues/17824))
-- Enable the `.org.matrix.msc4028.encrypted_event` push rule by default in accordance with [MSC4028](https://github.com/matrix-org/matrix-spec-proposals/pull/4028). Note that the corresponding experimental feature must still be switched on for this push rule to have any effect. ([\#17826](https://github.com/element-hq/synapse/issues/17826))
-- Fix some typing issues uncovered by upgrading mypy to 1.11.x. ([\#17842](https://github.com/element-hq/synapse/issues/17842))
-
-
-
-### Updates to locked dependencies
-
-* Bump mypy from 1.10.1 to 1.11.2. ([\#17842](https://github.com/element-hq/synapse/issues/17842))
-* Bump mypy-zope from 1.0.5 to 1.0.7. ([\#17827](https://github.com/element-hq/synapse/issues/17827))
-* Bump phonenumbers from 8.13.46 to 8.13.47. ([\#17797](https://github.com/element-hq/synapse/issues/17797))
-* Bump psycopg2 from 2.9.9 to 2.9.10. ([\#17843](https://github.com/element-hq/synapse/issues/17843))
-* Bump ruff from 0.6.8 to 0.6.9. ([\#17794](https://github.com/element-hq/synapse/issues/17794))
-* Bump sentry-sdk from 2.14.0 to 2.15.0. ([\#17795](https://github.com/element-hq/synapse/issues/17795))
-* Bump sentry-sdk from 2.15.0 to 2.16.0. ([\#17829](https://github.com/element-hq/synapse/issues/17829))
-* Bump sentry-sdk from 2.16.0 to 2.17.0. ([\#17844](https://github.com/element-hq/synapse/issues/17844))
-* Bump sigstore/cosign-installer from 3.6.0 to 3.7.0. ([\#17798](https://github.com/element-hq/synapse/issues/17798))
-* Bump tomli from 2.0.1 to 2.0.2. ([\#17796](https://github.com/element-hq/synapse/issues/17796))
-* Bump types-requests from 2.32.0.20240914 to 2.32.0.20241016. ([\#17841](https://github.com/element-hq/synapse/issues/17841))
-* Bump types-setuptools from 75.1.0.20240917 to 75.1.0.20241014. ([\#17828](https://github.com/element-hq/synapse/issues/17828))
-
-# Synapse 1.117.0 (2024-10-15)
-
-No significant changes since 1.117.0rc1.
-
-
-
-
-# Synapse 1.117.0rc1 (2024-10-08)
-
-### Features
-
-- Add config option `redis.password_path`. ([\#17717](https://github.com/element-hq/synapse/issues/17717))
-
-### Bugfixes
-
-- Fix a rare bug introduced in v1.29.0 where invalidating a user's access token from a worker could raise an error. ([\#17779](https://github.com/element-hq/synapse/issues/17779))
-- In the response to `GET /_matrix/client/versions`, set the `unstable_features` flag for [MSC4140](https://github.com/matrix-org/matrix-spec-proposals/pull/4140) to `false` when server configuration disables support for delayed events. ([\#17780](https://github.com/element-hq/synapse/issues/17780))
-- Improve input validation and room membership checks in admin redaction API. ([\#17792](https://github.com/element-hq/synapse/issues/17792))
-
-### Improved Documentation
-
-- Clarify the docstring of `test_forget_when_not_left`. ([\#17628](https://github.com/element-hq/synapse/issues/17628))
-- Add documentation note about PYTHONMALLOC for accurate jemalloc memory tracking. Contributed by @hensg. ([\#17709](https://github.com/element-hq/synapse/issues/17709))
-- Remove spurious "TODO UPDATE ALL THIS" note in the Debian installation docs. ([\#17749](https://github.com/element-hq/synapse/issues/17749))
-- Explain how load balancing works for `federation_sender_instances`. ([\#17776](https://github.com/element-hq/synapse/issues/17776))
-
-### Internal Changes
-
-- Minor performance increase for large accounts using sliding sync. ([\#17751](https://github.com/element-hq/synapse/issues/17751))
-- Increase performance of the notifier when there are many syncing users. ([\#17765](https://github.com/element-hq/synapse/issues/17765), [\#17766](https://github.com/element-hq/synapse/issues/17766))
-- Fix performance of streams that don't change often. ([\#17767](https://github.com/element-hq/synapse/issues/17767))
-- Improve performance of sliding sync connections that do not ask for any rooms. ([\#17768](https://github.com/element-hq/synapse/issues/17768))
-- Reduce overhead of sliding sync E2EE loops. ([\#17771](https://github.com/element-hq/synapse/issues/17771))
-- Sliding sync minor performance speed up using new table. ([\#17787](https://github.com/element-hq/synapse/issues/17787))
-- Sliding sync minor performance improvement by omitting unchanged data from incremental responses. ([\#17788](https://github.com/element-hq/synapse/issues/17788))
-- Speed up sliding sync when there are many active subscriptions. ([\#17789](https://github.com/element-hq/synapse/issues/17789))
-- Add missing license headers on new source files. ([\#17799](https://github.com/element-hq/synapse/issues/17799))
-
-
-
-### Updates to locked dependencies
-
-* Bump phonenumbers from 8.13.45 to 8.13.46. ([\#17773](https://github.com/element-hq/synapse/issues/17773))
-* Bump python-multipart from 0.0.10 to 0.0.12. ([\#17772](https://github.com/element-hq/synapse/issues/17772))
-* Bump regex from 1.10.6 to 1.11.0. ([\#17770](https://github.com/element-hq/synapse/issues/17770))
-* Bump ruff from 0.6.7 to 0.6.8. ([\#17774](https://github.com/element-hq/synapse/issues/17774))
-
-# Synapse 1.116.0 (2024-10-01)
-
-No significant changes since 1.116.0rc2.
-
-
-
-
-# Synapse 1.116.0rc2 (2024-09-26)
-
-### Features
-
-- Add implementation of restricting who can overwrite a state event as proposed by [MSC3757](https://github.com/matrix-org/matrix-spec-proposals/pull/3757). ([\#17513](https://github.com/element-hq/synapse/issues/17513))
-
-
-
-
-# Synapse 1.116.0rc1 (2024-09-25)
-
-### Features
-
-- Add initial implementation of delayed events as proposed by [MSC4140](https://github.com/matrix-org/matrix-spec-proposals/pull/4140). ([\#17326](https://github.com/element-hq/synapse/issues/17326))
-- Add an asynchronous Admin API endpoint [to redact all a user's events](https://element-hq.github.io/synapse/v1.116/admin_api/user_admin_api.html#redact-all-the-events-of-a-user),
-  and [an endpoint to check on the status of that redaction task](https://element-hq.github.io/synapse/v1.116/admin_api/user_admin_api.html#check-the-status-of-a-redaction-process). ([\#17506](https://github.com/element-hq/synapse/issues/17506))
-- Add support for the `tags` and `not_tags` filters for [MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186) Sliding Sync. ([\#17662](https://github.com/element-hq/synapse/issues/17662))
-- Guests can use the new media endpoints to download media, as described by [MSC4189](https://github.com/matrix-org/matrix-spec-proposals/pull/4189). ([\#17675](https://github.com/element-hq/synapse/issues/17675))
-- Add config option `turn_shared_secret_path`. ([\#17690](https://github.com/element-hq/synapse/issues/17690))
-- Return room tags in [MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186) Sliding Sync account data extension. ([\#17707](https://github.com/element-hq/synapse/issues/17707))
-
-### Bugfixes
-
-- Make sure we get up-to-date state information when using the new [MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186) Sliding Sync tables to derive room membership. ([\#17692](https://github.com/element-hq/synapse/issues/17692))
-- Fix bug where room account data would not correctly be sent down [MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186) Sliding Sync for old rooms. ([\#17695](https://github.com/element-hq/synapse/issues/17695))
-- Fix a bug in [MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186) Sliding Sync which could prevent /sync from working for certain user accounts. ([\#17727](https://github.com/element-hq/synapse/issues/17727), [\#17733](https://github.com/element-hq/synapse/issues/17733))
-- Ignore invites from ignored users in Sliding Sync. ([\#17729](https://github.com/element-hq/synapse/issues/17729))
-- Fix bug in [MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186) Sliding Sync where the server would incorrectly return a negative bump stamp, which caused Element X apps to stop syncing. ([\#17748](https://github.com/element-hq/synapse/issues/17748))
-
-### Internal Changes
-
-- Import pydantic objects from the `_pydantic_compat` module.
-  This allows `check_pydantic_models.py` to mock those pydantic objects
-  only in the synapse module, and not interfere with pydantic objects in
-  external dependencies. ([\#17667](https://github.com/element-hq/synapse/issues/17667))
-- Use [MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186) Sliding Sync tables as a bulk shortcut for getting the max `event_stream_ordering` of rooms. ([\#17693](https://github.com/element-hq/synapse/issues/17693))
-- Speed up [MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186) sliding sync requests a bit where there are many room changes. ([\#17696](https://github.com/element-hq/synapse/issues/17696))
-- Refactor [MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186) sliding sync filter unit tests so the sliding sync API has better test coverage. ([\#17703](https://github.com/element-hq/synapse/issues/17703))
-- Fetch `bump_stamp`s more efficiently in [MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186) Sliding Sync. ([\#17723](https://github.com/element-hq/synapse/issues/17723))
-- Shortcut for checking if certain background updates have completed (utilized in [MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186) Sliding Sync). ([\#17724](https://github.com/element-hq/synapse/issues/17724))
-- More efficiently fetch rooms for [MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186) Sliding Sync. ([\#17725](https://github.com/element-hq/synapse/issues/17725))
-- Fix `_bulk_get_max_event_pos` being inefficient. ([\#17728](https://github.com/element-hq/synapse/issues/17728))
-- Add cache to `get_tags_for_room(...)`. ([\#17730](https://github.com/element-hq/synapse/issues/17730))
-- Small performance improvement in speeding up [MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186) Sliding Sync. ([\#17731](https://github.com/element-hq/synapse/issues/17731))
-- Minor speed up of initial [MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186) sliding sync requests. ([\#17734](https://github.com/element-hq/synapse/issues/17734))
-- Remove usage of the deprecated `cgi` module, deprecated in Python 3.11 and removed in Python 3.13. ([\#17741](https://github.com/element-hq/synapse/issues/17741))
-- Fix typing of a variable that is not `Unknown` anymore after updating `treq`. ([\#17744](https://github.com/element-hq/synapse/issues/17744))
-
-
-
-### Updates to locked dependencies
-
-* Bump anyhow from 1.0.86 to 1.0.89. ([\#17685](https://github.com/element-hq/synapse/issues/17685), [\#17716](https://github.com/element-hq/synapse/issues/17716))
-* Bump bytes from 1.7.1 to 1.7.2. ([\#17743](https://github.com/element-hq/synapse/issues/17743))
-* Bump cryptography from 43.0.0 to 43.0.1. ([\#17689](https://github.com/element-hq/synapse/issues/17689))
-* Bump idna from 3.8 to 3.10. ([\#17758](https://github.com/element-hq/synapse/issues/17758))
-* Bump msgpack from 1.0.8 to 1.1.0. ([\#17759](https://github.com/element-hq/synapse/issues/17759))
-* Bump phonenumbers from 8.13.44 to 8.13.45. ([\#17762](https://github.com/element-hq/synapse/issues/17762))
-* Bump prometheus-client from 0.20.0 to 0.21.0. ([\#17746](https://github.com/element-hq/synapse/issues/17746))
-* Bump pyasn1 from 0.6.0 to 0.6.1. ([\#17714](https://github.com/element-hq/synapse/issues/17714))
-* Bump pyasn1-modules from 0.4.0 to 0.4.1. ([\#17747](https://github.com/element-hq/synapse/issues/17747))
-* Bump pydantic from 2.8.2 to 2.9.2. ([\#17756](https://github.com/element-hq/synapse/issues/17756))
-* Bump python-multipart from 0.0.9 to 0.0.10. ([\#17745](https://github.com/element-hq/synapse/issues/17745))
-* Bump ruff from 0.6.4 to 0.6.7. ([\#17715](https://github.com/element-hq/synapse/issues/17715), [\#17760](https://github.com/element-hq/synapse/issues/17760))
-* Bump sentry-sdk from 2.13.0 to 2.14.0. ([\#17712](https://github.com/element-hq/synapse/issues/17712))
-* Bump serde from 1.0.209 to 1.0.210. ([\#17686](https://github.com/element-hq/synapse/issues/17686))
-* Bump serde_json from 1.0.127 to 1.0.128. ([\#17687](https://github.com/element-hq/synapse/issues/17687))
-* Bump treq from 23.11.0 to 24.9.1. ([\#17744](https://github.com/element-hq/synapse/issues/17744))
-* Bump types-pyyaml from 6.0.12.20240808 to 6.0.12.20240917. ([\#17755](https://github.com/element-hq/synapse/issues/17755))
-* Bump types-requests from 2.32.0.20240712 to 2.32.0.20240914. ([\#17713](https://github.com/element-hq/synapse/issues/17713))
-* Bump types-setuptools from 74.1.0.20240907 to 75.1.0.20240917. ([\#17757](https://github.com/element-hq/synapse/issues/17757))
-
-# Synapse 1.115.0 (2024-09-17)
-
-No significant changes since 1.115.0rc2.
-
-
-
-
-# Synapse 1.115.0rc2 (2024-09-12)
-
-### Internal Changes
-
-- Pre-populate room data used in experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint for quick filtering/sorting. ([\#17652](https://github.com/element-hq/synapse/issues/17652))
-- Speed up sliding sync by reducing amount of data pulled out of the database for large rooms. ([\#17683](https://github.com/element-hq/synapse/issues/17683))
-
-
-
-
-# Synapse 1.115.0rc1 (2024-09-10)
-
-### Features
-
-- Improve cross-signing upload when using [MSC3861](https://github.com/matrix-org/matrix-spec-proposals/pull/3861) to use a custom UIA flow stage, with web fallback support. ([\#17509](https://github.com/element-hq/synapse/issues/17509))
-
-### Bugfixes
-
-- Return `400 M_BAD_JSON` upon attempting to complete various room actions with a non-local user ID and unknown room ID, rather than an internal server error. ([\#17607](https://github.com/element-hq/synapse/issues/17607))
-- Fix authenticated media responses using a wrong limit when following redirects over federation. ([\#17626](https://github.com/element-hq/synapse/issues/17626))
-- Fix bug where we returned the wrong `bump_stamp` for invites in sliding sync response, causing incorrect ordering of invites in the room list. ([\#17674](https://github.com/element-hq/synapse/issues/17674))
-
-### Improved Documentation
-
-- Clarify that the admin api resource is only loaded on the main process and not workers. ([\#17590](https://github.com/element-hq/synapse/issues/17590))
-- Fixed typo in `saml2_config` config [example](https://element-hq.github.io/synapse/latest/usage/configuration/config_documentation.html#saml2_config). ([\#17594](https://github.com/element-hq/synapse/issues/17594))
-
-### Deprecations and Removals
-
-- Stabilise [MSC4156](https://github.com/matrix-org/matrix-spec-proposals/pull/4156) by removing the `msc4156_enabled` config setting and defaulting it to `true`. ([\#17650](https://github.com/element-hq/synapse/issues/17650))
-
-### Internal Changes
-
-- Update [MSC3861](https://github.com/matrix-org/matrix-spec-proposals/pull/3861) implementation: load the issuer and account management URLs from OIDC discovery. ([\#17407](https://github.com/element-hq/synapse/issues/17407))
-- Pre-populate room data used in experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint for quick filtering/sorting. ([\#17512](https://github.com/element-hq/synapse/issues/17512), [\#17632](https://github.com/element-hq/synapse/issues/17632), [\#17633](https://github.com/element-hq/synapse/issues/17633), [\#17634](https://github.com/element-hq/synapse/issues/17634), [\#17635](https://github.com/element-hq/synapse/issues/17635), [\#17636](https://github.com/element-hq/synapse/issues/17636), [\#17641](https://github.com/element-hq/synapse/issues/17641), [\#17654](https://github.com/element-hq/synapse/issues/17654), [\#17673](https://github.com/element-hq/synapse/issues/17673))
-- Store sliding sync per-connection state in the database. ([\#17599](https://github.com/element-hq/synapse/issues/17599), [\#17631](https://github.com/element-hq/synapse/issues/17631))
-- Make the sliding sync `PerConnectionState` class immutable. ([\#17600](https://github.com/element-hq/synapse/issues/17600))
-- Replace `isort` and `black` with `ruff`. ([\#17620](https://github.com/element-hq/synapse/issues/17620), [\#17643](https://github.com/element-hq/synapse/issues/17643))
-- Sliding Sync: Split up `get_room_membership_for_user_at_to_token`. ([\#17629](https://github.com/element-hq/synapse/issues/17629))
-- Use new database tables for sliding sync. ([\#17630](https://github.com/element-hq/synapse/issues/17630), [\#17649](https://github.com/element-hq/synapse/issues/17649))
-- Prevent duplicate tags being added to Sliding Sync traces. ([\#17655](https://github.com/element-hq/synapse/issues/17655))
-- Get `bump_stamp` from [new sliding sync tables](https://github.com/element-hq/synapse/pull/17512) which should be faster. ([\#17658](https://github.com/element-hq/synapse/issues/17658))
-- Speed up incremental Sliding Sync requests by avoiding extra work. ([\#17665](https://github.com/element-hq/synapse/issues/17665))
-- Small performance improvement in speeding up sliding sync. ([\#17666](https://github.com/element-hq/synapse/issues/17666), [\#17670](https://github.com/element-hq/synapse/issues/17670), [\#17672](https://github.com/element-hq/synapse/issues/17672))
-- Speed up sliding sync by reducing number of database calls. ([\#17684](https://github.com/element-hq/synapse/issues/17684))
-- Speed up sync by pulling out fewer events from the database. ([\#17688](https://github.com/element-hq/synapse/issues/17688))
-
-
-
-### Updates to locked dependencies
-
-* Bump authlib from 1.3.1 to 1.3.2. ([\#17679](https://github.com/element-hq/synapse/issues/17679))
-* Bump idna from 3.7 to 3.8. ([\#17682](https://github.com/element-hq/synapse/issues/17682))
-* Bump ruff from 0.6.2 to 0.6.4. ([\#17680](https://github.com/element-hq/synapse/issues/17680))
-* Bump towncrier from 24.7.1 to 24.8.0. ([\#17645](https://github.com/element-hq/synapse/issues/17645))
-* Bump twisted from 24.7.0rc1 to 24.7.0. ([\#17647](https://github.com/element-hq/synapse/issues/17647))
-* Bump types-pillow from 10.2.0.20240520 to 10.2.0.20240822. ([\#17644](https://github.com/element-hq/synapse/issues/17644))
-* Bump types-psycopg2 from 2.9.21.20240417 to 2.9.21.20240819. ([\#17646](https://github.com/element-hq/synapse/issues/17646))
-* Bump types-setuptools from 71.1.0.20240818 to 74.1.0.20240907. ([\#17681](https://github.com/element-hq/synapse/issues/17681))
-
-# Synapse 1.114.0 (2024-09-02)
-
-This release enables support for
-[MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186) —
-Simplified Sliding Sync. This allows using the upcoming releases of the Element
-X mobile apps without having to run a Sliding Sync Proxy.
-
-
-### Features
-
-- Enable native sliding sync support ([MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) and [MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186)) by default. ([\#17648](https://github.com/element-hq/synapse/issues/17648))
-
-
-
-
-# Synapse 1.114.0rc3 (2024-08-30)
-
-### Bugfixes
-
-- Fix regression in v1.114.0rc2 that caused workers to fail to start. ([\#17626](https://github.com/element-hq/synapse/issues/17626))
-
-
-
-
-# Synapse 1.114.0rc2 (2024-08-30)
-
-### Features
-
-- Improve cross-signing upload when using [MSC3861](https://github.com/matrix-org/matrix-spec-proposals/pull/3861) to use a custom UIA flow stage, with web fallback support. ([\#17509](https://github.com/element-hq/synapse/issues/17509))
-- Make `hash_password` script accept password input from stdin. ([\#17608](https://github.com/element-hq/synapse/issues/17608))
-
-### Bugfixes
-
-- Fix hierarchy returning 403 when room is accessible through federation. Contributed by Krishan (@kfiven). ([\#17194](https://github.com/element-hq/synapse/issues/17194))
-- Fix content-length on federation `/thumbnail` responses. ([\#17532](https://github.com/element-hq/synapse/issues/17532))
-- Fix authenticated media responses using a wrong limit when following redirects over federation. ([\#17543](https://github.com/element-hq/synapse/issues/17543))
-
-### Internal Changes
-
-- MSC3861: load the issuer and account management URLs from OIDC discovery. ([\#17407](https://github.com/element-hq/synapse/issues/17407))
-- Refactor sliding sync class into multiple files. ([\#17595](https://github.com/element-hq/synapse/issues/17595))
-- Store sliding sync per-connection state in the database. ([\#17599](https://github.com/element-hq/synapse/issues/17599))
-- Make the sliding sync `PerConnectionState` class immutable. ([\#17600](https://github.com/element-hq/synapse/issues/17600))
-- Add support to `@tag_args` for standalone functions. ([\#17604](https://github.com/element-hq/synapse/issues/17604))
-- Speed up incremental syncs in sliding sync by adding some more caching. ([\#17606](https://github.com/element-hq/synapse/issues/17606))
-- Always return the user's own read receipts in sliding sync. ([\#17617](https://github.com/element-hq/synapse/issues/17617))
-- Replace `isort` and `black` with `ruff`. ([\#17620](https://github.com/element-hq/synapse/issues/17620))
-- Refactor sliding sync code to move room list logic out into a separate class. ([\#17622](https://github.com/element-hq/synapse/issues/17622))
-
-
-
-### Updates to locked dependencies
-
-* Bump attrs from 23.2.0 to 24.2.0. ([\#17609](https://github.com/element-hq/synapse/issues/17609))
-* Bump cryptography from 42.0.8 to 43.0.0. ([\#17584](https://github.com/element-hq/synapse/issues/17584))
-* Bump phonenumbers from 8.13.43 to 8.13.44. ([\#17610](https://github.com/element-hq/synapse/issues/17610))
-* Bump pygithub from 2.3.0 to 2.4.0. ([\#17612](https://github.com/element-hq/synapse/issues/17612))
-* Bump pyyaml from 6.0.1 to 6.0.2. ([\#17611](https://github.com/element-hq/synapse/issues/17611))
-* Bump sentry-sdk from 2.12.0 to 2.13.0. ([\#17585](https://github.com/element-hq/synapse/issues/17585))
-* Bump serde from 1.0.206 to 1.0.208. ([\#17581](https://github.com/element-hq/synapse/issues/17581))
-* Bump serde from 1.0.208 to 1.0.209. ([\#17613](https://github.com/element-hq/synapse/issues/17613))
-* Bump serde_json from 1.0.124 to 1.0.125. ([\#17582](https://github.com/element-hq/synapse/issues/17582))
-* Bump serde_json from 1.0.125 to 1.0.127. ([\#17614](https://github.com/element-hq/synapse/issues/17614))
-* Bump types-jsonschema from 4.23.0.20240712 to 4.23.0.20240813. ([\#17583](https://github.com/element-hq/synapse/issues/17583))
-* Bump types-setuptools from 71.1.0.20240726 to 71.1.0.20240818. ([\#17586](https://github.com/element-hq/synapse/issues/17586))
-
 # Synapse 1.114.0rc1 (2024-08-20)
 
 ### Features

Cargo.lock

@@ -13,9 +13,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.91"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8"
+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
 
 [[package]]
 name = "arc-swap"
@@ -67,9 +67,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "bytes"
-version = "1.8.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
+checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
 
 [[package]]
 name = "cfg-if"
@@ -302,9 +302,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.89"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
@@ -444,9 +444,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.11.1"
+version = "1.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -456,9 +456,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.8"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -467,9 +467,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.5"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
 
 [[package]]
 name = "ryu"
@@ -485,18 +485,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "serde"
-version = "1.0.213"
+version = "1.0.209"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1"
+checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.213"
+version = "1.0.209"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5"
+checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -505,9 +505,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.132"
+version = "1.0.127"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
+checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
 dependencies = [
  "itoa",
  "memchr",
@@ -551,9 +551,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
 
 [[package]]
 name = "syn"
-version = "2.0.85"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",

README.rst

@@ -158,7 +158,7 @@ it:
 
 We **strongly** recommend using a CAPTCHA, particularly if your homeserver is exposed to
 the public internet. Without it, anyone can freely register accounts on your homeserver.
-This can be exploited by attackers to create spambots targeting the rest of the Matrix
+This can be exploited by attackers to create spambots targetting the rest of the Matrix
 federation.
 
 Your new user name will be formed partly from the ``server_name``, and partly

changelog.d/17194.bugfix

@@ -0,0 +1 @@
+Fix hierarchy returning 403 when room is accessible through federation. Contributed by Krishan (@kfiven).

changelog.d/17374.feature

@@ -1 +0,0 @@
-Support [MSC4151](https://github.com/matrix-org/matrix-spec-proposals/pull/4151)'s stable report room API.

changelog.d/17512.misc

@@ -0,0 +1 @@
+Pre-populate room data used in experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint for quick filtering/sorting.

changelog.d/17532.bugfix

@@ -0,0 +1 @@
+Fix content-length on federation /thumbnail responses.

changelog.d/17543.bugfix

@@ -0,0 +1 @@
+Fix authenticated media responses using a wrong limit when following redirects over federation.

changelog.d/17590.doc

@@ -0,0 +1 @@
+Clarify that the admin api resource is only loaded on the main process and not workers.

changelog.d/17594.doc

@@ -0,0 +1 @@
+Fixed typo in `saml2_config` config [example](https://element-hq.github.io/synapse/latest/usage/configuration/config_documentation.html#saml2_config).

changelog.d/17595.misc

@@ -0,0 +1 @@
+Refactor sliding sync class into multiple files.

changelog.d/17600.misc

@@ -0,0 +1 @@
+Make the sliding sync `PerConnectionState` class immutable.

changelog.d/17604.misc

@@ -0,0 +1 @@
+Add support to `@tag_args` for standalone functions.

changelog.d/17606.misc

@@ -0,0 +1 @@
+Speed up incremental syncs in sliding sync by adding some more caching.

changelog.d/17607.bugfix

@@ -0,0 +1 @@
+Return `400 M_BAD_JSON` upon attempting to complete various room actions with a non-local user ID and unknown room ID, rather than an internal server error.

changelog.d/17608.feature

@@ -0,0 +1 @@
+Make `hash_password` accept password input from stdin.

changelog.d/17617.misc

@@ -0,0 +1 @@
+Always return the user's own read receipts in sliding sync.

changelog.d/17622.misc

@@ -0,0 +1 @@
+Refactor sliding sync code to move room list logic out into a separate class.

changelog.d/17626.bugfix

@@ -0,0 +1 @@
+Fix authenticated media responses using a wrong limit when following redirects over federation.

changelog.d/17630.misc

@@ -0,0 +1 @@
+Use new database tables for sliding sync.

changelog.d/17786.misc

@@ -1 +0,0 @@
-Add a test for downloading and thumbnailing a CMYK JPEG.

changelog.d/17813.bugfix

@@ -1 +0,0 @@
-Avoid lost data on some database query retries.

changelog.d/17814.bugfix

@@ -1 +0,0 @@
-Avoid lost data on some database query retries.

changelog.d/17815.bugfix

@@ -1 +0,0 @@
-Avoid lost data on some database query retries.

changelog.d/17816.bugfix

@@ -1 +0,0 @@
-Avoid lost data on some database query retries.

changelog.d/17817.bugfix

@@ -1 +0,0 @@
-Avoid lost data on some database query retries.

changelog.d/17818.bugfix

@@ -1 +0,0 @@
-Avoid lost data on some database query retries.

changelog.d/17830.misc

@@ -1 +0,0 @@
-Include the destination in the error of 'Destination mismatch' on federation requests.

changelog.d/17839.bugfix

@@ -1 +0,0 @@
-Check if user has membership in a room before tagging it. Contributed by Lama Alosaimi.

changelog.d/17847.bugfix

@@ -1,2 +0,0 @@
-Fix a bug in the admin redact endpoint where the background task would not run if a worker was specified in
-the config option `run_background_tasks_on`.

changelog.d/17861.bugfix

@@ -1 +0,0 @@
-Fix detection when the built Rust library was outdated when using source installations.

changelog.d/17884.misc

@@ -1 +0,0 @@
-Minor speed-up of sliding sync by computing extensions results in parallel.

changelog.d/17894.misc

@@ -1 +0,0 @@
-Remove usage of internal header encoding API.

contrib/cmdclient/console.py

@@ -21,8 +21,7 @@
 #
 #
 
-"""Starts a synapse client console."""
-
+""" Starts a synapse client console. """
 import argparse
 import binascii
 import cmd

contrib/graph/graph.py

@@ -20,8 +20,8 @@
 #
 
 import argparse
+import cgi
 import datetime
-import html
 import json
 import urllib.request
 from typing import List
@@ -85,7 +85,7 @@ def make_graph(pdus: List[dict], filename_prefix: str) -> None:
             "name": name,
             "type": pdu.get("pdu_type"),
             "state_key": pdu.get("state_key"),
-            "content": html.escape(json.dumps(pdu.get("content")), quote=True),
+            "content": cgi.escape(json.dumps(pdu.get("content")), quote=True),
             "time": t,
             "depth": pdu.get("depth"),
         }

debian/changelog

@@ -1,81 +1,3 @@
-matrix-synapse-py3 (1.118.0) stable; urgency=medium
-
-  * New Synapse release 1.118.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 29 Oct 2024 15:29:53 +0100
-
-matrix-synapse-py3 (1.118.0~rc1) stable; urgency=medium
-
-  * New Synapse release 1.118.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 22 Oct 2024 11:48:14 +0100
-
-matrix-synapse-py3 (1.117.0) stable; urgency=medium
-
-  * New Synapse release 1.117.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 15 Oct 2024 10:46:30 +0100
-
-matrix-synapse-py3 (1.117.0~rc1) stable; urgency=medium
-
-  * New Synapse release 1.117.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 08 Oct 2024 14:37:11 +0100
-
-matrix-synapse-py3 (1.116.0) stable; urgency=medium
-
-  * New Synapse release 1.116.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 01 Oct 2024 11:14:07 +0100
-
-matrix-synapse-py3 (1.116.0~rc2) stable; urgency=medium
-
-  * New synapse release 1.116.0rc2.
-
- -- Synapse Packaging team <packages@matrix.org>  Thu, 26 Sep 2024 13:28:43 +0000
-
-matrix-synapse-py3 (1.116.0~rc1) stable; urgency=medium
-
-  * New synapse release 1.116.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Wed, 25 Sep 2024 09:34:07 +0000
-
-matrix-synapse-py3 (1.115.0) stable; urgency=medium
-
-  * New Synapse release 1.115.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 17 Sep 2024 14:32:10 +0100
-
-matrix-synapse-py3 (1.115.0~rc2) stable; urgency=medium
-
-  * New Synapse release 1.115.0rc2.
-
- -- Synapse Packaging team <packages@matrix.org>  Thu, 12 Sep 2024 11:10:15 +0100
-
-matrix-synapse-py3 (1.115.0~rc1) stable; urgency=medium
-
-  * New Synapse release 1.115.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 10 Sep 2024 08:39:09 -0600
-
-matrix-synapse-py3 (1.114.0) stable; urgency=medium
-
-  * New Synapse release 1.114.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Mon, 02 Sep 2024 15:14:53 +0100
-
-matrix-synapse-py3 (1.114.0~rc3) stable; urgency=medium
-
-  * New Synapse release 1.114.0rc3.
-
- -- Synapse Packaging team <packages@matrix.org>  Fri, 30 Aug 2024 16:38:05 +0100
-
-matrix-synapse-py3 (1.114.0~rc2) stable; urgency=medium
-
-  * New Synapse release 1.114.0rc2.
-
- -- Synapse Packaging team <packages@matrix.org>  Fri, 30 Aug 2024 15:35:13 +0100
-
 matrix-synapse-py3 (1.114.0~rc1) stable; urgency=medium
 
   * New synapse release 1.114.0rc1.

docker/complement/conf/workers-shared-extra.yaml.j2

@@ -111,9 +111,6 @@ server_notices:
   system_mxid_avatar_url: ""
   room_name: "Server Alert"
 
-# Enable delayed events (msc4140)
-max_event_delay_duration: 24h
-
 
 # Disable sync cache so that initial `/sync` requests are up-to-date.
 caches:

docs/admin_api/user_admin_api.md

@@ -1361,86 +1361,3 @@ Returns a `404` HTTP status code if no user was found, with a response body like
 ```
 
 _Added in Synapse 1.72.0._
-
-
-## Redact all the events of a user
-
-This endpoint allows an admin to redact the events of a given user. There are no restrictions on redactions for a 
-local user. By default, we puppet the user who sent the message to redact it themselves. Redactions for non-local users are issued using the admin user, and will fail in rooms where the admin user is not admin/does not have the specified power level to issue redactions. 
-
-The API is 
-```
-POST /_synapse/admin/v1/user/$user_id/redact
-
-{
-  "rooms": ["!roomid1", "!roomid2"]
-}
-```
-If an empty list is provided as the key for `rooms`, all events in all the rooms the user is member of will be redacted, 
-otherwise all the events in the rooms provided in the request will be redacted. 
-
-The API starts redaction process running, and returns immediately with a JSON body with
-a redact id which can be used to query the status of the redaction process:
-
-```json
-{
-    "redact_id": "<opaque id>"
-}
-```
-
-**Parameters**
-
-The following parameters should be set in the URL:
-
-- `user_id` - The fully qualified MXID of the user: for example, `@user:server.com`.
-
-The following JSON body parameter must be provided:
-
--  `rooms` - A list of rooms to redact the user's events in. If an empty list is provided all events in all rooms
-  the user is a member of will be redacted
-
-_Added in Synapse 1.116.0._
-
-The following JSON body parameters are optional:
-
-- `reason` - Reason the redaction is being requested, ie "spam", "abuse", etc. This will be included in each redaction event, and be visible to users.
-- `limit` - a limit on the number of the user's events to search for ones that can be redacted (events are redacted newest to oldest) in each room, defaults to 1000 if not provided
-
-
-## Check the status of a redaction process
-
-It is possible to query the status of the background task for redacting a user's events.
-The status can be queried up to 24 hours after completion of the task,
-or until Synapse is restarted (whichever happens first).
-
-The API is:
-
-```
-GET /_synapse/admin/v1/user/redact_status/$redact_id
-```
-
-A response body like the following is returned:
-
-```
-{
-  "status": "active",
-  "failed_redactions": [],
-}
-```
-
-**Parameters**
-
-The following parameters should be set in the URL:
-
-* `redact_id` - string - The ID for this redaction process, provided when the redaction was requested.
-
-
-**Response**
-
-The following fields are returned in the JSON response body:
-
-- `status` - string - one of scheduled/active/completed/failed, indicating the status of the redaction job
-- `failed_redactions` - dictionary - the keys of the dict are event ids the process was unable to redact, if any, and the values are 
-  the corresponding error that caused the redaction to fail
-
-_Added in Synapse 1.116.0._

docs/code_style.md

@@ -8,7 +8,9 @@ errors in code.
 
 The necessary tools are:
 
-- [ruff](https://github.com/charliermarsh/ruff), which can spot common errors and enforce a consistent style; and
+- [black](https://black.readthedocs.io/en/stable/), a source code formatter;
+- [isort](https://pycqa.github.io/isort/), which organises each file's imports;
+- [ruff](https://github.com/charliermarsh/ruff), which can spot common errors; and
 - [mypy](https://mypy.readthedocs.io/en/stable/), a type checker.
 
 See [the contributing guide](development/contributing_guide.md#run-the-linters) for instructions

docs/modules/spam_checker_callbacks.md

@@ -76,9 +76,8 @@ _Changed in Synapse v1.62.0: `synapse.module_api.NOT_SPAM` and `synapse.module_a
 async def user_may_invite(inviter: str, invitee: str, room_id: str) -> Union["synapse.module_api.NOT_SPAM", "synapse.module_api.errors.Codes", bool]
 ```
 
-Called when processing an invitation, both when one is created locally or when
-receiving an invite over federation. Both inviter and invitee are represented by
-their Matrix user ID (e.g. `@alice:example.com`).
+Called when processing an invitation. Both inviter and invitee are
+represented by their Matrix user ID (e.g. `@alice:example.com`).
 
 
 The callback must return one of:
@@ -113,9 +112,7 @@ async def user_may_send_3pid_invite(
 ```
 
 Called when processing an invitation using a third-party identifier (also called a 3PID,
-e.g. an email address or a phone number). It is only called when a 3PID invite is created
-locally - not when one is received in a room over federation. If the 3PID is already associated
-with a Matrix ID, the spam check will go through the `user_may_invite` callback instead.
+e.g. an email address or a phone number). 
 
 The inviter is represented by their Matrix user ID (e.g. `@alice:example.com`), and the
 invitee is represented by its medium (e.g. "email") and its address

docs/setup/installation.md

@@ -52,6 +52,8 @@ architecture via <https://packages.matrix.org/debian/>.
 
 To install the latest release:
 
+TODO UPDATE ALL THIS
+
 ```sh
 sudo apt install -y lsb-release wget apt-transport-https
 sudo wget -O /usr/share/keyrings/matrix-org-archive-keyring.gpg https://packages.matrix.org/debian/matrix-org-archive-keyring.gpg
@@ -314,7 +316,7 @@ sudo dnf group install "Development Tools"
 
 *Note: The term "RHEL" below refers to both Red Hat Enterprise Linux and Rocky Linux. The distributions are 1:1 binary compatible.*
 
-It's recommended to use the latest Python versions.
+It's recommended to use the latest Python versions. 
 
 RHEL 8 in particular ships with Python 3.6 by default which is EOL and therefore no longer supported by Synapse. RHEL 9 ship with Python 3.9 which is still supported by the Python core team as of this writing. However, newer Python versions provide significant performance improvements and they're available in official distributions' repositories. Therefore it's recommended to use them.
 
@@ -344,7 +346,7 @@ dnf install python3.12 python3.12-devel
 ```
 Finally, install common prerequisites
 ```bash
-dnf install libicu libicu-devel libpq5 libpq5-devel lz4 pkgconf
+dnf install libicu libicu-devel libpq5 libpq5-devel lz4 pkgconf 
 dnf group install "Development Tools"
 ```
 ###### Using venv module instead of virtualenv command
@@ -353,7 +355,7 @@ It's recommended to use Python venv module directly rather than the virtualenv c
 * On RHEL 9, virtualenv is only available on [EPEL](https://docs.fedoraproject.org/en-US/epel/).
 * On RHEL 8, virtualenv is based on Python 3.6. It does not support creating 3.11/3.12 virtual environments.
 
-Here's an example of creating Python 3.12 virtual environment and installing Synapse from PyPI.
+Here's an example of creating Python 3.12 virtual environment and installing Synapse from PyPI. 
 
 ```bash
 mkdir -p ~/synapse

docs/usage/administration/admin_faq.md

@@ -255,8 +255,6 @@ line to `/etc/default/matrix-synapse`:
 
     LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.2
 
-*Note*: You may need to set `PYTHONMALLOC=malloc` to ensure that `jemalloc` can accurately calculate memory usage. By default, Python uses its internal small-object allocator, which may interfere with jemalloc's ability to track memory consumption correctly. This could prevent the [cache_autotuning](../configuration/config_documentation.md#caches-and-associated-values) feature from functioning as expected, as the Python allocator may not reach the memory threshold set by `max_cache_memory_usage`, thus not triggering the cache eviction process.
-
 This made a significant difference on Python 2.7 - it's unclear how
 much of an improvement it provides on Python 3.x.
 

docs/usage/configuration/config_documentation.md

@@ -761,19 +761,6 @@ email:
     password_reset: "[%(server_name)s] Password reset"
     email_validation: "[%(server_name)s] Validate your email"
 ```
----
-### `max_event_delay_duration`
-
-The maximum allowed duration by which sent events can be delayed, as per
-[MSC4140](https://github.com/matrix-org/matrix-spec-proposals/pull/4140).
-Must be a positive value if set.
-
-Defaults to no duration (`null`), which disallows sending delayed events.
-
-Example configuration:
-```yaml
-max_event_delay_duration: 24h
-```
 
 ## Homeserver blocking
 Useful options for Synapse admins.
@@ -1434,7 +1421,7 @@ number of entries that can be stored.
    Please see the [Config Conventions](#config-conventions) for information on how to specify memory size and cache expiry
    durations.
      * `max_cache_memory_usage` sets a ceiling on how much memory the cache can use before caches begin to be continuously evicted.
-        They will continue to be evicted until the memory usage drops below the `target_cache_memory_usage`, set in
+        They will continue to be evicted until the memory usage drops below the `target_memory_usage`, set in
         the setting below, or until the `min_cache_ttl` is hit. There is no default value for this option.
      * `target_cache_memory_usage` sets a rough target for the desired memory usage of the caches. There is no default value
         for this option.
@@ -2328,22 +2315,6 @@ Example configuration:
 ```yaml
 turn_shared_secret: "YOUR_SHARED_SECRET"
 ```
----
-### `turn_shared_secret_path`
-
-An alternative to [`turn_shared_secret`](#turn_shared_secret):
-allows the shared secret to be specified in an external file.
-
-The file should be a plain text file, containing only the shared secret.
-Synapse reads the shared secret from the given file once at startup.
-
-Example configuration:
-```yaml
-turn_shared_secret_path: /path/to/secrets/file
-```
-
-_Added in Synapse 1.116.0._
-
 ---
 ### `turn_username` and `turn_password`
 
@@ -3722,8 +3693,6 @@ Additional sub-options for this setting include:
    Required if `enabled` is set to true.
 * `subject_claim`: Name of the claim containing a unique identifier for the user.
    Optional, defaults to `sub`.
-* `display_name_claim`: Name of the claim containing the display name for the user. Optional.
-   If provided, the display name will be set to the value of this claim upon first login.
 * `issuer`: The issuer to validate the "iss" claim against. Optional. If provided the
    "iss" claim will be required and validated for all JSON web tokens.
 * `audiences`: A list of audiences to validate the "aud" claim against. Optional.
@@ -3738,7 +3707,6 @@ jwt_config:
     secret: "provided-by-your-issuer"
     algorithm: "provided-by-your-issuer"
     subject_claim: "name_of_claim"
-    display_name_claim: "name_of_claim"
     issuer: "provided-by-your-issuer"
     audiences:
         - "provided-by-your-issuer"
@@ -4371,13 +4339,7 @@ It is possible to scale the processes that handle sending outbound federation re
 by running a [`generic_worker`](../../workers.md#synapseappgeneric_worker) and adding it's [`worker_name`](#worker_name) to
 a `federation_sender_instances` map. Doing so will remove handling of this function from
 the main process. Multiple workers can be added to this map, in which case the work is
-balanced across them. 
-
-The way that the load balancing works is any outbound federation request will be assigned 
-to a federation sender worker based on the hash of the destination server name. This
-means that all requests being sent to the same destination will be processed by the same
-worker instance. Multiple `federation_sender_instances` are useful if there is a federation
-with multiple servers.
+balanced across them.
 
 This configuration setting must be shared between all workers handling federation
 sending, and if changed all federation sender workers must be stopped at the same time
@@ -4527,9 +4489,6 @@ This setting has the following sub-options:
 * `path`: The full path to a local Unix socket file. **If this is used, `host` and
  `port` are ignored.** Defaults to `/tmp/redis.sock'
 * `password`: Optional password if configured on the Redis instance.
-* `password_path`: Alternative to `password`, reading the password from an
-   external file. The file should be a plain text file, containing only the
-   password. Synapse reads the password from the given file once at startup.
 * `dbid`: Optional redis dbid if needs to connect to specific redis logical db.
 * `use_tls`: Whether to use tls connection. Defaults to false.
 * `certificate_file`: Optional path to the certificate file
@@ -4543,16 +4502,13 @@ This setting has the following sub-options:
 
   _Changed in Synapse 1.85.0: Added path option to use a local Unix socket_
 
-  _Changed in Synapse 1.116.0: Added password\_path_
-
 Example configuration:
 ```yaml
 redis:
   enabled: true
   host: localhost
   port: 6379
-  password_path: <path_to_the_password_file>
-  # OR password: <secret_password>
+  password: <secret_password>
   dbid: <dbid>
   #use_tls: True
   #certificate_file: <path_to_the_certificate_file>

docs/workers.md

@@ -177,11 +177,11 @@ The following applies to Synapse installations that have been installed from sou
 
 You can start the main Synapse process with Poetry by running the following command:
 ```console
-poetry run synapse_homeserver --config-path [your homeserver.yaml]
+poetry run synapse_homeserver --config-file [your homeserver.yaml]
 ```
 For worker setups, you can run the following command
 ```console
-poetry run synapse_worker --config-path [your homeserver.yaml] --config-path [your worker.yaml]
+poetry run synapse_worker --config-file [your homeserver.yaml] --config-file [your worker.yaml]
 ```
 ## Available worker applications
 
@@ -290,7 +290,6 @@ information.
 Additionally, the following REST endpoints can be handled for GET requests:
 
     ^/_matrix/client/(api/v1|r0|v3|unstable)/pushrules/
-    ^/_matrix/client/unstable/org.matrix.msc4140/delayed_events
 
 Pagination requests can also be handled, but all requests for a given
 room must be routed to the same instance. Additionally, care must be taken to

pylint.cfg

@@ -0,0 +1,280 @@
+[MASTER]
+
+# Specify a configuration file.
+#rcfile=
+
+# Python code to execute, usually for sys.path manipulation such as
+# pygtk.require().
+#init-hook=
+
+# Profiled execution.
+profile=no
+
+# Add files or directories to the blacklist. They should be base names, not
+# paths.
+ignore=CVS
+
+# Pickle collected data for later comparisons.
+persistent=yes
+
+# List of plugins (as comma separated values of python modules names) to load,
+# usually to register additional checkers.
+load-plugins=
+
+
+[MESSAGES CONTROL]
+
+# Enable the message, report, category or checker with the given id(s). You can
+# either give multiple identifier separated by comma (,) or put this option
+# multiple time. See also the "--disable" option for examples.
+#enable=
+
+# Disable the message, report, category or checker with the given id(s). You
+# can either give multiple identifiers separated by comma (,) or put this
+# option multiple times (only on the command line, not in the configuration
+# file where it should appear only once).You can also use "--disable=all" to
+# disable everything first and then reenable specific checks. For example, if
+# you want to run only the similarities checker, you can use "--disable=all
+# --enable=similarities". If you want to run only the classes checker, but have
+# no Warning level messages displayed, use"--disable=all --enable=classes
+# --disable=W"
+disable=missing-docstring
+
+
+[REPORTS]
+
+# Set the output format. Available formats are text, parseable, colorized, msvs
+# (visual studio) and html. You can also give a reporter class, eg
+# mypackage.mymodule.MyReporterClass.
+output-format=text
+
+# Put messages in a separate file for each module / package specified on the
+# command line instead of printing them on stdout. Reports (if any) will be
+# written in a file name "pylint_global.[txt|html]".
+files-output=no
+
+# Tells whether to display a full report or only the messages
+reports=yes
+
+# Python expression which should return a note less than 10 (10 is the highest
+# note). You have access to the variables errors warning, statement which
+# respectively contain the number of errors / warnings messages and the total
+# number of statements analyzed. This is used by the global evaluation report
+# (RP0004).
+evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
+
+# Add a comment according to your evaluation note. This is used by the global
+# evaluation report (RP0004).
+comment=no
+
+# Template used to display messages. This is a python new-style format string
+# used to format the message information. See doc for all details
+#msg-template=
+
+
+[TYPECHECK]
+
+# Tells whether missing members accessed in mixin class should be ignored. A
+# mixin class is detected if its name ends with "mixin" (case insensitive).
+ignore-mixin-members=yes
+
+# List of classes names for which member attributes should not be checked
+# (useful for classes with attributes dynamically set).
+ignored-classes=SQLObject
+
+# When zope mode is activated, add a predefined set of Zope acquired attributes
+# to generated-members.
+zope=no
+
+# List of members which are set dynamically and missed by pylint inference
+# system, and so shouldn't trigger E0201 when accessed. Python regular
+# expressions are accepted.
+generated-members=REQUEST,acl_users,aq_parent
+
+
+[MISCELLANEOUS]
+
+# List of note tags to take in consideration, separated by a comma.
+notes=FIXME,XXX,TODO
+
+
+[SIMILARITIES]
+
+# Minimum lines number of a similarity.
+min-similarity-lines=4
+
+# Ignore comments when computing similarities.
+ignore-comments=yes
+
+# Ignore docstrings when computing similarities.
+ignore-docstrings=yes
+
+# Ignore imports when computing similarities.
+ignore-imports=no
+
+
+[VARIABLES]
+
+# Tells whether we should check for unused import in __init__ files.
+init-import=no
+
+# A regular expression matching the beginning of the name of dummy variables
+# (i.e. not used).
+dummy-variables-rgx=_$|dummy
+
+# List of additional names supposed to be defined in builtins. Remember that
+# you should avoid to define new builtins when possible.
+additional-builtins=
+
+
+[BASIC]
+
+# Required attributes for module, separated by a comma
+required-attributes=
+
+# List of builtins function names that should not be used, separated by a comma
+bad-functions=map,filter,apply,input
+
+# Regular expression which should only match correct module names
+module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
+
+# Regular expression which should only match correct module level names
+const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$
+
+# Regular expression which should only match correct class names
+class-rgx=[A-Z_][a-zA-Z0-9]+$
+
+# Regular expression which should only match correct function names
+function-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct method names
+method-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct instance attribute names
+attr-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct argument names
+argument-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct variable names
+variable-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct attribute names in class
+# bodies
+class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
+
+# Regular expression which should only match correct list comprehension /
+# generator expression variable names
+inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
+
+# Good variable names which should always be accepted, separated by a comma
+good-names=i,j,k,ex,Run,_
+
+# Bad variable names which should always be refused, separated by a comma
+bad-names=foo,bar,baz,toto,tutu,tata
+
+# Regular expression which should only match function or class names that do
+# not require a docstring.
+no-docstring-rgx=__.*__
+
+# Minimum line length for functions/classes that require docstrings, shorter
+# ones are exempt.
+docstring-min-length=-1
+
+
+[FORMAT]
+
+# Maximum number of characters on a single line.
+max-line-length=80
+
+# Regexp for a line that is allowed to be longer than the limit.
+ignore-long-lines=^\s*(# )?<?https?://\S+>?$
+
+# Allow the body of an if to be on the same line as the test if there is no
+# else.
+single-line-if-stmt=no
+
+# List of optional constructs for which whitespace checking is disabled
+no-space-check=trailing-comma,dict-separator
+
+# Maximum number of lines in a module
+max-module-lines=1000
+
+# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1
+# tab).
+indent-string='    '
+
+
+[DESIGN]
+
+# Maximum number of arguments for function / method
+max-args=5
+
+# Argument names that match this expression will be ignored. Default to name
+# with leading underscore
+ignored-argument-names=_.*
+
+# Maximum number of locals for function / method body
+max-locals=15
+
+# Maximum number of return / yield for function / method body
+max-returns=6
+
+# Maximum number of branch for function / method body
+max-branches=12
+
+# Maximum number of statements in function / method body
+max-statements=50
+
+# Maximum number of parents for a class (see R0901).
+max-parents=7
+
+# Maximum number of attributes for a class (see R0902).
+max-attributes=7
+
+# Minimum number of public methods for a class (see R0903).
+min-public-methods=2
+
+# Maximum number of public methods for a class (see R0904).
+max-public-methods=20
+
+
+[IMPORTS]
+
+# Deprecated modules which should not be used, separated by a comma
+deprecated-modules=regsub,TERMIOS,Bastion,rexec
+
+# Create a graph of every (i.e. internal and external) dependencies in the
+# given file (report RP0402 must not be disabled)
+import-graph=
+
+# Create a graph of external dependencies in the given file (report RP0402 must
+# not be disabled)
+ext-import-graph=
+
+# Create a graph of internal dependencies in the given file (report RP0402 must
+# not be disabled)
+int-import-graph=
+
+
+[CLASSES]
+
+# List of interface methods to ignore, separated by a comma. This is used for
+# instance to not check methods defines in Zope's Interface base class.
+ignore-iface-methods=isImplementedBy,deferred,extends,names,namesAndDescriptions,queryDescriptionFor,getBases,getDescriptionFor,getDoc,getName,getTaggedValue,getTaggedValueTags,isEqualOrExtendedBy,setTaggedValue,isImplementedByInstancesOf,adaptWith,is_implemented_by
+
+# List of method names used to declare (i.e. assign) instance attributes.
+defining-attr-methods=__init__,__new__,setUp
+
+# List of valid names for the first argument in a class method.
+valid-classmethod-first-arg=cls
+
+# List of valid names for the first argument in a metaclass class method.
+valid-metaclass-classmethod-first-arg=mcs
+
+
+[EXCEPTIONS]
+
+# Exceptions that will emit a warning when being caught. Defaults to
+# "Exception"
+overgeneral-exceptions=Exception

pyproject.toml

@@ -34,9 +34,14 @@
         name = "Internal Changes"
         showcontent = true
 
+[tool.black]
+target-version = ['py38', 'py39', 'py310', 'py311']
+# black ignores everything in .gitignore by default, see
+# https://black.readthedocs.io/en/stable/usage_and_configuration/file_collection_and_discovery.html#gitignore
+# Use `extend-exclude` if you want to exclude something in addition to this.
+
 [tool.ruff]
 line-length = 88
-target-version = "py38"
 
 [tool.ruff.lint]
 # See https://beta.ruff.rs/docs/rules/#error-e
@@ -58,8 +63,6 @@ select = [
     "W",
     # pyflakes
     "F",
-    # isort
-    "I001",
     # flake8-bugbear
     "B0",
     # flake8-comprehensions
@@ -76,20 +79,17 @@ select = [
     "EXE",
 ]
 
-[tool.ruff.lint.isort]
-combine-as-imports = true
-section-order = ["future", "standard-library", "third-party", "twisted", "first-party", "testing", "local-folder"]
-known-first-party = ["synapse"]
-
-[tool.ruff.lint.isort.sections]
-twisted = ["twisted", "OpenSSL"]
-testing = ["tests"]
-
-[tool.ruff.format]
-quote-style = "double"
-indent-style = "space"
-skip-magic-trailing-comma = false
-line-ending = "auto"
+[tool.isort]
+line_length = 88
+sections = ["FUTURE", "STDLIB", "THIRDPARTY", "TWISTED", "FIRSTPARTY", "TESTS", "LOCALFOLDER"]
+default_section = "THIRDPARTY"
+known_first_party = ["synapse"]
+known_tests = ["tests"]
+known_twisted = ["twisted", "OpenSSL"]
+multi_line_output = 3
+include_trailing_comma = true
+combine_as_imports = true
+skip_gitignore = true
 
 [tool.maturin]
 manifest-path = "rust/Cargo.toml"
@@ -97,7 +97,7 @@ module-name = "synapse.synapse_rust"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.118.0"
+version = "1.114.0rc1"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "AGPL-3.0-or-later"
@@ -320,7 +320,9 @@ all = [
 # failing on new releases. Keeping lower bounds loose here means that dependabot
 # can bump versions without having to update the content-hash in the lockfile.
 # This helps prevents merge conflicts when running a batch of dependabot updates.
-ruff = "0.7.1"
+isort = ">=5.10.1"
+black = ">=22.7.0"
+ruff = "0.5.5"
 # Type checking only works with the pydantic.v1 compat module from pydantic v2
 pydantic = "^2"
 

rust/benches/evaluator.rs

@@ -60,7 +60,6 @@ fn bench_match_exact(b: &mut Bencher) {
         true,
         vec![],
         false,
-        false,
     )
     .unwrap();
 
@@ -106,7 +105,6 @@ fn bench_match_word(b: &mut Bencher) {
         true,
         vec![],
         false,
-        false,
     )
     .unwrap();
 
@@ -152,7 +150,6 @@ fn bench_match_word_miss(b: &mut Bencher) {
         true,
         vec![],
         false,
-        false,
     )
     .unwrap();
 
@@ -198,7 +195,6 @@ fn bench_eval_message(b: &mut Bencher) {
         true,
         vec![],
         false,
-        false,
     )
     .unwrap();
 
@@ -209,7 +205,6 @@ fn bench_eval_message(b: &mut Bencher) {
         false,
         false,
         false,
-        false,
     );
 
     b.iter(|| eval.run(&rules, Some("bob"), Some("person")));

rust/src/push/base_rules.rs

@@ -81,7 +81,7 @@ pub const BASE_APPEND_OVERRIDE_RULES: &[PushRule] = &[
         ))]),
         actions: Cow::Borrowed(&[Action::Notify]),
         default: true,
-        default_enabled: true,
+        default_enabled: false,
     },
     PushRule {
         rule_id: Cow::Borrowed("global/override/.m.rule.suppress_notices"),

rust/src/push/evaluator.rs

@@ -105,9 +105,6 @@ pub struct PushRuleEvaluator {
     /// If MSC3931 (room version feature flags) is enabled. Usually controlled by the same
     /// flag as MSC1767 (extensible events core).
     msc3931_enabled: bool,
-
-    // If MSC4210 (remove legacy mentions) is enabled.
-    msc4210_enabled: bool,
 }
 
 #[pymethods]
@@ -125,7 +122,6 @@ impl PushRuleEvaluator {
         related_event_match_enabled,
         room_version_feature_flags,
         msc3931_enabled,
-        msc4210_enabled,
     ))]
     pub fn py_new(
         flattened_keys: BTreeMap<String, JsonValue>,
@@ -137,7 +133,6 @@ impl PushRuleEvaluator {
         related_event_match_enabled: bool,
         room_version_feature_flags: Vec<String>,
         msc3931_enabled: bool,
-        msc4210_enabled: bool,
     ) -> Result<Self, Error> {
         let body = match flattened_keys.get("content.body") {
             Some(JsonValue::Value(SimpleJsonValue::Str(s))) => s.clone().into_owned(),
@@ -155,7 +150,6 @@ impl PushRuleEvaluator {
             related_event_match_enabled,
             room_version_feature_flags,
             msc3931_enabled,
-            msc4210_enabled,
         })
     }
 
@@ -182,8 +176,7 @@ impl PushRuleEvaluator {
 
             // For backwards-compatibility the legacy mention rules are disabled
             // if the event contains the 'm.mentions' property.
-            // Additionally, MSC4210 always disables the legacy rules.
-            if (self.has_mentions || self.msc4210_enabled)
+            if self.has_mentions
                 && (rule_id == "global/override/.m.rule.contains_display_name"
                     || rule_id == "global/content/.m.rule.contains_user_name"
                     || rule_id == "global/override/.m.rule.roomnotif")
@@ -533,7 +526,6 @@ fn push_rule_evaluator() {
         true,
         vec![],
         true,
-        false,
     )
     .unwrap();
 
@@ -563,7 +555,6 @@ fn test_requires_room_version_supports_condition() {
         false,
         flags,
         true,
-        false,
     )
     .unwrap();
 
@@ -591,7 +582,7 @@ fn test_requires_room_version_supports_condition() {
     };
     let rules = PushRules::new(vec![custom_rule]);
     result = evaluator.run(
-        &FilteredPushRules::py_new(rules, BTreeMap::new(), true, false, true, false, false),
+        &FilteredPushRules::py_new(rules, BTreeMap::new(), true, false, true, false),
         None,
         None,
     );

rust/src/push/mod.rs

@@ -534,7 +534,6 @@ pub struct FilteredPushRules {
     msc3381_polls_enabled: bool,
     msc3664_enabled: bool,
     msc4028_push_encrypted_events: bool,
-    msc4210_enabled: bool,
 }
 
 #[pymethods]
@@ -547,7 +546,6 @@ impl FilteredPushRules {
         msc3381_polls_enabled: bool,
         msc3664_enabled: bool,
         msc4028_push_encrypted_events: bool,
-        msc4210_enabled: bool,
     ) -> Self {
         Self {
             push_rules,
@@ -556,7 +554,6 @@ impl FilteredPushRules {
             msc3381_polls_enabled,
             msc3664_enabled,
             msc4028_push_encrypted_events,
-            msc4210_enabled,
         }
     }
 
@@ -599,14 +596,6 @@ impl FilteredPushRules {
                     return false;
                 }
 
-                if self.msc4210_enabled
-                    && (rule.rule_id == "global/override/.m.rule.contains_display_name"
-                        || rule.rule_id == "global/content/.m.rule.contains_user_name"
-                        || rule.rule_id == "global/override/.m.rule.roomnotif")
-                {
-                    return false;
-                }
-
                 true
             })
             .map(|r| {

scripts-dev/build_debian_packages.py

@@ -32,8 +32,8 @@ DISTS = (
     "debian:sid",  # (EOL not specified yet) (our EOL forced by Python 3.11 is 2027-10-24)
     "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:noble",  # 24.04 LTS (EOL 2029-06)
-    "ubuntu:oracular",  # 24.10 (EOL 2025-07)
+    "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/check_pydantic_models.py

@@ -31,7 +31,6 @@ Pydantic does not yet offer a strict mode, but it is planned for pydantic v2. Se
 until then, this script is a best effort to stop us from introducing type coersion bugs
 (like the infamous stringy power levels fixed in room version 10).
 """
-
 import argparse
 import contextlib
 import functools
@@ -45,6 +44,7 @@ import traceback
 import unittest.mock
 from contextlib import contextmanager
 from typing import (
+    TYPE_CHECKING,
     Any,
     Callable,
     Dict,
@@ -56,16 +56,29 @@ from typing import (
 )
 
 from parameterized import parameterized
-from typing_extensions import ParamSpec
 
-from synapse._pydantic_compat import (
-    BaseModel as PydanticBaseModel,
-    conbytes,
-    confloat,
-    conint,
-    constr,
-    get_args,
-)
+from synapse._pydantic_compat import HAS_PYDANTIC_V2
+
+if TYPE_CHECKING or HAS_PYDANTIC_V2:
+    from pydantic.v1 import (
+        BaseModel as PydanticBaseModel,
+        conbytes,
+        confloat,
+        conint,
+        constr,
+    )
+    from pydantic.v1.typing import get_args
+else:
+    from pydantic import (
+        BaseModel as PydanticBaseModel,
+        conbytes,
+        confloat,
+        conint,
+        constr,
+    )
+    from pydantic.typing import get_args
+
+from typing_extensions import ParamSpec
 
 logger = logging.getLogger(__name__)
 
@@ -169,16 +182,22 @@ def monkeypatch_pydantic() -> Generator[None, None, None]:
         # Most Synapse code ought to import the patched objects directly from
         # `pydantic`. But we also patch their containing modules `pydantic.main` and
         # `pydantic.types` for completeness.
-        patch_basemodel = unittest.mock.patch(
-            "synapse._pydantic_compat.BaseModel", new=PatchedBaseModel
+        patch_basemodel1 = unittest.mock.patch(
+            "pydantic.BaseModel", new=PatchedBaseModel
         )
-        patches.enter_context(patch_basemodel)
+        patch_basemodel2 = unittest.mock.patch(
+            "pydantic.main.BaseModel", new=PatchedBaseModel
+        )
+        patches.enter_context(patch_basemodel1)
+        patches.enter_context(patch_basemodel2)
         for factory in CONSTRAINED_TYPE_FACTORIES_WITH_STRICT_FLAG:
             wrapper: Callable = make_wrapper(factory)
-            patch = unittest.mock.patch(
-                f"synapse._pydantic_compat.{factory.__name__}", new=wrapper
+            patch1 = unittest.mock.patch(f"pydantic.{factory.__name__}", new=wrapper)
+            patch2 = unittest.mock.patch(
+                f"pydantic.types.{factory.__name__}", new=wrapper
             )
-            patches.enter_context(patch)
+            patches.enter_context(patch1)
+            patches.enter_context(patch2)
         yield
 
 

scripts-dev/complement.sh

@@ -220,11 +220,9 @@ test_packages=(
     ./tests/msc3874
     ./tests/msc3890
     ./tests/msc3391
-    ./tests/msc3757
     ./tests/msc3930
     ./tests/msc3902
     ./tests/msc3967
-    ./tests/msc4140
 )
 
 # Enable dirty runs, so tests will reuse the same container where possible.

scripts-dev/lint.sh

@@ -1,9 +1,8 @@
 #!/usr/bin/env bash
 #
 # Runs linting scripts over the local Synapse checkout
+# black - opinionated code formatter
 # ruff - lints and finds mistakes
-# mypy - typechecks python code
-# cargo clippy - lints rust code
 
 set -e
 
@@ -102,6 +101,12 @@ echo
 # Print out the commands being run
 set -x
 
+# Ensure the sort order of imports.
+isort "${files[@]}"
+
+# Ensure Python code conforms to an opinionated style.
+python3 -m black "${files[@]}"
+
 # Ensure the sample configuration file conforms to style checks.
 ./scripts-dev/config-lint.sh
 
@@ -109,9 +114,6 @@ set -x
 # --quiet suppresses the update check.
 ruff check --quiet --fix "${files[@]}"
 
-# Reformat Python code.
-ruff format --quiet "${files[@]}"
-
 # Catch any common programming mistakes in Rust code.
 #
 # --bins, --examples, --lib, --tests combined explicitly disable checking

scripts-dev/mypy_synapse_plugin.py

@@ -360,7 +360,7 @@ def is_cacheable(
         # 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):
+    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

scripts-dev/release.py

@@ -20,7 +20,8 @@
 #
 #
 
-"""An interactive script for doing a release. See `cli()` below."""
+"""An interactive script for doing a release. See `cli()` below.
+"""
 
 import glob
 import json
@@ -40,7 +41,7 @@ import commonmark
 import git
 from click.exceptions import ClickException
 from git import GitCommandError, Repo
-from github import BadCredentialsException, Github
+from github import Github
 from packaging import version
 
 
@@ -323,8 +324,10 @@ def tag(gh_token: Optional[str]) -> None:
 def _tag(gh_token: Optional[str]) -> None:
     """Tags the release and generates a draft GitHub release"""
 
-    # Test that the GH Token is valid before continuing.
-    check_valid_gh_token(gh_token)
+    if gh_token:
+        # Test that the GH Token is valid before continuing.
+        gh = Github(gh_token)
+        gh.get_user()
 
     # Make sure we're in a git repo.
     repo = get_repo_and_check_clean_checkout()
@@ -467,8 +470,10 @@ def upload(gh_token: Optional[str]) -> None:
 def _upload(gh_token: Optional[str]) -> None:
     """Upload release to pypi."""
 
-    # Test that the GH Token is valid before continuing.
-    check_valid_gh_token(gh_token)
+    if gh_token:
+        # Test that the GH Token is valid before continuing.
+        gh = Github(gh_token)
+        gh.get_user()
 
     current_version = get_package_version()
     tag_name = f"v{current_version}"
@@ -565,8 +570,10 @@ def wait_for_actions(gh_token: Optional[str]) -> None:
 
 
 def _wait_for_actions(gh_token: Optional[str]) -> None:
-    # Test that the GH Token is valid before continuing.
-    check_valid_gh_token(gh_token)
+    if gh_token:
+        # Test that the GH Token is valid before continuing.
+        gh = Github(gh_token)
+        gh.get_user()
 
     # Find out the version and tag name.
     current_version = get_package_version()
@@ -800,22 +807,6 @@ def get_repo_and_check_clean_checkout(
     return repo
 
 
-def check_valid_gh_token(gh_token: Optional[str]) -> None:
-    """Check that a github token is valid, if supplied"""
-
-    if not gh_token:
-        # No github token supplied, so nothing to do.
-        return
-
-    try:
-        gh = Github(gh_token)
-
-        # We need to lookup name to trigger a request.
-        _name = gh.get_user().name
-    except BadCredentialsException as e:
-        raise click.ClickException(f"Github credentials are bad: {e}")
-
-
 def find_ref(repo: git.Repo, ref_name: str) -> Optional[git.HEAD]:
     """Find the branch/ref, looking first locally then in the remote."""
     if ref_name in repo.references:

stubs/txredisapi.pyi

@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Contains *incomplete* type hints for txredisapi."""
-
+"""Contains *incomplete* type hints for txredisapi.
+"""
 from typing import Any, List, Optional, Type, Union
 
 from twisted.internet import protocol

synapse/__init__.py

@@ -20,7 +20,8 @@
 #
 #
 
-"""This is an implementation of a Matrix homeserver."""
+""" This is an implementation of a Matrix homeserver.
+"""
 
 import os
 import sys

synapse/_pydantic_compat.py

@@ -19,8 +19,6 @@
 #
 #
 
-from typing import TYPE_CHECKING
-
 from packaging.version import Version
 
 try:
@@ -32,64 +30,4 @@ except ImportError:
 
 HAS_PYDANTIC_V2: bool = Version(pydantic_version).major == 2
 
-if TYPE_CHECKING or HAS_PYDANTIC_V2:
-    from pydantic.v1 import (
-        BaseModel,
-        Extra,
-        Field,
-        MissingError,
-        PydanticValueError,
-        StrictBool,
-        StrictInt,
-        StrictStr,
-        ValidationError,
-        conbytes,
-        confloat,
-        conint,
-        constr,
-        parse_obj_as,
-        validator,
-    )
-    from pydantic.v1.error_wrappers import ErrorWrapper
-    from pydantic.v1.typing import get_args
-else:
-    from pydantic import (
-        BaseModel,
-        Extra,
-        Field,
-        MissingError,
-        PydanticValueError,
-        StrictBool,
-        StrictInt,
-        StrictStr,
-        ValidationError,
-        conbytes,
-        confloat,
-        conint,
-        constr,
-        parse_obj_as,
-        validator,
-    )
-    from pydantic.error_wrappers import ErrorWrapper
-    from pydantic.typing import get_args
-
-__all__ = (
-    "HAS_PYDANTIC_V2",
-    "BaseModel",
-    "constr",
-    "conbytes",
-    "conint",
-    "confloat",
-    "ErrorWrapper",
-    "Extra",
-    "Field",
-    "get_args",
-    "MissingError",
-    "parse_obj_as",
-    "PydanticValueError",
-    "StrictBool",
-    "StrictInt",
-    "StrictStr",
-    "ValidationError",
-    "validator",
-)
+__all__ = ("HAS_PYDANTIC_V2",)

synapse/_scripts/generate_workers_map.py

@@ -171,7 +171,7 @@ def elide_http_methods_if_unconflicting(
     """
 
     def paths_to_methods_dict(
-        methods_and_paths: Iterable[Tuple[str, str]],
+        methods_and_paths: Iterable[Tuple[str, str]]
     ) -> Dict[str, Set[str]]:
         """
         Given (method, path) pairs, produces a dict from path to set of methods
@@ -201,7 +201,7 @@ def elide_http_methods_if_unconflicting(
 
 
 def simplify_path_regexes(
-    registrations: Dict[Tuple[str, str], EndpointDescription],
+    registrations: Dict[Tuple[str, str], EndpointDescription]
 ) -> Dict[Tuple[str, str], EndpointDescription]:
     """
     Simplify all the path regexes for the dict of endpoint descriptions,

synapse/_scripts/review_recent_signups.py

@@ -40,7 +40,6 @@ from synapse.storage.engines import create_engine
 
 class ReviewConfig(RootConfig):
     "A config class that just pulls out the database config"
-
     config_classes = [DatabaseConfig]
 
 
@@ -161,11 +160,7 @@ def main() -> None:
 
     with make_conn(database_config, engine, "review_recent_signups") as db_conn:
         # This generates a type of Cursor, not LoggingTransaction.
-        user_infos = get_recent_users(
-            db_conn.cursor(),
-            since_ms,  # type: ignore[arg-type]
-            exclude_users_with_appservice,
-        )
+        user_infos = get_recent_users(db_conn.cursor(), since_ms, exclude_users_with_appservice)  # type: ignore[arg-type]
 
     for user_info in user_infos:
         if exclude_users_with_email and user_info.emails:

synapse/_scripts/synapse_port_db.py

@@ -717,7 +717,9 @@ class Porter:
                 return
 
             # Check if all background updates are done, abort if not.
-            updates_complete = await self.sqlite_store.db_pool.updates.has_completed_background_updates()
+            updates_complete = (
+                await self.sqlite_store.db_pool.updates.has_completed_background_updates()
+            )
             if not updates_complete:
                 end_error = (
                     "Pending background updates exist in the SQLite3 database."
@@ -1093,10 +1095,10 @@ class Porter:
         return done, remaining + done
 
     async def _setup_state_group_id_seq(self) -> None:
-        curr_id: Optional[
-            int
-        ] = await self.sqlite_store.db_pool.simple_select_one_onecol(
-            table="state_groups", keyvalues={}, retcol="MAX(id)", allow_none=True
+        curr_id: Optional[int] = (
+            await self.sqlite_store.db_pool.simple_select_one_onecol(
+                table="state_groups", keyvalues={}, retcol="MAX(id)", allow_none=True
+            )
         )
 
         if not curr_id:
@@ -1184,13 +1186,13 @@ class Porter:
         )
 
     async def _setup_auth_chain_sequence(self) -> None:
-        curr_chain_id: Optional[
-            int
-        ] = await self.sqlite_store.db_pool.simple_select_one_onecol(
-            table="event_auth_chains",
-            keyvalues={},
-            retcol="MAX(chain_id)",
-            allow_none=True,
+        curr_chain_id: Optional[int] = (
+            await self.sqlite_store.db_pool.simple_select_one_onecol(
+                table="event_auth_chains",
+                keyvalues={},
+                retcol="MAX(chain_id)",
+                allow_none=True,
+            )
         )
 
         def r(txn: LoggingTransaction) -> None:

synapse/api/auth/msc3861_delegated.py

@@ -121,9 +121,7 @@ class MSC3861DelegatedAuth(BaseAuth):
         self._hostname = hs.hostname
         self._admin_token = self._config.admin_token
 
-        self._issuer_metadata = RetryOnExceptionCachedCall[OpenIDProviderMetadata](
-            self._load_metadata
-        )
+        self._issuer_metadata = RetryOnExceptionCachedCall(self._load_metadata)
 
         if isinstance(auth_method, PrivateKeyJWTWithKid):
             # Use the JWK as the client secret when using the private_key_jwt method
@@ -147,33 +145,6 @@ class MSC3861DelegatedAuth(BaseAuth):
         # metadata.validate_introspection_endpoint()
         return metadata
 
-    async def issuer(self) -> str:
-        """
-        Get the configured issuer
-
-        This will use the issuer value set in the metadata,
-        falling back to the one set in the config if not set in the metadata
-        """
-        metadata = await self._issuer_metadata.get()
-        return metadata.issuer or self._config.issuer
-
-    async def account_management_url(self) -> Optional[str]:
-        """
-        Get the configured account management URL
-
-        This will discover the account management URL from the issuer if it's not set in the config
-        """
-        if self._config.account_management_url is not None:
-            return self._config.account_management_url
-
-        try:
-            metadata = await self._issuer_metadata.get()
-            return metadata.get("account_management_uri", None)
-        # We don't want to raise here if we can't load the metadata
-        except Exception:
-            logger.warning("Failed to load metadata:", exc_info=True)
-            return None
-
     async def _introspection_endpoint(self) -> str:
         """
         Returns the introspection endpoint of the issuer
@@ -183,7 +154,7 @@ class MSC3861DelegatedAuth(BaseAuth):
         if self._config.introspection_endpoint is not None:
             return self._config.introspection_endpoint
 
-        metadata = await self._issuer_metadata.get()
+        metadata = await self._load_metadata()
         return metadata.get("introspection_endpoint")
 
     async def _introspect_token(self, token: str) -> IntrospectionToken:
@@ -338,7 +309,7 @@ class MSC3861DelegatedAuth(BaseAuth):
             logger.exception("Failed to introspect token")
             raise SynapseError(503, "Unable to introspect the access token")
 
-        logger.debug("Introspection result: %r", introspection_result)
+        logger.info(f"Introspection result: {introspection_result!r}")
 
         # TODO: introspection verification should be more extensive, especially:
         #   - verify the audience

synapse/api/constants.py

@@ -230,8 +230,6 @@ class EventContentFields:
 
     ROOM_NAME: Final = "name"
 
-    MEMBERSHIP: Final = "membership"
-
     # Used in m.room.guest_access events.
     GUEST_ACCESS: Final = "guest_access"
 

synapse/api/room_versions.py

@@ -107,8 +107,6 @@ class RoomVersion:
     # support the flag. Unknown flags are ignored by the evaluator, making conditions
     # fail if used.
     msc3931_push_features: Tuple[str, ...]  # values from PushRuleRoomFlag
-    # MSC3757: Restricting who can overwrite a state event
-    msc3757_enabled: bool
 
 
 class RoomVersions:
@@ -130,7 +128,6 @@ class RoomVersions:
         knock_restricted_join_rule=False,
         enforce_int_power_levels=False,
         msc3931_push_features=(),
-        msc3757_enabled=False,
     )
     V2 = RoomVersion(
         "2",
@@ -150,7 +147,6 @@ class RoomVersions:
         knock_restricted_join_rule=False,
         enforce_int_power_levels=False,
         msc3931_push_features=(),
-        msc3757_enabled=False,
     )
     V3 = RoomVersion(
         "3",
@@ -170,7 +166,6 @@ class RoomVersions:
         knock_restricted_join_rule=False,
         enforce_int_power_levels=False,
         msc3931_push_features=(),
-        msc3757_enabled=False,
     )
     V4 = RoomVersion(
         "4",
@@ -190,7 +185,6 @@ class RoomVersions:
         knock_restricted_join_rule=False,
         enforce_int_power_levels=False,
         msc3931_push_features=(),
-        msc3757_enabled=False,
     )
     V5 = RoomVersion(
         "5",
@@ -210,7 +204,6 @@ class RoomVersions:
         knock_restricted_join_rule=False,
         enforce_int_power_levels=False,
         msc3931_push_features=(),
-        msc3757_enabled=False,
     )
     V6 = RoomVersion(
         "6",
@@ -230,7 +223,6 @@ class RoomVersions:
         knock_restricted_join_rule=False,
         enforce_int_power_levels=False,
         msc3931_push_features=(),
-        msc3757_enabled=False,
     )
     V7 = RoomVersion(
         "7",
@@ -250,7 +242,6 @@ class RoomVersions:
         knock_restricted_join_rule=False,
         enforce_int_power_levels=False,
         msc3931_push_features=(),
-        msc3757_enabled=False,
     )
     V8 = RoomVersion(
         "8",
@@ -270,7 +261,6 @@ class RoomVersions:
         knock_restricted_join_rule=False,
         enforce_int_power_levels=False,
         msc3931_push_features=(),
-        msc3757_enabled=False,
     )
     V9 = RoomVersion(
         "9",
@@ -290,7 +280,6 @@ class RoomVersions:
         knock_restricted_join_rule=False,
         enforce_int_power_levels=False,
         msc3931_push_features=(),
-        msc3757_enabled=False,
     )
     V10 = RoomVersion(
         "10",
@@ -310,7 +299,6 @@ class RoomVersions:
         knock_restricted_join_rule=True,
         enforce_int_power_levels=True,
         msc3931_push_features=(),
-        msc3757_enabled=False,
     )
     MSC1767v10 = RoomVersion(
         # MSC1767 (Extensible Events) based on room version "10"
@@ -331,28 +319,6 @@ class RoomVersions:
         knock_restricted_join_rule=True,
         enforce_int_power_levels=True,
         msc3931_push_features=(PushRuleRoomFlag.EXTENSIBLE_EVENTS,),
-        msc3757_enabled=False,
-    )
-    MSC3757v10 = RoomVersion(
-        # MSC3757 (Restricting who can overwrite a state event) based on room version "10"
-        "org.matrix.msc3757.10",
-        RoomDisposition.UNSTABLE,
-        EventFormatVersions.ROOM_V4_PLUS,
-        StateResolutionVersions.V2,
-        enforce_key_validity=True,
-        special_case_aliases_auth=False,
-        strict_canonicaljson=True,
-        limit_notifications_power_levels=True,
-        implicit_room_creator=False,
-        updated_redaction_rules=False,
-        restricted_join_rule=True,
-        restricted_join_rule_fix=True,
-        knock_join_rule=True,
-        msc3389_relation_redactions=False,
-        knock_restricted_join_rule=True,
-        enforce_int_power_levels=True,
-        msc3931_push_features=(),
-        msc3757_enabled=True,
     )
     V11 = RoomVersion(
         "11",
@@ -372,28 +338,6 @@ class RoomVersions:
         knock_restricted_join_rule=True,
         enforce_int_power_levels=True,
         msc3931_push_features=(),
-        msc3757_enabled=False,
-    )
-    MSC3757v11 = RoomVersion(
-        # MSC3757 (Restricting who can overwrite a state event) based on room version "11"
-        "org.matrix.msc3757.11",
-        RoomDisposition.UNSTABLE,
-        EventFormatVersions.ROOM_V4_PLUS,
-        StateResolutionVersions.V2,
-        enforce_key_validity=True,
-        special_case_aliases_auth=False,
-        strict_canonicaljson=True,
-        limit_notifications_power_levels=True,
-        implicit_room_creator=True,  # Used by MSC3820
-        updated_redaction_rules=True,  # Used by MSC3820
-        restricted_join_rule=True,
-        restricted_join_rule_fix=True,
-        knock_join_rule=True,
-        msc3389_relation_redactions=False,
-        knock_restricted_join_rule=True,
-        enforce_int_power_levels=True,
-        msc3931_push_features=(),
-        msc3757_enabled=True,
     )
 
 
@@ -411,8 +355,6 @@ KNOWN_ROOM_VERSIONS: Dict[str, RoomVersion] = {
         RoomVersions.V9,
         RoomVersions.V10,
         RoomVersions.V11,
-        RoomVersions.MSC3757v10,
-        RoomVersions.MSC3757v11,
     )
 }
 

synapse/api/urls.py

@@ -19,8 +19,7 @@
 #
 #
 
-"""Contains the URL paths to prefix various aspects of the server with."""
-
+"""Contains the URL paths to prefix various aspects of the server with. """
 import hmac
 from hashlib import sha256
 from urllib.parse import urlencode

synapse/app/generic_worker.py

@@ -3,7 +3,7 @@
 #
 # Copyright 2020 The Matrix.org Foundation C.I.C.
 # Copyright 2016 OpenMarket Ltd
-# Copyright (C) 2023-2024 New Vector, Ltd
+# Copyright (C) 2023 New Vector, Ltd
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -65,7 +65,6 @@ from synapse.storage.databases.main.appservice import (
 )
 from synapse.storage.databases.main.censor_events import CensorEventsStore
 from synapse.storage.databases.main.client_ips import ClientIpWorkerStore
-from synapse.storage.databases.main.delayed_events import DelayedEventsStore
 from synapse.storage.databases.main.deviceinbox import DeviceInboxWorkerStore
 from synapse.storage.databases.main.devices import DeviceWorkerStore
 from synapse.storage.databases.main.directory import DirectoryWorkerStore
@@ -99,7 +98,6 @@ from synapse.storage.databases.main.roommember import RoomMemberWorkerStore
 from synapse.storage.databases.main.search import SearchStore
 from synapse.storage.databases.main.session import SessionStore
 from synapse.storage.databases.main.signatures import SignatureWorkerStore
-from synapse.storage.databases.main.sliding_sync import SlidingSyncStore
 from synapse.storage.databases.main.state import StateGroupWorkerStore
 from synapse.storage.databases.main.stats import StatsStore
 from synapse.storage.databases.main.stream import StreamWorkerStore
@@ -161,8 +159,6 @@ class GenericWorkerStore(
     SessionStore,
     TaskSchedulerWorkerStore,
     ExperimentalFeaturesStore,
-    SlidingSyncStore,
-    DelayedEventsStore,
 ):
     # Properties that multiple storage classes define. Tell mypy what the
     # expected type is.

synapse/appservice/scheduler.py

@@ -54,7 +54,6 @@ UP & quit           +---------- YES                       SUCCESS
 This is all tied together by the AppServiceScheduler which DIs the required
 components.
 """
-
 import logging
 from typing import (
     TYPE_CHECKING,

synapse/config/_util.py

@@ -18,11 +18,17 @@
 # [This file includes modifications made by New Vector Limited]
 #
 #
-from typing import Any, Dict, Type, TypeVar
+from typing import TYPE_CHECKING, Any, Dict, Type, TypeVar
 
 import jsonschema
 
-from synapse._pydantic_compat import BaseModel, ValidationError, parse_obj_as
+from synapse._pydantic_compat import HAS_PYDANTIC_V2
+
+if TYPE_CHECKING or HAS_PYDANTIC_V2:
+    from pydantic.v1 import BaseModel, ValidationError, parse_obj_as
+else:
+    from pydantic import BaseModel, ValidationError, parse_obj_as
+
 from synapse.config._base import ConfigError
 from synapse.types import JsonDict, StrSequence
 

synapse/config/experimental.py

@@ -338,10 +338,8 @@ class ExperimentalConfig(Config):
         # MSC3391: Removing account data.
         self.msc3391_enabled = experimental.get("msc3391_enabled", False)
 
-        # MSC3575 (Sliding Sync) alternate endpoints, c.f. MSC4186.
-        #
-        # This is enabled by default as a replacement for the sliding sync proxy.
-        self.msc3575_enabled: bool = experimental.get("msc3575_enabled", True)
+        # MSC3575 (Sliding Sync API endpoints)
+        self.msc3575_enabled: bool = experimental.get("msc3575_enabled", False)
 
         # MSC3773: Thread notifications
         self.msc3773_enabled: bool = experimental.get("msc3773_enabled", False)
@@ -448,5 +446,5 @@ class ExperimentalConfig(Config):
         # MSC4151: Report room API (Client-Server API)
         self.msc4151_enabled: bool = experimental.get("msc4151_enabled", False)
 
-        # MSC4210: Remove legacy mentions
-        self.msc4210_enabled: bool = experimental.get("msc4210_enabled", False)
+        # MSC4156: Migrate server_name to via
+        self.msc4156_enabled: bool = experimental.get("msc4156_enabled", False)

synapse/config/jwt.py

@@ -38,7 +38,6 @@ class JWTConfig(Config):
             self.jwt_algorithm = jwt_config["algorithm"]
 
             self.jwt_subject_claim = jwt_config.get("subject_claim", "sub")
-            self.jwt_display_name_claim = jwt_config.get("display_name_claim")
 
             # The issuer and audiences are optional, if provided, it is asserted
             # that the claims exist on the JWT.
@@ -50,6 +49,5 @@ class JWTConfig(Config):
             self.jwt_secret = None
             self.jwt_algorithm = None
             self.jwt_subject_claim = None
-            self.jwt_display_name_claim = None
             self.jwt_issuer = None
             self.jwt_audiences = None

synapse/config/key.py

@@ -200,13 +200,16 @@ class KeyConfig(Config):
             )
             form_secret = 'form_secret: "%s"' % random_string_with_symbols(50)
 
-        return """\
+        return (
+            """\
         %(macaroon_secret_key)s
         %(form_secret)s
         signing_key_path: "%(base_key_name)s.signing.key"
         trusted_key_servers:
           - server_name: "matrix.org"
-        """ % locals()
+        """
+            % locals()
+        )
 
     def read_signing_keys(self, signing_key_path: str, name: str) -> List[SigningKey]:
         """Read the signing keys in the given path.
@@ -246,9 +249,7 @@ class KeyConfig(Config):
             if is_signing_algorithm_supported(key_id):
                 key_base64 = key_data["key"]
                 key_bytes = decode_base64(key_base64)
-                verify_key: "VerifyKeyWithExpiry" = decode_verify_key_bytes(
-                    key_id, key_bytes
-                )  # type: ignore[assignment]
+                verify_key: "VerifyKeyWithExpiry" = decode_verify_key_bytes(key_id, key_bytes)  # type: ignore[assignment]
                 verify_key.expired = key_data["expired_ts"]
                 keys[key_id] = verify_key
             else:

synapse/config/logger.py

@@ -157,9 +157,12 @@ class LoggingConfig(Config):
         self, config_dir_path: str, server_name: str, **kwargs: Any
     ) -> str:
         log_config = os.path.join(config_dir_path, server_name + ".log.config")
-        return """\
+        return (
+            """\
         log_config: "%(log_config)s"
-        """ % locals()
+        """
+            % locals()
+        )
 
     def read_arguments(self, args: argparse.Namespace) -> None:
         if args.no_redirect_stdio is not None:

synapse/config/redis.py

@@ -21,15 +21,10 @@
 
 from typing import Any
 
-from synapse.config._base import Config, ConfigError, read_file
+from synapse.config._base import Config
 from synapse.types import JsonDict
 from synapse.util.check_dependencies import check_requirements
 
-CONFLICTING_PASSWORD_OPTS_ERROR = """\
-You have configured both `redis.password` and `redis.password_path`.
-These are mutually incompatible.
-"""
-
 
 class RedisConfig(Config):
     section = "redis"
@@ -48,17 +43,6 @@ class RedisConfig(Config):
         self.redis_path = redis_config.get("path", None)
         self.redis_dbid = redis_config.get("dbid", None)
         self.redis_password = redis_config.get("password")
-        redis_password_path = redis_config.get("password_path")
-        if redis_password_path:
-            if self.redis_password:
-                raise ConfigError(CONFLICTING_PASSWORD_OPTS_ERROR)
-            self.redis_password = read_file(
-                redis_password_path,
-                (
-                    "redis",
-                    "password_path",
-                ),
-            ).strip()
 
         self.redis_use_tls = redis_config.get("use_tls", False)
         self.redis_certificate = redis_config.get("certificate_file", None)

synapse/config/server.py

@@ -2,7 +2,7 @@
 # This file is licensed under the Affero General Public License (AGPL) version 3.
 #
 # Copyright 2014-2021 The Matrix.org Foundation C.I.C.
-# Copyright (C) 2023-2024 New Vector, Ltd
+# Copyright (C) 2023 New Vector, Ltd
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -780,17 +780,6 @@ class ServerConfig(Config):
         else:
             self.delete_stale_devices_after = None
 
-        # The maximum allowed delay duration for delayed events (MSC4140).
-        max_event_delay_duration = config.get("max_event_delay_duration")
-        if max_event_delay_duration is not None:
-            self.max_event_delay_ms: Optional[int] = self.parse_duration(
-                max_event_delay_duration
-            )
-            if self.max_event_delay_ms <= 0:
-                raise ConfigError("max_event_delay_duration must be a positive value")
-        else:
-            self.max_event_delay_ms = None
-
     def has_tls_listener(self) -> bool:
         return any(listener.is_tls() for listener in self.listeners)
 
@@ -839,10 +828,13 @@ class ServerConfig(Config):
             ).lstrip()
 
         if not unsecure_listeners:
-            unsecure_http_bindings = """- port: %(unsecure_port)s
+            unsecure_http_bindings = (
+                """- port: %(unsecure_port)s
             tls: false
             type: http
-            x_forwarded: true""" % locals()
+            x_forwarded: true"""
+                % locals()
+            )
 
             if not open_private_ports:
                 unsecure_http_bindings += (
@@ -861,13 +853,16 @@ class ServerConfig(Config):
         if not secure_listeners:
             secure_http_bindings = ""
 
-        return """\
+        return (
+            """\
         server_name: "%(server_name)s"
         pid_file: %(pid_file)s
         listeners:
           %(secure_http_bindings)s
           %(unsecure_http_bindings)s
-        """ % locals()
+        """
+            % locals()
+        )
 
     def read_arguments(self, args: argparse.Namespace) -> None:
         if args.manhole is not None:

synapse/config/voip.py

@@ -23,12 +23,7 @@ from typing import Any
 
 from synapse.types import JsonDict
 
-from ._base import Config, ConfigError, read_file
-
-CONFLICTING_SHARED_SECRET_OPTS_ERROR = """\
-You have configured both `turn_shared_secret` and `turn_shared_secret_path`.
-These are mutually incompatible.
-"""
+from ._base import Config
 
 
 class VoipConfig(Config):
@@ -37,13 +32,6 @@ class VoipConfig(Config):
     def read_config(self, config: JsonDict, **kwargs: Any) -> None:
         self.turn_uris = config.get("turn_uris", [])
         self.turn_shared_secret = config.get("turn_shared_secret")
-        turn_shared_secret_path = config.get("turn_shared_secret_path")
-        if turn_shared_secret_path:
-            if self.turn_shared_secret:
-                raise ConfigError(CONFLICTING_SHARED_SECRET_OPTS_ERROR)
-            self.turn_shared_secret = read_file(
-                turn_shared_secret_path, ("turn_shared_secret_path",)
-            ).strip()
         self.turn_username = config.get("turn_username")
         self.turn_password = config.get("turn_password")
         self.turn_user_lifetime = self.parse_duration(

synapse/config/workers.py

@@ -22,17 +22,17 @@
 
 import argparse
 import logging
-from typing import Any, Dict, List, Optional, Union
+from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union
 
 import attr
 
-from synapse._pydantic_compat import (
-    BaseModel,
-    Extra,
-    StrictBool,
-    StrictInt,
-    StrictStr,
-)
+from synapse._pydantic_compat import HAS_PYDANTIC_V2
+
+if TYPE_CHECKING or HAS_PYDANTIC_V2:
+    from pydantic.v1 import BaseModel, Extra, StrictBool, StrictInt, StrictStr
+else:
+    from pydantic import BaseModel, Extra, StrictBool, StrictInt, StrictStr
+
 from synapse.config._base import (
     Config,
     ConfigError,
@@ -328,11 +328,10 @@ class WorkerConfig(Config):
                 )
 
         # type-ignore: the expression `Union[A, B]` is not a Type[Union[A, B]] currently
-        self.instance_map: Dict[str, InstanceLocationConfig] = (
-            parse_and_validate_mapping(
-                instance_map,
-                InstanceLocationConfig,  # type: ignore[arg-type]
-            )
+        self.instance_map: Dict[
+            str, InstanceLocationConfig
+        ] = parse_and_validate_mapping(
+            instance_map, InstanceLocationConfig  # type: ignore[arg-type]
         )
 
         # Map from type of streams to source, c.f. WriterLocations.

synapse/event_auth.py

@@ -388,7 +388,6 @@ LENIENT_EVENT_BYTE_LIMITS_ROOM_VERSIONS = {
     RoomVersions.V9,
     RoomVersions.V10,
     RoomVersions.MSC1767v10,
-    RoomVersions.MSC3757v10,
 }
 
 
@@ -791,10 +790,9 @@ def get_send_level(
 
 
 def _can_send_event(event: "EventBase", auth_events: StateMap["EventBase"]) -> bool:
-    state_key = event.get_state_key()
     power_levels_event = get_power_level_event(auth_events)
 
-    send_level = get_send_level(event.type, state_key, power_levels_event)
+    send_level = get_send_level(event.type, event.get("state_key"), power_levels_event)
     user_level = get_user_power_level(event.user_id, auth_events)
 
     if user_level < send_level:
@@ -805,34 +803,11 @@ def _can_send_event(event: "EventBase", auth_events: StateMap["EventBase"]) -> b
             errcode=Codes.INSUFFICIENT_POWER,
         )
 
-    if (
-        state_key is not None
-        and state_key.startswith("@")
-        and state_key != event.user_id
-    ):
-        if event.room_version.msc3757_enabled:
-            try:
-                colon_idx = state_key.index(":", 1)
-                suffix_idx = state_key.find("_", colon_idx + 1)
-                state_key_user_id = (
-                    state_key[:suffix_idx] if suffix_idx != -1 else state_key
-                )
-                if not UserID.is_valid(state_key_user_id):
-                    raise ValueError
-            except ValueError:
-                raise SynapseError(
-                    400,
-                    "State key neither equals a valid user ID, nor starts with one plus an underscore",
-                    errcode=Codes.BAD_JSON,
-                )
-            if (
-                # sender is owner of the state key
-                state_key_user_id == event.user_id
-                # sender has higher PL than the owner of the state key
-                or user_level > get_user_power_level(state_key_user_id, auth_events)
-            ):
-                return True
-        raise AuthError(403, "You are not allowed to set others state")
+    # Check state_key
+    if hasattr(event, "state_key"):
+        if event.state_key.startswith("@"):
+            if event.state_key != event.user_id:
+                raise AuthError(403, "You are not allowed to set others state")
 
     return True
 
@@ -912,8 +887,7 @@ def _check_power_levels(
                     raise SynapseError(400, f"{v!r} must be an integer.")
             if k in {"events", "notifications", "users"}:
                 if not isinstance(v, collections.abc.Mapping) or not all(
-                    type(v) is int
-                    for v in v.values()  # noqa: E721
+                    type(v) is int for v in v.values()  # noqa: E721
                 ):
                     raise SynapseError(
                         400,

synapse/events/presence_router.py

@@ -80,7 +80,7 @@ def load_legacy_presence_router(hs: "HomeServer") -> None:
     # All methods that the module provides should be async, but this wasn't enforced
     # in the old module system, so we wrap them if needed
     def async_wrapper(
-        f: Optional[Callable[P, R]],
+        f: Optional[Callable[P, R]]
     ) -> Optional[Callable[P, Awaitable[R]]]:
         # f might be None if the callback isn't implemented by the module. In this
         # case we don't want to register a callback at all so we return None.

synapse/events/snapshot.py

@@ -504,7 +504,7 @@ class UnpersistedEventContext(UnpersistedEventContextBase):
 
 
 def _encode_state_group_delta(
-    state_group_delta: Dict[Tuple[int, int], StateMap[str]],
+    state_group_delta: Dict[Tuple[int, int], StateMap[str]]
 ) -> List[Tuple[int, int, Optional[List[Tuple[str, str, str]]]]]:
     if not state_group_delta:
         return []
@@ -517,7 +517,7 @@ def _encode_state_group_delta(
 
 
 def _decode_state_group_delta(
-    input: List[Tuple[int, int, List[Tuple[str, str, str]]]],
+    input: List[Tuple[int, int, List[Tuple[str, str, str]]]]
 ) -> Dict[Tuple[int, int], StateMap[str]]:
     if not input:
         return {}
@@ -544,7 +544,7 @@ def _encode_state_dict(
 
 
 def _decode_state_dict(
-    input: Optional[List[Tuple[str, str, str]]],
+    input: Optional[List[Tuple[str, str, str]]]
 ) -> Optional[StateMap[str]]:
     """Decodes a state dict encoded using `_encode_state_dict` above"""
     if input is None:

synapse/events/validator.py

@@ -19,11 +19,17 @@
 #
 #
 import collections.abc
-from typing import List, Type, Union, cast
+from typing import TYPE_CHECKING, List, Type, Union, cast
 
 import jsonschema
 
-from synapse._pydantic_compat import Field, StrictBool, StrictStr
+from synapse._pydantic_compat import HAS_PYDANTIC_V2
+
+if TYPE_CHECKING or HAS_PYDANTIC_V2:
+    from pydantic.v1 import Field, StrictBool, StrictStr
+else:
+    from pydantic import Field, StrictBool, StrictStr
+
 from synapse.api.constants import (
     MAX_ALIAS_LENGTH,
     EventContentFields,

synapse/federation/__init__.py

@@ -19,4 +19,5 @@
 #
 #
 
-"""This package includes all the federation specific logic."""
+""" This package includes all the federation specific logic.
+"""

synapse/federation/persistence.py

@@ -20,7 +20,7 @@
 #
 #
 
-"""This module contains all the persistence actions done by the federation
+""" This module contains all the persistence actions done by the federation
 package.
 
 These actions are mostly only used by the :py:mod:`.replication` module.

synapse/federation/transport/server/_base.py

@@ -113,7 +113,7 @@ class Authenticator:
                 ):
                     raise AuthenticationError(
                         HTTPStatus.UNAUTHORIZED,
-                        f"Destination mismatch in auth header, received: {destination!r}",
+                        "Destination mismatch in auth header",
                         Codes.UNAUTHORIZED,
                     )
         if (

synapse/federation/transport/server/federation.py

@@ -859,6 +859,7 @@ class FederationMediaThumbnailServlet(BaseFederationServerServlet):
         request: SynapseRequest,
         media_id: str,
     ) -> None:
+
         width = parse_integer(request, "width", required=True)
         height = parse_integer(request, "height", required=True)
         method = parse_string(request, "method", "scale")

synapse/federation/units.py

@@ -19,7 +19,7 @@
 #
 #
 
-"""Defines the JSON structure of the protocol units used by the server to
+""" Defines the JSON structure of the protocol units used by the server to
 server protocol.
 """
 

synapse/handlers/account.py

@@ -118,10 +118,10 @@ class AccountHandler:
             }
 
             if self._use_account_validity_in_account_status:
-                status[
-                    "org.matrix.expired"
-                ] = await self._account_validity_handler.is_user_expired(
-                    user_id.to_string()
+                status["org.matrix.expired"] = (
+                    await self._account_validity_handler.is_user_expired(
+                        user_id.to_string()
+                    )
                 )
 
         return status

synapse/handlers/account_data.py

@@ -33,7 +33,7 @@ from synapse.replication.http.account_data import (
     ReplicationRemoveUserAccountDataRestServlet,
 )
 from synapse.streams import EventSource
-from synapse.types import JsonDict, JsonMapping, StrCollection, StreamKeyType, UserID
+from synapse.types import JsonDict, StrCollection, StreamKeyType, UserID
 
 if TYPE_CHECKING:
     from synapse.server import HomeServer
@@ -253,7 +253,7 @@ class AccountDataHandler:
             return response["max_stream_id"]
 
     async def add_tag_to_room(
-        self, user_id: str, room_id: str, tag: str, content: JsonMapping
+        self, user_id: str, room_id: str, tag: str, content: JsonDict
     ) -> int:
         """Add a tag to a room for a user.
 

synapse/handlers/admin.py

@@ -21,34 +21,13 @@
 
 import abc
 import logging
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Dict,
-    List,
-    Mapping,
-    Optional,
-    Sequence,
-    Set,
-    Tuple,
-)
+from typing import TYPE_CHECKING, Any, Dict, List, Mapping, Optional, Sequence, Set
 
 import attr
 
-from synapse.api.constants import Direction, EventTypes, Membership
-from synapse.api.errors import SynapseError
+from synapse.api.constants import Direction, Membership
 from synapse.events import EventBase
-from synapse.types import (
-    JsonMapping,
-    Requester,
-    RoomStreamToken,
-    ScheduledTask,
-    StateMap,
-    TaskStatus,
-    UserID,
-    UserInfo,
-    create_requester,
-)
+from synapse.types import JsonMapping, RoomStreamToken, StateMap, UserID, UserInfo
 from synapse.visibility import filter_events_for_client
 
 if TYPE_CHECKING:
@@ -56,8 +35,6 @@ if TYPE_CHECKING:
 
 logger = logging.getLogger(__name__)
 
-REDACT_ALL_EVENTS_ACTION_NAME = "redact_all_events"
-
 
 class AdminHandler:
     def __init__(self, hs: "HomeServer"):
@@ -66,22 +43,6 @@ class AdminHandler:
         self._storage_controllers = hs.get_storage_controllers()
         self._state_storage_controller = self._storage_controllers.state
         self._msc3866_enabled = hs.config.experimental.msc3866.enabled
-        self.event_creation_handler = hs.get_event_creation_handler()
-        self._task_scheduler = hs.get_task_scheduler()
-
-        self._task_scheduler.register_action(
-            self._redact_all_events, REDACT_ALL_EVENTS_ACTION_NAME
-        )
-
-        self.hs = hs
-
-    async def get_redact_task(self, redact_id: str) -> Optional[ScheduledTask]:
-        """Get the current status of an active redaction process
-
-        Args:
-            redact_id: redact_id returned by start_redact_events.
-        """
-        return await self._task_scheduler.get_task(redact_id)
 
     async def get_whois(self, user: UserID) -> JsonMapping:
         connections = []
@@ -236,16 +197,14 @@ class AdminHandler:
             # events that we have and then filtering, this isn't the most
             # efficient method perhaps but it does guarantee we get everything.
             while True:
-                (
-                    events,
-                    _,
-                    _,
-                ) = await self._store.paginate_room_events_by_topological_ordering(
-                    room_id=room_id,
-                    from_key=from_key,
-                    to_key=to_key,
-                    limit=100,
-                    direction=Direction.FORWARDS,
+                events, _ = (
+                    await self._store.paginate_room_events_by_topological_ordering(
+                        room_id=room_id,
+                        from_key=from_key,
+                        to_key=to_key,
+                        limit=100,
+                        direction=Direction.FORWARDS,
+                    )
                 )
                 if not events:
                     break
@@ -352,155 +311,6 @@ class AdminHandler:
 
         return writer.finished()
 
-    async def start_redact_events(
-        self,
-        user_id: str,
-        rooms: list,
-        requester: JsonMapping,
-        reason: Optional[str],
-        limit: Optional[int],
-    ) -> str:
-        """
-        Start a task redacting the events of the given user in the given rooms
-
-        Args:
-            user_id: the user ID of the user whose events should be redacted
-            rooms: the rooms in which to redact the user's events
-            requester: the user requesting the events
-            reason: reason for requesting the redaction, ie spam, etc
-            limit: limit on the number of events in each room to redact
-
-        Returns:
-            a unique ID which can be used to query the status of the task
-        """
-        active_tasks = await self._task_scheduler.get_tasks(
-            actions=[REDACT_ALL_EVENTS_ACTION_NAME],
-            resource_id=user_id,
-            statuses=[TaskStatus.ACTIVE],
-        )
-
-        if len(active_tasks) > 0:
-            raise SynapseError(
-                400, "Redact already in progress for user %s" % (user_id,)
-            )
-
-        if not limit:
-            limit = 1000
-
-        redact_id = await self._task_scheduler.schedule_task(
-            REDACT_ALL_EVENTS_ACTION_NAME,
-            resource_id=user_id,
-            params={
-                "rooms": rooms,
-                "requester": requester,
-                "user_id": user_id,
-                "reason": reason,
-                "limit": limit,
-            },
-        )
-
-        logger.info(
-            "starting redact events with redact_id %s",
-            redact_id,
-        )
-
-        return redact_id
-
-    async def _redact_all_events(
-        self, task: ScheduledTask
-    ) -> Tuple[TaskStatus, Optional[Mapping[str, Any]], Optional[str]]:
-        """
-        Task to redact all of a users events in the given rooms, tracking which, if any, events
-        whose redaction failed
-        """
-
-        assert task.params is not None
-        rooms = task.params.get("rooms")
-        assert rooms is not None
-
-        r = task.params.get("requester")
-        assert r is not None
-        admin = Requester.deserialize(self._store, r)
-
-        user_id = task.params.get("user_id")
-        assert user_id is not None
-
-        # puppet the user if they're ours, otherwise use admin to redact
-        requester = create_requester(
-            user_id if self.hs.is_mine_id(user_id) else admin.user.to_string(),
-            authenticated_entity=admin.user.to_string(),
-        )
-
-        reason = task.params.get("reason")
-        limit = task.params.get("limit")
-        assert limit is not None
-
-        result: Mapping[str, Any] = (
-            task.result if task.result else {"failed_redactions": {}}
-        )
-        for room in rooms:
-            room_version = await self._store.get_room_version(room)
-            event_ids = await self._store.get_events_sent_by_user_in_room(
-                user_id,
-                room,
-                limit,
-                ["m.room.member", "m.room.message"],
-            )
-            if not event_ids:
-                # nothing to redact in this room
-                continue
-
-            events = await self._store.get_events_as_list(event_ids)
-            for event in events:
-                # we care about join events but not other membership events
-                if event.type == "m.room.member":
-                    content = event.content
-                    if content:
-                        if content.get("membership") == Membership.JOIN:
-                            pass
-                        else:
-                            continue
-                relations = await self._store.get_relations_for_event(
-                    room, event.event_id, event, event_type=EventTypes.Redaction
-                )
-
-                # if we've already successfully redacted this event then skip processing it
-                if relations[0]:
-                    continue
-
-                event_dict = {
-                    "type": EventTypes.Redaction,
-                    "content": {"reason": reason} if reason else {},
-                    "room_id": room,
-                    "sender": user_id,
-                }
-                if room_version.updated_redaction_rules:
-                    event_dict["content"]["redacts"] = event.event_id
-                else:
-                    event_dict["redacts"] = event.event_id
-
-                try:
-                    # set the prev event to the offending message to allow for redactions
-                    # to be processed in the case where the user has been kicked/banned before
-                    # redactions are requested
-                    (
-                        redaction,
-                        _,
-                    ) = await self.event_creation_handler.create_and_send_nonmember_event(
-                        requester,
-                        event_dict,
-                        prev_event_ids=[event.event_id],
-                        ratelimit=False,
-                    )
-                except Exception as ex:
-                    logger.info(
-                        f"Redaction of event {event.event_id} failed due to: {ex}"
-                    )
-                    result["failed_redactions"][event.event_id] = str(ex)
-                    await self._task_scheduler.update_task(task.id, result=result)
-
-        return TaskStatus.COMPLETE, result, None
-
 
 class ExfiltrationWriter(metaclass=abc.ABCMeta):
     """Interface used to specify how to write exported data."""

synapse/handlers/auth.py

@@ -166,7 +166,8 @@ def login_id_phone_to_thirdparty(identifier: JsonDict) -> Dict[str, str]:
     if "country" not in identifier or (
         # The specification requires a "phone" field, while Synapse used to require a "number"
         # field. Accept both for backwards compatibility.
-        "phone" not in identifier and "number" not in identifier
+        "phone" not in identifier
+        and "number" not in identifier
     ):
         raise SynapseError(
             400, "Invalid phone-type identifier", errcode=Codes.INVALID_PARAM

synapse/handlers/delayed_events.py

@@ -1,498 +0,0 @@
-#
-# This file is licensed under the Affero General Public License (AGPL) version 3.
-#
-# Copyright (C) 2024 New Vector, Ltd
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# See the GNU Affero General Public License for more details:
-# <https://www.gnu.org/licenses/agpl-3.0.html>.
-#
-
-import logging
-from typing import TYPE_CHECKING, List, Optional, Set, Tuple
-
-from twisted.internet.interfaces import IDelayedCall
-
-from synapse.api.constants import EventTypes
-from synapse.api.errors import ShadowBanError
-from synapse.config.workers import MAIN_PROCESS_INSTANCE_NAME
-from synapse.logging.opentracing import set_tag
-from synapse.metrics import event_processing_positions
-from synapse.metrics.background_process_metrics import run_as_background_process
-from synapse.replication.http.delayed_events import (
-    ReplicationAddedDelayedEventRestServlet,
-)
-from synapse.storage.databases.main.delayed_events import (
-    DelayedEventDetails,
-    DelayID,
-    EventType,
-    StateKey,
-    Timestamp,
-    UserLocalpart,
-)
-from synapse.storage.databases.main.state_deltas import StateDelta
-from synapse.types import (
-    JsonDict,
-    Requester,
-    RoomID,
-    UserID,
-    create_requester,
-)
-from synapse.util.events import generate_fake_event_id
-from synapse.util.metrics import Measure
-
-if TYPE_CHECKING:
-    from synapse.server import HomeServer
-
-logger = logging.getLogger(__name__)
-
-
-class DelayedEventsHandler:
-    def __init__(self, hs: "HomeServer"):
-        self._store = hs.get_datastores().main
-        self._storage_controllers = hs.get_storage_controllers()
-        self._config = hs.config
-        self._clock = hs.get_clock()
-        self._request_ratelimiter = hs.get_request_ratelimiter()
-        self._event_creation_handler = hs.get_event_creation_handler()
-        self._room_member_handler = hs.get_room_member_handler()
-
-        self._next_delayed_event_call: Optional[IDelayedCall] = None
-
-        # The current position in the current_state_delta stream
-        self._event_pos: Optional[int] = None
-
-        # Guard to ensure we only process event deltas one at a time
-        self._event_processing = False
-
-        if hs.config.worker.worker_app is None:
-            self._repl_client = None
-
-            async def _schedule_db_events() -> None:
-                # We kick this off to pick up outstanding work from before the last restart.
-                # Block until we're up to date.
-                await self._unsafe_process_new_event()
-                hs.get_notifier().add_replication_callback(self.notify_new_event)
-                # Kick off again (without blocking) to catch any missed notifications
-                # that may have fired before the callback was added.
-                self._clock.call_later(0, self.notify_new_event)
-
-                # Delayed events that are already marked as processed on startup might not have been
-                # sent properly on the last run of the server, so unmark them to send them again.
-                # Caveat: this will double-send delayed events that successfully persisted, but failed
-                # to be removed from the DB table of delayed events.
-                # TODO: To avoid double-sending, scan the timeline to find which of these events were
-                # already sent. To do so, must store delay_ids in sent events to retrieve them later.
-                await self._store.unprocess_delayed_events()
-
-                events, next_send_ts = await self._store.process_timeout_delayed_events(
-                    self._get_current_ts()
-                )
-
-                if next_send_ts:
-                    self._schedule_next_at(next_send_ts)
-
-                # Can send the events in background after having awaited on marking them as processed
-                run_as_background_process(
-                    "_send_events",
-                    self._send_events,
-                    events,
-                )
-
-            self._initialized_from_db = run_as_background_process(
-                "_schedule_db_events", _schedule_db_events
-            )
-        else:
-            self._repl_client = ReplicationAddedDelayedEventRestServlet.make_client(hs)
-
-    @property
-    def _is_master(self) -> bool:
-        return self._repl_client is None
-
-    def notify_new_event(self) -> None:
-        """
-        Called when there may be more state event deltas to process,
-        which should cancel pending delayed events for the same state.
-        """
-        if self._event_processing:
-            return
-
-        self._event_processing = True
-
-        async def process() -> None:
-            try:
-                await self._unsafe_process_new_event()
-            finally:
-                self._event_processing = False
-
-        run_as_background_process("delayed_events.notify_new_event", process)
-
-    async def _unsafe_process_new_event(self) -> None:
-        # If self._event_pos is None then means we haven't fetched it from the DB yet
-        if self._event_pos is None:
-            self._event_pos = await self._store.get_delayed_events_stream_pos()
-            room_max_stream_ordering = self._store.get_room_max_stream_ordering()
-            if self._event_pos > room_max_stream_ordering:
-                # apparently, we've processed more events than exist in the database!
-                # this can happen if events are removed with history purge or similar.
-                logger.warning(
-                    "Event stream ordering appears to have gone backwards (%i -> %i): "
-                    "rewinding delayed events processor",
-                    self._event_pos,
-                    room_max_stream_ordering,
-                )
-                self._event_pos = room_max_stream_ordering
-
-        # Loop round handling deltas until we're up to date
-        while True:
-            with Measure(self._clock, "delayed_events_delta"):
-                room_max_stream_ordering = self._store.get_room_max_stream_ordering()
-                if self._event_pos == room_max_stream_ordering:
-                    return
-
-                logger.debug(
-                    "Processing delayed events %s->%s",
-                    self._event_pos,
-                    room_max_stream_ordering,
-                )
-                (
-                    max_pos,
-                    deltas,
-                ) = await self._storage_controllers.state.get_current_state_deltas(
-                    self._event_pos, room_max_stream_ordering
-                )
-
-                logger.debug(
-                    "Handling %d state deltas for delayed events processing",
-                    len(deltas),
-                )
-                await self._handle_state_deltas(deltas)
-
-                self._event_pos = max_pos
-
-                # Expose current event processing position to prometheus
-                event_processing_positions.labels("delayed_events").set(max_pos)
-
-                await self._store.update_delayed_events_stream_pos(max_pos)
-
-    async def _handle_state_deltas(self, deltas: List[StateDelta]) -> None:
-        """
-        Process current state deltas to cancel pending delayed events
-        that target the same state.
-        """
-        for delta in deltas:
-            logger.debug(
-                "Handling: %r %r, %s", delta.event_type, delta.state_key, delta.event_id
-            )
-
-            next_send_ts = await self._store.cancel_delayed_state_events(
-                room_id=delta.room_id,
-                event_type=delta.event_type,
-                state_key=delta.state_key,
-            )
-
-            if self._next_send_ts_changed(next_send_ts):
-                self._schedule_next_at_or_none(next_send_ts)
-
-    async def add(
-        self,
-        requester: Requester,
-        *,
-        room_id: str,
-        event_type: str,
-        state_key: Optional[str],
-        origin_server_ts: Optional[int],
-        content: JsonDict,
-        delay: int,
-    ) -> str:
-        """
-        Creates a new delayed event and schedules its delivery.
-
-        Args:
-            requester: The requester of the delayed event, who will be its owner.
-            room_id: The ID of the room where the event should be sent to.
-            event_type: The type of event to be sent.
-            state_key: The state key of the event to be sent, or None if it is not a state event.
-            origin_server_ts: The custom timestamp to send the event with.
-                If None, the timestamp will be the actual time when the event is sent.
-            content: The content of the event to be sent.
-            delay: How long (in milliseconds) to wait before automatically sending the event.
-
-        Returns: The ID of the added delayed event.
-
-        Raises:
-            SynapseError: if the delayed event fails validation checks.
-        """
-        await self._request_ratelimiter.ratelimit(requester)
-
-        self._event_creation_handler.validator.validate_builder(
-            self._event_creation_handler.event_builder_factory.for_room_version(
-                await self._store.get_room_version(room_id),
-                {
-                    "type": event_type,
-                    "content": content,
-                    "room_id": room_id,
-                    "sender": str(requester.user),
-                    **({"state_key": state_key} if state_key is not None else {}),
-                },
-            )
-        )
-
-        creation_ts = self._get_current_ts()
-
-        delay_id, next_send_ts = await self._store.add_delayed_event(
-            user_localpart=requester.user.localpart,
-            device_id=requester.device_id,
-            creation_ts=creation_ts,
-            room_id=room_id,
-            event_type=event_type,
-            state_key=state_key,
-            origin_server_ts=origin_server_ts,
-            content=content,
-            delay=delay,
-        )
-
-        if self._repl_client is not None:
-            # NOTE: If this throws, the delayed event will remain in the DB and
-            # will be picked up once the main worker gets another delayed event.
-            await self._repl_client(
-                instance_name=MAIN_PROCESS_INSTANCE_NAME,
-                next_send_ts=next_send_ts,
-            )
-        elif self._next_send_ts_changed(next_send_ts):
-            self._schedule_next_at(next_send_ts)
-
-        return delay_id
-
-    def on_added(self, next_send_ts: int) -> None:
-        next_send_ts = Timestamp(next_send_ts)
-        if self._next_send_ts_changed(next_send_ts):
-            self._schedule_next_at(next_send_ts)
-
-    async def cancel(self, requester: Requester, delay_id: str) -> None:
-        """
-        Cancels the scheduled delivery of the matching delayed event.
-
-        Args:
-            requester: The owner of the delayed event to act on.
-            delay_id: The ID of the delayed event to act on.
-
-        Raises:
-            NotFoundError: if no matching delayed event could be found.
-        """
-        assert self._is_master
-        await self._request_ratelimiter.ratelimit(requester)
-        await self._initialized_from_db
-
-        next_send_ts = await self._store.cancel_delayed_event(
-            delay_id=delay_id,
-            user_localpart=requester.user.localpart,
-        )
-
-        if self._next_send_ts_changed(next_send_ts):
-            self._schedule_next_at_or_none(next_send_ts)
-
-    async def restart(self, requester: Requester, delay_id: str) -> None:
-        """
-        Restarts the scheduled delivery of the matching delayed event.
-
-        Args:
-            requester: The owner of the delayed event to act on.
-            delay_id: The ID of the delayed event to act on.
-
-        Raises:
-            NotFoundError: if no matching delayed event could be found.
-        """
-        assert self._is_master
-        await self._request_ratelimiter.ratelimit(requester)
-        await self._initialized_from_db
-
-        next_send_ts = await self._store.restart_delayed_event(
-            delay_id=delay_id,
-            user_localpart=requester.user.localpart,
-            current_ts=self._get_current_ts(),
-        )
-
-        if self._next_send_ts_changed(next_send_ts):
-            self._schedule_next_at(next_send_ts)
-
-    async def send(self, requester: Requester, delay_id: str) -> None:
-        """
-        Immediately sends the matching delayed event, instead of waiting for its scheduled delivery.
-
-        Args:
-            requester: The owner of the delayed event to act on.
-            delay_id: The ID of the delayed event to act on.
-
-        Raises:
-            NotFoundError: if no matching delayed event could be found.
-        """
-        assert self._is_master
-        await self._request_ratelimiter.ratelimit(requester)
-        await self._initialized_from_db
-
-        event, next_send_ts = await self._store.process_target_delayed_event(
-            delay_id=delay_id,
-            user_localpart=requester.user.localpart,
-        )
-
-        if self._next_send_ts_changed(next_send_ts):
-            self._schedule_next_at_or_none(next_send_ts)
-
-        await self._send_event(
-            DelayedEventDetails(
-                delay_id=DelayID(delay_id),
-                user_localpart=UserLocalpart(requester.user.localpart),
-                room_id=event.room_id,
-                type=event.type,
-                state_key=event.state_key,
-                origin_server_ts=event.origin_server_ts,
-                content=event.content,
-                device_id=event.device_id,
-            )
-        )
-
-    async def _send_on_timeout(self) -> None:
-        self._next_delayed_event_call = None
-
-        events, next_send_ts = await self._store.process_timeout_delayed_events(
-            self._get_current_ts()
-        )
-
-        if next_send_ts:
-            self._schedule_next_at(next_send_ts)
-
-        await self._send_events(events)
-
-    async def _send_events(self, events: List[DelayedEventDetails]) -> None:
-        sent_state: Set[Tuple[RoomID, EventType, StateKey]] = set()
-        for event in events:
-            if event.state_key is not None:
-                state_info = (event.room_id, event.type, event.state_key)
-                if state_info in sent_state:
-                    continue
-            else:
-                state_info = None
-            try:
-                # TODO: send in background if message event or non-conflicting state event
-                await self._send_event(event)
-                if state_info is not None:
-                    sent_state.add(state_info)
-            except Exception:
-                logger.exception("Failed to send delayed event")
-
-            for room_id, event_type, state_key in sent_state:
-                await self._store.delete_processed_delayed_state_events(
-                    room_id=str(room_id),
-                    event_type=event_type,
-                    state_key=state_key,
-                )
-
-    def _schedule_next_at_or_none(self, next_send_ts: Optional[Timestamp]) -> None:
-        if next_send_ts is not None:
-            self._schedule_next_at(next_send_ts)
-        elif self._next_delayed_event_call is not None:
-            self._next_delayed_event_call.cancel()
-            self._next_delayed_event_call = None
-
-    def _schedule_next_at(self, next_send_ts: Timestamp) -> None:
-        delay = next_send_ts - self._get_current_ts()
-        delay_sec = delay / 1000 if delay > 0 else 0
-
-        if self._next_delayed_event_call is None:
-            self._next_delayed_event_call = self._clock.call_later(
-                delay_sec,
-                run_as_background_process,
-                "_send_on_timeout",
-                self._send_on_timeout,
-            )
-        else:
-            self._next_delayed_event_call.reset(delay_sec)
-
-    async def get_all_for_user(self, requester: Requester) -> List[JsonDict]:
-        """Return all pending delayed events requested by the given user."""
-        await self._request_ratelimiter.ratelimit(requester)
-        return await self._store.get_all_delayed_events_for_user(
-            requester.user.localpart
-        )
-
-    async def _send_event(
-        self,
-        event: DelayedEventDetails,
-        txn_id: Optional[str] = None,
-    ) -> None:
-        user_id = UserID(event.user_localpart, self._config.server.server_name)
-        user_id_str = user_id.to_string()
-        # Create a new requester from what data is currently available
-        requester = create_requester(
-            user_id,
-            is_guest=await self._store.is_guest(user_id_str),
-            device_id=event.device_id,
-        )
-
-        try:
-            if event.state_key is not None and event.type == EventTypes.Member:
-                membership = event.content.get("membership")
-                assert membership is not None
-                event_id, _ = await self._room_member_handler.update_membership(
-                    requester,
-                    target=UserID.from_string(event.state_key),
-                    room_id=event.room_id.to_string(),
-                    action=membership,
-                    content=event.content,
-                    origin_server_ts=event.origin_server_ts,
-                )
-            else:
-                event_dict: JsonDict = {
-                    "type": event.type,
-                    "content": event.content,
-                    "room_id": event.room_id.to_string(),
-                    "sender": user_id_str,
-                }
-
-                if event.origin_server_ts is not None:
-                    event_dict["origin_server_ts"] = event.origin_server_ts
-
-                if event.state_key is not None:
-                    event_dict["state_key"] = event.state_key
-
-                (
-                    sent_event,
-                    _,
-                ) = await self._event_creation_handler.create_and_send_nonmember_event(
-                    requester,
-                    event_dict,
-                    txn_id=txn_id,
-                )
-                event_id = sent_event.event_id
-        except ShadowBanError:
-            event_id = generate_fake_event_id()
-        finally:
-            # TODO: If this is a temporary error, retry. Otherwise, consider notifying clients of the failure
-            try:
-                await self._store.delete_processed_delayed_event(
-                    event.delay_id, event.user_localpart
-                )
-            except Exception:
-                logger.exception("Failed to delete processed delayed event")
-
-        set_tag("event_id", event_id)
-
-    def _get_current_ts(self) -> Timestamp:
-        return Timestamp(self._clock.time_msec())
-
-    def _next_send_ts_changed(self, next_send_ts: Optional[Timestamp]) -> bool:
-        # The DB alone knows if the next send time changed after adding/modifying
-        # a delayed event, but if we were to ever miss updating our delayed call's
-        # firing time, we may miss other updates. So, keep track of changes to the
-        # the next send time here instead of in the DB.
-        cached_next_send_ts = (
-            int(self._next_delayed_event_call.getTime() * 1000)
-            if self._next_delayed_event_call is not None
-            else None
-        )
-        return next_send_ts != cached_next_send_ts

synapse/handlers/device.py

@@ -48,7 +48,6 @@ from synapse.metrics.background_process_metrics import (
     wrap_as_background_process,
 )
 from synapse.storage.databases.main.client_ips import DeviceLastConnectionInfo
-from synapse.storage.databases.main.roommember import EventIdMembership
 from synapse.storage.databases.main.state_deltas import StateDelta
 from synapse.types import (
     DeviceListUpdates,
@@ -223,6 +222,7 @@ class DeviceWorkerHandler:
         return changed
 
     @trace
+    @measure_func("device.get_user_ids_changed")
     @cancellable
     async def get_user_ids_changed(
         self, user_id: str, from_token: StreamToken
@@ -290,11 +290,9 @@ class DeviceWorkerHandler:
                 memberships_to_fetch.add(delta.prev_event_id)
 
         # Fetch all the memberships for the membership events
-        event_id_to_memberships: Mapping[str, Optional[EventIdMembership]] = {}
-        if memberships_to_fetch:
-            event_id_to_memberships = await self.store.get_membership_from_event_ids(
-                memberships_to_fetch
-            )
+        event_id_to_memberships = await self.store.get_membership_from_event_ids(
+            memberships_to_fetch
+        )
 
         joined_invited_knocked = (
             Membership.JOIN,
@@ -351,6 +349,7 @@ class DeviceWorkerHandler:
 
         return device_list_updates
 
+    @measure_func("_generate_sync_entry_for_device_list")
     async def generate_sync_entry_for_device_list(
         self,
         user_id: str,

synapse/handlers/directory.py

@@ -265,9 +265,9 @@ class DirectoryHandler:
     async def get_association(self, room_alias: RoomAlias) -> JsonDict:
         room_id = None
         if self.hs.is_mine(room_alias):
-            result: Optional[
-                RoomAliasMapping
-            ] = await self.get_association_from_room_alias(room_alias)
+            result: Optional[RoomAliasMapping] = (
+                await self.get_association_from_room_alias(room_alias)
+            )
 
             if result:
                 room_id = result.room_id
@@ -512,9 +512,11 @@ class DirectoryHandler:
                 raise SynapseError(403, "Not allowed to publish room")
 
             # Check if publishing is blocked by a third party module
-            allowed_by_third_party_rules = await (
-                self._third_party_event_rules.check_visibility_can_be_modified(
-                    room_id, visibility
+            allowed_by_third_party_rules = (
+                await (
+                    self._third_party_event_rules.check_visibility_can_be_modified(
+                        room_id, visibility
+                    )
                 )
             )
             if not allowed_by_third_party_rules:

synapse/handlers/federation.py

@@ -1001,11 +1001,11 @@ class FederationHandler:
                     )
 
                 if include_auth_user_id:
-                    event_content[
-                        EventContentFields.AUTHORISING_USER
-                    ] = await self._event_auth_handler.get_user_which_could_invite(
-                        room_id,
-                        state_ids,
+                    event_content[EventContentFields.AUTHORISING_USER] = (
+                        await self._event_auth_handler.get_user_which_could_invite(
+                            room_id,
+                            state_ids,
+                        )
                     )
 
         builder = self.event_builder_factory.for_room_version(

synapse/handlers/identity.py

@@ -21,7 +21,6 @@
 #
 
 """Utilities for interacting with Identity Servers"""
-
 import logging
 import urllib.parse
 from typing import TYPE_CHECKING, Awaitable, Callable, Dict, List, Optional, Tuple