@ai-matrx/print 0.8.6 → 0.8.8

package/CHANGELOG.md

@@ -1,5 +1,40 @@
 # Changelog
 
+## 0.8.8
+
+- **Security: every markdown→HTML path is allow-list sanitized.** The regex
+  converter (`markdownToHtml`, `markdownToArticleHtml`, and through them
+  `renderMarkdownDocument`, `markdownToHtmlForSkin`, `markdownToPdfBlob`) used a
+  block-list and let `<iframe>`, `<form>`, `<meta http-equiv=refresh>`,
+  `<object>`/`<embed>`, `<base>`, `<link>`, `<svg>`, `<textarea>`/`<select>` and
+  inline `style` through. Output now goes through `PRINT_HTML_SCHEMA`
+  (hast-util-sanitize's GitHub schema plus the converter's own `.matrx-*` /
+  `print-*` / `code-*` classes, table-cell `text-align`, the flashcard
+  checkbox + label, figures, page-break data/aria attributes). Sync, DOM-free.
+- **Security (`/document`):** TeX `\href`, `\style`, `\class`, `\cssId`,
+  `\bbox[css]` and `\mmlToken[attrs]` no longer write `href`/`style` into the
+  exported MathML (`MATHML_SCHEMA`); a front-matter `header`/`footer` can no
+  longer close the document's `<style>` element.
+- **New subpath `/safe-html`:** `sanitizeHtmlFragment`, `SAFE_HTML_SCHEMA`
+  (plain GitHub allow-list for email/CMS), `PRINT_HTML_SCHEMA`,
+  `sanitizePrintHtml`, `MATHML_SCHEMA`, `sanitizeMathml`.
+- **Visible differences:** author raw-HTML classes outside the print
+  vocabulary are dropped (`<div class="note">` → `<div class="matrx-div">`);
+  author inline styles are dropped; HTML serialization is normalized (`<img …>`
+  not `<img … />`, text `>` and `"` literal instead of `&gt;`/`&quot;`) —
+  same rendered page.
+- Consumer action: none — refresh to latest.
+
+## 0.8.7
+
+- **Fixed: hidden reasoning merged two paragraphs.** `removeThinkingContent`
+  replaced every `<thinking>` / `<think>` / `<reasoning>` section with one line
+  break, so a section standing between two paragraphs (blank lines around it)
+  joined them into one on screen. A section with a blank line on either side
+  now leaves a paragraph break; one inside a paragraph still leaves a line
+  break (verify-RC-B5 round 3 F6).
+- Consumer action: none — refresh to latest.
+
 ## 0.8.6
 
 Automatic changed-only republish (docs/metadata drift since the last tag — see

package/dist/document.cjs

@@ -170,6 +170,206 @@ function contentColumnWidths(b, n, avail, measure, pad = 10) {
 
 // src/document/math.ts
 var import_source = require("@ai-matrx/content-ir/source");
+
+// src/safe-html.ts
+var import_hast_util_from_html = require("hast-util-from-html");
+var import_hast_util_sanitize = require("hast-util-sanitize");
+var import_hast_util_to_html = require("hast-util-to-html");
+var STRIP_WITH_CONTENT = [
+  "script",
+  "style",
+  "noscript",
+  "template",
+  "iframe",
+  "object",
+  "embed",
+  "textarea",
+  "select",
+  "head",
+  "title"
+];
+var FORBIDDEN_TAGS = [
+  ...STRIP_WITH_CONTENT,
+  "form",
+  "meta",
+  "base",
+  "link",
+  "frame",
+  "frameset",
+  "applet",
+  "button",
+  "svg",
+  "math"
+];
+var baseAttributes = import_hast_util_sanitize.defaultSchema.attributes ?? {};
+var SAFE_HTML_SCHEMA = {
+  ...import_hast_util_sanitize.defaultSchema,
+  tagNames: (import_hast_util_sanitize.defaultSchema.tagNames ?? []).filter((t) => !FORBIDDEN_TAGS.includes(t)),
+  strip: STRIP_WITH_CONTENT,
+  // Authored anchors keep their names; the GitHub `user-content-` rewrite
+  // would also break `<label for>` → `<input id>` pairs.
+  clobberPrefix: "",
+  clobber: []
+};
+var PRINT_CLASS = /^(?:(?:matrx|print|code|doc|language)-[\w-]*|inline-code|is-checked)$/;
+function withPrintClasses(defs = []) {
+  let found = false;
+  const out = defs.map((d) => {
+    if (Array.isArray(d) && d[0] === "className") {
+      found = true;
+      return [...d, PRINT_CLASS];
+    }
+    return d;
+  });
+  return found ? out : [...out, ["className", PRINT_CLASS]];
+}
+var printAttributes = Object.fromEntries(
+  Object.entries(baseAttributes).map(([tag, defs]) => [tag, withPrintClasses(defs)])
+);
+var cellAlign = ["style", /^text-align:\s*(?:left|center|right);?$/];
+var PRINT_HTML_SCHEMA = {
+  ...SAFE_HTML_SCHEMA,
+  tagNames: [
+    .../* @__PURE__ */ new Set([...SAFE_HTML_SCHEMA.tagNames ?? [], "section", "figure", "figcaption", "label"])
+  ],
+  attributes: {
+    ...printAttributes,
+    "*": [
+      ...baseAttributes["*"] ?? [],
+      ["className", PRINT_CLASS],
+      "role",
+      "ariaLabel",
+      "ariaHidden",
+      "dataLabel",
+      "dataLanguage",
+      "dataArtifactType"
+    ],
+    // Table-cell alignment is the one inline style the converter writes.
+    td: withPrintClasses([...baseAttributes["td"] ?? [], [...cellAlign]]),
+    th: withPrintClasses([...baseAttributes["th"] ?? [], [...cellAlign]]),
+    // The flashcard flip is a checkbox + label pair (GitHub forces `disabled`).
+    input: withPrintClasses([["type", "checkbox"], "checked"]),
+    label: withPrintClasses(["htmlFor"])
+  },
+  required: { input: { type: "checkbox" } },
+  protocols: {
+    ...import_hast_util_sanitize.defaultSchema.protocols,
+    href: [...import_hast_util_sanitize.defaultSchema.protocols?.href ?? [], "tel"],
+    // Embedded images (`data:image/png;base64,…`) — an <img> never runs script.
+    src: [...import_hast_util_sanitize.defaultSchema.protocols?.src ?? [], "data"]
+  }
+};
+function sanitizeHtmlFragment(html, schema = SAFE_HTML_SCHEMA) {
+  if (!html) return "";
+  const tree = (0, import_hast_util_sanitize.sanitize)((0, import_hast_util_from_html.fromHtml)(html, { fragment: true }), schema);
+  return (0, import_hast_util_to_html.toHtml)(tree, { characterReferences: { useNamedReferences: true } });
+}
+var MATHML_TAGS = [
+  "math",
+  "maction",
+  "annotation",
+  "menclose",
+  "merror",
+  "mfrac",
+  "mglyph",
+  "mi",
+  "mlabeledtr",
+  "mmultiscripts",
+  "mn",
+  "mo",
+  "mover",
+  "mpadded",
+  "mphantom",
+  "mprescripts",
+  "none",
+  "mroot",
+  "mrow",
+  "ms",
+  "mspace",
+  "msqrt",
+  "mstyle",
+  "msub",
+  "msubsup",
+  "msup",
+  "mtable",
+  "mtd",
+  "mtext",
+  "mtr",
+  "munder",
+  "munderover",
+  "semantics"
+];
+var MATHML_ATTRIBUTES = [
+  "xmlns",
+  "display",
+  "displaystyle",
+  "mathvariant",
+  "mathsize",
+  "mathcolor",
+  "mathbackground",
+  "scriptlevel",
+  "dir",
+  "fence",
+  "form",
+  "largeop",
+  "lspace",
+  "rspace",
+  "movablelimits",
+  "separator",
+  "stretchy",
+  "symmetric",
+  "maxsize",
+  "minsize",
+  "accent",
+  "accentunder",
+  "align",
+  "columnalign",
+  "rowalign",
+  "columnspacing",
+  "rowspacing",
+  "columnlines",
+  "rowlines",
+  "frame",
+  "framespacing",
+  "equalrows",
+  "equalcolumns",
+  "linethickness",
+  "numalign",
+  "denomalign",
+  "bevelled",
+  "notation",
+  "width",
+  "height",
+  "depth",
+  "voffset",
+  "lquote",
+  "rquote",
+  "columnspan",
+  "rowspan",
+  "encoding",
+  "open",
+  "close",
+  "separators",
+  "actiontype",
+  "selection",
+  "mslinebreak",
+  "linebreak",
+  "indentalign",
+  "data*"
+];
+var MATHML_SCHEMA = {
+  tagNames: MATHML_TAGS,
+  attributes: { "*": MATHML_ATTRIBUTES },
+  strip: ["script", "style"],
+  clobberPrefix: "",
+  clobber: [],
+  protocols: {}
+};
+function sanitizeMathml(mathml) {
+  return sanitizeHtmlFragment(mathml, MATHML_SCHEMA);
+}
+
+// src/document/math.ts
 var MATH_OPEN = "\uE100";
 var MATH_CLOSE = "\uE101";
 var MATH_TOKEN_RE = /\uE100(\d+)\uE101/g;
@@ -236,10 +436,10 @@ async function typesetMathSpans(spans) {
       const mathml = mj.mml(s.tex, s.display);
       const err = /<merror[\s\S]*?<mtext[^>]*>([\s\S]*?)<\/mtext>/.exec(mathml);
       if (err) {
-        out.set(key, { mathml, error: decodeXml(err[1]) });
+        out.set(key, { mathml: sanitizeMathml(mathml), error: decodeXml(err[1]) });
         continue;
       }
-      const entry = { mathml: mathml.replace(/\n\s*/g, "") };
+      const entry = { mathml: sanitizeMathml(mathml.replace(/\n\s*/g, "")) };
       if (s.display) {
         const svg = mj.svg(s.tex, true);
         entry.svg = svg;
@@ -3437,7 +3637,7 @@ function coverHtml(s, x) {
     s.title ?? ""
   )}</h1>${s.subtitle ? `<p class="doc-cover-subtitle">${(0, import_html_escape.escapeHtml)(s.subtitle)}</p>` : ""}${s.author ? `<p class="doc-cover-author">${(0, import_html_escape.escapeHtml)(s.author)}</p>` : ""}${s.date ? `<p class="doc-cover-date">${(0, import_html_escape.escapeHtml)(s.date)}</p>` : ""}</section>`;
 }
-var cssString = (s) => `"${s.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, " ")}"`;
+var cssString = (s) => `"${s.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, " ").replace(/</g, "\\3C ").replace(/>/g, "\\3E ")}"`;
 function marginContent(template, s) {
   if (!template) return "none";
   return templateParts(template, s).map((p) => "field" in p ? `counter(${p.field})` : cssString(p.text)).join(" ");
@@ -4897,7 +5097,8 @@ var import_micromark_extension_gfm = require("micromark-extension-gfm");
 var import_html_escape3 = require("@ai-matrx/kit/html-escape");
 function removeThinkingContent(content) {
   if (!content) return "";
-  let result = content.replace(/\n*<thinking>[\s\S]*?<\/thinking>\n*/gi, "\n").replace(/\n*<think>[\s\S]*?<\/think>\n*/gi, "\n").replace(/\n*<reasoning>[\s\S]*?<\/reasoning>\n*/gi, "\n");
+  const hide = (_match, before, after) => before.length >= 2 || after.length >= 2 ? "\n\n" : "\n";
+  let result = content.replace(/(\n*)<thinking>[\s\S]*?<\/thinking>(\n*)/gi, hide).replace(/(\n*)<think>[\s\S]*?<\/think>(\n*)/gi, hide).replace(/(\n*)<reasoning>[\s\S]*?<\/reasoning>(\n*)/gi, hide);
   result = result.replace(/\n{3,}/g, "\n\n");
   return result.trim();
 }
@@ -4966,6 +5167,7 @@ function looksLikeJson(body) {
     return false;
   }
 }
+var ALLOWED_TAGS = new Set(PRINT_HTML_SCHEMA.tagNames ?? []);
 var LINK_URL = String.raw`((?:[^()\s]|\([^()\s]*\))+)(?:\s+"[^"]*")?`;
 var IMAGE_RE = new RegExp(String.raw`!\[([^\]]*)\]\(` + LINK_URL + String.raw`\)`, "g");
 var LINK_RE = new RegExp(String.raw`\[([^\]]+)\]\(` + LINK_URL + String.raw`\)`, "g");