diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2020-03-10 18:42:15 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-10 18:42:15 +0000 |
| commit | 6640460d054e8f4444046a34bdf638921b31c01e (patch) | |
| tree | 065818deeadd4d46e0f14ba1023fd68b5aaf7dba /synapse/config | |
| parent | Merge pull request #7055 from matrix-org/babolivier/get_time_of_last_push_act... (diff) | |
| parent | Rephrase default message (diff) | |
| download | synapse-6640460d054e8f4444046a34bdf638921b31c01e.tar.xz | |
Merge pull request #7058 from matrix-org/babolivier/saml_error_html
SAML2: render a comprehensible error page if something goes wrong
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/saml2_config.py | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/synapse/config/saml2_config.py b/synapse/config/saml2_config.py index 423c158b11..07895c4315 100644 --- a/synapse/config/saml2_config.py +++ b/synapse/config/saml2_config.py @@ -27,6 +27,18 @@ DEFAULT_USER_MAPPING_PROVIDER = ( "synapse.handlers.saml_handler.DefaultSamlMappingProvider" ) +SAML2_ERROR_DEFAULT_HTML = """ +<html> + <body> + <p>Oops! Something went wrong</p> + <p> + Try logging in again from your Matrix client and if the problem persists + please contact the server's administrator. + </p> + </body> +</html> +""" + def _dict_merge(merge_dict, into_dict): """Do a deep merge of two dicts @@ -160,6 +172,13 @@ class SAML2Config(Config): saml2_config.get("saml_session_lifetime", "5m") ) + if "error_html_path" in config: + self.saml2_error_html_content = self.read_file( + config["error_html_path"], "saml2_config.error_html_path", + ) + else: + self.saml2_error_html_content = SAML2_ERROR_DEFAULT_HTML + def _default_saml_config_dict( self, required_attributes: set, optional_attributes: set ): @@ -325,6 +344,13 @@ class SAML2Config(Config): # The default is 'uid'. # #grandfathered_mxid_source_attribute: upn + + # Path to a file containing HTML content to serve in case an error happens + # when the user gets redirected from the SAML IdP back to Synapse. + # If no file is provided, this defaults to some minimalistic HTML telling the + # user that something went wrong and they should try authenticating again. + # + #error_html_path: /path/to/static/content/saml_error.html """ % { "config_dir_path": config_dir_path } |