Skip to content

Fix html injection in formatToHtml #28

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
ulidtko wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −8
Open

Fix html injection in formatToHtml #28

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
13 changes: 5 additions & 8 deletions decode-spam-headers.py
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6648,14 +6648,11 @@ def formatToHtml(body, headers):
body = body.replace(testEnd, '</div>')

body = body.replace('\n', '<br/>\n').replace('\t', '\t' + '&nbsp;' * 4).replace(' ', '&nbsp;')
headers = headers.replace('\n', '<br/>\n').replace('\t', '\t' + '&nbsp;' * 4).replace(' ', '&nbsp;')
body2 = body

for m in re.finditer(r'(<[^>]+>)', body, re.I):
a = m.group(1)
b = a.replace('&nbsp;', ' ')
body2 = body2.replace(a, b)

body = body2

outputHtml = f'''
Expand Down Expand Up @@ -6781,7 +6778,7 @@ def formatToHtml(body, headers):
font-style: normal;
font-variant: normal;
font-weight: 400;
line-height: 18.5714px;
line-height: 18.5714px;
}}

a {{
Expand All @@ -6804,9 +6801,9 @@ def formatToHtml(body, headers):
<details>
<summary>Original SMTP Headers</summary>
<blockquote>
<code>
{headers}
</code>
<code><pre>
{escape(headers)}
</pre></code>
Copy link
Author

@ulidtko ulidtko Mar 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The added wrapping into <pre> allows to simply ditch the \n → <br/>\n shenanigans — within <pre>, the contained (html-escaped) html blob will render as-is.

</blockquote>
</details>
</article>
Expand All @@ -6815,7 +6812,7 @@ def formatToHtml(body, headers):
{body}
</body>
</html>
'''
'''
return outputHtml

def colorizeOutput(out, headers):
Expand Down