Merge commit '920dd1083' into anoa/dinsic_release_1_21_x

* commit '920dd1083':
  1.20.1
  Mark the shadow_banned column as boolean in synapse_port_db. (#8386)
  Hotfix: disable autoescape by default when rendering Jinja2 templates (#8394)

1 files changed, 6 insertions, 0 deletions

diff --git a/synapse/config/saml2_config.py b/synapse/config/saml2_config.py

index 99aa8b3bf1..bd4b47b341 100644
--- a/synapse/config/saml2_config.py
+++ b/synapse/config/saml2_config.py
@@ -169,6 +169,12 @@ class SAML2Config(Config):
             saml2_config.get("saml_session_lifetime", "15m")
         )
 
+        # We enable autoescape here as the message may potentially come from a
+        # remote resource
+        self.saml2_error_html_template = self.read_templates(
+            ["saml_error.html"], saml2_config.get("template_dir"), autoescape=True
+        )[0]
+
     def _default_saml_config_dict(
         self, required_attributes: set, optional_attributes: set
     ):