* feat(mermaid): 新增 mermaid 懒加载 chunk(构建链四处同步 + mermaid 依赖) tsdown CHUNKS / bundle-route CHUNK_NAMES / chunk-loader ChunkName / package.json files 同步注册 mermaid chunk;mermaid ^11.16.1 进依赖与 lockfile;chunk 构建注入 uuid 浏览器入口别名,绕开 node:crypto 纯度门。 * feat(mermaid): Markdown 预览安全渲染 mermaid 图表 + 点击放大弹窗 - splitMermaidBlocks 纯函数按 fence 切块,无 mermaid 文件零行为变化; - mermaid.initialize 走 securityLevel strict + htmlLabels:false,不应用 bindFunctions(静态图);渲染 SVG 经 mermaid-sanitize 二次清洗: 删 foreignObject/script/外来 HTML 元素、剥 @*/on* 属性、移除全部 href/xlink:href,仅接受 SVG 根,解析失败返回空串; - 点击图表弹出放大弹窗(滚轮缩放/拖拽平移/快捷键,借鉴 PR #75 交互, 基于已清洗 SVG 克隆重写,不新增攻击面); - 深浅色跟随重渲、失败回退错误条 + 原码、CodeBlock 同款 chrome。 * test(mermaid): splitter/sanitize 单测 + chunk 清单同步 + 挂载冒烟 diagram.md - mermaid-blocks.spec 10 例 fence 切块语义; - mermaid-sanitize.spec 8 例 XSS(foreignObject/on*/@*/href/xlink:href/ script/外来元素/畸形 XML/非 SVG 根); - bundle-route / chunk-artifact / manifest-consistency 清单加入 mermaid (chunk-artifact 补 addEventListener stub); - 挂载冒烟新增 diagram.md:client-mermaid.js 往返、SVG 节点文字、 点击弹窗 Esc 关闭、preview 模式编辑器隐藏。 * docs(mermaid): 安全渲染设计文档 + lazy-chunks 表 + README 双语更新 设计文档记录基线决策(PR #99 架构 + PR #75 点击放大)、安全模型 (strict/htmlLabels/清洗/href 剥离/无 bindFunctions)、验证与取舍。 * fix(mermaid): sanitizer 属性名大小写归一,堵住混合大小写属性绕过(CR P1) XML 属性名保留大小写,而输出会经 HTML 解析归一化(dangerouslySetInnerHTML), oNload/HREF/xlink:HREF 这类混合大小写属性此前会漏过清洗。比较前先 toLowerCase(),按原名删除;新增混合大小写事件/链接属性回归用例。 * fix(mermaid): sanitizer 元素黑名单大小写归一,堵住混合大小写元素绕过(CR P1) XML 元素名保留大小写,querySelectorAll('script') 等选择器匹配不到 <sCrIpT>/<foreignobject>,而输出经 HTML 解析会被归一化为 SVG script/foreignObject(可执行/可注入 HTML)。改为遍历全部元素按 localName.toLowerCase() 命中小写黑名单后整节点删除;新增混合大小写 script/foreignObject/外来 HTML 元素回归用例(jsdom 实证:旧选择器 命中 0,新逻辑命中 2)。 * fix(mermaid): 单次 Markdown 解析 + 占位交换(CR P1)+ CommonMark fence 规则(CR P2) P1(跨 fence 语义):弃用逐块 MarkdownText 拆分,改为整篇文档单次 MarkdownText 渲染,布局后把 language-mermaid 代码块交换为 MermaidDiagram (React 管理的 .md-code-block 宿主保留在树中、display:contents 抑制盒子, 协调安全;块不再 mermaid 时还原原 children)。新增 tests/mermaid-markdown.spec.tsx 与 e2e 跨 fence 引用链接断言。 P2(fence 匹配):支持 3+ 反引号与波浪号开 fence;闭 fence 须同字符且 长度不小于开 fence;反引号 info string 含反引号不视为开 fence;修复 带缩进开 fence 的 info 提取。blocks 单测 +3 例。
117 lines
4.5 KiB
TypeScript
117 lines
4.5 KiB
TypeScript
/**
|
|
* Mermaid SVG sanitizer security spec: the rendered diagram must never
|
|
* carry an executable surface into the markdown preview — foreignObject
|
|
* (the raw-HTML channel) is stripped wholesale, event/`@*` attributes are
|
|
* removed, href/xlink:href are removed, script elements are removed, and a
|
|
* malformed/foreign document is rejected entirely (empty string) rather
|
|
* than passed through.
|
|
*/
|
|
// @vitest-environment jsdom
|
|
import { describe, expect, it } from 'vitest'
|
|
import { sanitizeSvg } from '../src/client/mermaid-sanitize.ts'
|
|
|
|
describe('sanitizeSvg', () => {
|
|
it('keeps a benign diagram (svg + text nodes)', () => {
|
|
const svg = '<svg xmlns="http://www.w3.org/2000/svg"><text>Hello</text></svg>'
|
|
const out = sanitizeSvg(svg)
|
|
expect(out).toContain('<text>Hello</text>')
|
|
expect(out).not.toContain('foreignObject')
|
|
})
|
|
|
|
it('strips foreignObject wholesale (the raw-HTML channel)', () => {
|
|
const svg = [
|
|
'<svg xmlns="http://www.w3.org/2000/svg">',
|
|
'<foreignObject><div><img src="x" onerror="alert(1)"/></div></foreignObject>',
|
|
'<text>keep</text>',
|
|
'</svg>',
|
|
].join('')
|
|
const out = sanitizeSvg(svg)
|
|
expect(out).not.toContain('foreignObject')
|
|
expect(out).not.toContain('<img')
|
|
expect(out).not.toContain('onerror')
|
|
expect(out).toContain('<text>keep</text>')
|
|
})
|
|
|
|
it('strips on* and @* attributes from every element', () => {
|
|
const svg = '<svg xmlns="http://www.w3.org/2000/svg" onload="alert(1)"><text onclick="x()" @click="y()">t</text></svg>'
|
|
const out = sanitizeSvg(svg)
|
|
expect(out).not.toContain('onload')
|
|
expect(out).not.toContain('onclick')
|
|
expect(out).not.toContain('@click')
|
|
})
|
|
|
|
it('strips mixed-case event/link attributes (HTML parsing normalizes case)', () => {
|
|
const svg = [
|
|
'<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">',
|
|
'<text oNload="alert(1)" OnClick="x()">t</text>',
|
|
'<a HREF="javascript:alert(1)" xlink:HREF="data:text/html,<script>1</script>">x</a>',
|
|
'<text @Click="y()">u</text>',
|
|
'</svg>',
|
|
].join('')
|
|
const out = sanitizeSvg(svg)
|
|
expect(out).not.toContain('oNload')
|
|
expect(out).not.toContain('OnClick')
|
|
expect(out).not.toContain('@Click')
|
|
expect(out).not.toContain('HREF')
|
|
expect(out).not.toContain('xlink:HREF')
|
|
expect(out).not.toContain('javascript:')
|
|
})
|
|
|
|
it('removes href and xlink:href regardless of scheme', () => {
|
|
const svg = [
|
|
'<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">',
|
|
'<a href="javascript:alert(1)" xlink:href="data:text/html,<script>1</script>">x</a>',
|
|
'<a href="https://example.com">y</a>',
|
|
'</svg>',
|
|
].join('')
|
|
const out = sanitizeSvg(svg)
|
|
expect(out).not.toContain('href')
|
|
expect(out).not.toContain('javascript:')
|
|
expect(out).not.toContain('data:text/html')
|
|
})
|
|
|
|
it('removes script elements', () => {
|
|
const svg = '<svg xmlns="http://www.w3.org/2000/svg"><script>alert(1)</script><text>t</text></svg>'
|
|
const out = sanitizeSvg(svg)
|
|
expect(out).not.toContain('script')
|
|
expect(out).toContain('<text>t</text>')
|
|
})
|
|
|
|
it('strips mixed-case element names (HTML parsing normalizes tag casing)', () => {
|
|
const svg = [
|
|
'<svg xmlns="http://www.w3.org/2000/svg">',
|
|
'<sCrIpT>alert(1)</sCrIpT>',
|
|
'<foreignobject><div><img src="x" onerror="alert(1)"/></div></foreignobject>',
|
|
'<ImG src="y" onerror="alert(2)"/>',
|
|
'<iFrAmE src="https://evil.test"/>',
|
|
'<text>keep</text>',
|
|
'</svg>',
|
|
].join('')
|
|
const out = sanitizeSvg(svg)
|
|
expect(out).not.toContain('sCrIpT')
|
|
expect(out).not.toContain('alert')
|
|
expect(out).not.toContain('foreignobject')
|
|
expect(out).not.toContain('<img')
|
|
expect(out).not.toContain('<ImG')
|
|
expect(out).not.toContain('iFrAmE')
|
|
expect(out).not.toContain('onerror')
|
|
expect(out).toContain('<text>keep</text>')
|
|
})
|
|
|
|
it('rejects malformed XML instead of passing it through', () => {
|
|
const out = sanitizeSvg('<svg xmlns="http://www.w3.org/2000/svg"><text>oops</svg>')
|
|
expect(out).toBe('')
|
|
})
|
|
|
|
it('strips foreign HTML elements smuggled past lenient parsers', () => {
|
|
const out = sanitizeSvg('<svg xmlns="http://www.w3.org/2000/svg"><img src="x" onerror="alert(1)"/></svg>')
|
|
expect(out).not.toContain('<img')
|
|
expect(out).not.toContain('onerror')
|
|
})
|
|
|
|
it('rejects a non-svg document', () => {
|
|
const out = sanitizeSvg('<html><body onload="alert(1)">hi</body></html>')
|
|
expect(out).toBe('')
|
|
})
|
|
})
|