Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Allow RedirectResponse in SAML response handler #7151

Merged
merged 2 commits into from
Mar 26, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/7151.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Allow custom SAML handlers to redirect after processing an auth response.
jaywink marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 4 additions & 0 deletions synapse/handlers/saml_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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.
Expand Down