Merge pull request matrix-org#7151 from matrix-org/jaywink/saml-redir…

…ect-fix Allow RedirectResponse in SAML response handler
bryanchance · Mar 26, 2020 · 7496d3d · 7496d3d
2 parents fa4f121 + 55ca6cf
commit 7496d3d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/changelog.d/7151.bugfix b/changelog.d/7151.bugfix
@@ -0,0 +1 @@
+Fix error page being shown when a custom SAML handler attempted to redirect when processing an auth response.
diff --git a/synapse/handlers/saml_handler.py b/synapse/handlers/saml_handler.py
@@ -26,6 +26,7 @@
 from synapse.http.server import finish_request
 from synapse.http.servlet import parse_string
 from synapse.module_api import ModuleApi
+from synapse.module_api.errors import RedirectException
 from synapse.types import (
     UserID,
     map_username_to_mxid_localpart,
@@ -119,6 +120,9 @@ async def handle_saml_response(self, request):
 
         try:
             user_id = await self._map_saml_response_to_user(resp_bytes, relay_state)
+        except RedirectException:
+            # Raise the exception as per the wishes of the SAML module response
+            raise
         except Exception as e:
             # If decoding the response or mapping it to a user failed, then log the
             # error and tell the user that something went wrong.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix error page being shown when a custom SAML handler attempted to redirect when processing an auth response.