Fix Internal Server Error on GET /saml2/authn_response (#9623)

* Fix Internal Server Error on `GET /saml2/authn_response`

Seems to have been introduced in #8765 (Synapse 1.24.0)

* Fix newsfile
This commit is contained in:
Richard van der Hoff 2021-03-16 10:20:20 +00:00 committed by GitHub
parent f87dfb9403
commit 1c8a2541da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions

1
changelog.d/9623.bugfix Normal file
View File

@ -0,0 +1 @@
Fix Internal Server Error on `GET /_synapse/client/saml2/authn_response` request.

View File

@ -14,24 +14,30 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from typing import TYPE_CHECKING
from synapse.http.server import DirectServeHtmlResource from synapse.http.server import DirectServeHtmlResource
if TYPE_CHECKING:
from synapse.server import HomeServer
class SAML2ResponseResource(DirectServeHtmlResource): class SAML2ResponseResource(DirectServeHtmlResource):
"""A Twisted web resource which handles the SAML response""" """A Twisted web resource which handles the SAML response"""
isLeaf = 1 isLeaf = 1
def __init__(self, hs): def __init__(self, hs: "HomeServer"):
super().__init__() super().__init__()
self._saml_handler = hs.get_saml_handler() self._saml_handler = hs.get_saml_handler()
self._sso_handler = hs.get_sso_handler()
async def _async_render_GET(self, request): async def _async_render_GET(self, request):
# We're not expecting any GET request on that resource if everything goes right, # We're not expecting any GET request on that resource if everything goes right,
# but some IdPs sometimes end up responding with a 302 redirect on this endpoint. # but some IdPs sometimes end up responding with a 302 redirect on this endpoint.
# In this case, just tell the user that something went wrong and they should # In this case, just tell the user that something went wrong and they should
# try to authenticate again. # try to authenticate again.
self._saml_handler._render_error( self._sso_handler.render_error(
request, "unexpected_get", "Unexpected GET request on /saml2/authn_response" request, "unexpected_get", "Unexpected GET request on /saml2/authn_response"
) )