diff options
| author | Andrew Morgan <andrewm@element.io> | 2022-03-24 18:14:26 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrewm@element.io> | 2022-03-24 18:14:26 +0000 |
| commit | a503c2c3881bc9c0fc6e98e8a735d6a30d1d7ead (patch) | |
| tree | 65f3ada99432c90b831a2e1f454cc0602ba910a8 /synapse/push | |
| parent | Do not consider events by ignored users for relations (#12285) (diff) | |
| parent | update changelog for 1.55.1 (diff) | |
| download | synapse-a503c2c3881bc9c0fc6e98e8a735d6a30d1d7ead.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/push')
| -rw-r--r-- | synapse/push/mailer.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py index 649a4f49d0..5ccdd88364 100644 --- a/synapse/push/mailer.py +++ b/synapse/push/mailer.py @@ -18,6 +18,7 @@ from typing import TYPE_CHECKING, Dict, Iterable, List, Optional, TypeVar import bleach import jinja2 +from markupsafe import Markup from synapse.api.constants import EventTypes, Membership, RoomTypes from synapse.api.errors import StoreError @@ -867,7 +868,7 @@ class Mailer: ) -def safe_markup(raw_html: str) -> jinja2.Markup: +def safe_markup(raw_html: str) -> Markup: """ Sanitise a raw HTML string to a set of allowed tags and attributes, and linkify any bare URLs. @@ -877,7 +878,7 @@ def safe_markup(raw_html: str) -> jinja2.Markup: Returns: A Markup object ready to safely use in a Jinja template. """ - return jinja2.Markup( + return Markup( bleach.linkify( bleach.clean( raw_html, @@ -891,7 +892,7 @@ def safe_markup(raw_html: str) -> jinja2.Markup: ) -def safe_text(raw_text: str) -> jinja2.Markup: +def safe_text(raw_text: str) -> Markup: """ Sanitise text (escape any HTML tags), and then linkify any bare URLs. @@ -901,7 +902,7 @@ def safe_text(raw_text: str) -> jinja2.Markup: Returns: A Markup object ready to safely use in a Jinja template. """ - return jinja2.Markup( + return Markup( bleach.linkify(bleach.clean(raw_text, tags=[], attributes=[], strip=False)) ) |