Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2025-08-10 23:10:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

Move the default SAML2 error HTML to a dedicated file

Browse source 
Also add some JS to it to process any error we might have in the URI
(see #6893).
This commit is contained in:
Brendan Abolivier 2020-03-11 19:33:16 +00:00
parent 54dd28621b
commit b8cfe79ffc
No known key found for this signature in database
GPG key ID: 1E015C145F1916CD
2 changed files with 55 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

29
synapse/config/saml2_config.py
View file

@ -15,6 +15,9 @@
# limitations under the License.
import logging
import os
import pkg_resources
from synapse.python_dependencies import DependencyException, check_requirements
from synapse.util.module_loader import load_module, load_python_module
@ -27,18 +30,6 @@ 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
@ -172,12 +163,14 @@ 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
error_html_path = config.get("error_html_path")
if not error_html_path:
template_dir = pkg_resources.resource_filename("synapse", "res/templates")
error_html_path = os.path.join(template_dir, "saml_error.html")
self.saml2_error_html_content = self.read_file(
error_html_path, "saml2_config.error_html_path",
)
def _default_saml_config_dict(
self, required_attributes: set, optional_attributes: set