From e8bf3a12cd24780dbe59c8798b1eb6536c9828d0 Mon Sep 17 00:00:00 2001
From: "Danilo M." <danix@danix.xyz>
Date: Sun, 2 Aug 2026 17:46:21 +0200
Subject: feat: add HTML builder and cid: scheme handler

HtmlBuilder renders parsed messages (and whole threads, as one document,
so newsletter threads don't spawn one Chromium process per message) into
the HTML string the web view loads. Plain text is escaped and quote lines
marked; the cid: rewrite is namespaced per message ("<prefix>!<id>") so
two thread messages sharing a Content-ID don't collide.

Hardened namespaceCids beyond the initial sketch after attacking it:
handles unquoted cid: attribute values, background=/poster= (not just
src/href), and CSS url(cid:...) in both style="" attributes and <style>
blocks, all case-insensitively. Replaced the greedy [^"']+ capture with
per-quote-style alternation so two cid: refs on one line can't bleed into
each other.

CidSchemeHandler serves cid: requests from the thread's inline-parts map,
keyed by the same namespaced string, replaced wholesale per thread.
---
 tests/CMakeLists.txt       |   1 +
 tests/test_htmlbuilder.cpp | 206 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 207 insertions(+)
 create mode 100644 tests/test_htmlbuilder.cpp

(limited to 'tests')

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index cab8d6c..d0faeec 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -11,3 +11,4 @@ add_qtmaildir_test(mimeparser)
 target_compile_definitions(test_mimeparser PRIVATE
     FIXTURE_DIR="${CMAKE_CURRENT_SOURCE_DIR}/fixtures")
 add_qtmaildir_test(interceptor)
+add_qtmaildir_test(htmlbuilder)
diff --git a/tests/test_htmlbuilder.cpp b/tests/test_htmlbuilder.cpp
new file mode 100644
index 0000000..38699f4
--- /dev/null
+++ b/tests/test_htmlbuilder.cpp
@@ -0,0 +1,206 @@
+#include <QtTest>
+#include "htmlbuilder.h"
+
+class TestHtmlBuilder : public QObject
+{
+    Q_OBJECT
+private slots:
+    void escapesPlainText();
+    void preservesHtmlBodyWhenHtmlRequested();
+    void marksQuotedLines();
+    void plainTextScriptTagIsNeutralised();
+    void buildsThreadWithAllMessages();
+    void collapsedMessageShowsStubOnly();
+    void threadNamespacesCidUrls();
+
+    // Adversarial additions.
+    void namespacesUnquotedCidAttribute();
+    void namespacesCaseInsensitiveAttributeName();
+    void namespacesCidInBackgroundAttribute();
+    void namespacesCidInInlineStyleUrl();
+    void namespacesCidInStyleBlock();
+    void namespacesMultipleCidRefsOnOneLine();
+    void namespacesWhitespaceAroundEquals();
+};
+
+void TestHtmlBuilder::escapesPlainText()
+{
+    ParsedMessage msg;
+    msg.ok = true;
+    msg.plainBody = QStringLiteral("a < b & c > d");
+
+    const QString html = HtmlBuilder::build(msg, HtmlBuilder::ForcePlain);
+    QVERIFY(html.contains(QStringLiteral("a &lt; b &amp; c &gt; d")));
+}
+
+void TestHtmlBuilder::preservesHtmlBodyWhenHtmlRequested()
+{
+    ParsedMessage msg;
+    msg.ok = true;
+    msg.htmlBody = QStringLiteral("<p>hello</p>");
+
+    const QString html = HtmlBuilder::build(msg, HtmlBuilder::PreferHtml);
+    QVERIFY(html.contains(QStringLiteral("<p>hello</p>")));
+}
+
+void TestHtmlBuilder::marksQuotedLines()
+{
+    ParsedMessage msg;
+    msg.ok = true;
+    msg.plainBody = QStringLiteral("reply\n> quoted\nend");
+
+    const QString html = HtmlBuilder::build(msg, HtmlBuilder::ForcePlain);
+    QVERIFY(html.contains(QStringLiteral("class=\"quote\"")));
+}
+
+void TestHtmlBuilder::plainTextScriptTagIsNeutralised()
+{
+    ParsedMessage msg;
+    msg.ok = true;
+    msg.plainBody = QStringLiteral("<script>alert(1)</script>");
+
+    const QString html = HtmlBuilder::build(msg, HtmlBuilder::ForcePlain);
+    // Escaped, not embedded. (JavaScript is also disabled at the profile level,
+    // so this is the second of two independent defences.)
+    QVERIFY(!html.contains(QStringLiteral("<script>")));
+    QVERIFY(html.contains(QStringLiteral("&lt;script&gt;")));
+}
+
+void TestHtmlBuilder::buildsThreadWithAllMessages()
+{
+    ThreadRenderItem first;
+    first.message.ok = true;
+    first.message.subject = QStringLiteral("First");
+    first.message.from = QStringLiteral("Alice");
+    first.message.plainBody = QStringLiteral("first body");
+    first.expanded = true;
+
+    ThreadRenderItem second;
+    second.message.ok = true;
+    second.message.subject = QStringLiteral("Second");
+    second.message.from = QStringLiteral("Bob");
+    second.message.plainBody = QStringLiteral("second body");
+    second.expanded = true;
+
+    const QString html =
+        HtmlBuilder::buildThread({ first, second }, HtmlBuilder::ForcePlain);
+
+    QVERIFY(html.contains(QStringLiteral("first body")));
+    QVERIFY(html.contains(QStringLiteral("second body")));
+    // Each message is its own section, so per-message CSS and anchors work.
+    QCOMPARE(html.count(QStringLiteral("class=\"message\"")), 2);
+}
+
+void TestHtmlBuilder::collapsedMessageShowsStubOnly()
+{
+    ThreadRenderItem item;
+    item.message.ok = true;
+    item.message.from = QStringLiteral("Carol");
+    item.message.subject = QStringLiteral("Old news");
+    item.message.plainBody = QStringLiteral("secret body text");
+    item.expanded = false;
+
+    const QString html =
+        HtmlBuilder::buildThread({ item }, HtmlBuilder::ForcePlain);
+
+    // Unmatched messages collapse to a one-line stub; the body is not emitted.
+    QVERIFY(html.contains(QStringLiteral("Carol")));
+    QVERIFY(!html.contains(QStringLiteral("secret body text")));
+    QVERIFY(html.contains(QStringLiteral("class=\"stub\"")));
+}
+
+void TestHtmlBuilder::threadNamespacesCidUrls()
+{
+    // Two messages in one document may both reference cid:logo@x. Without
+    // namespacing, the second would show the first's image.
+    ThreadRenderItem first;
+    first.message.ok = true;
+    first.message.htmlBody =
+        QStringLiteral("<img src=\"cid:logo@example.org\">");
+    first.expanded = true;
+    first.cidPrefix = QStringLiteral("m0");
+
+    ThreadRenderItem second;
+    second.message.ok = true;
+    second.message.htmlBody =
+        QStringLiteral("<img src=\"cid:logo@example.org\">");
+    second.expanded = true;
+    second.cidPrefix = QStringLiteral("m1");
+
+    const QString html =
+        HtmlBuilder::buildThread({ first, second }, HtmlBuilder::PreferHtml);
+
+    QVERIFY(html.contains(QStringLiteral("cid:m0!logo@example.org")));
+    QVERIFY(html.contains(QStringLiteral("cid:m1!logo@example.org")));
+    // The bare form must not survive, or it would resolve ambiguously.
+    QVERIFY(!html.contains(QStringLiteral("\"cid:logo@example.org\"")));
+}
+
+void TestHtmlBuilder::namespacesUnquotedCidAttribute()
+{
+    // <img src=cid:logo@example.org> is valid HTML. An unquoted reference
+    // that survives un-namespaced would resolve against the WRONG message's
+    // parts map (or none), so it must be rewritten too.
+    const QString html = HtmlBuilder::namespaceCids(
+        QStringLiteral("<img src=cid:logo@example.org>"), QStringLiteral("m0"));
+    QVERIFY(html.contains(QStringLiteral("cid:m0!logo@example.org")));
+    QVERIFY(!html.contains(QStringLiteral("src=cid:logo@example.org")));
+}
+
+void TestHtmlBuilder::namespacesCaseInsensitiveAttributeName()
+{
+    const QString html = HtmlBuilder::namespaceCids(
+        QStringLiteral("<img SRC = \"cid:logo@example.org\">"), QStringLiteral("m0"));
+    QVERIFY(html.contains(QStringLiteral("cid:m0!logo@example.org")));
+}
+
+void TestHtmlBuilder::namespacesCidInBackgroundAttribute()
+{
+    // HTML email frequently sets background images via the background=
+    // attribute on <table>/<td>/<body>.
+    const QString html = HtmlBuilder::namespaceCids(
+        QStringLiteral("<table background=\"cid:bg@example.org\">"),
+        QStringLiteral("m0"));
+    QVERIFY(html.contains(QStringLiteral("cid:m0!bg@example.org")));
+}
+
+void TestHtmlBuilder::namespacesCidInInlineStyleUrl()
+{
+    const QString html = HtmlBuilder::namespaceCids(
+        QStringLiteral("<div style=\"background-image:url(cid:bg@example.org)\">"),
+        QStringLiteral("m0"));
+    QVERIFY(html.contains(QStringLiteral("cid:m0!bg@example.org")));
+}
+
+void TestHtmlBuilder::namespacesCidInStyleBlock()
+{
+    const QString html = HtmlBuilder::namespaceCids(
+        QStringLiteral("<style>.logo{background:url('cid:bg@example.org')}</style>"),
+        QStringLiteral("m0"));
+    QVERIFY(html.contains(QStringLiteral("cid:m0!bg@example.org")));
+}
+
+void TestHtmlBuilder::namespacesMultipleCidRefsOnOneLine()
+{
+    // Guards against a greedy [^"']+ eating past the first closing quote.
+    const QString html = HtmlBuilder::namespaceCids(
+        QStringLiteral("<img src=\"cid:a@x\"><img src=\"cid:b@x\">"),
+        QStringLiteral("m0"));
+    QVERIFY(html.contains(QStringLiteral("cid:m0!a@x")));
+    QVERIFY(html.contains(QStringLiteral("cid:m0!b@x")));
+    // A greedy [^"']+ would eat past the first closing quote and swallow the
+    // second tag's markup into the first cid value; guard against that by
+    // requiring the first tag to close immediately after its own value.
+    QVERIFY(html.contains(QStringLiteral("cid:m0!a@x\"><img")));
+}
+
+void TestHtmlBuilder::namespacesWhitespaceAroundEquals()
+{
+    const QString html = HtmlBuilder::namespaceCids(
+        QStringLiteral("<img src\n = \n\"cid:logo@example.org\">"),
+        QStringLiteral("m0"));
+    QVERIFY(html.contains(QStringLiteral("cid:m0!logo@example.org")));
+}
+
+QTEST_MAIN(TestHtmlBuilder)
+#include "test_htmlbuilder.moc"
-- 
cgit v1.2.3