From d93ec0a0ba5f6d2fbf2bc321086d4ad4c03136e0 Mon Sep 17 00:00:00 2001 From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> Date: Tue, 18 Jan 2022 16:03:56 +0000 Subject: [PATCH 1/4] Partially revert #11602 to prevent webclient overriding client resource (#11764) --- changelog.d/11764.bugfix | 1 + synapse/app/homeserver.py | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 changelog.d/11764.bugfix diff --git a/changelog.d/11764.bugfix b/changelog.d/11764.bugfix new file mode 100644 index 000000000..1de5b9c60 --- /dev/null +++ b/changelog.d/11764.bugfix @@ -0,0 +1 @@ +Fixes a bug introduced in Synapse 1.50.0rc1 that could cause Matrix clients to be unable to connect to Synapse instances with the 'webclient' resource enabled. \ No newline at end of file diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 177ce040e..dd76e0732 100644 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -27,7 +27,6 @@ import synapse import synapse.config.logger from synapse import events from synapse.api.urls import ( - CLIENT_API_PREFIX, FEDERATION_PREFIX, LEGACY_MEDIA_PREFIX, MEDIA_R0_PREFIX, @@ -193,7 +192,13 @@ class SynapseHomeServer(HomeServer): resources.update( { - CLIENT_API_PREFIX: client_resource, + "/_matrix/client/api/v1": client_resource, + "/_matrix/client/r0": client_resource, + "/_matrix/client/v1": client_resource, + "/_matrix/client/v3": client_resource, + "/_matrix/client/unstable": client_resource, + "/_matrix/client/v2_alpha": client_resource, + "/_matrix/client/versions": client_resource, "/.well-known": well_known_resource(self), "/_synapse/admin": AdminRestResource(self), **build_synapse_client_resource_tree(self), From ab12c909a20d626cd39f615d1df218d574f826a7 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Tue, 18 Jan 2022 16:09:04 +0000 Subject: [PATCH 2/4] 1.50.1 --- CHANGES.md | 13 +++++++++++++ changelog.d/11764.bugfix | 1 - debian/changelog | 6 ++++++ synapse/__init__.py | 2 +- 4 files changed, 20 insertions(+), 2 deletions(-) delete mode 100644 changelog.d/11764.bugfix diff --git a/CHANGES.md b/CHANGES.md index 8029a9d21..ea8b15dce 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,19 @@ +Synapse 1.50.1 (2022-01-18) +=========================== + +This release fixes a bug in Synapse 1.50.0 that could prevent clients from being able to connect to Synapse if the `webclient` resource was enabled. Further details are available in [this issue](https://github.com/matrix-org/synapse/issues/11763). + +Bugfixes +-------- + +- Fix a bug introduced in Synapse 1.50.0rc1 that could cause Matrix clients to be unable to connect to Synapse instances with the 'webclient' resource enabled. ([\#11764](https://github.com/matrix-org/synapse/issues/11764)) + + Synapse 1.50.0 (2022-01-18) =========================== +**This release has a critical bug that may prevent clients from being able to connect. As such, we do not recommend upgrading to 1.50.0, and instead upgrading straight to 1.50.1. Further details are in [this issue](https://github.com/matrix-org/synapse/issues/11763).** + Please note that we now only support Python 3.7+ and PostgreSQL 10+ (if applicable), because Python 3.6 and PostgreSQL 9.6 have reached end-of-life. No significant changes since 1.50.0rc2. diff --git a/changelog.d/11764.bugfix b/changelog.d/11764.bugfix deleted file mode 100644 index 1de5b9c60..000000000 --- a/changelog.d/11764.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixes a bug introduced in Synapse 1.50.0rc1 that could cause Matrix clients to be unable to connect to Synapse instances with the 'webclient' resource enabled. \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index f1245cd3a..18983f5da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +matrix-synapse-py3 (1.50.1) stable; urgency=medium + + * New synapse release 1.50.1. + + -- Synapse Packaging team Tue, 18 Jan 2022 16:06:26 +0000 + matrix-synapse-py3 (1.50.0) stable; urgency=medium * New synapse release 1.50.0. diff --git a/synapse/__init__.py b/synapse/__init__.py index 201925e91..5ec9f9417 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -47,7 +47,7 @@ try: except ImportError: pass -__version__ = "1.50.0" +__version__ = "1.50.1" if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)): # We import here so that we don't have to install a bunch of deps when From 9d0098595e49755e420eb6f654d5e2e2327868fe Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Tue, 18 Jan 2022 16:11:38 +0000 Subject: [PATCH 3/4] Reword 1.50.0 warning a bit in the changelog --- CHANGES.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index ea8b15dce..84fddb47c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -12,7 +12,9 @@ Bugfixes Synapse 1.50.0 (2022-01-18) =========================== -**This release has a critical bug that may prevent clients from being able to connect. As such, we do not recommend upgrading to 1.50.0, and instead upgrading straight to 1.50.1. Further details are in [this issue](https://github.com/matrix-org/synapse/issues/11763).** +**This release has a critical bug that may prevent clients from being able to connect. +As such, it is not recommended to upgrade to 1.50.0. Instead, please upgrade straight to +to 1.50.1. Further details are in [this issue](https://github.com/matrix-org/synapse/issues/11763).** Please note that we now only support Python 3.7+ and PostgreSQL 10+ (if applicable), because Python 3.6 and PostgreSQL 9.6 have reached end-of-life. From fd05a3ed0330d5d4993620cd0160a3d000262f2c Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Tue, 18 Jan 2022 16:13:54 +0000 Subject: [PATCH 4/4] Wording fixes to 1.50.0/1 changelog entries --- CHANGES.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 84fddb47c..ced1dcc0d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,15 +6,15 @@ This release fixes a bug in Synapse 1.50.0 that could prevent clients from being Bugfixes -------- -- Fix a bug introduced in Synapse 1.50.0rc1 that could cause Matrix clients to be unable to connect to Synapse instances with the 'webclient' resource enabled. ([\#11764](https://github.com/matrix-org/synapse/issues/11764)) +- Fix a bug introduced in Synapse 1.50.0rc1 that could cause Matrix clients to be unable to connect to Synapse instances with the `webclient` resource enabled. ([\#11764](https://github.com/matrix-org/synapse/issues/11764)) Synapse 1.50.0 (2022-01-18) =========================== -**This release has a critical bug that may prevent clients from being able to connect. +**This release contains a critical bug that may prevent clients from being able to connect. As such, it is not recommended to upgrade to 1.50.0. Instead, please upgrade straight to -to 1.50.1. Further details are in [this issue](https://github.com/matrix-org/synapse/issues/11763).** +to 1.50.1. Further details are available in [this issue](https://github.com/matrix-org/synapse/issues/11763).** Please note that we now only support Python 3.7+ and PostgreSQL 10+ (if applicable), because Python 3.6 and PostgreSQL 9.6 have reached end-of-life.