From 7292b7c0ebf2dcc971349e0bd17dc041a49f94f4 Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Tue, 23 Feb 2021 12:57:37 -0500 Subject: [PATCH 1/4] Add back the deprecated SAML endpoint. (#9474) --- changelog.d/9474.misc | 1 + synapse/rest/synapse/client/__init__.py | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 changelog.d/9474.misc diff --git a/changelog.d/9474.misc b/changelog.d/9474.misc new file mode 100644 index 000000000..1b9a23529 --- /dev/null +++ b/changelog.d/9474.misc @@ -0,0 +1 @@ +Revert change in v1.28.0rc1 to remove the deprecated SAML endpoint. diff --git a/synapse/rest/synapse/client/__init__.py b/synapse/rest/synapse/client/__init__.py index 8588b6d27..9eeb97058 100644 --- a/synapse/rest/synapse/client/__init__.py +++ b/synapse/rest/synapse/client/__init__.py @@ -54,7 +54,12 @@ def build_synapse_client_resource_tree(hs: "HomeServer") -> Mapping[str, Resourc if hs.config.saml2_enabled: from synapse.rest.synapse.client.saml2 import SAML2Resource - resources["/_synapse/client/saml2"] = SAML2Resource(hs) + res = SAML2Resource(hs) + resources["/_synapse/client/saml2"] = res + + # This is also mounted under '/_matrix' for backwards-compatibility. + # To be removed in Synapse v1.32.0. + resources["/_matrix/saml2"] = res return resources From b5c4fe1971e32930150abd904cc5b7e8d66ec811 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 25 Feb 2021 10:22:07 +0000 Subject: [PATCH 2/4] 1.28.0 --- CHANGES.md | 9 +++++++++ changelog.d/9474.misc | 1 - debian/changelog | 6 ++++++ synapse/__init__.py | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) delete mode 100644 changelog.d/9474.misc diff --git a/CHANGES.md b/CHANGES.md index c216d2881..e68d3154a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,12 @@ +Synapse 1.28.0 (2021-02-25) +=========================== + +Internal Changes +---------------- + +- Revert change in v1.28.0rc1 to remove the deprecated SAML endpoint. ([\#9474](https://github.com/matrix-org/synapse/issues/9474)) + + Synapse 1.28.0rc1 (2021-02-19) ============================== diff --git a/changelog.d/9474.misc b/changelog.d/9474.misc deleted file mode 100644 index 1b9a23529..000000000 --- a/changelog.d/9474.misc +++ /dev/null @@ -1 +0,0 @@ -Revert change in v1.28.0rc1 to remove the deprecated SAML endpoint. diff --git a/debian/changelog b/debian/changelog index aa83d4e13..642e4d381 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +matrix-synapse-py3 (1.28.0) stable; urgency=medium + + * New synapse release 1.28.0. + + -- Synapse Packaging team Thu, 25 Feb 2021 10:21:57 +0000 + matrix-synapse-py3 (1.27.0) stable; urgency=medium [ Dan Callahan ] diff --git a/synapse/__init__.py b/synapse/__init__.py index 2e70f4618..869e860fb 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -48,7 +48,7 @@ try: except ImportError: pass -__version__ = "1.28.0rc1" +__version__ = "1.28.0" 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 0f9f30b32bc071d4550d5631db7b36f3c597a79b Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 25 Feb 2021 10:27:22 +0000 Subject: [PATCH 3/4] Fixup changelog --- CHANGES.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index e68d3154a..33c691d81 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,11 @@ Synapse 1.28.0 (2021-02-25) =========================== +Note that this release drops support for ARMv7 in the official Docker images, due to repeated problems building for ARMv7 (and the associated maintenance burden this entails). + +This release also fixes the documentation included in v1.27.0 around the callback URI for SAML2 identity providers. If your server is configured to use single sign-on via a SAML2 IdP, you may need to make configuration changes. Please review [UPGRADE.rst](UPGRADE.rst) for more details on these changes. + + Internal Changes ---------------- @@ -10,10 +15,6 @@ Internal Changes Synapse 1.28.0rc1 (2021-02-19) ============================== -Note that this release drops support for ARMv7 in the official Docker images, due to repeated problems building for ARMv7 (and the associated maintenance burden this entails). - -This release also fixes the documentation included in v1.27.0 around the callback URI for SAML2 identity providers. If your server is configured to use single sign-on via a SAML2 IdP, you may need to make configuration changes. Please review [UPGRADE.rst](UPGRADE.rst) for more details on these changes. - Removal warning --------------- From 2756517f7a6e17d2403de44981569dc18329315b Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 25 Feb 2021 10:47:19 +0000 Subject: [PATCH 4/4] Fixup changelog --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 33c691d81..d584d342d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -41,7 +41,7 @@ Bugfixes -------- - Fix long-standing bug where sending email notifications would fail for rooms that the server had since left. ([\#9257](https://github.com/matrix-org/synapse/issues/9257)) -- Fix bug in Synapse 1.27.0rc1 which meant the "session expired" error page during SSO registration was badly formatted. ([\#9296](https://github.com/matrix-org/synapse/issues/9296)) +- Fix bug introduced in Synapse 1.27.0rc1 which meant the "session expired" error page during SSO registration was badly formatted. ([\#9296](https://github.com/matrix-org/synapse/issues/9296)) - Assert a maximum length for some parameters for spec compliance. ([\#9321](https://github.com/matrix-org/synapse/issues/9321), [\#9393](https://github.com/matrix-org/synapse/issues/9393)) - Fix additional errors when previewing URLs: "AttributeError 'NoneType' object has no attribute 'xpath'" and "ValueError: Unicode strings with encoding declaration are not supported. Please use bytes input or XML fragments without declaration.". ([\#9333](https://github.com/matrix-org/synapse/issues/9333)) - Fix a bug causing Synapse to impose the wrong type constraints on fields when processing responses from appservices to `/_matrix/app/v1/thirdparty/user/{protocol}`. ([\#9361](https://github.com/matrix-org/synapse/issues/9361))