From 3bae65222ced31bff70b2d3788934dcb1c8fb4a0 Mon Sep 17 00:00:00 2001 From: dklimpel <5740567+dklimpel@users.noreply.github.com> Date: Wed, 12 Apr 2023 09:31:03 +0200 Subject: [PATCH 1/3] Load SSO rest API for redirect only if SSO is enabled --- synapse/rest/client/login.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/synapse/rest/client/login.py b/synapse/rest/client/login.py index b7e9c8f6b572..da802c410763 100644 --- a/synapse/rest/client/login.py +++ b/synapse/rest/client/login.py @@ -672,7 +672,12 @@ def register_servlets(hs: "HomeServer", http_server: HttpServer) -> None: LoginRestServlet(hs).register(http_server) if hs.config.registration.refreshable_access_token_lifetime is not None: RefreshTokenServlet(hs).register(http_server) - SsoRedirectServlet(hs).register(http_server) + if ( + hs.config.cas.cas_enabled + or hs.config.saml2.saml2_enabled + or hs.config.oidc.oidc_enabled + ): + SsoRedirectServlet(hs).register(http_server) if hs.config.cas.cas_enabled: CasTicketServlet(hs).register(http_server) From a5feb3f04c64d46415ef43911ae4c746f5bba7a8 Mon Sep 17 00:00:00 2001 From: dklimpel <5740567+dklimpel@users.noreply.github.com> Date: Wed, 12 Apr 2023 09:34:28 +0200 Subject: [PATCH 2/3] newsfile --- changelog.d/15421.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/15421.misc diff --git a/changelog.d/15421.misc b/changelog.d/15421.misc new file mode 100644 index 000000000000..4809cb8f1be7 --- /dev/null +++ b/changelog.d/15421.misc @@ -0,0 +1 @@ +Load SSO rest API for redirect only if SSO is enabled. \ No newline at end of file From b783f042449fb980e3d78dd64ab00638c64fdc88 Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Thu, 13 Apr 2023 08:15:07 -0400 Subject: [PATCH 3/3] Update changelog. --- changelog.d/15421.misc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/15421.misc b/changelog.d/15421.misc index 4809cb8f1be7..5deea3ac5b4b 100644 --- a/changelog.d/15421.misc +++ b/changelog.d/15421.misc @@ -1 +1 @@ -Load SSO rest API for redirect only if SSO is enabled. \ No newline at end of file +Only load the SSO redirect servlet if SSO is enabled. \ No newline at end of file