Newsfile

Fix release process to not create duplicate releases
2025-12-09 01:30:18 +00:00 · 2024-11-27 11:35:27 +00:00 · 2024-11-27 11:34:47 +00:00
249 changed files with 5647 additions and 14069 deletions
--- a/.ci/before_build_wheel.sh
+++ b/.ci/before_build_wheel.sh
@@ -1,10 +0,0 @@
-#!/bin/sh
-set -xeu
-
-# On 32-bit Linux platforms, we need libatomic1 to use rustup
-if command -v yum &> /dev/null; then
-   yum install -y libatomic
-fi
-
-# Install a Rust toolchain
-curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.82.0 -y --profile minimal
--- a/.ci/scripts/calculate_jobs.py
+++ b/.ci/scripts/calculate_jobs.py
@@ -60,7 +60,7 @@ trial_postgres_tests = [
    {
        "python-version": "3.9",
        "database": "postgres",
-        "postgres-version": "13",
+        "postgres-version": "11",
        "extras": "all",
    }
 ]
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -14,7 +14,7 @@ permissions:
  id-token: write # needed for signing the images with GitHub OIDC Token
 jobs:
  build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
    steps:
      - name: Set up QEMU
        id: qemu
@@ -30,7 +30,7 @@ jobs:
        run: docker buildx inspect

      - name: Install Cosign
-        uses: sigstore/cosign-installer@v3.8.1
+        uses: sigstore/cosign-installer@v3.7.0

      - name: Checkout repository
        uses: actions/checkout@v4
--- a/.github/workflows/docs-pr-netlify.yaml
+++ b/.github/workflows/docs-pr-netlify.yaml
@@ -14,7 +14,7 @@ jobs:
      # There's a 'download artifact' action, but it hasn't been updated for the workflow_run action
      # (https://github.com/actions/download-artifact/issues/60) so instead we get this mess:
      - name: 📥 Download artifact
-        uses: dawidd6/action-download-artifact@20319c5641d495c8a52e688b7dc5fada6c3a9fbc # v8
+        uses: dawidd6/action-download-artifact@bf251b5aa9c2f7eeb574a96ee720e24f801b7c11 # v6
        with:
          workflow: docs-pr.yaml
          run_id: ${{ github.event.workflow_run.id }}
--- a/.github/workflows/fix_lint.yaml
+++ b/.github/workflows/fix_lint.yaml
@@ -21,7 +21,7 @@ jobs:
          # We use nightly so that `fmt` correctly groups together imports, and
          # clippy correctly fixes up the benchmarks.
          toolchain: nightly-2022-12-01
-          components: clippy, rustfmt
+          components: rustfmt
      - uses: Swatinem/rust-cache@v2

      - name: Setup Poetry
--- a/.github/workflows/release-artifacts.yml
+++ b/.github/workflows/release-artifacts.yml
@@ -139,7 +139,7 @@ jobs:
          python-version: "3.x"

      - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.23.0
+        run: python -m pip install cibuildwheel==2.19.1

      - name: Set up QEMU to emulate aarch64
        if: matrix.arch == 'aarch64'
@@ -212,8 +212,7 @@ jobs:
          mv debs*/* debs/
          tar -cvJf debs.tar.xz debs
      - name: Attach to release
-        # Pinned to work around https://github.com/softprops/action-gh-release/issues/445
-        uses: softprops/action-gh-release@v0.1.15
+        uses: softprops/action-gh-release@v2.0.5
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
@@ -221,7 +220,3 @@ jobs:
            Sdist/*
            Wheel*/*
            debs.tar.xz
-          # if it's not already published, keep the release as a draft.
-          draft: true
-          # mark it as a prerelease if the tag contains 'rc'.
-          prerelease: ${{ contains(github.ref, 'rc') }}
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -581,7 +581,7 @@ jobs:
      matrix:
        include:
          - python-version: "3.9"
-            postgres-version: "13"
+            postgres-version: "11"

          - python-version: "3.13"
            postgres-version: "17"
--- a/CHANGES.md
+++ b/CHANGES.md
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -13,9 +13,9 @@ dependencies = [

 [[package]]
 name = "anyhow"
-version = "1.0.96"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b964d184e89d9b6b67dd2715bc8e74cf3107fb2b529990c90cf517326150bf4"
+checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"

 [[package]]
 name = "arc-swap"
@@ -35,12 +35,6 @@ version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"

-[[package]]
-name = "bitflags"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
-
 [[package]]
 name = "blake2"
 version = "0.10.6"
@@ -67,9 +61,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"

 [[package]]
 name = "bytes"
-version = "1.10.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9"
+checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"

 [[package]]
 name = "cfg-if"
@@ -125,14 +119,15 @@ dependencies = [

 [[package]]
 name = "getrandom"
-version = "0.3.1"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
 "cfg-if",
+ "js-sys",
 "libc",
 "wasi",
- "windows-targets",
+ "wasm-bindgen",
 ]

 [[package]]
@@ -173,9 +168,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"

 [[package]]
 name = "http"
-version = "1.2.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
+checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
 dependencies = [
 "bytes",
 "fnv",
@@ -223,9 +218,9 @@ checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"

 [[package]]
 name = "log"
-version = "0.4.26"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"

 [[package]]
 name = "memchr"
@@ -277,9 +272,9 @@ dependencies = [

 [[package]]
 name = "pyo3"
-version = "0.23.5"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7778bffd85cf38175ac1f545509665d0b9b92a198ca7941f131f85f7a4f9a872"
+checksum = "f54b3d09cbdd1f8c20650b28e7b09e338881482f4aa908a5f61a00c98fba2690"
 dependencies = [
 "anyhow",
 "cfg-if",
@@ -296,9 +291,9 @@ dependencies = [

 [[package]]
 name = "pyo3-build-config"
-version = "0.23.5"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94f6cbe86ef3bf18998d9df6e0f3fc1050a8c5efa409bf712e661a4366e010fb"
+checksum = "3015cf985888fe66cfb63ce0e321c603706cd541b7aec7ddd35c281390af45d8"
 dependencies = [
 "once_cell",
 "target-lexicon",
@@ -306,9 +301,9 @@ dependencies = [

 [[package]]
 name = "pyo3-ffi"
-version = "0.23.5"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9f1b4c431c0bb1c8fb0a338709859eed0d030ff6daa34368d3b152a63dfdd8d"
+checksum = "6fca7cd8fd809b5ac4eefb89c1f98f7a7651d3739dfb341ca6980090f554c270"
 dependencies = [
 "libc",
 "pyo3-build-config",
@@ -316,9 +311,9 @@ dependencies = [

 [[package]]
 name = "pyo3-log"
-version = "0.12.1"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be5bb22b77965a7b5394e9aae9897a0607b51df5167561ffc3b02643b4200bc7"
+checksum = "3eb421dc86d38d08e04b927b02424db480be71b777fa3a56f32e2f2a3a1a3b08"
 dependencies = [
 "arc-swap",
 "log",
@@ -327,9 +322,9 @@ dependencies = [

 [[package]]
 name = "pyo3-macros"
-version = "0.23.5"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc2201328f63c4710f68abdf653c89d8dbc2858b88c5d88b0ff38a75288a9da"
+checksum = "34e657fa5379a79151b6ff5328d9216a84f55dc93b17b08e7c3609a969b73aa0"
 dependencies = [
 "proc-macro2",
 "pyo3-macros-backend",
@@ -339,9 +334,9 @@ dependencies = [

 [[package]]
 name = "pyo3-macros-backend"
-version = "0.23.5"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fca6726ad0f3da9c9de093d6f116a93c1a38e417ed73bf138472cf4064f72028"
+checksum = "295548d5ffd95fd1981d2d3cf4458831b21d60af046b729b6fd143b0ba7aee2f"
 dependencies = [
 "heck",
 "proc-macro2",
@@ -371,20 +366,20 @@ dependencies = [

 [[package]]
 name = "rand"
-version = "0.9.0"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
+ "libc",
 "rand_chacha",
 "rand_core",
- "zerocopy",
 ]

 [[package]]
 name = "rand_chacha"
-version = "0.9.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
 "ppv-lite86",
 "rand_core",
@@ -392,12 +387,11 @@ dependencies = [

 [[package]]
 name = "rand_core"
-version = "0.9.0"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b08f3c9802962f7e1b25113931d94f43ed9725bebc59db9d0c3e9a23b67e15ff"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
 "getrandom",
- "zerocopy",
 ]

 [[package]]
@@ -437,18 +431,18 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"

 [[package]]
 name = "serde"
-version = "1.0.218"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60"
+checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.218"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b"
+checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -457,9 +451,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.139"
+version = "1.0.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6"
+checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
 dependencies = [
 "itoa",
 "memchr",
@@ -544,10 +538,11 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"

 [[package]]
 name = "ulid"
-version = "1.2.0"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab82fc73182c29b02e2926a6df32f2241dbadb5cfc111fd595515b3598f46bb3"
+checksum = "04f903f293d11f31c0c29e4148f6dc0d033a7f80cebc0282bea147611667d289"
 dependencies = [
+ "getrandom",
 "rand",
 "web-time",
 ]
@@ -572,12 +567,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"

 [[package]]
 name = "wasi"
-version = "0.13.3+wasi-0.2.2"
+version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
-dependencies = [
- "wit-bindgen-rt",
-]
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"

 [[package]]
 name = "wasm-bindgen"
@@ -642,96 +634,3 @@ dependencies = [
 "js-sys",
 "wasm-bindgen",
 ]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
-dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_gnullvm",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-
-[[package]]
-name = "wit-bindgen-rt"
-version = "0.33.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "zerocopy"
-version = "0.8.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa91407dacce3a68c56de03abe2760159582b846c6a4acd2f456618087f12713"
-dependencies = [
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.8.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06718a168365cad3d5ff0bb133aad346959a2074bd4a85c121255a11304a8626"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
--- a/LICENSE-AGPL-3.0
+++ b/LICENSE-AGPL-3.0
--- a/6
+++ b/6
@@ -1,6 +0,0 @@
-Licensees holding a valid commercial license with Element may use this
-software in accordance with the terms contained in a written agreement
-between you and Element.
-
-To purchase a commercial license please contact our sales team at
-licensing@element.io
--- a/README.rst
+++ b/README.rst
@@ -10,15 +10,14 @@ implementation, written and maintained by `Element <https://element.io>`_.
 `Matrix <https://github.com/matrix-org>`__ is the open standard for
 secure and interoperable real time communications. You can directly run
 and manage the source code in this repository, available under an AGPL
-license (or alternatively under a commercial license from Element).
-There is no support provided by Element unless you have a
-subscription from Element.
+license. There is no support provided from Element unless you have a
+subscription.

-Subscription
-============
+Subscription alternative
+========================

-For those that need an enterprise-ready solution, Element
-Server Suite (ESS) is `available via subscription <https://element.io/pricing>`_.
+Alternatively, for those that need an enterprise-ready solution, Element
+Server Suite (ESS) is `available as a subscription <https://element.io/pricing>`_.
 ESS builds on Synapse to offer a complete Matrix-based backend including the full
 `Admin Console product <https://element.io/enterprise-functionality/admin-console>`_,
 giving admins the power to easily manage an organization-wide
@@ -250,20 +249,6 @@ Developers might be particularly interested in:
 Alongside all that, join our developer community on Matrix:
 `#synapse-dev:matrix.org <https://matrix.to/#/#synapse-dev:matrix.org>`_, featuring real humans!

-Copyright and Licensing
-=======================
-
-Copyright 2014-2017 OpenMarket Ltd
-Copyright 2017 Vector Creations Ltd
-Copyright 2017-2025 New Vector Ltd 
-
-This software is dual-licensed by New Vector Ltd (Element). It can be used either:
-  
-(1) for free 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); OR
-  
-(2) under the terms of a paid-for Element Commercial License agreement between you and Element (the terms of which may vary depending on what you and Element have agreed to).
-Unless required by applicable law or agreed to in writing, software distributed under the Licenses is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the Licenses for the specific language governing permissions and limitations under the Licenses.
-

 .. |support| image:: https://img.shields.io/badge/matrix-community%20support-success
  :alt: (get community support in #synapse:matrix.org)
--- a/build_rust.py
+++ b/build_rust.py
@@ -1,10 +1,8 @@
 # A build script for poetry that adds the rust extension.

-import itertools
 import os
 from typing import Any, Dict

-from packaging.specifiers import SpecifierSet
 from setuptools_rust import Binding, RustExtension


@@ -16,8 +14,6 @@ def build(setup_kwargs: Dict[str, Any]) -> None:
        target="synapse.synapse_rust",
        path=cargo_toml_path,
        binding=Binding.PyO3,
-        # This flag is a no-op in the latest versions. Instead, we need to
-        # specify this in the `bdist_wheel` config below.
        py_limited_api=True,
        # We force always building in release mode, as we can't tell the
        # difference between using `poetry` in development vs production.
@@ -25,18 +21,3 @@ def build(setup_kwargs: Dict[str, Any]) -> None:
    )
    setup_kwargs.setdefault("rust_extensions", []).append(extension)
    setup_kwargs["zip_safe"] = False
-
-    # We lookup the minimum supported python version by looking at
-    # `python_requires` (e.g. ">=3.9.0,<4.0.0") and finding the first python
-    # version that matches. We then convert that into the `py_limited_api` form,
-    # e.g. cp39 for python 3.9.
-    py_limited_api: str
-    python_bounds = SpecifierSet(setup_kwargs["python_requires"])
-    for minor_version in itertools.count(start=8):
-        if f"3.{minor_version}.0" in python_bounds:
-            py_limited_api = f"cp3{minor_version}"
-            break
-
-    setup_kwargs.setdefault("options", {}).setdefault("bdist_wheel", {})[
-        "py_limited_api"
-    ] = py_limited_api
--- a/changelog.d/17253.misc
+++ b/changelog.d/17253.misc
@@ -0,0 +1 @@
+[MSC4108](https://github.com/matrix-org/matrix-spec-proposals/pull/4108): Add a `Content-Type` header on the `PUT` response to work around a faulty behavior in some caching reverse proxies.
--- a/changelog.d/17872.doc
+++ b/changelog.d/17872.doc
@@ -0,0 +1 @@
+Add OIDC example configuration for Forgejo (fork of Gitea).
--- a/changelog.d/17933.bugfix
+++ b/changelog.d/17933.bugfix
@@ -0,0 +1 @@
+Fix long-standing bug where read receipts could get overly delayed being sent over federation.
--- a/changelog.d/17936.misc
+++ b/changelog.d/17936.misc
@@ -0,0 +1 @@
+Fix incorrect comment in new schema delta.
--- a/changelog.d/17944.misc
+++ b/changelog.d/17944.misc
@@ -0,0 +1 @@
+Raise setuptools_rust version cap to 1.10.2.
--- a/changelog.d/17945.misc
+++ b/changelog.d/17945.misc
@@ -0,0 +1 @@
+Enable encrypted appservice related experimental features in the complement docker image.
--- a/changelog.d/17952.misc
+++ b/changelog.d/17952.misc
@@ -0,0 +1 @@
+Return whether the user is suspended when querying the user account in the Admin API.
--- a/changelog.d/17953.doc
+++ b/changelog.d/17953.doc
@@ -0,0 +1 @@
+Link to element-docker-demo from contrib/docker*.
--- a/changelog.d/17966.misc
+++ b/changelog.d/17966.misc
@@ -0,0 +1 @@
+Bump pyo3 and dependencies to v0.23.2.
--- a/changelog.d/17970.bugfix
+++ b/changelog.d/17970.bugfix
@@ -0,0 +1 @@
+Fix release process to not create duplicate releases.
--- a/contrib/cmdclient/console.py
+++ b/contrib/cmdclient/console.py
@@ -245,7 +245,7 @@ class SynapseCmd(cmd.Cmd):

        if "flows" not in json_res:
            print("Failed to find any login flows.")
-            return False
+            defer.returnValue(False)

        flow = json_res["flows"][0]  # assume first is the one we want.
        if "type" not in flow or "m.login.password" != flow["type"] or "stages" in flow:
@@ -254,8 +254,8 @@ class SynapseCmd(cmd.Cmd):
                "Unable to login via the command line client. Please visit "
                "%s to login." % fallback_url
            )
-            return False
-        return True
+            defer.returnValue(False)
+        defer.returnValue(True)

    def do_emailrequest(self, line):
        """Requests the association of a third party identifier
--- a/contrib/cmdclient/http.py
+++ b/contrib/cmdclient/http.py
@@ -78,7 +78,7 @@ class TwistedHttpClient(HttpClient):
            url, data, headers_dict={"Content-Type": ["application/json"]}
        )
        body = yield readBody(response)
-        return response.code, body
+        defer.returnValue((response.code, body))

    @defer.inlineCallbacks
    def get_json(self, url, args=None):
@@ -88,7 +88,7 @@ class TwistedHttpClient(HttpClient):
            url = "%s?%s" % (url, qs)
        response = yield self._create_get_request(url)
        body = yield readBody(response)
-        return json.loads(body)
+        defer.returnValue(json.loads(body))

    def _create_put_request(self, url, json_data, headers_dict: Optional[dict] = None):
        """Wrapper of _create_request to issue a PUT request"""
@@ -134,7 +134,7 @@ class TwistedHttpClient(HttpClient):
            response = yield self._create_request(method, url)

        body = yield readBody(response)
-        return json.loads(body)
+        defer.returnValue(json.loads(body))

    @defer.inlineCallbacks
    def _create_request(
@@ -173,7 +173,7 @@ class TwistedHttpClient(HttpClient):
        if self.verbose:
            print("Status %s %s" % (response.code, response.phrase))
            print(pformat(list(response.headers.getAllRawHeaders())))
-        return response
+        defer.returnValue(response)

    def sleep(self, seconds):
        d = defer.Deferred()
--- a/contrib/docker/docker-compose.yml
+++ b/contrib/docker/docker-compose.yml
@@ -51,7 +51,7 @@ services:
      - traefik.http.routers.https-synapse.tls.certResolver=le-ssl

  db:
-    image: docker.io/postgres:15-alpine
+    image: docker.io/postgres:12-alpine
    # Change that password, of course!
    environment:
      - POSTGRES_USER=synapse
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,105 +1,3 @@
-matrix-synapse-py3 (1.126.0~rc2) stable; urgency=medium
-
-  * New Synapse release 1.126.0rc2.
-
- -- Synapse Packaging team <packages@matrix.org>  Wed, 05 Mar 2025 14:29:12 +0000
-
-matrix-synapse-py3 (1.126.0~rc1) stable; urgency=medium
-
-  * New Synapse release 1.126.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 04 Mar 2025 13:11:51 +0000
-
-matrix-synapse-py3 (1.125.0) stable; urgency=medium
-
-  * New Synapse release 1.125.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 25 Feb 2025 08:10:07 -0700
-
-matrix-synapse-py3 (1.125.0~rc1) stable; urgency=medium
-
-  * New synapse release 1.125.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 18 Feb 2025 13:32:49 +0000
-
-matrix-synapse-py3 (1.124.0) stable; urgency=medium
-
-  * New Synapse release 1.124.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 11 Feb 2025 11:55:22 +0100
-
-matrix-synapse-py3 (1.124.0~rc3) stable; urgency=medium
-
-  * New Synapse release 1.124.0rc3.
-
- -- Synapse Packaging team <packages@matrix.org>  Fri, 07 Feb 2025 13:42:55 +0000
-
-matrix-synapse-py3 (1.124.0~rc2) stable; urgency=medium
-
-  * New Synapse release 1.124.0rc2.
-
- -- Synapse Packaging team <packages@matrix.org>  Wed, 05 Feb 2025 16:35:53 +0000
-
-matrix-synapse-py3 (1.124.0~rc1) stable; urgency=medium
-
-  * New Synapse release 1.124.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 04 Feb 2025 11:53:05 +0000
-
-matrix-synapse-py3 (1.123.0) stable; urgency=medium
-
-  * New Synapse release 1.123.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 28 Jan 2025 08:37:34 -0700
-
-matrix-synapse-py3 (1.123.0~rc1) stable; urgency=medium
-
-  * New Synapse release 1.123.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 21 Jan 2025 14:39:57 +0100
-
-matrix-synapse-py3 (1.122.0) stable; urgency=medium
-
-  * New Synapse release 1.122.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 14 Jan 2025 14:14:14 +0000
-
-matrix-synapse-py3 (1.122.0~rc1) stable; urgency=medium
-
-  * New Synapse release 1.122.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 07 Jan 2025 14:06:19 +0000
-
-matrix-synapse-py3 (1.121.1) stable; urgency=medium
-
-  * New Synapse release 1.121.1.
-
- -- Synapse Packaging team <packages@matrix.org>  Wed, 11 Dec 2024 18:24:48 +0000
-
-matrix-synapse-py3 (1.121.0) stable; urgency=medium
-
-  * New Synapse release 1.121.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Wed, 11 Dec 2024 13:12:30 +0100
-
-matrix-synapse-py3 (1.121.0~rc1) stable; urgency=medium
-
-  * New Synapse release 1.121.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Wed, 04 Dec 2024 14:47:23 +0000
-
-matrix-synapse-py3 (1.120.2) stable; urgency=medium
-
-  * New synapse release 1.120.2.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 03 Dec 2024 15:43:37 +0000
-
-matrix-synapse-py3 (1.120.1) stable; urgency=medium
-
-  * New synapse release 1.120.1.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 03 Dec 2024 09:07:57 +0000
-
 matrix-synapse-py3 (1.120.0) stable; urgency=medium

  * New synapse release 1.120.0.
--- a/demo/start.sh
+++ b/demo/start.sh
@@ -138,13 +138,6 @@ for port in 8080 8081 8082; do
 			  per_user:
 			    per_second: 1000
 			    burst_count: 1000
-			rc_presence:
-			  per_user:
-			    per_second: 1000
-			    burst_count: 1000
-			rc_delayed_event_mgmt:
-			  per_second: 1000
-			  burst_count: 1000
 			RC
 			)
            echo "${ratelimiting}" >> "$port.config"
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -20,16 +20,45 @@
 # `poetry export | pip install -r /dev/stdin`, but beware: we have experienced bugs in
 # in `poetry export` in the past.

-ARG DEBIAN_VERSION=bookworm
 ARG PYTHON_VERSION=3.12
-ARG POETRY_VERSION=1.8.3

 ###
 ### Stage 0: generate requirements.txt
 ###
-### This stage is platform-agnostic, so we can use the build platform in case of cross-compilation.
-###
-FROM --platform=$BUILDPLATFORM ghcr.io/astral-sh/uv:python${PYTHON_VERSION}-${DEBIAN_VERSION} AS requirements
+# We hardcode the use of Debian bookworm here because this could change upstream
+# and other Dockerfiles used for testing are expecting bookworm.
+FROM docker.io/library/python:${PYTHON_VERSION}-slim-bookworm AS requirements
+
+# RUN --mount is specific to buildkit and is documented at
+# https://github.com/moby/buildkit/blob/master/frontend/dockerfile/docs/syntax.md#build-mounts-run---mount.
+# Here we use it to set up a cache for apt (and below for pip), to improve
+# rebuild speeds on slow connections.
+RUN \
+  --mount=type=cache,target=/var/cache/apt,sharing=locked \
+  --mount=type=cache,target=/var/lib/apt,sharing=locked \
+  apt-get update -qq && apt-get install -yqq \
+  build-essential curl git libffi-dev libssl-dev pkg-config \
+  && rm -rf /var/lib/apt/lists/*
+
+# Install rust and ensure its in the PATH.
+# (Rust may be needed to compile `cryptography`---which is one of poetry's
+# dependencies---on platforms that don't have a `cryptography` wheel.
+ENV RUSTUP_HOME=/rust
+ENV CARGO_HOME=/cargo
+ENV PATH=/cargo/bin:/rust/bin:$PATH
+RUN mkdir /rust /cargo
+
+RUN curl -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --default-toolchain stable --profile minimal
+
+# arm64 builds consume a lot of memory if `CARGO_NET_GIT_FETCH_WITH_CLI` is not
+# set to true, so we expose it as a build-arg.
+ARG CARGO_NET_GIT_FETCH_WITH_CLI=false
+ENV CARGO_NET_GIT_FETCH_WITH_CLI=$CARGO_NET_GIT_FETCH_WITH_CLI
+
+# We install poetry in its own build stage to avoid its dependencies conflicting with
+# synapse's dependencies.
+RUN --mount=type=cache,target=/root/.cache/pip \
+  pip install --user "poetry==1.3.2"

 WORKDIR /synapse

@@ -46,30 +75,41 @@ ARG TEST_ONLY_SKIP_DEP_HASH_VERIFICATION
 # Instead, we'll just install what a regular `pip install` would from PyPI.
 ARG TEST_ONLY_IGNORE_POETRY_LOCKFILE

-# This silences a warning as uv isn't able to do hardlinks between its cache
-# (mounted as --mount=type=cache) and the target directory.
-ENV UV_LINK_MODE=copy
-
 # Export the dependencies, but only if we're actually going to use the Poetry lockfile.
 # Otherwise, just create an empty requirements file so that the Dockerfile can
 # proceed.
-ARG POETRY_VERSION
-RUN --mount=type=cache,target=/root/.cache/uv \
-  if [ -z "$TEST_ONLY_IGNORE_POETRY_LOCKFILE" ]; then \
-    uvx --with poetry-plugin-export==1.8.0 \
-        poetry@${POETRY_VERSION} export --extras all -o /synapse/requirements.txt ${TEST_ONLY_SKIP_DEP_HASH_VERIFICATION:+--without-hashes}; \
+RUN if [ -z "$TEST_ONLY_IGNORE_POETRY_LOCKFILE" ]; then \
+  /root/.local/bin/poetry export --extras all -o /synapse/requirements.txt ${TEST_ONLY_SKIP_DEP_HASH_VERIFICATION:+--without-hashes}; \
  else \
-    touch /synapse/requirements.txt; \
+  touch /synapse/requirements.txt; \
  fi

 ###
 ### Stage 1: builder
 ###
-FROM ghcr.io/astral-sh/uv:python${PYTHON_VERSION}-${DEBIAN_VERSION} AS builder
+FROM docker.io/library/python:${PYTHON_VERSION}-slim-bookworm AS builder
+
+# install the OS build deps
+RUN \
+  --mount=type=cache,target=/var/cache/apt,sharing=locked \
+  --mount=type=cache,target=/var/lib/apt,sharing=locked \
+  apt-get update -qq && apt-get install -yqq \
+  build-essential \
+  libffi-dev \
+  libjpeg-dev \
+  libpq-dev \
+  libssl-dev \
+  libwebp-dev \
+  libxml++2.6-dev \
+  libxslt1-dev \
+  openssl \
+  zlib1g-dev \
+  git \
+  curl \
+  libicu-dev \
+  pkg-config \
+  && rm -rf /var/lib/apt/lists/*

-# This silences a warning as uv isn't able to do hardlinks between its cache
-# (mounted as --mount=type=cache) and the target directory.
-ENV UV_LINK_MODE=copy

 # Install rust and ensure its in the PATH
 ENV RUSTUP_HOME=/rust
@@ -79,6 +119,7 @@ RUN mkdir /rust /cargo

 RUN curl -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --default-toolchain stable --profile minimal

+
 # arm64 builds consume a lot of memory if `CARGO_NET_GIT_FETCH_WITH_CLI` is not
 # set to true, so we expose it as a build-arg.
 ARG CARGO_NET_GIT_FETCH_WITH_CLI=false
@@ -90,8 +131,8 @@ ENV CARGO_NET_GIT_FETCH_WITH_CLI=$CARGO_NET_GIT_FETCH_WITH_CLI
 #
 # This is aiming at installing the `[tool.poetry.depdendencies]` from pyproject.toml.
 COPY --from=requirements /synapse/requirements.txt /synapse/
-RUN --mount=type=cache,target=/root/.cache/uv \
-  uv pip install --prefix="/install" --no-deps -r /synapse/requirements.txt
+RUN --mount=type=cache,target=/root/.cache/pip \
+  pip install --prefix="/install" --no-deps --no-warn-script-location -r /synapse/requirements.txt

 # Copy over the rest of the synapse source code.
 COPY synapse /synapse/synapse/
@@ -105,85 +146,41 @@ ARG TEST_ONLY_IGNORE_POETRY_LOCKFILE
 # Install the synapse package itself.
 # If we have populated requirements.txt, we don't install any dependencies
 # as we should already have those from the previous `pip install` step.
-RUN \
-  --mount=type=cache,target=/root/.cache/uv \
-  --mount=type=cache,target=/synapse/target,sharing=locked \
+RUN --mount=type=cache,target=/synapse/target,sharing=locked \
  --mount=type=cache,target=${CARGO_HOME}/registry,sharing=locked \
  if [ -z "$TEST_ONLY_IGNORE_POETRY_LOCKFILE" ]; then \
-    uv pip install --prefix="/install" --no-deps /synapse[all]; \
+  pip install --prefix="/install" --no-deps --no-warn-script-location /synapse[all]; \
  else \
-    uv pip install --prefix="/install" /synapse[all]; \
+  pip install --prefix="/install" --no-warn-script-location /synapse[all]; \
  fi

 ###
-### Stage 2: runtime dependencies download for ARM64 and AMD64
-###
-FROM --platform=$BUILDPLATFORM docker.io/library/debian:${DEBIAN_VERSION} AS runtime-deps
-
-# Tell apt to keep downloaded package files, as we're using cache mounts.
-RUN rm -f /etc/apt/apt.conf.d/docker-clean; echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache
-
-# Add both target architectures
-RUN dpkg --add-architecture arm64
-RUN dpkg --add-architecture amd64
-
-# Fetch the runtime dependencies debs for both architectures
-# We do that by building a recursive list of packages we need to download with `apt-cache depends`
-# and then downloading them with `apt-get download`.
-RUN \
-  --mount=type=cache,target=/var/cache/apt,sharing=locked \
-  --mount=type=cache,target=/var/lib/apt,sharing=locked \
-  apt-get update -qq && \
-  apt-get install -y --no-install-recommends rsync && \
-  apt-cache depends --recurse --no-recommends --no-suggests --no-conflicts --no-breaks --no-replaces --no-enhances --no-pre-depends \
-      curl \
-      gosu \
-      libjpeg62-turbo \
-      libpq5 \
-      libwebp7 \
-      xmlsec1 \
-      libjemalloc2 \
-      libicu \
-    | grep '^\w' > /tmp/pkg-list && \
-  for arch in arm64 amd64; do \
-    mkdir -p /tmp/debs-${arch} && \
-    cd /tmp/debs-${arch} && \
-    apt-get download $(sed "s/$/:${arch}/" /tmp/pkg-list); \
-  done
-
-# Extract the debs for each architecture
-# On the runtime image, /lib is a symlink to /usr/lib, so we need to copy the
-# libraries to the right place, else the `COPY` won't work.
-# On amd64, we'll also have a /lib64 folder with ld-linux-x86-64.so.2, which is
-# already present in the runtime image.
-RUN \
-  for arch in arm64 amd64; do \
-    mkdir -p /install-${arch}/var/lib/dpkg/status.d/ && \
-    for deb in /tmp/debs-${arch}/*.deb; do \
-      package_name=$(dpkg-deb -I ${deb} | awk '/^ Package: .*$/ {print $2}'); \
-      echo "Extracting: ${package_name}"; \
-      dpkg --ctrl-tarfile $deb | tar -Ox ./control > /install-${arch}/var/lib/dpkg/status.d/${package_name}; \
-      dpkg --extract $deb /install-${arch}; \
-    done; \
-    rsync -avr /install-${arch}/lib/ /install-${arch}/usr/lib; \
-    rm -rf /install-${arch}/lib /install-${arch}/lib64; \
-  done
-
-
-###
-### Stage 3: runtime
+### Stage 2: runtime
 ###

-FROM docker.io/library/python:${PYTHON_VERSION}-slim-${DEBIAN_VERSION}
-
-ARG TARGETARCH
+FROM docker.io/library/python:${PYTHON_VERSION}-slim-bookworm

 LABEL org.opencontainers.image.url='https://matrix.org/docs/projects/server/synapse'
 LABEL org.opencontainers.image.documentation='https://github.com/element-hq/synapse/blob/master/docker/README.md'
 LABEL org.opencontainers.image.source='https://github.com/element-hq/synapse.git'
 LABEL org.opencontainers.image.licenses='AGPL-3.0-or-later'

-COPY --from=runtime-deps /install-${TARGETARCH} /
+RUN \
+  --mount=type=cache,target=/var/cache/apt,sharing=locked \
+  --mount=type=cache,target=/var/lib/apt,sharing=locked \
+  apt-get update -qq && apt-get install -yqq \
+  curl \
+  gosu \
+  libjpeg62-turbo \
+  libpq5 \
+  libwebp7 \
+  xmlsec1 \
+  libjemalloc2 \
+  libicu72 \
+  libssl-dev \
+  openssl \
+  && rm -rf /var/lib/apt/lists/*
+
 COPY --from=builder /install /usr/local
 COPY ./docker/start.py /start.py
 COPY ./docker/conf /conf
--- a/docker/README.md
+++ b/docker/README.md
@@ -114,9 +114,6 @@ The following environment variables are supported in `run` mode:
  is set via `docker run --user`, defaults to `991`, `991`. Note that this user
  must have permission to read the config files, and write to the data directories.
 * `TZ`: the [timezone](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones) the container will run with. Defaults to `UTC`.
-* `SYNAPSE_HTTP_PROXY`: Passed through to the Synapse process as the `http_proxy` environment variable.
-* `SYNAPSE_HTTPS_PROXY`: Passed through to the Synapse process as the `https_proxy` environment variable.
-* `SYNAPSE_NO_PROXY`: Passed through to the Synapse process as `no_proxy` environment variable.

 For more complex setups (e.g. for workers) you can also pass your args directly to synapse using `run` mode. For example like this:

--- a/docker/complement/conf/workers-shared-extra.yaml.j2
+++ b/docker/complement/conf/workers-shared-extra.yaml.j2
@@ -7,7 +7,6 @@
 #}

 ## Server ##
-public_baseurl: http://127.0.0.1:8008/
 report_stats: False
 trusted_key_servers: []
 enable_registration: true
@@ -85,18 +84,6 @@ rc_invites:
  per_user:
    per_second: 1000
    burst_count: 1000
-  per_issuer:
-    per_second: 1000
-    burst_count: 1000
-
-rc_presence:
-  per_user:
-    per_second: 9999
-    burst_count: 9999
-
-rc_delayed_event_mgmt:
-  per_second: 9999
-  burst_count: 9999

 federation_rr_transactions_per_room_per_second: 9999

@@ -143,9 +130,4 @@ caches:
  sync_response_cache_duration: 0


-# Complement assumes that it can publish to the room list by default.
-room_list_publication_rules:
-  - action: allow
-
-
 {% include "shared-orig.yaml.j2" %}
--- a/docker/conf-workers/nginx.conf.j2
+++ b/docker/conf-workers/nginx.conf.j2
@@ -38,13 +38,10 @@ server {
 {% if using_unix_sockets %}
        proxy_pass http://unix:/run/main_public.sock;
 {% else %}
-        # note: do not add a path (even a single /) after the port in `proxy_pass`,
-        # otherwise nginx will canonicalise the URI and cause signature verification
-        # errors.
        proxy_pass http://localhost:8080;
 {% endif %}
        proxy_set_header X-Forwarded-For $remote_addr;
        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header Host $host:$server_port;
+        proxy_set_header Host $host;
    }
 }
--- a/docker/conf-workers/synapse.supervisord.conf.j2
+++ b/docker/conf-workers/synapse.supervisord.conf.j2
@@ -1,6 +1,5 @@
 {% if use_forking_launcher %}
 [program:synapse_fork]
-environment=http_proxy="%(ENV_SYNAPSE_HTTP_PROXY)s",https_proxy="%(ENV_SYNAPSE_HTTPS_PROXY)s",no_proxy="%(ENV_SYNAPSE_NO_PROXY)s"
 command=/usr/local/bin/python -m synapse.app.complement_fork_starter
  {{ main_config_path }}
  synapse.app.homeserver
@@ -21,7 +20,6 @@ exitcodes=0

 {% else %}
 [program:synapse_main]
-environment=http_proxy="%(ENV_SYNAPSE_HTTP_PROXY)s",https_proxy="%(ENV_SYNAPSE_HTTPS_PROXY)s",no_proxy="%(ENV_SYNAPSE_NO_PROXY)s"
 command=/usr/local/bin/prefix-log /usr/local/bin/python -m synapse.app.homeserver
  --config-path="{{ main_config_path }}"
  --config-path=/conf/workers/shared.yaml
@@ -38,7 +36,6 @@ exitcodes=0

  {% for worker in workers %}
 [program:synapse_{{ worker.name }}]
-environment=http_proxy="%(ENV_SYNAPSE_HTTP_PROXY)s",https_proxy="%(ENV_SYNAPSE_HTTPS_PROXY)s",no_proxy="%(ENV_SYNAPSE_NO_PROXY)s"
 command=/usr/local/bin/prefix-log /usr/local/bin/python -m {{ worker.app }}
  --config-path="{{ main_config_path }}"
  --config-path=/conf/workers/shared.yaml
--- a/docker/configure_workers_and_start.py
+++ b/docker/configure_workers_and_start.py
@@ -1099,13 +1099,6 @@ def main(args: List[str], environ: MutableMapping[str, str]) -> None:
    else:
        log("Could not find %s, will not use" % (jemallocpath,))

-    # Empty strings are falsy in Python so this default is fine. We just can't have these
-    # be undefined because supervisord will complain about our
-    # `%(ENV_SYNAPSE_HTTP_PROXY)s` usage.
-    environ.setdefault("SYNAPSE_HTTP_PROXY", "")
-    environ.setdefault("SYNAPSE_HTTPS_PROXY", "")
-    environ.setdefault("SYNAPSE_NO_PROXY", "")
-
    # Start supervisord, which will start Synapse, all of the configured worker
    # processes, redis, nginx etc. according to the config we created above.
    log("Starting supervisord")
--- a/docs/admin_api/event_reports.md
+++ b/docs/admin_api/event_reports.md
@@ -60,11 +60,10 @@ paginate through.
  anything other than the return value of `next_token` from a previous call. Defaults to `0`.
 * `dir`: string - Direction of event report order. Whether to fetch the most recent
  first (`b`) or the oldest first (`f`). Defaults to `b`.
-* `user_id`: optional string - Filter by the user ID of the reporter. This is the user who reported the event
-   and wrote the reason.
-* `room_id`: optional string - Filter by room id.
-* `event_sender_user_id`: optional string - Filter by the sender of the reported event. This is the user who 
-   the report was made against.
+* `user_id`: string - Is optional and filters to only return users with user IDs that
+  contain this value. This is the user who reported the event and wrote the reason.
+* `room_id`: string - Is optional and filters to only return rooms with room IDs that
+  contain this value.

 **Response**

--- a/docs/admin_api/rooms.md
+++ b/docs/admin_api/rooms.md
@@ -385,13 +385,6 @@ The API is:
 GET /_synapse/admin/v1/rooms/<room_id>/state
 ```

-**Parameters**
-
-The following query parameter is available:
-
-* `type` - The type of room state event to filter by, eg "m.room.create". If provided, only state events
-    of this type will be returned (regardless of their `state_key` value).
-
 A response body like the following is returned:

 ```json
--- a/docs/admin_api/user_admin_api.md
+++ b/docs/admin_api/user_admin_api.md
@@ -40,7 +40,6 @@ It returns a JSON body like the following:
    "erased": false,
    "shadow_banned": 0,
    "creation_ts": 1560432506,
-    "last_seen_ts": 1732919539393,
    "appservice_id": null,
    "consent_server_notice_sent": null,
    "consent_version": null,
@@ -414,32 +413,6 @@ The following actions are **NOT** performed. The list may be incomplete.
 - Remove from monthly active users
 - Remove user's consent information (consent version and timestamp)

-## Suspend/Unsuspend Account
-
-This API allows an admin to suspend/unsuspend an account. While an account is suspended, the user is 
-prohibited from sending invites, joining or knocking on rooms, sending messages, changing profile data, and redacting messages other than their own. 
-
-The api is:
-
-```
-PUT /_synapse/admin/v1/suspend/<user_id>
-```
-
-with a body of:
-
-```json
-{
-    "suspend": true
-}
-```
-
-To unsuspend a user, use the same endpoint with a body of:
-```json
-{
-  "suspend": false
-}
-```
-
 ## Reset password

 **Note:** This API is disabled when MSC3861 is enabled. [See #15582](https://github.com/matrix-org/synapse/pull/15582)
@@ -504,9 +477,9 @@ with a body of:
 }
 ```

-## List joined rooms of a user
+## List room memberships of a user

-Gets a list of all `room_id` that a specific `user_id` is joined to and is a member of (participating in).
+Gets a list of all `room_id` that a specific `user_id` is member.

 The API is:

@@ -543,73 +516,6 @@ The following fields are returned in the JSON response body:
 - `joined_rooms` - An array of `room_id`.
 - `total` - Number of rooms.

-## Get the number of invites sent by the user
-
-Fetches the number of invites sent by the provided user ID across all rooms
-after the given timestamp.
-
-```
-GET /_synapse/admin/v1/users/$user_id/sent_invite_count
-```
-
-**Parameters**
-
-The following parameters should be set in the URL:
-
-* `user_id`: fully qualified: for example, `@user:server.com`
-
-The following should be set as query parameters in the URL:
-
-* `from_ts`: int, required. A timestamp in ms from the unix epoch. Only
-   invites sent at or after the provided timestamp will be returned.
-   This works by comparing the provided timestamp to the `received_ts`
-   column in the `events` table.
-   Note: https://currentmillis.com/ is a useful tool for converting dates
-   into timestamps and vice versa.
-
-A response body like the following is returned:
-
-```json
-{
-  "invite_count": 30
-}
-```
-
-_Added in Synapse 1.122.0_
-
-## Get the cumulative number of rooms a user has joined after a given timestamp
-
-Fetches the number of rooms that the user joined after the given timestamp, even
-if they have subsequently left/been banned from those rooms.
-
-```
-GET /_synapse/admin/v1/users/$<user_id/cumulative_joined_room_count
-```
-
-**Parameters**
-
-The following parameters should be set in the URL:
-
-* `user_id`: fully qualified: for example, `@user:server.com`
-
-The following should be set as query parameters in the URL:
-
-* `from_ts`: int, required. A timestamp in ms from the unix epoch. Only
-   invites sent at or after the provided timestamp will be returned.
-   This works by comparing the provided timestamp to the `received_ts`
-   column in the `events` table.
-   Note: https://currentmillis.com/ is a useful tool for converting dates
-   into timestamps and vice versa.
-
-A response body like the following is returned:
-
-```json
-{
-  "cumulative_joined_room_count": 30
-}
-```
-_Added in Synapse 1.122.0_
-
 ## Account Data
 Gets information about account data for a specific `user_id`.

@@ -1494,13 +1400,13 @@ 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

-_Added in Synapse 1.116.0._
-

 ## Check the status of a redaction process

@@ -1538,6 +1444,4 @@ The following fields are returned in the JSON response body:
 - `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._
-
-
+_Added in Synapse 1.116.0._
--- a/docs/changelogs/CHANGES-2023.md
+++ b/docs/changelogs/CHANGES-2023.md
--- a/docs/changelogs/CHANGES-2024.md
+++ b/docs/changelogs/CHANGES-2024.md
--- a/docs/development/database_schema.md
+++ b/docs/development/database_schema.md
@@ -162,7 +162,7 @@ by a unique name, the current status (stored in JSON), and some dependency infor
 * Whether the update requires a previous update to be complete.
 * A rough ordering for which to complete updates.

-A new background update needs to be added to the `background_updates` table:
+A new background updates needs to be added to the `background_updates` table:

 ```sql
 INSERT INTO background_updates (ordering, update_name, depends_on, progress_json) VALUES
--- a/docs/modules/spam_checker_callbacks.md
+++ b/docs/modules/spam_checker_callbacks.md
@@ -245,7 +245,7 @@ this callback.
 _First introduced in Synapse v1.37.0_

 ```python
-async def check_username_for_spam(user_profile: synapse.module_api.UserProfile, requester_id: str) -> bool
+async def check_username_for_spam(user_profile: synapse.module_api.UserProfile) -> bool
 ```

 Called when computing search results in the user directory. The module must return a
@@ -264,8 +264,6 @@ The profile is represented as a dictionary with the following keys:
 The module is given a copy of the original dictionary, so modifying it from within the
 module cannot modify a user's profile when included in user directory search results.

-The requester_id parameter is the ID of the user that called the user directory API.
-
 If multiple modules implement this callback, they will be considered in order. If a
 callback returns `False`, Synapse falls through to the next one. The value of the first
 callback that does not return `False` will be used. If this happens, Synapse will not call
--- a/docs/reverse_proxy.md
+++ b/docs/reverse_proxy.md
@@ -74,7 +74,7 @@ server {
        proxy_pass http://localhost:8008;
        proxy_set_header X-Forwarded-For $remote_addr;
        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header Host $host:$server_port;
+        proxy_set_header Host $host;

        # Nginx by default only allows file uploads up to 1M in size
        # Increase client_max_body_size to match max_upload_size defined in homeserver.yaml
--- a/docs/setup/installation.md
+++ b/docs/setup/installation.md
@@ -157,7 +157,7 @@ sudo pip install py-bcrypt

 #### Alpine Linux

-Jahway603 maintains [Synapse packages for Alpine Linux](https://pkgs.alpinelinux.org/packages?name=synapse&branch=edge) in the community repository. Install with:
+6543 maintains [Synapse packages for Alpine Linux](https://pkgs.alpinelinux.org/packages?name=synapse&branch=edge) in the community repository. Install with:

 ```sh
 sudo apk add synapse
@@ -310,18 +310,29 @@ sudo dnf install libtiff-devel libjpeg-devel libzip-devel freetype-devel \
 sudo dnf group install "Development Tools"
 ```

-##### Red Hat Enterprise Linux / Rocky Linux / Oracle Linux
+##### Red Hat Enterprise Linux / Rocky Linux

-*Note: The term "RHEL" below refers to Red Hat Enterprise Linux, Oracle Linux and Rocky Linux. The distributions are 1:1 binary compatible.*
+*Note: The term "RHEL" below refers to both Red Hat Enterprise Linux and Rocky Linux. The distributions are 1:1 binary compatible.*

 It's recommended to use the latest Python versions.

-RHEL 8 in particular ships with Python 3.6 by default which is EOL and therefore no longer supported by Synapse. RHEL 9 ships 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.
+RHEL 8 in particular ships with Python 3.6 by default which is EOL and therefore no longer supported by Synapse. RHEL 9 ship with Python 3.9 which is still supported by the Python core team as of this writing. However, newer Python versions provide significant performance improvements and they're available in official distributions' repositories. Therefore it's recommended to use them.

 Python 3.11 and 3.12 are available for both RHEL 8 and 9.

 These commands should be run as root user.

+RHEL 8
+```bash
+# Enable PowerTools repository
+dnf config-manager --set-enabled powertools
+```
+RHEL 9
+```bash
+# Enable CodeReady Linux Builder repository
+crb enable
+```
+
 Install new version of Python. You only need one of these:
 ```bash
 # Python 3.11
--- a/docs/spam_checker.md
+++ b/docs/spam_checker.md
@@ -72,8 +72,8 @@ class ExampleSpamChecker:
    async def user_may_publish_room(self, userid, room_id):
        return True  # allow publishing of all rooms

-    async def check_username_for_spam(self, user_profile, requester_id):
-        return False  # allow all usernames regardless of requester
+    async def check_username_for_spam(self, user_profile):
+        return False  # allow all usernames

    async def check_registration_for_spam(
        self,
--- a/docs/upgrade.md
+++ b/docs/upgrade.md
@@ -117,52 +117,6 @@ each upgrade are complete before moving on to the next upgrade, to avoid
 stacking them up. You can monitor the currently running background updates with
 [the Admin API](usage/administration/admin_api/background_updates.html#status).

-# Upgrading to v1.126.0
-
-## Room list publication rules change
-
-The default [`room_list_publication_rules`] setting was changed to disallow
-anyone (except server admins) from publishing to the room list by default.
-
-This is in line with Synapse policy of locking down features by default that can
-be abused without moderation.
-
-To keep the previous behavior of allowing publication by default, add the
-following to the config:
-
-```yaml
-room_list_publication_rules:
-  - "action": "allow"
-```
-
-[`room_list_publication_rules`]: usage/configuration/config_documentation.md#room_list_publication_rules
-
-## Change of signing key expiry date for the Debian/Ubuntu package repository
-
-Administrators using the Debian/Ubuntu packages from `packages.matrix.org`,
-please be aware that we have recently updated the expiry date on the repository's GPG signing key,
-but this change must be imported into your keyring.
-
-If you have the `matrix-org-archive-keyring` package installed and it updates before the current key expires, this should
-happen automatically.
-
-Otherwise, if you see an error similar to `The following signatures were invalid: EXPKEYSIG F473DD4473365DE1`, you
-will need to get a fresh copy of the keys. You can do so with:
-
-```sh
-sudo wget -O /usr/share/keyrings/matrix-org-archive-keyring.gpg https://packages.matrix.org/debian/matrix-org-archive-keyring.gpg
-```
-
-The old version of the key will expire on `2025-03-15`.
-
-# Upgrading to v1.122.0
-
-## Dropping support for PostgreSQL 11 and 12
-
-In line with our [deprecation policy](deprecation_policy.md), we've dropped
-support for PostgreSQL 11 and 12, as they are no longer supported upstream.
-This release of Synapse requires PostgreSQL 13+.
-
 # Upgrading to v1.120.0

 ## Removal of experimental MSC3886 feature
--- a/docs/usage/configuration/config_documentation.md
+++ b/docs/usage/configuration/config_documentation.md
@@ -162,53 +162,6 @@ Example configuration:
 pid_file: DATADIR/homeserver.pid
 ```
 ---
-### `daemonize`
-
-Specifies whether Synapse should be started as a daemon process. If Synapse is being
-managed by [systemd](../../systemd-with-workers/), this option must be omitted or set to
-`false`.
-
-This can also be set by the `--daemonize` (`-D`) argument when starting Synapse.
-
-See `worker_daemonize` for more information on daemonizing workers.
-
-Example configuration:
-```yaml
-daemonize: true
-```
---
-### `print_pidfile`
-
-Print the path to the pidfile just before daemonizing. Defaults to false.
-
-This can also be set by the `--print-pidfile` argument when starting Synapse.
-
-Example configuration:
-```yaml
-print_pidfile: true
-```
---
-### `user_agent_suffix`
-
-A suffix that is appended to the Synapse user-agent (ex. `Synapse/v1.123.0`). Defaults
-to None
-
-Example configuration:
-```yaml
-user_agent_suffix: " (I'm a teapot; Linux x86_64)"
-```
---
-### `use_frozen_dicts`
-
-Determines whether we should freeze the internal dict object in `FrozenEvent`. Freezing
-prevents bugs where we accidentally share e.g. signature dicts. However, freezing a
-dict is expensive. Defaults to false.
-
-Example configuration:
-```yaml
-use_frozen_dicts: true
-```
---
 ### `web_client_location`

 The absolute URL to the web client which `/` will redirect to. Defaults to none.
@@ -642,17 +595,6 @@ listeners:
      - names: [client, federation]
 ```

---
-### `manhole`
-
-Turn on the Twisted telnet manhole service on the given port. Defaults to none.
-
-This can also be set by the `--manhole` argument when starting Synapse.
-
-Example configuration:
-```yaml
-manhole: 1234
-```
 ---
 ### `manhole_settings`

@@ -731,9 +673,8 @@ This setting has the following sub-options:
   TLS via STARTTLS *if the SMTP server supports it*. If this option is set,
   Synapse will refuse to connect unless the server supports STARTTLS.
 * `enable_tls`: By default, if the server supports TLS, it will be used, and the server
-   must present a certificate that is valid for `tlsname`. If this option
+   must present a certificate that is valid for 'smtp_host'. If this option
   is set to false, TLS will not be used.
-* `tlsname`: The domain name the SMTP server's TLS certificate must be valid for, defaulting to `smtp_host`.
 * `notif_from`: defines the "From" address to use when sending emails.
    It must be set if email sending is enabled. The placeholder '%(app)s' will be replaced by the application name,
    which is normally set in `app_name`, but may be overridden by the
@@ -800,7 +741,6 @@ email:
  force_tls: true
  require_transport_security: true
  enable_tls: false
-  tlsname: mail.server.example.com
  notif_from: "Your Friendly %(app)s homeserver <noreply@example.com>"
  app_name: my_branded_matrix_server
  enable_notifs: true
@@ -1926,50 +1866,6 @@ rc_federation:
  concurrent: 5
 ```
 ---
-### `rc_presence`
-
-This option sets ratelimiting for presence.
-
-The `rc_presence.per_user` option sets rate limits on how often a specific
-users' presence updates are evaluated. Ratelimited presence updates sent via sync are
-ignored, and no error is returned to the client.
-This option also sets the rate limit for the
-[`PUT /_matrix/client/v3/presence/{userId}/status`](https://spec.matrix.org/latest/client-server-api/#put_matrixclientv3presenceuseridstatus)
-endpoint.
-
-`per_user` defaults to `per_second: 0.1`, `burst_count: 1`.
-
-Example configuration:
-```yaml
-rc_presence:
-  per_user:
-    per_second: 0.05
-    burst_count: 1
-```
---
-### `rc_delayed_event_mgmt`
-
-Ratelimiting settings for delayed event management.
-
-This is a ratelimiting option that ratelimits
-attempts to restart, cancel, or view delayed events
-based on the sending client's account and device ID.
-It defaults to: `per_second: 1`, `burst_count: 5`.
-
-Attempts to create or send delayed events are ratelimited not by this setting, but by `rc_message`.
-
-Setting this to a high value allows clients to make delayed event management requests often
-(such as repeatedly restarting a delayed event with a short timeout,
-or restarting several different delayed events all at once)
-without the risk of being ratelimited.
-
-Example configuration:
-```yaml
-rc_delayed_event_mgmt:
-  per_second: 2
-  burst_count: 20
-```
---
 ### `federation_rr_transactions_per_room_per_second`

 Sets outgoing federation transaction frequency for sending read-receipts,
@@ -2615,14 +2511,6 @@ This is primarily intended for use with the `register_new_matrix_user` script
 (see [Registering a user](../../setup/installation.md#registering-a-user));
 however, the interface is [documented](../../admin_api/register_api.html).

-Replacing an existing `registration_shared_secret` with a new one requires users
-of the [Shared-Secret Registration API](../../admin_api/register_api.html) to
-start using the new secret for requesting any further one-time nonces.
-
-> ⚠️ **Warning** – The additional consequences of replacing
-> [`macaroon_secret_key`](#macaroon_secret_key) will apply in case it delegates
-> to `registration_shared_secret`.
-
 See also [`registration_shared_secret_path`](#registration_shared_secret_path).

 Example configuration:
@@ -3199,31 +3087,10 @@ A secret which is used to sign
 If none is specified, the `registration_shared_secret` is used, if one is given;
 otherwise, a secret key is derived from the signing key.

-> ⚠️ **Warning** – Replacing an existing `macaroon_secret_key` with a new one
-> will lead to invalidation of access tokens for all guest users. It will also
-> break unsubscribe links in emails sent before the change. An unlucky user
-> might encounter a broken SSO login flow and would have to start again.
-
 Example configuration:
 ```yaml
 macaroon_secret_key: <PRIVATE STRING>
 ```
---
-### `macaroon_secret_key_path`
-
-An alternative to [`macaroon_secret_key`](#macaroon_secret_key):
-allows the secret key to be specified in an external file.
-
-The file should be a plain text file, containing only the secret key.
-Synapse reads the secret key from the given file once at startup.
-
-Example configuration:
-```yaml
-macaroon_secret_key_path: /path/to/secrets/file
-```
-
-_Added in Synapse 1.121.0._
-
 ---
 ### `form_secret`

@@ -3231,29 +3098,10 @@ A secret which is used to calculate HMACs for form values, to stop
 falsification of values. Must be specified for the User Consent
 forms to work.

-Replacing an existing `form_secret` with a new one might break the user consent
-page for an unlucky user and require them to reopen the page from a new link.
-
 Example configuration:
 ```yaml
 form_secret: <PRIVATE STRING>
 ```
---
-### `form_secret_path`
-
-An alternative to [`form_secret`](#form_secret):
-allows the secret to be specified in an external file.
-
-The file should be a plain text file, containing only the secret.
-Synapse reads the secret from the given file once at startup.
-
-Example configuration:
-```yaml
-form_secret_path: /path/to/secrets/file
-```
-
-_Added in Synapse 1.126.0._
-
 ---
 ## Signing Keys
 Config options relating to signing keys
@@ -3450,9 +3298,8 @@ This setting has the following sub-options:
   The default is 'uid'.
 * `attribute_requirements`: It is possible to configure Synapse to only allow logins if SAML attributes
    match particular values. The requirements can be listed under
-    `attribute_requirements` as shown in the example. All of the listed attributes must
-    match for the login to be permitted. Values can be specified in a `one_of` list to allow
-    multiple values for an attribute.
+   `attribute_requirements` as shown in the example. All of the listed attributes must
+    match for the login to be permitted.
 * `idp_entityid`: If the metadata XML contains multiple IdP entities then the `idp_entityid`
   option must be set to the entity to redirect users to.
   Most deployments only have a single IdP entity and so should omit this option.
@@ -3533,9 +3380,7 @@ saml2_config:
    - attribute: userGroup
      value: "staff"
    - attribute: department
-      one_of:
-        - "sales"
-        - "admins"
+      value: "sales"

  idp_entityid: 'https://our_idp/entityid'
 ```
@@ -3618,24 +3463,6 @@ Options for each entry include:
   to `auto`, which uses PKCE if supported during metadata discovery. Set to `always`
   to force enable PKCE or `never` to force disable PKCE.

-* `id_token_signing_alg_values_supported`: List of the JWS signing algorithms (`alg`
-  values) that are supported for signing the `id_token`.
-
-  This is *not* required if `discovery` is disabled. We default to supporting `RS256` in
-  the downstream usage if no algorithms are configured here or in the discovery
-  document.
-
-  According to the spec, the algorithm `"RS256"` MUST be included. The absolute rigid
-  approach would be to reject this provider as non-compliant if it's not included but we
-  simply allow whatever and see what happens (you're the one that configured the value
-  and cooperating with the identity provider).
-
-  The `alg` value `"none"` MAY be supported but can only be used if the Authorization
-  Endpoint does not include `id_token` in the `response_type` (ex.
-  `/authorize?response_type=code` where `none` can apply,
-  `/authorize?response_type=code%20id_token` where `none` can't apply) (such as when
-  using the Authorization Code Flow).
-
 * `scopes`: list of scopes to request. This should normally include the "openid"
   scope. Defaults to `["openid"]`.

@@ -3662,13 +3489,6 @@ Options for each entry include:
   not included in `scopes`. Set to `userinfo_endpoint` to always use the
   userinfo endpoint.

-* `redirect_uri`: An optional string, that if set will override the `redirect_uri`
-  parameter sent in the requests to the authorization and token endpoints.
-  Useful if you want to redirect the client to another endpoint as part of the
-  OIDC login. Be aware that the client must then call Synapse's OIDC callback
-  URL (`<public_baseurl>/_synapse/client/oidc/callback`) manually afterwards.
-  Must be a valid URL including scheme and path.
-
 * `additional_authorization_parameters`: String to string dictionary that will be passed as
   additional parameters to the authorization grant URL.

@@ -4291,8 +4111,8 @@ unwanted entries from being published in the public room list.

 The format of this option is the same as that for
 [`alias_creation_rules`](#alias_creation_rules): an optional list of 0 or more
-rules. By default, no list is provided, meaning that no one may publish to the
-room list (except server admins).
+rules. By default, no list is provided, meaning that all rooms may be
+published to the room list.

 Otherwise, requests to publish a room are matched against each rule in order.
 The first rule that matches decides if the request is allowed or denied. If no
@@ -4318,10 +4138,6 @@ Note that the patterns match against fully qualified IDs, e.g. against
 of `alice`, `room` and `abcedgghijk`.


-_Changed in Synapse 1.126.0: The default was changed to deny publishing to the
-room list by default_
-
-
 Example configuration:

 ```yaml
@@ -4527,29 +4343,10 @@ HTTP requests from workers.
 The default, this value is omitted (equivalently `null`), which means that
 traffic between the workers and the main process is not authenticated.

-Replacing an existing `worker_replication_secret` with a new one will break
-communication with all workers that have not yet updated their secret.
-
 Example configuration:
 ```yaml
 worker_replication_secret: "secret_secret"
 ```
---
-### `worker_replication_secret_path`
-
-An alternative to [`worker_replication_secret`](#worker_replication_secret):
-allows the secret to be specified in an external file.
-
-The file should be a plain text file, containing only the secret.
-Synapse reads the secret from the given file once at startup.
-
-Example configuration:
-```yaml
-worker_replication_secret_path: /path/to/secrets/file
-```
-
-_Added in Synapse 1.126.0._
-
 ---
 ### `start_pushers`

@@ -4650,10 +4447,6 @@ instance_map:
  worker1:
    host: localhost
    port: 8034
-  other:
-    host: localhost
-    port: 8035
-    tls: true
 ```
 Example configuration(#2, for UNIX sockets):
 ```yaml
--- a/docs/workers.md
+++ b/docs/workers.md
@@ -273,6 +273,17 @@ information.
    ^/_matrix/client/(api/v1|r0|v3|unstable)/knock/
    ^/_matrix/client/(api/v1|r0|v3|unstable)/profile/

+    # Account data requests
+    ^/_matrix/client/(r0|v3|unstable)/.*/tags
+    ^/_matrix/client/(r0|v3|unstable)/.*/account_data
+
+    # Receipts requests
+    ^/_matrix/client/(r0|v3|unstable)/rooms/.*/receipt
+    ^/_matrix/client/(r0|v3|unstable)/rooms/.*/read_markers
+
+    # Presence requests
+    ^/_matrix/client/(api/v1|r0|v3|unstable)/presence/
+
    # User directory search requests
    ^/_matrix/client/(r0|v3|unstable)/user_directory/search$

@@ -281,13 +292,6 @@ 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

-    # Account data requests
-    ^/_matrix/client/(r0|v3|unstable)/.*/tags
-    ^/_matrix/client/(r0|v3|unstable)/.*/account_data
-
-    # Presence requests
-    ^/_matrix/client/(api/v1|r0|v3|unstable)/presence/
-
 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
 ensure that the purge history admin API is not used while pagination requests
--- a/poetry.lock
+++ b/poetry.lock
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -97,7 +97,7 @@ module-name = "synapse.synapse_rust"

 [tool.poetry]
 name = "matrix-synapse"
-version = "1.126.0rc2"
+version = "1.120.0"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "AGPL-3.0-or-later"
@@ -386,11 +386,8 @@ build-backend = "poetry.core.masonry.api"
 #    c.f. https://github.com/matrix-org/synapse/pull/14259
 skip = "cp36* cp37* cp38* pp37* pp38* *-musllinux_i686 pp*aarch64 *-musllinux_aarch64"

-# We need a rust compiler.
-#
-# We temporarily pin Rust to 1.82.0 to work around
-# https://github.com/element-hq/synapse/issues/17988
-before-all =  "sh .ci/before_build_wheel.sh"
+# We need a rust compiler
+before-all =  "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain stable -y --profile minimal"
 environment= { PATH = "$PATH:$HOME/.cargo/bin" }

 # For some reason if we don't manually clean the build directory we
--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@@ -30,11 +30,11 @@ http = "1.1.0"
 lazy_static = "1.4.0"
 log = "0.4.17"
 mime = "0.3.17"
-pyo3 = { version = "0.23.5", features = [
+pyo3 = { version = "0.23.2", features = [
    "macros",
    "anyhow",
    "abi3",
-    "abi3-py39",
+    "abi3-py38",
 ] }
 pyo3-log = "0.12.0"
 pythonize = "0.23.0"
--- a/rust/src/identifier.rs
+++ b/rust/src/identifier.rs
@@ -71,34 +71,6 @@ impl TryFrom<&str> for UserID {
    }
 }

-impl TryFrom<String> for UserID {
-    type Error = IdentifierError;
-
-    /// Will try creating a `UserID` from the provided `&str`.
-    /// Can fail if the user_id is incorrectly formatted.
-    fn try_from(s: String) -> Result<Self, Self::Error> {
-        if !s.starts_with('@') {
-            return Err(IdentifierError::IncorrectSigil);
-        }
-
-        if s.find(':').is_none() {
-            return Err(IdentifierError::MissingColon);
-        }
-
-        Ok(UserID(s))
-    }
-}
-
-impl<'de> serde::Deserialize<'de> for UserID {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        let s: String = serde::Deserialize::deserialize(deserializer)?;
-        UserID::try_from(s).map_err(serde::de::Error::custom)
-    }
-}
-
 impl Deref for UserID {
    type Target = str;

@@ -112,141 +84,3 @@ impl fmt::Display for UserID {
        write!(f, "{}", self.0)
    }
 }
-
-/// A Matrix room_id.
-#[derive(Clone, Debug, PartialEq)]
-pub struct RoomID(String);
-
-impl RoomID {
-    /// Returns the `localpart` of the room_id.
-    pub fn localpart(&self) -> &str {
-        &self[1..self.colon_pos()]
-    }
-
-    /// Returns the `server_name` / `domain` of the room_id.
-    pub fn server_name(&self) -> &str {
-        &self[self.colon_pos() + 1..]
-    }
-
-    /// Returns the position of the ':' inside of the room_id.
-    /// Used when splitting the room_id into it's respective parts.
-    fn colon_pos(&self) -> usize {
-        self.find(':').unwrap()
-    }
-}
-
-impl TryFrom<&str> for RoomID {
-    type Error = IdentifierError;
-
-    /// Will try creating a `RoomID` from the provided `&str`.
-    /// Can fail if the room_id is incorrectly formatted.
-    fn try_from(s: &str) -> Result<Self, Self::Error> {
-        if !s.starts_with('!') {
-            return Err(IdentifierError::IncorrectSigil);
-        }
-
-        if s.find(':').is_none() {
-            return Err(IdentifierError::MissingColon);
-        }
-
-        Ok(RoomID(s.to_string()))
-    }
-}
-
-impl TryFrom<String> for RoomID {
-    type Error = IdentifierError;
-
-    /// Will try creating a `RoomID` from the provided `String`.
-    /// Can fail if the room_id is incorrectly formatted.
-    fn try_from(s: String) -> Result<Self, Self::Error> {
-        if !s.starts_with('!') {
-            return Err(IdentifierError::IncorrectSigil);
-        }
-
-        if s.find(':').is_none() {
-            return Err(IdentifierError::MissingColon);
-        }
-
-        Ok(RoomID(s))
-    }
-}
-
-impl<'de> serde::Deserialize<'de> for RoomID {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        let s: String = serde::Deserialize::deserialize(deserializer)?;
-        RoomID::try_from(s).map_err(serde::de::Error::custom)
-    }
-}
-
-impl Deref for RoomID {
-    type Target = str;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl fmt::Display for RoomID {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-/// A Matrix event_id.
-#[derive(Clone, Debug, PartialEq)]
-pub struct EventID(String);
-
-impl TryFrom<&str> for EventID {
-    type Error = IdentifierError;
-
-    /// Will try creating a `EventID` from the provided `&str`.
-    /// Can fail if the event_id is incorrectly formatted.
-    fn try_from(s: &str) -> Result<Self, Self::Error> {
-        if !s.starts_with('$') {
-            return Err(IdentifierError::IncorrectSigil);
-        }
-
-        Ok(EventID(s.to_string()))
-    }
-}
-
-impl TryFrom<String> for EventID {
-    type Error = IdentifierError;
-
-    /// Will try creating a `EventID` from the provided `String`.
-    /// Can fail if the event_id is incorrectly formatted.
-    fn try_from(s: String) -> Result<Self, Self::Error> {
-        if !s.starts_with('$') {
-            return Err(IdentifierError::IncorrectSigil);
-        }
-
-        Ok(EventID(s))
-    }
-}
-
-impl<'de> serde::Deserialize<'de> for EventID {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        let s: String = serde::Deserialize::deserialize(deserializer)?;
-        EventID::try_from(s).map_err(serde::de::Error::custom)
-    }
-}
-
-impl Deref for EventID {
-    type Target = str;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl fmt::Display for EventID {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
--- a/rust/src/rendezvous/mod.rs
+++ b/rust/src/rendezvous/mod.rs
@@ -47,7 +47,7 @@ fn prepare_headers(headers: &mut HeaderMap, session: &Session) {
    headers.typed_insert(AccessControlAllowOrigin::ANY);
    headers.typed_insert(AccessControlExposeHeaders::from_iter([ETAG]));
    headers.typed_insert(Pragma::no_cache());
-    headers.typed_insert(CacheControl::new().with_no_store().with_no_transform());
+    headers.typed_insert(CacheControl::new().with_no_store());
    headers.typed_insert(session.etag());
    headers.typed_insert(session.expires());
    headers.typed_insert(session.last_modified());
@@ -192,12 +192,10 @@ impl RendezvousHandler {
            "url": uri,
        })
        .to_string();
-        let length = response.len() as _;

        let mut response = Response::new(response.as_bytes());
        *response.status_mut() = StatusCode::CREATED;
        response.headers_mut().typed_insert(ContentType::json());
-        response.headers_mut().typed_insert(ContentLength(length));
        prepare_headers(response.headers_mut(), &session);
        http_response_to_twisted(twisted_request, response)?;

@@ -301,7 +299,6 @@ impl RendezvousHandler {
        // proxy/cache setup which strips the ETag header if there is no Content-Type set.
        // Specifically, we noticed this behaviour when placing Synapse behind Cloudflare.
        response.headers_mut().typed_insert(ContentType::text());
-        response.headers_mut().typed_insert(ContentLength(0));

        http_response_to_twisted(twisted_request, response)?;

@@ -319,7 +316,6 @@ impl RendezvousHandler {
        response
            .headers_mut()
            .typed_insert(AccessControlAllowOrigin::ANY);
-        response.headers_mut().typed_insert(ContentLength(0));
        http_response_to_twisted(twisted_request, response)?;

        Ok(())
--- a/scripts-dev/complement.sh
+++ b/scripts-dev/complement.sh
@@ -195,10 +195,6 @@ if [ -z "$skip_docker_build" ]; then
        # Build the unified Complement image (from the worker Synapse image we just built).
        echo_if_github "::group::Build Docker image: complement/Dockerfile"
        $CONTAINER_RUNTIME build -t complement-synapse \
-            `# This is the tag we end up pushing to the registry (see` \
-            `# .github/workflows/push_complement_image.yml) so let's just label it now` \
-            `# so people can reference it by the same name locally.` \
-            -t ghcr.io/element-hq/synapse/complement-synapse \
            -f "docker/complement/Dockerfile" "docker/complement"
        echo_if_github "::endgroup::"

--- a/synapse/_scripts/synapse_port_db.py
+++ b/synapse/_scripts/synapse_port_db.py
@@ -42,12 +42,12 @@ from typing import (
    Set,
    Tuple,
    Type,
-    TypedDict,
    TypeVar,
    cast,
 )

 import yaml
+from typing_extensions import TypedDict

 from twisted.internet import defer, reactor as reactor_

@@ -191,11 +191,6 @@ APPEND_ONLY_TABLES = [


 IGNORED_TABLES = {
-    # Porting the auto generated sequence in this table is non-trivial.
-    # None of the entries in this list are mandatory for Synapse to keep working.
-    # If state group disk space is an issue after the port, the
-    # `delete_unreferenced_state_groups_bg_update` background task can be run again.
-    "state_groups_pending_deletion",
    # We don't port these tables, as they're a faff and we can regenerate
    # them anyway.
    "user_directory",
@@ -221,15 +216,6 @@ IGNORED_TABLES = {
 }


-# These background updates will not be applied upon creation of the postgres database.
-IGNORED_BACKGROUND_UPDATES = {
-    # Reapplying this background update to the postgres database is unnecessary after
-    # already having waited for the SQLite database to complete all running background
-    # updates.
-    "delete_unreferenced_state_groups_bg_update",
-}
-
-
 # Error returned by the run function. Used at the top-level part of the script to
 # handle errors and return codes.
 end_error: Optional[str] = None
@@ -701,20 +687,6 @@ class Porter:
        # 0 means off. 1 means full. 2 means incremental.
        return autovacuum_setting != 0

-    async def remove_ignored_background_updates_from_database(self) -> None:
-        def _remove_delete_unreferenced_state_groups_bg_updates(
-            txn: LoggingTransaction,
-        ) -> None:
-            txn.execute(
-                "DELETE FROM background_updates WHERE update_name = ANY(?)",
-                (list(IGNORED_BACKGROUND_UPDATES),),
-            )
-
-        await self.postgres_store.db_pool.runInteraction(
-            "remove_delete_unreferenced_state_groups_bg_updates",
-            _remove_delete_unreferenced_state_groups_bg_updates,
-        )
-
    async def run(self) -> None:
        """Ports the SQLite database to a PostgreSQL database.

@@ -760,8 +732,6 @@ class Porter:
                self.hs_config.database.get_single_database()
            )

-            await self.remove_ignored_background_updates_from_database()
-
            await self.run_background_updates_on_postgres()

            self.progress.set_state("Creating port tables")
--- a/synapse/api/auth/init.py
+++ b/synapse/api/auth/init.py
@@ -18,7 +18,9 @@
 # [This file includes modifications made by New Vector Limited]
 #
 #
-from typing import TYPE_CHECKING, Optional, Protocol, Tuple
+from typing import TYPE_CHECKING, Optional, Tuple
+
+from typing_extensions import Protocol

 from twisted.web.server import Request

--- a/synapse/api/auth/msc3861_delegated.py
+++ b/synapse/api/auth/msc3861_delegated.py
@@ -19,7 +19,7 @@
 #
 #
 import logging
-from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional
+from typing import TYPE_CHECKING, Any, Dict, List, Optional
 from urllib.parse import urlencode

 from authlib.oauth2 import ClientAuth
@@ -119,7 +119,7 @@ class MSC3861DelegatedAuth(BaseAuth):
        self._clock = hs.get_clock()
        self._http_client = hs.get_proxied_http_client()
        self._hostname = hs.hostname
-        self._admin_token: Callable[[], Optional[str]] = self._config.admin_token
+        self._admin_token = self._config.admin_token

        self._issuer_metadata = RetryOnExceptionCachedCall[OpenIDProviderMetadata](
            self._load_metadata
@@ -133,10 +133,9 @@ class MSC3861DelegatedAuth(BaseAuth):
            )
        else:
            # Else use the client secret
-            client_secret = self._config.client_secret()
-            assert client_secret, "No client_secret provided"
+            assert self._config.client_secret, "No client_secret provided"
            self._client_auth = ClientAuth(
-                self._config.client_id, client_secret, auth_method
+                self._config.client_id, self._config.client_secret, auth_method
            )

    async def _load_metadata(self) -> OpenIDProviderMetadata:
@@ -175,12 +174,6 @@ class MSC3861DelegatedAuth(BaseAuth):
            logger.warning("Failed to load metadata:", exc_info=True)
            return None

-    async def auth_metadata(self) -> Dict[str, Any]:
-        """
-        Returns the auth metadata dict
-        """
-        return await self._issuer_metadata.get()
-
    async def _introspection_endpoint(self) -> str:
        """
        Returns the introspection endpoint of the issuer
@@ -214,9 +207,6 @@ class MSC3861DelegatedAuth(BaseAuth):
            "Content-Type": "application/x-www-form-urlencoded",
            "User-Agent": str(self._http_client.user_agent, "utf-8"),
            "Accept": "application/json",
-            # Tell MAS that we support reading the device ID as an explicit
-            # value, not encoded in the scope. This is supported by MAS 0.15+
-            "X-MAS-Supports-Device-Id": "1",
        }

        args = {"token": token, "token_type_hint": "access_token"}
@@ -287,7 +277,7 @@ class MSC3861DelegatedAuth(BaseAuth):
            requester = await self.get_user_by_access_token(access_token, allow_expired)

        # Do not record requests from MAS using the virtual `__oidc_admin` user.
-        if access_token != self._admin_token():
+        if access_token != self._admin_token:
            await self._record_request(request, requester)

        if not allow_guest and requester.is_guest:
@@ -328,8 +318,7 @@ class MSC3861DelegatedAuth(BaseAuth):
        token: str,
        allow_expired: bool = False,
    ) -> Requester:
-        admin_token = self._admin_token()
-        if admin_token is not None and token == admin_token:
+        if self._admin_token is not None and token == self._admin_token:
            # XXX: This is a temporary solution so that the admin API can be called by
            # the OIDC provider. This will be removed once we have OIDC client
            # credentials grant support in matrix-authentication-service.
@@ -412,41 +401,29 @@ class MSC3861DelegatedAuth(BaseAuth):
        else:
            user_id = UserID.from_string(user_id_str)

-        # MAS 0.15+ will give us the device ID as an explicit value for compatibility sessions
-        # If present, we get it from here, if not we get it in thee scope
-        device_id = introspection_result.get("device_id")
-        if device_id is not None:
-            # We got the device ID explicitly, just sanity check that it's a string
-            if not isinstance(device_id, str):
-                raise AuthError(
-                    500,
-                    "Invalid device ID in introspection result",
-                )
-        else:
-            # Find device_ids in scope
-            # We only allow a single device_id in the scope, so we find them all in the
-            # scope list, and raise if there are more than one. The OIDC server should be
-            # the one enforcing valid scopes, so we raise a 500 if we find an invalid scope.
-            device_ids = [
-                tok[len(SCOPE_MATRIX_DEVICE_PREFIX) :]
-                for tok in scope
-                if tok.startswith(SCOPE_MATRIX_DEVICE_PREFIX)
-            ]
+        # Find device_ids in scope
+        # We only allow a single device_id in the scope, so we find them all in the
+        # scope list, and raise if there are more than one. The OIDC server should be
+        # the one enforcing valid scopes, so we raise a 500 if we find an invalid scope.
+        device_ids = [
+            tok[len(SCOPE_MATRIX_DEVICE_PREFIX) :]
+            for tok in scope
+            if tok.startswith(SCOPE_MATRIX_DEVICE_PREFIX)
+        ]

-            if len(device_ids) > 1:
-                raise AuthError(
-                    500,
-                    "Multiple device IDs in scope",
-                )
-
-            device_id = device_ids[0] if device_ids else None
+        if len(device_ids) > 1:
+            raise AuthError(
+                500,
+                "Multiple device IDs in scope",
+            )

+        device_id = device_ids[0] if device_ids else None
        if device_id is not None:
            # Sanity check the device_id
            if len(device_id) > 255 or len(device_id) < 1:
                raise AuthError(
                    500,
-                    "Invalid device ID in introspection result",
+                    "Invalid device ID in scope",
                )

            # Create the device on the fly if it does not exist
--- a/synapse/api/constants.py
+++ b/synapse/api/constants.py
@@ -231,8 +231,6 @@ class EventContentFields:
    ROOM_NAME: Final = "name"

    MEMBERSHIP: Final = "membership"
-    MEMBERSHIP_DISPLAYNAME: Final = "displayname"
-    MEMBERSHIP_AVATAR_URL: Final = "avatar_url"

    # Used in m.room.guest_access events.
    GUEST_ACCESS: Final = "guest_access"
@@ -320,8 +318,3 @@ class ApprovalNoticeMedium:
 class Direction(enum.Enum):
    BACKWARDS = "b"
    FORWARDS = "f"
-
-
-class ProfileFields:
-    DISPLAYNAME: Final = "displayname"
-    AVATAR_URL: Final = "avatar_url"
--- a/synapse/api/errors.py
+++ b/synapse/api/errors.py
@@ -87,7 +87,8 @@ class Codes(str, Enum):
    WEAK_PASSWORD = "M_WEAK_PASSWORD"
    INVALID_SIGNATURE = "M_INVALID_SIGNATURE"
    USER_DEACTIVATED = "M_USER_DEACTIVATED"
-    USER_LOCKED = "M_USER_LOCKED"
+    # USER_LOCKED = "M_USER_LOCKED"
+    USER_LOCKED = "ORG_MATRIX_MSC3939_USER_LOCKED"
    NOT_YET_UPLOADED = "M_NOT_YET_UPLOADED"
    CANNOT_OVERWRITE_MEDIA = "M_CANNOT_OVERWRITE_MEDIA"

@@ -100,9 +101,8 @@ class Codes(str, Enum):
    # The account has been suspended on the server.
    # By opposition to `USER_DEACTIVATED`, this is a reversible measure
    # that can possibly be appealed and reverted.
-    # Introduced by MSC3823
-    # https://github.com/matrix-org/matrix-spec-proposals/pull/3823
-    USER_ACCOUNT_SUSPENDED = "M_USER_SUSPENDED"
+    # Part of MSC3823.
+    USER_ACCOUNT_SUSPENDED = "ORG.MATRIX.MSC3823.USER_ACCOUNT_SUSPENDED"

    BAD_ALIAS = "M_BAD_ALIAS"
    # For restricted join rules.
@@ -132,10 +132,6 @@ class Codes(str, Enum):
    # connection.
    UNKNOWN_POS = "M_UNKNOWN_POS"

-    # Part of MSC4133
-    PROFILE_TOO_LARGE = "M_PROFILE_TOO_LARGE"
-    KEY_TOO_LARGE = "M_KEY_TOO_LARGE"
-

 class CodeMessageException(RuntimeError):
    """An exception with integer code, a message string attributes and optional headers.
--- a/synapse/api/ratelimiting.py
+++ b/synapse/api/ratelimiting.py
@@ -275,7 +275,6 @@ class Ratelimiter:
        update: bool = True,
        n_actions: int = 1,
        _time_now_s: Optional[float] = None,
-        pause: Optional[float] = 0.5,
    ) -> None:
        """Checks if an action can be performed. If not, raises a LimitExceededError

@@ -299,8 +298,6 @@ class Ratelimiter:
                at all.
            _time_now_s: The current time. Optional, defaults to the current time according
                to self.clock. Only used by tests.
-            pause: Time in seconds to pause when an action is being limited. Defaults to 0.5
-                to stop clients from "tight-looping" on retrying their request.

        Raises:
            LimitExceededError: If an action could not be performed, along with the time in
@@ -319,8 +316,9 @@ class Ratelimiter:
        )

        if not allowed:
-            if pause:
-                await self.clock.sleep(pause)
+            # We pause for a bit here to stop clients from "tight-looping" on
+            # retrying their request.
+            await self.clock.sleep(0.5)

            raise LimitExceededError(
                limiter_name=self._limiter_name,
--- a/synapse/api/urls.py
+++ b/synapse/api/urls.py
@@ -23,8 +23,7 @@

 import hmac
 from hashlib import sha256
-from typing import Optional
-from urllib.parse import urlencode, urljoin
+from urllib.parse import urlencode

 from synapse.config import ConfigError
 from synapse.config.homeserver import HomeServerConfig
@@ -67,42 +66,3 @@ class ConsentURIBuilder:
            urlencode({"u": user_id, "h": mac}),
        )
        return consent_uri
-
-
-class LoginSSORedirectURIBuilder:
-    def __init__(self, hs_config: HomeServerConfig):
-        self._public_baseurl = hs_config.server.public_baseurl
-
-    def build_login_sso_redirect_uri(
-        self, *, idp_id: Optional[str], client_redirect_url: str
-    ) -> str:
-        """Build a `/login/sso/redirect` URI for the given identity provider.
-
-        Builds `/_matrix/client/v3/login/sso/redirect/{idpId}?redirectUrl=xxx` when `idp_id` is specified.
-        Otherwise, builds `/_matrix/client/v3/login/sso/redirect?redirectUrl=xxx` when `idp_id` is `None`.
-
-        Args:
-            idp_id: Optional ID of the identity provider
-            client_redirect_url: URL to redirect the user to after login
-
-        Returns
-            The URI to follow when choosing a specific identity provider.
-        """
-        base_url = urljoin(
-            self._public_baseurl,
-            f"{CLIENT_API_PREFIX}/v3/login/sso/redirect",
-        )
-
-        serialized_query_parameters = urlencode({"redirectUrl": client_redirect_url})
-
-        if idp_id:
-            resultant_url = urljoin(
-                # We have to add a trailing slash to the base URL to ensure that the
-                # last path segment is not stripped away when joining with another path.
-                f"{base_url}/",
-                f"{idp_id}?{serialized_query_parameters}",
-            )
-        else:
-            resultant_url = f"{base_url}?{serialized_query_parameters}"
-
-        return resultant_url
--- a/synapse/appservice/init.py
+++ b/synapse/appservice/init.py
@@ -87,7 +87,6 @@ class ApplicationService:
        ip_range_whitelist: Optional[IPSet] = None,
        supports_ephemeral: bool = False,
        msc3202_transaction_extensions: bool = False,
-        msc4190_device_management: bool = False,
    ):
        self.token = token
        self.url = (
@@ -101,7 +100,6 @@ class ApplicationService:
        self.ip_range_whitelist = ip_range_whitelist
        self.supports_ephemeral = supports_ephemeral
        self.msc3202_transaction_extensions = msc3202_transaction_extensions
-        self.msc4190_device_management = msc4190_device_management

        if "|" in self.id:
            raise Exception("application service ID cannot contain '|' character")
--- a/synapse/config/_base.py
+++ b/synapse/config/_base.py
@@ -221,13 +221,9 @@ class Config:
            The number of milliseconds in the duration.

        Raises:
-            TypeError: if given something other than an integer or a string, or the
-                duration is using an incorrect suffix.
+            TypeError, if given something other than an integer or a string
            ValueError: if given a string not of the form described above.
        """
-        # For integers, we prefer to use `type(value) is int` instead of
-        # `isinstance(value, int)` because we want to exclude subclasses of int, such as
-        # bool.
        if type(value) is int:  # noqa: E721
            return value
        elif isinstance(value, str):
@@ -250,20 +246,9 @@ class Config:
            if suffix in sizes:
                value = value[:-1]
                size = sizes[suffix]
-            elif suffix.isdigit():
-                #  No suffix is treated as milliseconds.
-                value = value
-                size = 1
-            else:
-                raise TypeError(
-                    f"Bad duration suffix {value} (expected no suffix or one of these suffixes: {sizes.keys()})"
-                )
-
            return int(value) * size
        else:
-            raise TypeError(
-                f"Bad duration type {value!r} (expected int or string duration)"
-            )
+            raise TypeError(f"Bad duration {value!r}")

    @staticmethod
    def abspath(file_path: str) -> str:
@@ -589,14 +574,6 @@ class RootConfig:
            " Defaults to the directory containing the last config file",
        )

-        config_parser.add_argument(
-            "--no-secrets-in-config",
-            dest="secrets_in_config",
-            action="store_false",
-            default=True,
-            help="Reject config options that expect an in-line secret as value.",
-        )
-
        cls.invoke_all_static("add_arguments", config_parser)

    @classmethod
@@ -634,10 +611,7 @@ class RootConfig:

        config_dict = read_config_files(config_files)
        obj.parse_config_dict(
-            config_dict,
-            config_dir_path=config_dir_path,
-            data_dir_path=data_dir_path,
-            allow_secrets_in_config=config_args.secrets_in_config,
+            config_dict, config_dir_path=config_dir_path, data_dir_path=data_dir_path
        )

        obj.invoke_all("read_arguments", config_args)
@@ -664,13 +638,6 @@ class RootConfig:
            help="Specify config file. Can be given multiple times and"
            " may specify directories containing *.yaml files.",
        )
-        parser.add_argument(
-            "--no-secrets-in-config",
-            dest="secrets_in_config",
-            action="store_false",
-            default=True,
-            help="Reject config options that expect an in-line secret as value.",
-        )

        # we nest the mutually-exclusive group inside another group so that the help
        # text shows them in their own group.
@@ -839,21 +806,14 @@ class RootConfig:
            return None

        obj.parse_config_dict(
-            config_dict,
-            config_dir_path=config_dir_path,
-            data_dir_path=data_dir_path,
-            allow_secrets_in_config=config_args.secrets_in_config,
+            config_dict, config_dir_path=config_dir_path, data_dir_path=data_dir_path
        )
        obj.invoke_all("read_arguments", config_args)

        return obj

    def parse_config_dict(
-        self,
-        config_dict: Dict[str, Any],
-        config_dir_path: str,
-        data_dir_path: str,
-        allow_secrets_in_config: bool = True,
+        self, config_dict: Dict[str, Any], config_dir_path: str, data_dir_path: str
    ) -> None:
        """Read the information from the config dict into this Config object.

@@ -871,7 +831,6 @@ class RootConfig:
            config_dict,
            config_dir_path=config_dir_path,
            data_dir_path=data_dir_path,
-            allow_secrets_in_config=allow_secrets_in_config,
        )

    def generate_missing_files(
--- a/synapse/config/_base.pyi
+++ b/synapse/config/_base.pyi
@@ -132,11 +132,7 @@ class RootConfig:
    @classmethod
    def invoke_all_static(cls, func_name: str, *args: Any, **kwargs: Any) -> None: ...
    def parse_config_dict(
-        self,
-        config_dict: Dict[str, Any],
-        config_dir_path: str,
-        data_dir_path: str,
-        allow_secrets_in_config: bool = ...,
+        self, config_dict: Dict[str, Any], config_dir_path: str, data_dir_path: str
    ) -> None: ...
    def generate_config(
        self,
--- a/synapse/config/appservice.py
+++ b/synapse/config/appservice.py
@@ -183,18 +183,6 @@ def _load_appservice(
            "The `org.matrix.msc3202` option should be true or false if specified."
        )

-    # Opt-in flag for the MSC4190 behaviours.
-    # When enabled, the following C-S API endpoints change for appservices:
-    # - POST /register does not return an access token
-    # - PUT /devices/{device_id} creates a new device if one does not exist
-    # - DELETE /devices/{device_id} no longer requires UIA
-    # - POST /delete_devices/{device_id} no longer requires UIA
-    msc4190_enabled = as_info.get("io.element.msc4190", False)
-    if not isinstance(msc4190_enabled, bool):
-        raise ValueError(
-            "The `io.element.msc4190` option should be true or false if specified."
-        )
-
    return ApplicationService(
        token=as_info["as_token"],
        url=as_info["url"],
@@ -207,5 +195,4 @@ def _load_appservice(
        ip_range_whitelist=ip_range_whitelist,
        supports_ephemeral=supports_ephemeral,
        msc3202_transaction_extensions=msc3202_transaction_extensions,
-        msc4190_device_management=msc4190_enabled,
    )
--- a/synapse/config/captcha.py
+++ b/synapse/config/captcha.py
@@ -29,15 +29,8 @@ from ._base import Config, ConfigError
 class CaptchaConfig(Config):
    section = "captcha"

-    def read_config(
-        self, config: JsonDict, allow_secrets_in_config: bool, **kwargs: Any
-    ) -> None:
+    def read_config(self, config: JsonDict, **kwargs: Any) -> None:
        recaptcha_private_key = config.get("recaptcha_private_key")
-        if recaptcha_private_key and not allow_secrets_in_config:
-            raise ConfigError(
-                "Config options that expect an in-line secret as value are disabled",
-                ("recaptcha_private_key",),
-            )
        if recaptcha_private_key is not None and not isinstance(
            recaptcha_private_key, str
        ):
@@ -45,11 +38,6 @@ class CaptchaConfig(Config):
        self.recaptcha_private_key = recaptcha_private_key

        recaptcha_public_key = config.get("recaptcha_public_key")
-        if recaptcha_public_key and not allow_secrets_in_config:
-            raise ConfigError(
-                "Config options that expect an in-line secret as value are disabled",
-                ("recaptcha_public_key",),
-            )
        if recaptcha_public_key is not None and not isinstance(
            recaptcha_public_key, str
        ):
--- a/synapse/config/cas.py
+++ b/synapse/config/cas.py
@@ -20,7 +20,7 @@
 #
 #

-from typing import Any, List, Optional
+from typing import Any, List

 from synapse.config.sso import SsoAttributeRequirement
 from synapse.types import JsonDict
@@ -46,9 +46,7 @@ class CasConfig(Config):

            # TODO Update this to a _synapse URL.
            public_baseurl = self.root.server.public_baseurl
-            self.cas_service_url: Optional[str] = (
-                public_baseurl + "_matrix/client/r0/login/cas/ticket"
-            )
+            self.cas_service_url = public_baseurl + "_matrix/client/r0/login/cas/ticket"

            self.cas_protocol_version = cas_config.get("protocol_version")
            if (
--- a/synapse/config/emailconfig.py
+++ b/synapse/config/emailconfig.py
@@ -110,7 +110,6 @@ class EmailConfig(Config):
            raise ConfigError(
                "email.require_transport_security requires email.enable_tls to be true"
            )
-        self.email_tlsname = email_config.get("tlsname", None)

        if "app_name" in email_config:
            self.email_app_name = email_config["app_name"]
--- a/synapse/config/experimental.py
+++ b/synapse/config/experimental.py
@@ -20,15 +20,14 @@
 #

 import enum
-from functools import cache
-from typing import TYPE_CHECKING, Any, Iterable, Optional
+from typing import TYPE_CHECKING, Any, Optional

 import attr
 import attr.validators

 from synapse.api.room_versions import KNOWN_ROOM_VERSIONS, RoomVersions
 from synapse.config import ConfigError
-from synapse.config._base import Config, RootConfig, read_file
+from synapse.config._base import Config, RootConfig
 from synapse.types import JsonDict

 # Determine whether authlib is installed.
@@ -44,12 +43,6 @@ if TYPE_CHECKING:
    from authlib.jose.rfc7517 import JsonWebKey


-@cache
-def read_secret_from_file_once(file_path: Any, config_path: Iterable[str]) -> str:
-    """Returns the memoized secret read from file."""
-    return read_file(file_path, config_path).strip()
-
-
 class ClientAuthMethod(enum.Enum):
    """List of supported client auth methods."""

@@ -70,40 +63,6 @@ def _parse_jwks(jwks: Optional[JsonDict]) -> Optional["JsonWebKey"]:
    return JsonWebKey.import_key(jwks)


-def _check_client_secret(
-    instance: "MSC3861", _attribute: attr.Attribute, _value: Optional[str]
-) -> None:
-    if instance._client_secret and instance._client_secret_path:
-        raise ConfigError(
-            (
-                "You have configured both "
-                "`experimental_features.msc3861.client_secret` and "
-                "`experimental_features.msc3861.client_secret_path`. "
-                "These are mutually incompatible."
-            ),
-            ("experimental", "msc3861", "client_secret"),
-        )
-    # Check client secret can be retrieved
-    instance.client_secret()
-
-
-def _check_admin_token(
-    instance: "MSC3861", _attribute: attr.Attribute, _value: Optional[str]
-) -> None:
-    if instance._admin_token and instance._admin_token_path:
-        raise ConfigError(
-            (
-                "You have configured both "
-                "`experimental_features.msc3861.admin_token` and "
-                "`experimental_features.msc3861.admin_token_path`. "
-                "These are mutually incompatible."
-            ),
-            ("experimental", "msc3861", "admin_token"),
-        )
-    # Check client secret can be retrieved
-    instance.admin_token()
-
-
@attr.s(slots=True, frozen=True)
 class MSC3861:
    """Configuration for MSC3861: Matrix architecture change to delegate authentication via OIDC"""
@@ -138,30 +97,15 @@ class MSC3861:
    )
    """The auth method used when calling the introspection endpoint."""

-    _client_secret: Optional[str] = attr.ib(
+    client_secret: Optional[str] = attr.ib(
        default=None,
-        validator=[
-            attr.validators.optional(attr.validators.instance_of(str)),
-            _check_client_secret,
-        ],
+        validator=attr.validators.optional(attr.validators.instance_of(str)),
    )
    """
    The client secret to use when calling the introspection endpoint,
    when using any of the client_secret_* client auth methods.
    """

-    _client_secret_path: Optional[str] = attr.ib(
-        default=None,
-        validator=[
-            attr.validators.optional(attr.validators.instance_of(str)),
-            _check_client_secret,
-        ],
-    )
-    """
-    Alternative to `client_secret`: allows the secret to be specified in an
-    external file.
-    """
-
    jwk: Optional["JsonWebKey"] = attr.ib(default=None, converter=_parse_jwks)
    """
    The JWKS to use when calling the introspection endpoint,
@@ -189,7 +133,7 @@ class MSC3861:
                ClientAuthMethod.CLIENT_SECRET_BASIC,
                ClientAuthMethod.CLIENT_SECRET_JWT,
            )
-            and self.client_secret() is None
+            and self.client_secret is None
        ):
            raise ConfigError(
                f"A client secret must be provided when using the {value} client auth method",
@@ -208,51 +152,16 @@ class MSC3861:
    )
    """The URL of the My Account page on the OIDC Provider as per MSC2965."""

-    _admin_token: Optional[str] = attr.ib(
+    admin_token: Optional[str] = attr.ib(
        default=None,
-        validator=[
-            attr.validators.optional(attr.validators.instance_of(str)),
-            _check_admin_token,
-        ],
+        validator=attr.validators.optional(attr.validators.instance_of(str)),
    )
    """
    A token that should be considered as an admin token.
    This is used by the OIDC provider, to make admin calls to Synapse.
    """

-    _admin_token_path: Optional[str] = attr.ib(
-        default=None,
-        validator=[
-            attr.validators.optional(attr.validators.instance_of(str)),
-            _check_admin_token,
-        ],
-    )
-    """
-    Alternative to `admin_token`: allows the secret to be specified in an
-    external file.
-    """
-
-    def client_secret(self) -> Optional[str]:
-        """Returns the secret given via `client_secret` or `client_secret_path`."""
-        if self._client_secret_path:
-            return read_secret_from_file_once(
-                self._client_secret_path,
-                ("experimental_features", "msc3861", "client_secret_path"),
-            )
-        return self._client_secret
-
-    def admin_token(self) -> Optional[str]:
-        """Returns the admin token given via `admin_token` or `admin_token_path`."""
-        if self._admin_token_path:
-            return read_secret_from_file_once(
-                self._admin_token_path,
-                ("experimental_features", "msc3861", "admin_token_path"),
-            )
-        return self._admin_token
-
-    def check_config_conflicts(
-        self, root: RootConfig, allow_secrets_in_config: bool
-    ) -> None:
+    def check_config_conflicts(self, root: RootConfig) -> None:
        """Checks for any configuration conflicts with other parts of Synapse.

        Raises:
@@ -262,24 +171,6 @@ class MSC3861:
        if not self.enabled:
            return

-        if self._client_secret and not allow_secrets_in_config:
-            raise ConfigError(
-                "Config options that expect an in-line secret as value are disabled",
-                ("experimental", "msc3861", "client_secret"),
-            )
-
-        if self.jwk and not allow_secrets_in_config:
-            raise ConfigError(
-                "Config options that expect an in-line secret as value are disabled",
-                ("experimental", "msc3861", "jwk"),
-            )
-
-        if self._admin_token and not allow_secrets_in_config:
-            raise ConfigError(
-                "Config options that expect an in-line secret as value are disabled",
-                ("experimental", "msc3861", "admin_token"),
-            )
-
        if (
            root.auth.password_enabled_for_reauth
            or root.auth.password_enabled_for_login
@@ -370,9 +261,7 @@ class ExperimentalConfig(Config):

    section = "experimental"

-    def read_config(
-        self, config: JsonDict, allow_secrets_in_config: bool, **kwargs: Any
-    ) -> None:
+    def read_config(self, config: JsonDict, **kwargs: Any) -> None:
        experimental = config.get("experimental_features") or {}

        # MSC3026 (busy presence state)
@@ -516,9 +405,7 @@ class ExperimentalConfig(Config):
            ) from exc

        # Check that none of the other config options conflict with MSC3861 when enabled
-        self.msc3861.check_config_conflicts(
-            self.root, allow_secrets_in_config=allow_secrets_in_config
-        )
+        self.msc3861.check_config_conflicts(self.root)

        self.msc4028_push_encrypted_events = experimental.get(
            "msc4028_push_encrypted_events", False
@@ -549,14 +436,15 @@ class ExperimentalConfig(Config):
                ("experimental", "msc4108_delegation_endpoint"),
            )

-        # MSC4133: Custom profile fields
-        self.msc4133_enabled: bool = experimental.get("msc4133_enabled", False)
+        self.msc3823_account_suspension = experimental.get(
+            "msc3823_account_suspension", False
+        )
+
+        # 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)

        # MSC4222: Adding `state_after` to sync v2
        self.msc4222_enabled: bool = experimental.get("msc4222_enabled", False)
-
-        # MSC4076: Add `disable_badge_count`` to pusher configuration
-        self.msc4076_enabled: bool = experimental.get("msc4076_enabled", False)
--- a/synapse/config/key.py
+++ b/synapse/config/key.py
@@ -43,7 +43,7 @@ from unpaddedbase64 import decode_base64
 from synapse.types import JsonDict
 from synapse.util.stringutils import random_string, random_string_with_symbols

-from ._base import Config, ConfigError, read_file
+from ._base import Config, ConfigError

 if TYPE_CHECKING:
    from signedjson.key import VerifyKeyWithExpiry
@@ -91,16 +91,6 @@ To suppress this warning and continue using 'matrix.org', admins should set
 'suppress_key_server_warning' to 'true' in homeserver.yaml.
 --------------------------------------------------------------------------------"""

-CONFLICTING_MACAROON_SECRET_KEY_OPTS_ERROR = """\
-Conflicting options 'macaroon_secret_key' and 'macaroon_secret_key_path' are
-both defined in config file.
-"""
-
-CONFLICTING_FORM_SECRET_OPTS_ERROR = """\
-Conflicting options 'form_secret' and 'form_secret_path' are both defined in
-config file.
-"""
-
 logger = logging.getLogger(__name__)


@@ -117,11 +107,7 @@ class KeyConfig(Config):
    section = "key"

    def read_config(
-        self,
-        config: JsonDict,
-        config_dir_path: str,
-        allow_secrets_in_config: bool,
-        **kwargs: Any,
+        self, config: JsonDict, config_dir_path: str, **kwargs: Any
    ) -> None:
        # the signing key can be specified inline or in a separate file
        if "signing_key" in config:
@@ -180,21 +166,10 @@ class KeyConfig(Config):
            )
        )

-        macaroon_secret_key = config.get("macaroon_secret_key")
-        if macaroon_secret_key and not allow_secrets_in_config:
-            raise ConfigError(
-                "Config options that expect an in-line secret as value are disabled",
-                ("macaroon_secret_key",),
-            )
-        macaroon_secret_key_path = config.get("macaroon_secret_key_path")
-        if macaroon_secret_key_path:
-            if macaroon_secret_key:
-                raise ConfigError(CONFLICTING_MACAROON_SECRET_KEY_OPTS_ERROR)
-            macaroon_secret_key = read_file(
-                macaroon_secret_key_path, "macaroon_secret_key_path"
-            ).strip()
-        if not macaroon_secret_key:
-            macaroon_secret_key = self.root.registration.registration_shared_secret
+        macaroon_secret_key: Optional[str] = config.get(
+            "macaroon_secret_key", self.root.registration.registration_shared_secret
+        )
+
        if not macaroon_secret_key:
            # Unfortunately, there are people out there that don't have this
            # set. Lets just be "nice" and derive one from their secret key.
@@ -206,19 +181,7 @@ class KeyConfig(Config):

        # a secret which is used to calculate HMACs for form values, to stop
        # falsification of values
-        form_secret = config.get("form_secret", None)
-        if form_secret and not allow_secrets_in_config:
-            raise ConfigError(
-                "Config options that expect an in-line secret as value are disabled",
-                ("form_secret",),
-            )
-        form_secret_path = config.get("form_secret_path", None)
-        if form_secret_path:
-            if form_secret:
-                raise ConfigError(CONFLICTING_FORM_SECRET_OPTS_ERROR)
-            self.form_secret = read_file(form_secret_path, "form_secret_path").strip()
-        else:
-            self.form_secret = form_secret
+        self.form_secret = config.get("form_secret", None)

    def generate_config_section(
        self,
--- a/synapse/config/logger.py
+++ b/synapse/config/logger.py
@@ -360,6 +360,5 @@ def setup_logging(
        "Licensed under the AGPL 3.0 license. Website: https://github.com/element-hq/synapse"
    )
    logging.info("Server hostname: %s", config.server.server_name)
-    logging.info("Public Base URL: %s", config.server.public_baseurl)
    logging.info("Instance name: %s", hs.get_instance_name())
    logging.info("Twisted reactor: %s", type(reactor).__name__)
--- a/synapse/config/oidc.py
+++ b/synapse/config/oidc.py
@@ -125,10 +125,6 @@ OIDC_PROVIDER_CONFIG_SCHEMA = {
            "enum": ["client_secret_basic", "client_secret_post", "none"],
        },
        "pkce_method": {"type": "string", "enum": ["auto", "always", "never"]},
-        "id_token_signing_alg_values_supported": {
-            "type": "array",
-            "items": {"type": "string"},
-        },
        "scopes": {"type": "array", "items": {"type": "string"}},
        "authorization_endpoint": {"type": "string"},
        "token_endpoint": {"type": "string"},
@@ -141,9 +137,6 @@ OIDC_PROVIDER_CONFIG_SCHEMA = {
            "type": "string",
            "enum": ["auto", "userinfo_endpoint"],
        },
-        "redirect_uri": {
-            "type": ["string", "null"],
-        },
        "allow_existing_users": {"type": "boolean"},
        "user_mapping_provider": {"type": ["object", "null"]},
        "attribute_requirements": {
@@ -333,9 +326,6 @@ def _parse_oidc_config_dict(
        client_secret_jwt_key=client_secret_jwt_key,
        client_auth_method=client_auth_method,
        pkce_method=oidc_config.get("pkce_method", "auto"),
-        id_token_signing_alg_values_supported=oidc_config.get(
-            "id_token_signing_alg_values_supported"
-        ),
        scopes=oidc_config.get("scopes", ["openid"]),
        authorization_endpoint=oidc_config.get("authorization_endpoint"),
        token_endpoint=oidc_config.get("token_endpoint"),
@@ -347,7 +337,6 @@ def _parse_oidc_config_dict(
        ),
        skip_verification=oidc_config.get("skip_verification", False),
        user_profile_method=oidc_config.get("user_profile_method", "auto"),
-        redirect_uri=oidc_config.get("redirect_uri"),
        allow_existing_users=oidc_config.get("allow_existing_users", False),
        user_mapping_provider_class=user_mapping_provider_class,
        user_mapping_provider_config=user_mapping_provider_config,
@@ -413,34 +402,6 @@ class OidcProviderConfig:
    # Valid values are 'auto', 'always', and 'never'.
    pkce_method: str

-    id_token_signing_alg_values_supported: Optional[List[str]]
-    """
-    List of the JWS signing algorithms (`alg` values) that are supported for signing the
-    `id_token`.
-
-    This is *not* required if `discovery` is disabled. We default to supporting `RS256`
-    in the downstream usage if no algorithms are configured here or in the discovery
-    document.
-
-    According to the spec, the algorithm `"RS256"` MUST be included. The absolute rigid
-    approach would be to reject this provider as non-compliant if it's not included but
-    we can just allow whatever and see what happens (they're the ones that configured
-    the value and cooperating with the identity provider). It wouldn't be wise to add it
-    ourselves because absence of `RS256` might indicate that the provider actually
-    doesn't support it, despite the spec requirement. Adding it silently could lead to
-    failed authentication attempts or strange mismatch attacks.
-
-    The `alg` value `"none"` MAY be supported but can only be used if the Authorization
-    Endpoint does not include `id_token` in the `response_type` (ex.
-    `/authorize?response_type=code` where `none` can apply,
-    `/authorize?response_type=code%20id_token` where `none` can't apply) (such as when
-    using the Authorization Code Flow).
-
-    Spec:
-     - https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderMetadata
-     - https://openid.net/specs/openid-connect-core-1_0.html#AuthorizationExamples
-    """
-
    # list of scopes to request
    scopes: Collection[str]

@@ -471,18 +432,6 @@ class OidcProviderConfig:
    # values are: "auto" or "userinfo_endpoint".
    user_profile_method: str

-    redirect_uri: Optional[str]
-    """
-    An optional replacement for Synapse's hardcoded `redirect_uri` URL
-    (`<public_baseurl>/_synapse/client/oidc/callback`). This can be used to send
-    the client to a different URL after it receives a response from the
-    `authorization_endpoint`.
-
-    If this is set, the client is expected to call Synapse's OIDC callback URL
-    reproduced above itself with the necessary parameters and session cookie, in
-    order to complete OIDC login.
-    """
-
    # whether to allow a user logging in via OIDC to match a pre-existing account
    # instead of failing
    allow_existing_users: bool
--- a/synapse/config/ratelimiting.py
+++ b/synapse/config/ratelimiting.py
@@ -228,15 +228,3 @@ class RatelimitConfig(Config):
                config.get("remote_media_download_burst_count", "500M")
            ),
        )
-
-        self.rc_presence_per_user = RatelimitSettings.parse(
-            config,
-            "rc_presence.per_user",
-            defaults={"per_second": 0.1, "burst_count": 1},
-        )
-
-        self.rc_delayed_event_mgmt = RatelimitSettings.parse(
-            config,
-            "rc_delayed_event_mgmt",
-            defaults={"per_second": 1, "burst_count": 5},
-        )
--- a/synapse/config/redis.py
+++ b/synapse/config/redis.py
@@ -34,9 +34,7 @@ These are mutually incompatible.
 class RedisConfig(Config):
    section = "redis"

-    def read_config(
-        self, config: JsonDict, allow_secrets_in_config: bool, **kwargs: Any
-    ) -> None:
+    def read_config(self, config: JsonDict, **kwargs: Any) -> None:
        redis_config = config.get("redis") or {}
        self.redis_enabled = redis_config.get("enabled", False)

@@ -50,11 +48,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")
-        if self.redis_password and not allow_secrets_in_config:
-            raise ConfigError(
-                "Config options that expect an in-line secret as value are disabled",
-                ("redis", "password"),
-            )
        redis_password_path = redis_config.get("password_path")
        if redis_password_path:
            if self.redis_password:
--- a/synapse/config/registration.py
+++ b/synapse/config/registration.py
@@ -43,9 +43,7 @@ You have configured both `registration_shared_secret` and
 class RegistrationConfig(Config):
    section = "registration"

-    def read_config(
-        self, config: JsonDict, allow_secrets_in_config: bool, **kwargs: Any
-    ) -> None:
+    def read_config(self, config: JsonDict, **kwargs: Any) -> None:
        self.enable_registration = strtobool(
            str(config.get("enable_registration", False))
        )
@@ -70,11 +68,6 @@ class RegistrationConfig(Config):

        # read the shared secret, either inline or from an external file
        self.registration_shared_secret = config.get("registration_shared_secret")
-        if self.registration_shared_secret and not allow_secrets_in_config:
-            raise ConfigError(
-                "Config options that expect an in-line secret as value are disabled",
-                ("registration_shared_secret",),
-            )
        registration_shared_secret_path = config.get("registration_shared_secret_path")
        if registration_shared_secret_path:
            if self.registration_shared_secret:
--- a/synapse/config/repository.py
+++ b/synapse/config/repository.py
@@ -22,7 +22,7 @@
 import logging
 import os
 from typing import Any, Dict, List, Tuple
-from urllib.request import getproxies_environment
+from urllib.request import getproxies_environment  # type: ignore

 import attr

--- a/synapse/config/room_directory.py
+++ b/synapse/config/room_directory.py
@@ -54,7 +54,9 @@ class RoomDirectoryConfig(Config):
                for rule in room_list_publication_rules
            ]
        else:
-            self._room_list_publication_rules = []
+            self._room_list_publication_rules = [
+                _RoomDirectoryRule("room_list_publication_rules", {"action": "allow"})
+            ]

    def is_alias_creation_allowed(self, user_id: str, room_id: str, alias: str) -> bool:
        """Checks if the given user is allowed to create the given alias
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -332,14 +332,8 @@ class ServerConfig(Config):
            logger.info("Using default public_baseurl %s", public_baseurl)
        else:
            self.serve_client_wellknown = True
-            # Ensure that public_baseurl ends with a trailing slash
            if public_baseurl[-1] != "/":
                public_baseurl += "/"
-
-        # Scrutinize user-provided config
-        if not isinstance(public_baseurl, str):
-            raise ConfigError("Must be a string", ("public_baseurl",))
-
        self.public_baseurl = public_baseurl

        # check that public_baseurl is valid
--- a/synapse/config/sso.py
+++ b/synapse/config/sso.py
@@ -19,7 +19,7 @@
 #
 #
 import logging
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, Optional

 import attr

@@ -43,23 +43,13 @@ class SsoAttributeRequirement:
    """Object describing a single requirement for SSO attributes."""

    attribute: str
-    # If neither value nor one_of is given, the attribute must simply exist. This is
-    # only true for CAS configs which use a different JSON schema than the one below.
-    value: Optional[str] = None
-    one_of: Optional[List[str]] = None
+    # If a value is not given, than the attribute must simply exist.
+    value: Optional[str]

    JSON_SCHEMA = {
        "type": "object",
-        "properties": {
-            "attribute": {"type": "string"},
-            "value": {"type": "string"},
-            "one_of": {"type": "array", "items": {"type": "string"}},
-        },
-        "required": ["attribute"],
-        "oneOf": [
-            {"required": ["value"]},
-            {"required": ["one_of"]},
-        ],
+        "properties": {"attribute": {"type": "string"}, "value": {"type": "string"}},
+        "required": ["attribute", "value"],
    }


--- a/synapse/config/voip.py
+++ b/synapse/config/voip.py
@@ -34,16 +34,9 @@ These are mutually incompatible.
 class VoipConfig(Config):
    section = "voip"

-    def read_config(
-        self, config: JsonDict, allow_secrets_in_config: bool, **kwargs: Any
-    ) -> None:
+    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")
-        if self.turn_shared_secret and not allow_secrets_in_config:
-            raise ConfigError(
-                "Config options that expect an in-line secret as value are disabled",
-                ("turn_shared_secret",),
-            )
        turn_shared_secret_path = config.get("turn_shared_secret_path")
        if turn_shared_secret_path:
            if self.turn_shared_secret:
--- a/synapse/config/workers.py
+++ b/synapse/config/workers.py
@@ -38,7 +38,6 @@ from synapse.config._base import (
    ConfigError,
    RoutableShardedWorkerHandlingConfig,
    ShardedWorkerHandlingConfig,
-    read_file,
 )
 from synapse.config._util import parse_and_validate_mapping
 from synapse.config.server import (
@@ -66,11 +65,6 @@ configuration under `main` inside the `instance_map`. See workers documentation
 `https://element-hq.github.io/synapse/latest/workers.html#worker-configuration`
 """

-CONFLICTING_WORKER_REPLICATION_SECRET_OPTS_ERROR = """\
-Conflicting options 'worker_replication_secret' and
-'worker_replication_secret_path' are both defined in config file.
-"""
-
 # This allows for a handy knob when it's time to change from 'master' to
 # something with less 'history'
 MAIN_PROCESS_INSTANCE_NAME = "master"
@@ -224,9 +218,7 @@ class WorkerConfig(Config):

    section = "worker"

-    def read_config(
-        self, config: JsonDict, allow_secrets_in_config: bool, **kwargs: Any
-    ) -> None:
+    def read_config(self, config: JsonDict, **kwargs: Any) -> None:
        self.worker_app = config.get("worker_app")

        # Canonicalise worker_app so that master always has None
@@ -250,23 +242,7 @@ class WorkerConfig(Config):
            raise ConfigError(DIRECT_TCP_ERROR, ("worker_replication_port",))

        # The shared secret used for authentication when connecting to the main synapse.
-        worker_replication_secret = config.get("worker_replication_secret", None)
-        if worker_replication_secret and not allow_secrets_in_config:
-            raise ConfigError(
-                "Config options that expect an in-line secret as value are disabled",
-                ("worker_replication_secret",),
-            )
-        worker_replication_secret_path = config.get(
-            "worker_replication_secret_path", None
-        )
-        if worker_replication_secret_path:
-            if worker_replication_secret:
-                raise ConfigError(CONFLICTING_WORKER_REPLICATION_SECRET_OPTS_ERROR)
-            self.worker_replication_secret = read_file(
-                worker_replication_secret_path, "worker_replication_secret_path"
-            ).strip()
-        else:
-            self.worker_replication_secret = worker_replication_secret
+        self.worker_replication_secret = config.get("worker_replication_secret", None)

        self.worker_name = config.get("worker_name", self.worker_app)
        self.instance_name = self.worker_name or MAIN_PROCESS_INSTANCE_NAME
--- a/synapse/event_auth.py
+++ b/synapse/event_auth.py
@@ -32,7 +32,6 @@ from typing import (
    Mapping,
    MutableMapping,
    Optional,
-    Protocol,
    Set,
    Tuple,
    Union,
@@ -42,6 +41,7 @@ from typing import (
 from canonicaljson import encode_canonical_json
 from signedjson.key import decode_verify_key_bytes
 from signedjson.sign import SignatureVerifyException, verify_signed_json
+from typing_extensions import Protocol
 from unpaddedbase64 import decode_base64

 from synapse.api.constants import (
@@ -566,7 +566,6 @@ def _is_membership_change_allowed(
    logger.debug(
        "_is_membership_change_allowed: %s",
        {
-            "caller_membership": caller.membership if caller else None,
            "caller_in_room": caller_in_room,
            "caller_invited": caller_invited,
            "caller_knocked": caller_knocked,
@@ -678,8 +677,7 @@ def _is_membership_change_allowed(
                and join_rule == JoinRules.KNOCK_RESTRICTED
            )
        ):
-            # You can only join the room if you are invited or are already in the room.
-            if not (caller_in_room or caller_invited):
+            if not caller_in_room and not caller_invited:
                raise AuthError(403, "You are not invited to this room.")
        else:
            # TODO (erikj): may_join list
--- a/synapse/events/init.py
+++ b/synapse/events/init.py
@@ -30,7 +30,6 @@ from typing import (
    Generic,
    Iterable,
    List,
-    Literal,
    Optional,
    Tuple,
    Type,
@@ -40,9 +39,10 @@ from typing import (
 )

 import attr
+from typing_extensions import Literal
 from unpaddedbase64 import encode_base64

-from synapse.api.constants import EventTypes, RelationTypes
+from synapse.api.constants import RelationTypes
 from synapse.api.room_versions import EventFormatVersions, RoomVersion, RoomVersions
 from synapse.synapse_rust.events import EventInternalMetadata
 from synapse.types import JsonDict, StrCollection
@@ -325,17 +325,12 @@ class EventBase(metaclass=abc.ABCMeta):
    def __repr__(self) -> str:
        rejection = f"REJECTED={self.rejected_reason}, " if self.rejected_reason else ""

-        conditional_membership_string = ""
-        if self.get("type") == EventTypes.Member:
-            conditional_membership_string = f"membership={self.membership}, "
-
        return (
            f"<{self.__class__.__name__} "
            f"{rejection}"
            f"event_id={self.event_id}, "
            f"type={self.get('type')}, "
            f"state_key={self.get('state_key')}, "
-            f"{conditional_membership_string}"
            f"outlier={self.internal_metadata.is_outlier()}"
            ">"
        )
--- a/synapse/events/auto_accept_invites.py
+++ b/synapse/events/auto_accept_invites.py
@@ -66,67 +66,50 @@ class InviteAutoAccepter:
            event: The incoming event.
        """
        # Check if the event is an invite for a local user.
-        if (
-            event.type != EventTypes.Member
-            or event.is_state() is False
-            or event.membership != Membership.INVITE
-            or self._api.is_mine(event.state_key) is False
-        ):
-            return
+        is_invite_for_local_user = (
+            event.type == EventTypes.Member
+            and event.is_state()
+            and event.membership == Membership.INVITE
+            and self._api.is_mine(event.state_key)
+        )

        # Only accept invites for direct messages if the configuration mandates it.
        is_direct_message = event.content.get("is_direct", False)
-        if (
-            self._config.accept_invites_only_for_direct_messages
-            and is_direct_message is False
-        ):
-            return
+        is_allowed_by_direct_message_rules = (
+            not self._config.accept_invites_only_for_direct_messages
+            or is_direct_message is True
+        )

        # Only accept invites from remote users if the configuration mandates it.
        is_from_local_user = self._api.is_mine(event.sender)
-        if (
-            self._config.accept_invites_only_from_local_users
-            and is_from_local_user is False
-        ):
-            return
-
-        # Check the user is activated.
-        recipient = await self._api.get_userinfo_by_id(event.state_key)
-
-        # Ignore if the user doesn't exist.
-        if recipient is None:
-            return
-
-        # Never accept invites for deactivated users.
-        if recipient.is_deactivated:
-            return
-
-        # Never accept invites for suspended users.
-        if recipient.suspended:
-            return
-
-        # Never accept invites for locked users.
-        if recipient.locked:
-            return
-
-        # Make the user join the room. We run this as a background process to circumvent a race condition
-        # that occurs when responding to invites over federation (see https://github.com/matrix-org/synapse-auto-accept-invite/issues/12)
-        run_as_background_process(
-            "retry_make_join",
-            self._retry_make_join,
-            event.state_key,
-            event.state_key,
-            event.room_id,
-            "join",
-            bg_start_span=False,
+        is_allowed_by_local_user_rules = (
+            not self._config.accept_invites_only_from_local_users
+            or is_from_local_user is True
        )

-        if is_direct_message:
-            # Mark this room as a direct message!
-            await self._mark_room_as_direct_message(
-                event.state_key, event.sender, event.room_id
+        if (
+            is_invite_for_local_user
+            and is_allowed_by_direct_message_rules
+            and is_allowed_by_local_user_rules
+        ):
+            # Make the user join the room. We run this as a background process to circumvent a race condition
+            # that occurs when responding to invites over federation (see https://github.com/matrix-org/synapse-auto-accept-invite/issues/12)
+            run_as_background_process(
+                "retry_make_join",
+                self._retry_make_join,
+                event.state_key,
+                event.state_key,
+                event.room_id,
+                "join",
+                bg_start_span=False,
            )

+            if is_direct_message:
+                # Mark this room as a direct message!
+                await self._mark_room_as_direct_message(
+                    event.state_key, event.sender, event.room_id
+                )
+
    async def _mark_room_as_direct_message(
        self, user_id: str, dm_user_id: str, room_id: str
    ) -> None:
--- a/synapse/events/builder.py
+++ b/synapse/events/builder.py
@@ -24,7 +24,7 @@ from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple, Union
 import attr
 from signedjson.types import SigningKey

-from synapse.api.constants import MAX_DEPTH, EventTypes
+from synapse.api.constants import MAX_DEPTH
 from synapse.api.room_versions import (
    KNOWN_EVENT_FORMAT_VERSIONS,
    EventFormatVersions,
@@ -109,19 +109,6 @@ class EventBuilder:
    def is_state(self) -> bool:
        return self._state_key is not None

-    def is_mine_id(self, user_id: str) -> bool:
-        """Determines whether a user ID or room alias originates from this homeserver.
-
-        Returns:
-            `True` if the hostname part of the user ID or room alias matches this
-            homeserver.
-            `False` otherwise, or if the user ID or room alias is malformed.
-        """
-        localpart_hostname = user_id.split(":", 1)
-        if len(localpart_hostname) < 2:
-            return False
-        return localpart_hostname[1] == self._hostname
-
    async def build(
        self,
        prev_event_ids: List[str],
@@ -155,46 +142,6 @@ class EventBuilder:
                self, state_ids
            )

-            # Check for out-of-band membership that may have been exposed on `/sync` but
-            # the events have not been de-outliered yet so they won't be part of the
-            # room state yet.
-            #
-            # This helps in situations where a remote homeserver invites a local user to
-            # a room that we're already participating in; and we've persisted the invite
-            # as an out-of-band membership (outlier), but it hasn't been pushed to us as
-            # part of a `/send` transaction yet and de-outliered. This also helps for
-            # any of the other out-of-band membership transitions.
-            #
-            # As an optimization, we could check if the room state already includes a
-            # non-`leave` membership event, then we can assume the membership event has
-            # been de-outliered and we don't need to check for an out-of-band
-            # membership. But we don't have the necessary information from a
-            # `StateMap[str]` and we'll just have to take the hit of this extra lookup
-            # for any membership event for now.
-            if self.type == EventTypes.Member and self.is_mine_id(self.state_key):
-                (
-                    _membership,
-                    member_event_id,
-                ) = await self._store.get_local_current_membership_for_user_in_room(
-                    user_id=self.state_key,
-                    room_id=self.room_id,
-                )
-                # There is no need to check if the membership is actually an
-                # out-of-band membership (`outlier`) as we would end up with the
-                # same result either way (adding the member event to the
-                # `auth_event_ids`).
-                if (
-                    member_event_id is not None
-                    # We only need to be careful about duplicating the event in the
-                    # `auth_event_ids` list (duplicate `type`/`state_key` is part of the
-                    # authorization rules)
-                    and member_event_id not in auth_event_ids
-                ):
-                    auth_event_ids.append(member_event_id)
-                    # Also make sure to point to the previous membership event that will
-                    # allow this one to happen so the computed state works out.
-                    prev_event_ids.append(member_event_id)
-
        format_version = self.room_version.event_format
        # The types of auth/prev events changes between event versions.
        prev_events: Union[StrCollection, List[Tuple[str, Dict[str, str]]]]
--- a/synapse/events/snapshot.py
+++ b/synapse/events/snapshot.py
@@ -248,7 +248,7 @@ class EventContext(UnpersistedEventContextBase):
    @tag_args
    async def get_current_state_ids(
        self, state_filter: Optional["StateFilter"] = None
-    ) -> StateMap[str]:
+    ) -> Optional[StateMap[str]]:
        """
        Gets the room state map, including this event - ie, the state in ``state_group``

@@ -256,12 +256,13 @@ class EventContext(UnpersistedEventContextBase):
        not make it into the room state. This method will raise an exception if
        ``rejected`` is set.

-        It is also an error to access this for an outlier event.
-
        Arg:
           state_filter: specifies the type of state event to fetch from DB, example: EventTypes.JoinRules

        Returns:
+            Returns None if state_group is None, which happens when the associated
+            event is an outlier.
+
            Maps a (type, state_key) to the event ID of the state event matching
            this tuple.
        """
@@ -299,8 +300,7 @@ class EventContext(UnpersistedEventContextBase):
            this tuple.
        """

-        if self.state_group_before_event is None:
-            return {}
+        assert self.state_group_before_event is not None
        return await self._storage.state.get_state_ids_for_group(
            self.state_group_before_event, state_filter
        )
--- a/synapse/federation/sender/init.py
+++ b/synapse/federation/sender/init.py
@@ -139,13 +139,13 @@ from typing import (
    Hashable,
    Iterable,
    List,
-    Literal,
    Optional,
    Tuple,
 )

 import attr
 from prometheus_client import Counter
+from typing_extensions import Literal

 from twisted.internet import defer

--- a/synapse/federation/transport/server/init.py
+++ b/synapse/federation/transport/server/init.py
@@ -20,7 +20,9 @@
 #
 #
 import logging
-from typing import TYPE_CHECKING, Dict, Iterable, List, Literal, Optional, Tuple, Type
+from typing import TYPE_CHECKING, Dict, Iterable, List, Optional, Tuple, Type
+
+from typing_extensions import Literal

 from synapse.api.errors import FederationDeniedError, SynapseError
 from synapse.federation.transport.server._base import (
--- a/synapse/federation/transport/server/federation.py
+++ b/synapse/federation/transport/server/federation.py
@@ -24,7 +24,6 @@ from typing import (
    TYPE_CHECKING,
    Dict,
    List,
-    Literal,
    Mapping,
    Optional,
    Sequence,
@@ -33,6 +32,8 @@ from typing import (
    Union,
 )

+from typing_extensions import Literal
+
 from synapse.api.constants import Direction, EduTypes
 from synapse.api.errors import Codes, SynapseError
 from synapse.api.room_versions import RoomVersions
@@ -508,9 +509,6 @@ class FederationV2InviteServlet(BaseFederationServerServlet):
        event = content["event"]
        invite_room_state = content.get("invite_room_state", [])

-        if not isinstance(invite_room_state, list):
-            invite_room_state = []
-
        # Synapse expects invite_room_state to be in unsigned, as it is in v1
        # API

--- a/synapse/handlers/admin.py
+++ b/synapse/handlers/admin.py
@@ -473,7 +473,7 @@ class AdminHandler:
                    "type": EventTypes.Redaction,
                    "content": {"reason": reason} if reason else {},
                    "room_id": room,
-                    "sender": requester.user.to_string(),
+                    "sender": user_id,
                }
                if room_version.updated_redaction_rules:
                    event_dict["content"]["redacts"] = event.event_id
--- a/synapse/handlers/appservice.py
+++ b/synapse/handlers/appservice.py
@@ -896,10 +896,10 @@ class ApplicationServicesHandler:
        results = await make_deferred_yieldable(
            defer.DeferredList(
                [
-                    run_in_background(  # type: ignore[call-overload]
+                    run_in_background(
                        self.appservice_api.claim_client_keys,
                        # We know this must be an app service.
-                        self.store.get_app_service_by_id(service_id),
+                        self.store.get_app_service_by_id(service_id),  # type: ignore[arg-type]
                        service_query,
                    )
                    for service_id, service_query in query_by_appservice.items()
@@ -952,10 +952,10 @@ class ApplicationServicesHandler:
        results = await make_deferred_yieldable(
            defer.DeferredList(
                [
-                    run_in_background(  # type: ignore[call-overload]
+                    run_in_background(
                        self.appservice_api.query_keys,
                        # We know this must be an app service.
-                        self.store.get_app_service_by_id(service_id),
+                        self.store.get_app_service_by_id(service_id),  # type: ignore[arg-type]
                        service_query,
                    )
                    for service_id, service_query in query_by_appservice.items()
--- a/synapse/handlers/auth.py
+++ b/synapse/handlers/auth.py
@@ -1579,10 +1579,7 @@ class AuthHandler:
        # for the presence of an email address during password reset was
        # case sensitive).
        if medium == "email":
-            try:
-                address = canonicalise_email(address)
-            except ValueError as e:
-                raise SynapseError(400, str(e))
+            address = canonicalise_email(address)

        await self.store.user_add_threepid(
            user_id, medium, address, validated_at, self.hs.get_clock().time_msec()
@@ -1613,10 +1610,7 @@ class AuthHandler:
        """
        # 'Canonicalise' email addresses as per above
        if medium == "email":
-            try:
-                address = canonicalise_email(address)
-            except ValueError as e:
-                raise SynapseError(400, str(e))
+            address = canonicalise_email(address)

        await self.store.user_delete_threepid(user_id, medium, address)

--- a/synapse/handlers/delayed_events.py
+++ b/synapse/handlers/delayed_events.py
@@ -19,7 +19,6 @@ from twisted.internet.interfaces import IDelayedCall

 from synapse.api.constants import EventTypes
 from synapse.api.errors import ShadowBanError
-from synapse.api.ratelimiting import Ratelimiter
 from synapse.config.workers import MAIN_PROCESS_INSTANCE_NAME
 from synapse.logging.opentracing import set_tag
 from synapse.metrics import event_processing_positions
@@ -58,19 +57,10 @@ class DelayedEventsHandler:
        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._request_ratelimiter = hs.get_request_ratelimiter()
-
-        # Ratelimiter for management of existing delayed events,
-        # keyed by the sending user ID & device ID.
-        self._delayed_event_mgmt_ratelimiter = Ratelimiter(
-            store=self._store,
-            clock=self._clock,
-            cfg=self._config.ratelimiting.rc_delayed_event_mgmt,
-        )
-
        self._next_delayed_event_call: Optional[IDelayedCall] = None

        # The current position in the current_state_delta stream
@@ -237,9 +227,6 @@ class DelayedEventsHandler:
        Raises:
            SynapseError: if the delayed event fails validation checks.
        """
-        # Use standard request limiter for scheduling new delayed events.
-        # TODO: Instead apply ratelimiting based on the scheduled send time.
-        # See https://github.com/element-hq/synapse/issues/18021
        await self._request_ratelimiter.ratelimit(requester)

        self._event_creation_handler.validator.validate_builder(
@@ -298,10 +285,7 @@ class DelayedEventsHandler:
            NotFoundError: if no matching delayed event could be found.
        """
        assert self._is_master
-        await self._delayed_event_mgmt_ratelimiter.ratelimit(
-            requester,
-            (requester.user.to_string(), requester.device_id),
-        )
+        await self._request_ratelimiter.ratelimit(requester)
        await self._initialized_from_db

        next_send_ts = await self._store.cancel_delayed_event(
@@ -324,10 +308,7 @@ class DelayedEventsHandler:
            NotFoundError: if no matching delayed event could be found.
        """
        assert self._is_master
-        await self._delayed_event_mgmt_ratelimiter.ratelimit(
-            requester,
-            (requester.user.to_string(), requester.device_id),
-        )
+        await self._request_ratelimiter.ratelimit(requester)
        await self._initialized_from_db

        next_send_ts = await self._store.restart_delayed_event(
@@ -351,8 +332,6 @@ class DelayedEventsHandler:
            NotFoundError: if no matching delayed event could be found.
        """
        assert self._is_master
-        # Use standard request limiter for sending delayed events on-demand,
-        # as an on-demand send is similar to sending a regular event.
        await self._request_ratelimiter.ratelimit(requester)
        await self._initialized_from_db

@@ -436,10 +415,7 @@ class DelayedEventsHandler:

    async def get_all_for_user(self, requester: Requester) -> List[JsonDict]:
        """Return all pending delayed events requested by the given user."""
-        await self._delayed_event_mgmt_ratelimiter.ratelimit(
-            requester,
-            (requester.user.to_string(), requester.device_id),
-        )
+        await self._request_ratelimiter.ratelimit(requester)
        return await self._store.get_all_delayed_events_for_user(
            requester.user.localpart
        )
--- a/synapse/handlers/device.py
+++ b/synapse/handlers/device.py
@@ -729,40 +729,6 @@ class DeviceHandler(DeviceWorkerHandler):

        await self.notify_device_update(user_id, device_ids)

-    async def upsert_device(
-        self, user_id: str, device_id: str, display_name: Optional[str] = None
-    ) -> bool:
-        """Create or update a device
-
-        Args:
-            user_id: The user to update devices of.
-            device_id: The device to update.
-            display_name: The new display name for this device.
-
-        Returns:
-            True if the device was created, False if it was updated.
-
-        """
-
-        # Reject a new displayname which is too long.
-        self._check_device_name_length(display_name)
-
-        created = await self.store.store_device(
-            user_id,
-            device_id,
-            initial_device_display_name=display_name,
-        )
-
-        if not created:
-            await self.store.update_device(
-                user_id,
-                device_id,
-                new_display_name=display_name,
-            )
-
-        await self.notify_device_update(user_id, [device_id])
-        return created
-
    async def update_device(self, user_id: str, device_id: str, content: dict) -> None:
        """Update the given device

--- a/synapse/handlers/directory.py
+++ b/synapse/handlers/directory.py
@@ -21,7 +21,9 @@

 import logging
 import string
-from typing import TYPE_CHECKING, Iterable, List, Literal, Optional, Sequence
+from typing import TYPE_CHECKING, Iterable, List, Optional, Sequence
+
+from typing_extensions import Literal

 from synapse.api.constants import MAX_ALIAS_LENGTH, EventTypes
 from synapse.api.errors import (
--- a/synapse/handlers/e2e_room_keys.py
+++ b/synapse/handlers/e2e_room_keys.py
@@ -20,7 +20,9 @@
 #

 import logging
-from typing import TYPE_CHECKING, Dict, Literal, Optional, cast
+from typing import TYPE_CHECKING, Dict, Optional, cast
+
+from typing_extensions import Literal

 from synapse.api.errors import (
    Codes,
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -880,9 +880,6 @@ class FederationHandler:
        if stripped_room_state is None:
            raise KeyError("Missing 'knock_room_state' field in send_knock response")

-        if not isinstance(stripped_room_state, list):
-            raise TypeError("'knock_room_state' has wrong type")
-
        event.unsigned["knock_room_state"] = stripped_room_state

        context = EventContext.for_outlier(self._storage_controllers)
--- a/synapse/handlers/federation_event.py
+++ b/synapse/handlers/federation_event.py
@@ -151,8 +151,6 @@ class FederationEventHandler:
    def __init__(self, hs: "HomeServer"):
        self._clock = hs.get_clock()
        self._store = hs.get_datastores().main
-        self._state_store = hs.get_datastores().state
-        self._state_deletion_store = hs.get_datastores().state_deletion
        self._storage_controllers = hs.get_storage_controllers()
        self._state_storage_controller = self._storage_controllers.state

@@ -582,9 +580,7 @@ class FederationEventHandler:
                        room_version.identifier,
                        state_maps_to_resolve,
                        event_map=None,
-                        state_res_store=StateResolutionStore(
-                            self._store, self._state_deletion_store
-                        ),
+                        state_res_store=StateResolutionStore(self._store),
                    )
                )
            else:
@@ -1183,9 +1179,7 @@ class FederationEventHandler:
                room_version,
                state_maps,
                event_map={event_id: event},
-                state_res_store=StateResolutionStore(
-                    self._store, self._state_deletion_store
-                ),
+                state_res_store=StateResolutionStore(self._store),
            )

        except Exception as e:
@@ -1880,9 +1874,7 @@ class FederationEventHandler:
                    room_version,
                    [local_state_id_map, claimed_auth_events_id_map],
                    event_map=None,
-                    state_res_store=StateResolutionStore(
-                        self._store, self._state_deletion_store
-                    ),
+                    state_res_store=StateResolutionStore(self._store),
                )
            )
        else:
@@ -2022,9 +2014,7 @@ class FederationEventHandler:
                    room_version,
                    state_sets,
                    event_map=None,
-                    state_res_store=StateResolutionStore(
-                        self._store, self._state_deletion_store
-                    ),
+                    state_res_store=StateResolutionStore(self._store),
                )
            )
        else:
@@ -2282,9 +2272,8 @@ class FederationEventHandler:
                event_and_contexts, backfilled=backfilled
            )

-            # After persistence, we never notify clients (wake up `/sync` streams) about
-            # backfilled events but it's important to let all the workers know about any
-            # new event (backfilled or not) because TODO
+            # After persistence we always need to notify replication there may
+            # be new data.
            self._notifier.notify_replication()

            if self._ephemeral_messages_enabled:
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -644,33 +644,11 @@ class EventCreationHandler:
        """
        await self.auth_blocking.check_auth_blocking(requester=requester)

-        requester_suspended = await self.store.get_user_suspended_status(
-            requester.user.to_string()
-        )
-        if requester_suspended:
-            # We want to allow suspended users to perform "corrective" actions
-            # asked of them by server admins, such as redact their messages and
-            # leave rooms.
-            if event_dict["type"] in ["m.room.redaction", "m.room.member"]:
-                if event_dict["type"] == "m.room.redaction":
-                    event = await self.store.get_event(
-                        event_dict["content"]["redacts"], allow_none=True
-                    )
-                    if event:
-                        if event.sender != requester.user.to_string():
-                            raise SynapseError(
-                                403,
-                                "You can only redact your own events while account is suspended.",
-                                Codes.USER_ACCOUNT_SUSPENDED,
-                            )
-                if event_dict["type"] == "m.room.member":
-                    if event_dict["content"]["membership"] != "leave":
-                        raise SynapseError(
-                            403,
-                            "Changing membership while account is suspended is not allowed.",
-                            Codes.USER_ACCOUNT_SUSPENDED,
-                        )
-            else:
+        if event_dict["type"] == EventTypes.Message:
+            requester_suspended = await self.store.get_user_suspended_status(
+                requester.user.to_string()
+            )
+            if requester_suspended:
                raise SynapseError(
                    403,
                    "Sending messages while account is suspended is not allowed.",
--- a/synapse/handlers/oidc.py
+++ b/synapse/handlers/oidc.py
@@ -31,7 +31,6 @@ from typing import (
    List,
    Optional,
    Type,
-    TypedDict,
    TypeVar,
    Union,
 )
@@ -53,6 +52,7 @@ from pymacaroons.exceptions import (
    MacaroonInitException,
    MacaroonInvalidSignatureException,
 )
+from typing_extensions import TypedDict

 from twisted.web.client import readBody
 from twisted.web.http_headers import Headers
@@ -382,12 +382,7 @@ class OidcProvider:
        self._macaroon_generaton = macaroon_generator

        self._config = provider
-
-        self._callback_url: str
-        if provider.redirect_uri is not None:
-            self._callback_url = provider.redirect_uri
-        else:
-            self._callback_url = hs.config.oidc.oidc_callback_url
+        self._callback_url: str = hs.config.oidc.oidc_callback_url

        # Calculate the prefix for OIDC callback paths based on the public_baseurl.
        # We'll insert this into the Path= parameter of any session cookies we set.
@@ -645,11 +640,6 @@ class OidcProvider:
        elif self._config.pkce_method == "never":
            metadata.pop("code_challenge_methods_supported", None)

-        if self._config.id_token_signing_alg_values_supported:
-            metadata["id_token_signing_alg_values_supported"] = (
-                self._config.id_token_signing_alg_values_supported
-            )
-
        self._validate_metadata(metadata)

        return metadata
@@ -1012,21 +1002,7 @@ class OidcProvider:
        """

        state = generate_token()
-
-        # Generate a nonce 32 characters long. When encoded with base64url later on,
-        # the nonce will be 43 characters when sent to the identity provider.
-        #
-        # While RFC7636 does not specify a minimum length for the `nonce`
-        # parameter, the TI-Messenger IDP_FD spec v1.7.3 does require it to be
-        # between 43 and 128 characters. This spec concerns using Matrix for
-        # communication in German healthcare.
-        #
-        # As increasing the length only strengthens security, we use this length
-        # to allow TI-Messenger deployments using Synapse to satisfy this
-        # external spec.
-        #
-        # See https://github.com/element-hq/synapse/pull/18109 for more context.
-        nonce = generate_token(length=32)
+        nonce = generate_token()
        code_verifier = ""

        if not client_redirect_url:
--- a/synapse/handlers/profile.py
+++ b/synapse/handlers/profile.py
@@ -22,7 +22,6 @@ import logging
 import random
 from typing import TYPE_CHECKING, List, Optional, Union

-from synapse.api.constants import ProfileFields
 from synapse.api.errors import (
    AuthError,
    Codes,
@@ -32,7 +31,7 @@ from synapse.api.errors import (
    SynapseError,
 )
 from synapse.storage.databases.main.media_repository import LocalMedia, RemoteMedia
-from synapse.types import JsonDict, JsonValue, Requester, UserID, create_requester
+from synapse.types import JsonDict, Requester, UserID, create_requester
 from synapse.util.caches.descriptors import cached
 from synapse.util.stringutils import parse_and_validate_mxc_uri

@@ -43,8 +42,6 @@ logger = logging.getLogger(__name__)

 MAX_DISPLAYNAME_LEN = 256
 MAX_AVATAR_URL_LEN = 1000
-# Field name length is specced at 255 bytes.
-MAX_CUSTOM_FIELD_LEN = 255


 class ProfileHandler:
@@ -86,33 +83,19 @@ class ProfileHandler:

        Returns:
            A JSON dictionary. For local queries this will include the displayname and avatar_url
-            fields, if set. For remote queries it may contain arbitrary information.
+            fields. For remote queries it may contain arbitrary information.
        """
        target_user = UserID.from_string(user_id)

        if self.hs.is_mine(target_user):
            profileinfo = await self.store.get_profileinfo(target_user)
-            extra_fields = {}
-            if self.hs.config.experimental.msc4133_enabled:
-                extra_fields = await self.store.get_profile_fields(target_user)
-
-            if (
-                profileinfo.display_name is None
-                and profileinfo.avatar_url is None
-                and not extra_fields
-            ):
+            if profileinfo.display_name is None and profileinfo.avatar_url is None:
                raise SynapseError(404, "Profile was not found", Codes.NOT_FOUND)

-            # Do not include display name or avatar if unset.
-            ret = {}
-            if profileinfo.display_name is not None:
-                ret[ProfileFields.DISPLAYNAME] = profileinfo.display_name
-            if profileinfo.avatar_url is not None:
-                ret[ProfileFields.AVATAR_URL] = profileinfo.avatar_url
-            if extra_fields:
-                ret.update(extra_fields)
-
-            return ret
+            return {
+                "displayname": profileinfo.display_name,
+                "avatar_url": profileinfo.avatar_url,
+            }
        else:
            try:
                result = await self.federation.make_query(
@@ -416,110 +399,6 @@ class ProfileHandler:

        return True

-    async def get_profile_field(
-        self, target_user: UserID, field_name: str
-    ) -> JsonValue:
-        """
-        Fetch a user's profile from the database for local users and over federation
-        for remote users.
-
-        Args:
-            target_user: The user ID to fetch the profile for.
-            field_name: The field to fetch the profile for.
-
-        Returns:
-            The value for the profile field or None if the field does not exist.
-        """
-        if self.hs.is_mine(target_user):
-            try:
-                field_value = await self.store.get_profile_field(
-                    target_user, field_name
-                )
-            except StoreError as e:
-                if e.code == 404:
-                    raise SynapseError(404, "Profile was not found", Codes.NOT_FOUND)
-                raise
-
-            return field_value
-        else:
-            try:
-                result = await self.federation.make_query(
-                    destination=target_user.domain,
-                    query_type="profile",
-                    args={"user_id": target_user.to_string(), "field": field_name},
-                    ignore_backoff=True,
-                )
-            except RequestSendFailed as e:
-                raise SynapseError(502, "Failed to fetch profile") from e
-            except HttpResponseException as e:
-                raise e.to_synapse_error()
-
-            return result.get(field_name)
-
-    async def set_profile_field(
-        self,
-        target_user: UserID,
-        requester: Requester,
-        field_name: str,
-        new_value: JsonValue,
-        by_admin: bool = False,
-        deactivation: bool = False,
-    ) -> None:
-        """Set a new profile field for a user.
-
-        Args:
-            target_user: the user whose profile is to be changed.
-            requester: The user attempting to make this change.
-            field_name: The name of the profile field to update.
-            new_value: The new field value for this user.
-            by_admin: Whether this change was made by an administrator.
-            deactivation: Whether this change was made while deactivating the user.
-        """
-        if not self.hs.is_mine(target_user):
-            raise SynapseError(400, "User is not hosted on this homeserver")
-
-        if not by_admin and target_user != requester.user:
-            raise AuthError(403, "Cannot set another user's profile")
-
-        await self.store.set_profile_field(target_user, field_name, new_value)
-
-        # Custom fields do not propagate into the user directory *or* rooms.
-        profile = await self.store.get_profileinfo(target_user)
-        await self._third_party_rules.on_profile_update(
-            target_user.to_string(), profile, by_admin, deactivation
-        )
-
-    async def delete_profile_field(
-        self,
-        target_user: UserID,
-        requester: Requester,
-        field_name: str,
-        by_admin: bool = False,
-        deactivation: bool = False,
-    ) -> None:
-        """Delete a field from a user's profile.
-
-        Args:
-            target_user: the user whose profile is to be changed.
-            requester: The user attempting to make this change.
-            field_name: The name of the profile field to remove.
-            by_admin: Whether this change was made by an administrator.
-            deactivation: Whether this change was made while deactivating the user.
-        """
-        if not self.hs.is_mine(target_user):
-            raise SynapseError(400, "User is not hosted on this homeserver")
-
-        if not by_admin and target_user != requester.user:
-            raise AuthError(400, "Cannot set another user's profile")
-
-        await self.store.delete_profile_field(target_user, field_name)
-
-        # Custom fields do not propagate into the user directory *or* rooms.
-        profile = await self.store.get_profileinfo(target_user)
-        await self._third_party_rules.on_profile_update(
-            target_user.to_string(), profile, by_admin, deactivation
-        )
-
    async def on_profile_query(self, args: JsonDict) -> JsonDict:
        """Handles federation profile query requests."""

@@ -536,24 +415,13 @@ class ProfileHandler:

        just_field = args.get("field", None)

-        response: JsonDict = {}
+        response = {}
        try:
-            if just_field is None or just_field == ProfileFields.DISPLAYNAME:
+            if just_field is None or just_field == "displayname":
                response["displayname"] = await self.store.get_profile_displayname(user)

-            if just_field is None or just_field == ProfileFields.AVATAR_URL:
+            if just_field is None or just_field == "avatar_url":
                response["avatar_url"] = await self.store.get_profile_avatar_url(user)
-
-            if self.hs.config.experimental.msc4133_enabled:
-                if just_field is None:
-                    response.update(await self.store.get_profile_fields(user))
-                elif just_field not in (
-                    ProfileFields.DISPLAYNAME,
-                    ProfileFields.AVATAR_URL,
-                ):
-                    response[just_field] = await self.store.get_profile_field(
-                        user, just_field
-                    )
        except StoreError as e:
            if e.code == 404:
                raise SynapseError(404, "Profile was not found", Codes.NOT_FOUND)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Erik Johnston	b37ad05a62	Newsfile	2024-11-27 11:35:27 +00:00
Erik Johnston	d739d0f71d	Fix release process to not create duplicate releases	2024-11-27 11:34:47 +00:00
				`@@ -0,0 +1 @@`
				[MSC4108](https://github.com/matrix-org/matrix-spec-proposals/pull/4108): Add a `Content-Type` header on the `PUT` response to work around a faulty behavior in some caching reverse proxies.
				`@@ -0,0 +1 @@`
				`Add OIDC example configuration for Forgejo (fork of Gitea).`
				`@@ -0,0 +1 @@`
				`Fix long-standing bug where read receipts could get overly delayed being sent over federation.`
				`@@ -0,0 +1 @@`
				`Raise setuptools_rust version cap to 1.10.2.`
				`@@ -0,0 +1 @@`
				`Enable encrypted appservice related experimental features in the complement docker image.`
				`@@ -0,0 +1 @@`
				`Return whether the user is suspended when querying the user account in the Admin API.`
				`@@ -0,0 +1 @@`
				`Link to element-docker-demo from contrib/docker*.`
				`@@ -0,0 +1 @@`
				`Fix release process to not create duplicate releases.`