Skip to content

fix(email): avoid double-decoding HTML entities #68707

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ooiuuii wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −1
Open

fix(email): avoid double-decoding HTML entities #68707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion plugins/platforms/email/adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,9 +313,10 @@ def _strip_html(html: str) -> str:
text = re.sub(r"</p>", "\n", text, flags=re.IGNORECASE)
text = re.sub(r"<[^>]+>", "", text)
text = re.sub(r"&nbsp;", " ", text)
text = re.sub(r"&amp;", "&", text)
text = re.sub(r"&lt;", "<", text)
text = re.sub(r"&gt;", ">", text)
# Decode ampersands last so &amp;lt; remains literal &lt;, not markup-like text.
text = re.sub(r"&amp;", "&", text)
text = re.sub(r"\n{3,}", "\n\n", text)
return text.strip()

Expand Down
8 changes: 8 additions & 0 deletions tests/gateway/test_email.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,14 @@ def test_strip_html_basic(self):
self.assertNotIn("<p>", result)
self.assertNotIn("<b>", result)

def test_strip_html_does_not_double_decode_entities(self):
from plugins.platforms.email.adapter import _strip_html

self.assertEqual(
_strip_html("The token is &amp;lt;APIKEY&amp;gt;"),
"The token is &lt;APIKEY&gt;",
)


class TestExtractTextBody(unittest.TestCase):
"""Test email body extraction from different message formats."""
Expand Down
Loading