Merge 32b8b68df6 into 27756c9fdf

Add TODO to handle state resets
See https://github.com/element-hq/synapse/pull/17320#discussion_r1656548733
2024-06-30 09:03:28 +00:00 · 2024-06-27 18:14:01 -05:00 · 2024-06-27 18:13:34 -05:00 · 2024-06-27 17:58:31 -05:00 · 2024-06-27 13:36:08 +02:00 · 2024-06-27 11:04:31 +01:00
55 changed files with 141 additions and 170 deletions
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@ -21,6 +21,7 @@ jobs:
      trial: ${{ !startsWith(github.ref, 'refs/pull/') || steps.filter.outputs.trial }}
      integration: ${{ !startsWith(github.ref, 'refs/pull/') || steps.filter.outputs.integration }}
      linting: ${{ !startsWith(github.ref, 'refs/pull/') || steps.filter.outputs.linting }}
+      linting_readme: ${{ !startsWith(github.ref, 'refs/pull/') || steps.filter.outputs.linting_readme }}
    steps:
    - uses: dorny/paths-filter@v3
      id: filter
@ -72,6 +73,9 @@ jobs:
            - 'pyproject.toml'
            - 'poetry.lock'
            - '.github/workflows/tests.yml'
+          
+          linting_readme:
+            - 'README.rst'

  check-sampleconfig:
    runs-on: ubuntu-latest
@ -269,6 +273,20 @@ jobs:

      - run: cargo fmt --check

+  # This is to detect issues with the rst file, which can otherwise cause issues
+  # when uploading packages to PyPi.
+  lint-readme:
+    runs-on: ubuntu-latest
+    needs: changes
+    if: ${{ needs.changes.outputs.linting_readme == 'true' }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.x"
+      - run: "pip install rstcheck"
+      - run: "rstcheck --report-level=WARNING README.rst"
+
  # Dummy step to gate other tests on without repeating the whole list
  linting-done:
    if: ${{ !cancelled() }} # Run this even if prior jobs were skipped
@ -284,6 +302,7 @@ jobs:
      - lint-clippy
      - lint-clippy-nightly
      - lint-rustfmt
+      - lint-readme
    runs-on: ubuntu-latest
    steps:
      - uses: matrix-org/done-action@v2
@ -301,6 +320,7 @@ jobs:
            lint-clippy
            lint-clippy-nightly
            lint-rustfmt
+            lint-readme


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

 ### Internal Changes
--- a/README.rst
+++ b/README.rst
@ -5,9 +5,9 @@

 |support| |development| |documentation| |license| |pypi| |python|

-Synapse is an open source `Matrix <https://matrix.org>`_ homeserver
+Synapse is an open source `Matrix <https://matrix.org>`__ homeserver
 implementation, written and maintained by `Element <https://element.io>`_.
-`Matrix <https://github.com/matrix-org>`_ is the open standard for
+`Matrix <https://github.com/matrix-org>`__ is the open standard for
 secure and interoperable real time communications. You can directly run
 and manage the source code in this repository, available under an AGPL
 license. There is no support provided from Element unless you have a
@ -119,7 +119,7 @@ impact to other applications will be minimal.


 🧪 Testing a new installation
-============================
+=============================

 The easiest way to try out your new Synapse installation is by connecting to it
 from a web client.
@ -173,10 +173,10 @@ As when logging in, you will need to specify a "Custom server".  Specify your
 desired ``localpart`` in the 'User name' box.

 🎯 Troubleshooting and support
-=============================
+==============================

 🚀 Professional support
----------------------
+-----------------------

 Enterprise quality support for Synapse including SLAs is available as part of an
 `Element Server Suite (ESS) <https://element.io/pricing>` subscription.
@ -185,7 +185,7 @@ If you are an existing ESS subscriber then you can raise a `support request <htt
 and access the `knowledge base <https://ems-docs.element.io>`.

 🤝 Community support
-------------------
+--------------------

 The `Admin FAQ <https://element-hq.github.io/synapse/latest/usage/administration/admin_faq.html>`_
 includes tips on dealing with some common problems. For more details, see
@ -202,7 +202,7 @@ issues for support requests, only for bug reports and feature requests.
 .. _docs: docs

 🪪 Identity Servers
-==================
+===================

 Identity servers have the job of mapping email addresses and other 3rd Party
 IDs (3PIDs) to Matrix user IDs, as well as verifying the ownership of 3PIDs
--- a/changelog.d/17187.feature
+++ b/changelog.d/17187.feature
@ -1 +0,0 @@
-Add initial implementation of an experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint.
--- a/changelog.d/17198.misc
+++ b/changelog.d/17198.misc
@ -1 +0,0 @@
-Remove unused `expire_access_token` option in the Synapse Docker config file. Contributed by @AaronDewes.
--- a/changelog.d/17254.bugfix
+++ b/changelog.d/17254.bugfix
@ -1 +0,0 @@
-Fix searching for users with their exact localpart whose ID includes a hyphen.
--- a/changelog.d/17255.feature
+++ b/changelog.d/17255.feature
@ -1 +0,0 @@
-Add support for [MSC823](https://github.com/matrix-org/matrix-spec-proposals/pull/3823) - Account suspension.
--- a/changelog.d/17256.feature
+++ b/changelog.d/17256.feature
@ -1 +0,0 @@
- Improve ratelimiting in Synapse (#17256).
--- a/changelog.d/17265.misc
+++ b/changelog.d/17265.misc
@ -1 +0,0 @@
-Use fully-qualified `PersistedEventPosition` when returning `RoomsForUser` to facilitate proper comparisons and `RoomStreamToken` generation.
--- a/changelog.d/17266.misc
+++ b/changelog.d/17266.misc
@ -1 +0,0 @@
-Add debug logging for when room keys are uploaded, including whether they are replacing other room keys.
--- a/changelog.d/17270.feature
+++ b/changelog.d/17270.feature
@ -1 +0,0 @@
-Add support for the unstable [MSC4151](https://github.com/matrix-org/matrix-spec-proposals/pull/4151) report room API.
--- a/changelog.d/17271.misc
+++ b/changelog.d/17271.misc
@ -1 +0,0 @@
-Handle OTK uploads off master.
--- a/changelog.d/17272.bugfix
+++ b/changelog.d/17272.bugfix
@ -1 +0,0 @@
-Fix wrong retention policy being used when filtering events.
--- a/changelog.d/17273.misc
+++ b/changelog.d/17273.misc
@ -1 +0,0 @@
-Don't try and resync devices for remote users whose servers are marked as down.
--- a/changelog.d/17275.bugfix
+++ b/changelog.d/17275.bugfix
@ -1 +0,0 @@
-Fix bug where OTKs were not always included in `/sync` response when using workers.
--- a/changelog.d/17276.feature
+++ b/changelog.d/17276.feature
@ -1 +0,0 @@
-Filter for public and empty rooms added to Admin-API [List Room API](https://element-hq.github.io/synapse/latest/admin_api/rooms.html#list-room-api).
--- a/changelog.d/17277.feature
+++ b/changelog.d/17277.feature
@ -1 +0,0 @@
-Add `is_dm` filtering to experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint.
--- a/changelog.d/17279.misc
+++ b/changelog.d/17279.misc
@ -1 +0,0 @@
-Re-organize Pydantic models and types used in handlers.
--- a/changelog.d/17281.feature
+++ b/changelog.d/17281.feature
@ -1 +0,0 @@
-Add `is_encrypted` filtering to experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint.
--- a/changelog.d/17282.feature
+++ b/changelog.d/17282.feature
@ -1 +0,0 @@
-Include user membership in events served to clients, per MSC4115.
--- a/changelog.d/17283.bugfix
+++ b/changelog.d/17283.bugfix
@ -1 +0,0 @@
-Fix a long-standing bug where an invalid 'from' parameter to [`/notifications`](https://spec.matrix.org/v1.10/client-server-api/#get_matrixclientv3notifications) would result in an Internal Server Error.
--- a/changelog.d/17284.feature
+++ b/changelog.d/17284.feature
@ -1 +0,0 @@
-Do not require user-interactive authentication for uploading cross-signing keys for the first time, per MSC3967.
--- a/changelog.d/17293.feature
+++ b/changelog.d/17293.feature
@ -1 +0,0 @@
-Add `stream_ordering` sort to experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint.
--- a/changelog.d/17294.feature
+++ b/changelog.d/17294.feature
@ -1,2 +0,0 @@
-`register_new_matrix_user` now supports a --password-file flag, which
-is useful for scripting.
--- a/changelog.d/17295.bugfix
+++ b/changelog.d/17295.bugfix
@ -1 +0,0 @@
-Fix edge case in `/sync` returning the wrong the state when using sharded event persisters.
--- a/changelog.d/17296.feature
+++ b/changelog.d/17296.feature
@ -1 +0,0 @@
-Add support for the unstable [MSC4151](https://github.com/matrix-org/matrix-spec-proposals/pull/4151) report room API.
--- a/changelog.d/17297.misc
+++ b/changelog.d/17297.misc
@ -1 +0,0 @@
-Bump `mypy` from 1.8.0 to 1.9.0.
--- a/changelog.d/17300.misc
+++ b/changelog.d/17300.misc
@ -1 +0,0 @@
-Expose the worker instance that persisted the event on `event.internal_metadata.instance_name`.
--- a/changelog.d/17301.bugfix
+++ b/changelog.d/17301.bugfix
@ -1 +0,0 @@
-Add initial implementation of an experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint.
--- a/changelog.d/17304.feature
+++ b/changelog.d/17304.feature
@ -1,2 +0,0 @@
-`register_new_matrix_user` now supports a --exists-ok flag to allow registration of users that already exist in the database.
-This is useful for scripts that bootstrap user accounts with initial passwords.
--- a/changelog.d/17308.doc
+++ b/changelog.d/17308.doc
@ -1 +0,0 @@
-Add missing quotes for example for `exclude_rooms_from_sync`.
--- a/changelog.d/17322.feature
+++ b/changelog.d/17322.feature
@ -1 +0,0 @@
-Add support for via query parameter from MSC415.
--- a/changelog.d/17324.misc
+++ b/changelog.d/17324.misc
@ -1 +0,0 @@
-Update the README with Element branding, improve headers and fix the #synapse:matrix.org support room link rendering.
--- a/changelog.d/17325.misc
+++ b/changelog.d/17325.misc
@ -1 +0,0 @@
-This is a changelog so tests will run.
--- a/changelog.d/17329.doc
+++ b/changelog.d/17329.doc
@ -1 +0,0 @@
-Update header in the README to visually fix the the auto-generated table of contents.
--- a/changelog.d/17331.misc
+++ b/changelog.d/17331.misc
@ -1 +0,0 @@
-Change path of the experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync implementation to `/org.matrix.simplified_msc3575/sync` since our simplified API is slightly incompatible with what's in the current MSC.
--- a/changelog.d/17333.misc
+++ b/changelog.d/17333.misc
@ -1 +0,0 @@
-Handle device lists notifications for large accounts more efficiently in worker mode.
--- a/changelog.d/17335.feature
+++ b/changelog.d/17335.feature
@ -1 +0,0 @@
-Add `is_invite` filtering to experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint.
--- a/changelog.d/17336.bugfix
+++ b/changelog.d/17336.bugfix
@ -1 +0,0 @@
-Fix email notification subject when invited to a space.
--- a/changelog.d/17338.misc
+++ b/changelog.d/17338.misc
@ -1 +0,0 @@
-Do not block event sending/receiving while calculating large event auth chains.
--- a/changelog.d/17339.misc
+++ b/changelog.d/17339.misc
@ -1 +0,0 @@
-Tidy up `parse_integer` docs and call sites to reflect the fact that they require non-negative integers by default, and bring `parse_integer_from_args` default in alignment. Contributed by Denis Kasak (@dkasak).
--- a/changelog.d/17341.doc
+++ b/changelog.d/17341.doc
@ -1 +0,0 @@
-Fix stale references to the Foundation's Security Disclosure Policy.
--- a/changelog.d/17347.doc
+++ b/changelog.d/17347.doc
@ -1 +0,0 @@
-Add default values for `rc_invites.per_issuer` to docs.
--- a/changelog.d/17348.doc
+++ b/changelog.d/17348.doc
@ -1 +0,0 @@
-Fix an error in the docs for `search_all_users` parameter under `user_directory`.
--- a/changelog.d/17350.feature
+++ b/changelog.d/17350.feature
@ -1,2 +0,0 @@
-Support [MSC3916](https://github.com/matrix-org/matrix-spec-proposals/blob/rav/authentication-for-media/proposals/3916-authentication-for-media.md)
-by adding a federation /download endpoint.
--- a/changelog.d/17358.misc
+++ b/changelog.d/17358.misc
@ -1 +0,0 @@
-Handle device lists notifications for large accounts more efficiently in worker mode.
--- a/changelog.d/17362.bugfix
+++ b/changelog.d/17362.bugfix
@ -0,0 +1 @@
+Fix rare race which causes no new to-device messages to be received from remote server.
--- a/changelog.d/17363.misc
+++ b/changelog.d/17363.misc
@ -0,0 +1 @@
+Fix uploading packages to PyPi.
--- a/changelog.d/17367.misc
+++ b/changelog.d/17367.misc
@ -0,0 +1 @@
+Add CI check for the README.
--- a/debian/changelog
+++ b/debian/changelog
@ -1,8 +1,15 @@
-matrix-synapse-py3 (1.109.0+nmu1) UNRELEASED; urgency=medium
+matrix-synapse-py3 (1.110.0~rc2) stable; urgency=medium
+
+  * New Synapse release 1.110.0rc2.
+
+ -- Synapse Packaging team <packages@matrix.org>  Wed, 26 Jun 2024 18:14:48 +0200
+
+matrix-synapse-py3 (1.110.0~rc1) stable; urgency=medium

  * `register_new_matrix_user` now supports a --password-file and a --exists-ok flag.
+  * New Synapse release 1.110.0rc1.

- -- Synapse Packaging team <packages@matrix.org>  Tue, 18 Jun 2024 13:29:36 +0100
+ -- Synapse Packaging team <packages@matrix.org>  Wed, 26 Jun 2024 14:07:56 +0200

 matrix-synapse-py3 (1.109.0) stable; urgency=medium

--- a/pyproject.toml
+++ b/pyproject.toml
@ -96,7 +96,7 @@ module-name = "synapse.synapse_rust"

 [tool.poetry]
 name = "matrix-synapse"
-version = "1.109.0"
+version = "1.110.0rc2"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "AGPL-3.0-or-later"
--- a/synapse/handlers/sliding_sync.py
+++ b/synapse/handlers/sliding_sync.py
@ -1002,6 +1002,12 @@ class SlidingSyncHandler:

            stripped_state.append(strip_event(invite_or_knock_event))

+        # TODO: Handle state resets. For example, if we see
+        # `rooms_membership_for_user_at_to_token.membership = Membership.LEAVE` but
+        # `required_state` doesn't include it, we should indicate to the client that a
+        # state reset happened. Perhaps we should indicate this by setting `initial:
+        # True` and empty `required_state`.
+
        return SlidingSyncResult.RoomResult(
            # TODO: Dummy value
            name=None,
--- a/synapse/storage/databases/main/deviceinbox.py
+++ b/synapse/storage/databases/main/deviceinbox.py
@ -825,14 +825,13 @@ class DeviceInboxWorkerStore(SQLBaseStore):
            # Check if we've already inserted a matching message_id for that
            # origin. This can happen if the origin doesn't receive our
            # acknowledgement from the first time we received the message.
-            already_inserted = self.db_pool.simple_select_one_txn(
+            already_inserted = self.db_pool.simple_select_list_txn(
                txn,
                table="device_federation_inbox",
                keyvalues={"origin": origin, "message_id": message_id},
                retcols=("message_id",),
-                allow_none=True,
            )
-            if already_inserted is not None:
+            if already_inserted:
                return

            # Add an entry for this message_id so that we know we've processed
--- a/tests/rest/client/test_sync.py
+++ b/tests/rest/client/test_sync.py
@ -1624,7 +1624,7 @@ class SlidingSyncTestCase(unittest.HomeserverTestCase):
        user1_id = self.register_user("user1", "pass")
        user1_tok = self.login(user1_id, "pass")

-        room_id1 = self.helper.create_room_as(user1_id, tok=user1_tok, is_public=True)
+        _room_id1 = self.helper.create_room_as(user1_id, tok=user1_tok, is_public=True)
        room_id2 = self.helper.create_room_as(user1_id, tok=user1_tok, is_public=True)
        room_id3 = self.helper.create_room_as(user1_id, tok=user1_tok, is_public=True)

--- a/tests/storage/test_stream.py
+++ b/tests/storage/test_stream.py
@ -46,7 +46,7 @@ from synapse.types import (
 from synapse.util import Clock

 from tests.test_utils.event_injection import create_event
-from tests.unittest import FederatingHomeserverTestCase, HomeserverTestCase, skip_unless
+from tests.unittest import FederatingHomeserverTestCase, HomeserverTestCase

 logger = logging.getLogger(__name__)

@ -1012,115 +1012,6 @@ class GetCurrentStateDeltaMembershipChangesForUserTestCase(HomeserverTestCase):
            ],
        )

-    @skip_unless(
-        False,
-        "persist code does not support multiple membership events for the same user in the same batch",
-    )
-    def test_membership_persisted_in_same_batch(self) -> None:
-        """
-        Test batch of membership events for the same user being processed at once.
-
-        This *should* (doesn't happen currently) result in all of the memberships being
-        stored in the `current_state_delta_stream` table with the same `stream_ordering`
-        even though the individual events have different `stream_ordering`s.
-
-        FIXME: Currently, only the `join_event` is recorded in the `current_state_delta_stream`
-        table.
-        """
-        user1_id = self.register_user("user1", "pass")
-        _user1_tok = self.login(user1_id, "pass")
-        user2_id = self.register_user("user2", "pass")
-        user2_tok = self.login(user2_id, "pass")
-
-        before_room1_token = self.event_sources.get_current_token()
-
-        # User2 is just the designated person to create the room (we do this across the
-        # tests to be consistent)
-        room_id1 = self.helper.create_room_as(user2_id, tok=user2_tok)
-
-        # Persist a timeline event sandwiched between two membership events so they end
-        # up in the `current_state_delta_stream` table with the same `stream_id`.
-        join_event, join_event_context = self.get_success(
-            create_event(
-                self.hs,
-                sender=user1_id,
-                type=EventTypes.Member,
-                state_key=user1_id,
-                content={"membership": "join"},
-                room_id=room_id1,
-            )
-        )
-        timeline_event, timeline_event_context = self.get_success(
-            create_event(
-                self.hs,
-                sender=user1_id,
-                type=EventTypes.Message,
-                state_key=user1_id,
-                content={"body": "foo bar", "msgtype": "m.text"},
-                room_id=room_id1,
-            )
-        )
-        leave_event, leave_event_context = self.get_success(
-            create_event(
-                self.hs,
-                sender=user1_id,
-                type=EventTypes.Member,
-                state_key=user1_id,
-                content={"membership": "leave"},
-                room_id=room_id1,
-            )
-        )
-        self.get_success(
-            self.persistence.persist_events(
-                [
-                    (join_event, join_event_context),
-                    (timeline_event, timeline_event_context),
-                    (leave_event, leave_event_context),
-                ]
-            )
-        )
-
-        after_room1_token = self.event_sources.get_current_token()
-
-        # Get the membership changes for the user.
-        #
-        # At this point, the `current_state_delta_stream` table should look like (notice
-        # those three memberships at the end with `stream_id=7` because we persisted
-        # them in the same batch):
-        #
-        # TODO: DB rows to better see what's going on.
-        membership_changes = self.get_success(
-            self.store.get_current_state_delta_membership_changes_for_user(
-                user1_id,
-                from_key=before_room1_token.room_key,
-                to_key=after_room1_token.room_key,
-            )
-        )
-
-        join_pos = self.get_success(
-            self.store.get_position_for_event(join_event.event_id)
-        )
-
-        # Let the whole diff show on failure
-        self.maxDiff = None
-        self.assertEqual(
-            membership_changes,
-            [
-                CurrentStateDeltaMembership(
-                    event_id=leave_event.event_id,
-                    # Ideally, this would be `leave_pos` (to match the `event_id`) but
-                    # when events are persisted in a batch, they are all stored in the
-                    # `current_state_delta_stream` table with the minimum
-                    # `stream_ordering` from the batch.
-                    event_pos=join_pos,  # leave_pos,
-                    prev_event_id=None,
-                    room_id=room_id1,
-                    membership="leave",
-                    sender=user1_id,
-                ),
-            ],
-        )
-
    def test_state_reset(self) -> None:
        """
        Test a state reset scenario where the user gets removed from the room (when
Author	SHA1	Message	Date
Eric Eastwood	a4d94b5117	Merge `32b8b68df6` into `27756c9fdf`	2024-06-27 18:14:01 -05:00
Eric Eastwood	32b8b68df6	Add TODO to handle state resets See https://github.com/element-hq/synapse/pull/17320#discussion_r1656548733	2024-06-27 18:13:34 -05:00
Eric Eastwood	1158058aa5	Opt for tackling more batch scenarios in future PRs	2024-06-27 17:58:31 -05:00
Till	27756c9fdf	Use rstcheck to "lint" the README (#17367 ) Follow up to https://github.com/element-hq/synapse/pull/17363, so we can detect issues with the RST file early on. ### Pull Request Checklist <!-- Please read https://element-hq.github.io/synapse/latest/development/contributing_guide.html before submitting your pull request --> * [x] Pull request is based on the develop branch * [x] Pull request includes a [changelog file](https://element-hq.github.io/synapse/latest/development/contributing_guide.html#changelog). The entry should: - Be a short description of your change which makes sense to users. "Fixed a bug that prevented receiving messages from other servers." instead of "Moved X method from `EventStore` to `EventWorkerStore`.". - Use markdown where necessary, mostly for `code blocks`. - End with either a period (.) or an exclamation mark (!). - Start with a capital letter. - Feel free to credit yourself, by adding a sentence "Contributed by @github_username." or "Contributed by [Your Name]." to the end of the entry. * [x] [Code style](https://element-hq.github.io/synapse/latest/code_style.html) is correct (run the [linters](https://element-hq.github.io/synapse/latest/development/contributing_guide.html#run-the-linters))	2024-06-27 13:36:08 +02:00
Erik Johnston	cc5e5893fe	Handle multiple rows device inbox (#17362 ) Fix bug where we don't get new to-device from remote if they resent a message we've already persisted and have recorded in the DB twice. `device_federation_inbox` table doesn't have a unique index, and so we can race and store an entry in there twice. If we do so then `simple_select_one_txn` will throw an error due to the query returning more than one row. We should add an unique index, but it doesn't really matter so lets just handle the case of multiple rows correctly for now.	2024-06-27 11:04:31 +01:00
Till Faelligen	7c169f4d2c	Merge branch 'release-v1.110' into develop	2024-06-26 19:00:51 +02:00
Till Faelligen	f75da9cc53	1.110.0rc2	2024-06-26 18:14:57 +02:00
Till	75c19bf57a	Fix uploading packages to PyPi (#17363 ) As per https://github.com/sphinx-doc/sphinx/issues/3921#issuecomment-315581557, we need double underscores. Running `rst2html README.rst > /dev/null` found some more warnings.	2024-06-26 18:14:29 +02:00
Till	b924a8e1a9	Fix uploading packages to PyPi (#17363 ) As per https://github.com/sphinx-doc/sphinx/issues/3921#issuecomment-315581557, we need double underscores. Running `rst2html README.rst > /dev/null` found some more warnings.	2024-06-26 18:01:39 +02:00
Till Faelligen	a8dcd686fb	Fix typo	2024-06-26 15:10:49 +02:00
Till Faelligen	315b8d2032	Update changelog	2024-06-26 14:39:57 +02:00
Till Faelligen	9f47513458	1.110.0rc1	2024-06-26 14:09:13 +02:00
				`@ -1 +0,0 @@`
				Add initial implementation of an experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint.
				`@ -1 +0,0 @@`
				Remove unused `expire_access_token` option in the Synapse Docker config file. Contributed by @AaronDewes.
				`@ -1 +0,0 @@`
				`Fix searching for users with their exact localpart whose ID includes a hyphen.`
				`@ -1 +0,0 @@`
				`Add support for [MSC823](https://github.com/matrix-org/matrix-spec-proposals/pull/3823) - Account suspension.`
				`@ -1 +0,0 @@`
				Use fully-qualified `PersistedEventPosition` when returning `RoomsForUser` to facilitate proper comparisons and `RoomStreamToken` generation.
				`@ -1 +0,0 @@`
				`Add debug logging for when room keys are uploaded, including whether they are replacing other room keys.`
				`@ -1 +0,0 @@`
				`Add support for the unstable [MSC4151](https://github.com/matrix-org/matrix-spec-proposals/pull/4151) report room API.`
				`@ -1 +0,0 @@`
				`Fix wrong retention policy being used when filtering events.`
				`@ -1 +0,0 @@`
				`Don't try and resync devices for remote users whose servers are marked as down.`