diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-06-03 10:41:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-03 10:41:12 +0100 |
| commit | 1bbc9e2df6cf9251460ca110918d876d3f50a379 (patch) | |
| tree | a265286c7b9acf3c97147e1db33c35444d083431 /docs | |
| parent | update grafana dashboard (diff) | |
| download | synapse-1bbc9e2df6cf9251460ca110918d876d3f50a379.tar.xz | |
Clean up exception handling in SAML2ResponseResource (#7614)
* Expose `return_html_error`, and allow it to take a Jinja2 template instead of a raw string
* Clean up exception handling in SAML2ResponseResource
* use the existing code in `return_html_error` instead of re-implementing it
(giving it a jinja2 template rather than inventing a new form of template)
* do the exception-catching in the REST layer rather than in the handler
layer, to make sure we catch all exceptions.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/sample_config.yaml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index ce2c235994..6784234d5f 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -1512,7 +1512,13 @@ saml2_config: # * HTML page to display to users if something goes wrong during the # authentication process: 'saml_error.html'. # - # This template doesn't currently need any variable to render. + # When rendering, this template is given the following variables: + # * code: an HTML error code corresponding to the error that is being + # returned (typically 400 or 500) + # + # * msg: a textual message describing the error. + # + # The variables will automatically be HTML-escaped. # # You can see the default templates at: # https://github.com/matrix-org/synapse/tree/master/synapse/res/templates |