diff options
author | Patrick Cloke <patrickc@matrix.org> | 2020-07-02 10:55:41 -0400 |
---|---|---|
committer | Patrick Cloke <patrickc@matrix.org> | 2020-07-02 10:55:41 -0400 |
commit | 4d978d7db4448e3cb526ee1087aeab578a31ac71 (patch) | |
tree | 872c47b3fb4843e720b4c785cbcb9e87a95779ae /synapse/handlers/oidc_handler.py | |
parent | Hack to add push priority to push notifications (#7765) (diff) | |
parent | Merge tag 'v1.15.2' (diff) | |
download | synapse-4d978d7db4448e3cb526ee1087aeab578a31ac71.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/handlers/oidc_handler.py')
-rw-r--r-- | synapse/handlers/oidc_handler.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/synapse/handlers/oidc_handler.py b/synapse/handlers/oidc_handler.py index 9c08eb5399..87f0c5e197 100644 --- a/synapse/handlers/oidc_handler.py +++ b/synapse/handlers/oidc_handler.py @@ -35,7 +35,7 @@ from typing_extensions import TypedDict from twisted.web.client import readBody from synapse.config import ConfigError -from synapse.http.server import finish_request +from synapse.http.server import respond_with_html from synapse.http.site import SynapseRequest from synapse.logging.context import make_deferred_yieldable from synapse.push.mailer import load_jinja2_templates @@ -144,15 +144,10 @@ class OidcHandler: access_denied. error_description: A human-readable description of the error. """ - html_bytes = self._error_template.render( + html = self._error_template.render( error=error, error_description=error_description - ).encode("utf-8") - - request.setResponseCode(400) - request.setHeader(b"Content-Type", b"text/html; charset=utf-8") - request.setHeader(b"Content-Length", b"%i" % len(html_bytes)) - request.write(html_bytes) - finish_request(request) + ) + respond_with_html(request, 400, html) def _validate_metadata(self): """Verifies the provider metadata. |