diff --git a/packages/session-ui/component-tests/markdown.spec.ts b/packages/session-ui/component-tests/markdown.spec.ts index c9dc7b345d0..26982b57f82 100644 --- a/packages/session-ui/component-tests/markdown.spec.ts +++ b/packages/session-ui/component-tests/markdown.spec.ts @@ -20,12 +20,14 @@ story("renders small completed Markdown immediately without skipping sanitizatio text: '**Small response**\n\n', }) const markdown = document.querySelector('[data-testid="markdown-fixture"] [data-component="markdown"]')! + return { ready: markdown.hasAttribute("data-markdown-ready"), bold: markdown.querySelector("strong")?.textContent, unsafe: markdown.querySelectorAll("script, [onerror]").length, } }, fixture) + expect(result).toEqual({ ready: true, bold: "Small response", unsafe: 0 }) const harness = page.getByTestId("markdown-fixture") await harness.getByLabel("Markdown text").fill("```ts\nconst value = 42\n```") @@ -37,6 +39,7 @@ story("renders small completed Markdown immediately without skipping sanitizatio story("sanitizes raw HTML while preserving supported Markdown markup", async ({ page }) => { const result = await page.evaluate(async (fixture) => { const { sanitizeMarkdown } = await import(fixture) + return [ "

Safe formatting const x = 1

", 'unsafe', @@ -46,6 +49,7 @@ story("sanitizes raw HTML while preserving supported Markdown markup", async ({ '', ].map(sanitizeMarkdown) }, fixture) + expect(result).toEqual([ "

Safe formatting const x = 1

", 'unsafe', @@ -59,10 +63,13 @@ story("sanitizes raw HTML while preserving supported Markdown markup", async ({ story("keeps Markdown sanitization and link protections after Mermaid renders", async ({ page }) => { const result = await page.evaluate(async (fixture) => { const { renderMermaidSvg, sanitizeMarkdown } = await import(fixture) + const html = 'external' + const before = sanitizeMarkdown(html) const renders = [] + for (const source of [ "flowchart LR\n A[Start] --> B[End]", "sequenceDiagram\n Alice->>Bob: Hello", @@ -82,6 +89,7 @@ story("keeps Markdown sanitization and link protections after Mermaid renders", markdown: sanitizeMarkdown(html), }) } + return { before, renders, @@ -89,6 +97,7 @@ story("keeps Markdown sanitization and link protections after Mermaid renders", afterInvalid: sanitizeMarkdown(html), } }, fixture) + expect(result.before).toBe( 'external', ) @@ -185,6 +194,7 @@ story("shows a stable GitHub mark without changing link text or other sites", as expect( await markdown.getByRole("link", { name: "GitHub" }).evaluate((link) => getComputedStyle(link, "::before").content), ).toBe('""') + for (const name of ["other site", "lookalike"]) { expect( await markdown.getByRole("link", { name }).evaluate((link) => getComputedStyle(link, "::before").content), @@ -198,7 +208,9 @@ story("keeps favicon space stable across loading and failure without fetching pr const loading = new Promise((resolve) => (release = resolve)) await page.route("https://www.google.com/s2/favicons?**", async (route) => { requested.push(route.request().url()) + if (route.request().url().includes("developer.mozilla.org")) await loading + if (route.request().url().includes("broken.example.org")) return route.abort() await route.fulfill({ status: 200, contentType: "image/png", body: png }) }) @@ -253,6 +265,7 @@ async function resolvedColor(page: Page, token: string) { document.body.append(probe) const color = getComputedStyle(probe).color probe.remove() + return color }, token) } @@ -280,12 +293,14 @@ story("shares in-flight Markdown rendering without overwriting a reclaimed cache const abandoned = renderCachedMarkdown({ raw: "abandoned", src: "abandoned" }, "in-flight") await renderCachedMarkdown({ raw, src: raw }, "in-flight") await abandoned + return { shared: left === right, html: left.html, cached: getCachedMarkdown("in-flight") === left, } }, fixture) + expect(result).toMatchObject({ shared: true, cached: true }) expect(result.html).toContain("Shared result") }) @@ -295,16 +310,20 @@ story("settles an abandoned parse and permits immediate cache-key reuse", async const { getCachedMarkdown, renderCachedMarkdown, MarkdownWorkerDisposedError } = await import(fixture) const controller = new AbortController() const raw = "```typescript\nconst abandoned = true\n```" + const pending = renderCachedMarkdown({ raw, src: raw }, "released", controller.signal).catch( - (error: unknown) => error instanceof MarkdownWorkerDisposedError, + (error: Error) => error instanceof MarkdownWorkerDisposedError, ) + controller.abort() const rejected = await pending const empty = getCachedMarkdown("released") === undefined const replacement = "```typescript\nconst replacement = true\n```" const rendered = await renderCachedMarkdown({ raw: replacement, src: replacement }, "released") + return { rejected, empty, cached: getCachedMarkdown("released") === rendered, html: rendered.html } }, fixture) + expect(result).toMatchObject({ rejected: true, empty: true, cached: true }) expect(result.html).toContain("replacement") expect(result.html).not.toContain("abandoned") @@ -320,23 +339,29 @@ for (const owned of [true, false]) { const first = new AbortController() const second = new AbortController() const raw = "```typescript\nconst shared = true\n```" + const pending = renderCachedMarkdown({ raw, src: raw }, "shared-lifetime", first.signal).catch( - (error: unknown) => error instanceof MarkdownWorkerDisposedError, + (error: Error) => error instanceof MarkdownWorkerDisposedError, ) + let complete = false + const survivor = renderCachedMarkdown( { raw, src: raw }, "shared-lifetime", owned ? second.signal : undefined, ).then((value: { html: string }) => { complete = true + return value }) + first.abort() const rejected = await pending const independent = !complete const rendered = await survivor second.abort() + return { rejected, independent, @@ -346,6 +371,7 @@ for (const owned of [true, false]) { }, { fixture, owned }, ) + expect(result).toMatchObject({ rejected: true, independent: true, cached: true }) expect(result.html).toContain("shared") }, @@ -358,12 +384,15 @@ story("does not admit an already disposed Markdown consumer", async ({ page }) = const controller = new AbortController() controller.abort() const raw = "```typescript\nconst ignored = true\n```" + const rejected = await renderCachedMarkdown({ raw, src: raw }, "already-disposed", controller.signal).then( () => false, - (error: unknown) => error instanceof MarkdownWorkerDisposedError, + (error: Error) => error instanceof MarkdownWorkerDisposedError, ) + return { rejected, empty: getCachedMarkdown("already-disposed") === undefined } }, fixture) + expect(result).toEqual({ rejected: true, empty: true }) }) @@ -372,18 +401,23 @@ story("releases a timeline preload without cancelling a mounted shared consumer" const { getCachedMarkdown, preloadMarkdown, renderCachedMarkdown, MarkdownWorkerDisposedError } = await import( fixture ) + const controller = new AbortController() const raw = "```typescript\nconst preloaded = true\n```" + const preload = preloadMarkdown(raw, "timeline-preload", controller.signal).then( () => false, - (error: unknown) => error instanceof MarkdownWorkerDisposedError, + (error: Error) => error instanceof MarkdownWorkerDisposedError, ) + const mounted = renderCachedMarkdown({ raw, src: raw }, "timeline-preload:0:full") controller.abort() const rejected = await preload const rendered = await mounted + return { rejected, cached: getCachedMarkdown("timeline-preload:0:full") === rendered, html: rendered.html } }, fixture) + expect(result).toMatchObject({ rejected: true, cached: true }) expect(result.html).toContain("preloaded") }) @@ -403,11 +437,14 @@ story("keeps a reopened cached answer recent under cache pressure", async ({ pag await expect(markdown).toHaveCount(0) await harness.getByRole("button", { name: "Toggle Markdown" }).click() await expect(markdown.locator("strong")).toHaveText("Cached answer") + const cached = await page.evaluate(async (fixture) => { const { getCachedMarkdown, touchCachedMarkdown } = await import(fixture) touchCachedMarkdown("newest", { raw: "newest", hash: "newest", html: "

newest

" }) + return getCachedMarkdown("markdown-test:0:full")?.raw }, fixture) + expect(cached).toBe("**Cached answer**") }) @@ -521,11 +558,13 @@ story("highlights streamed code across comment and string boundaries", async ({ const markdown = harness.locator('[data-component="markdown"]') const code = markdown.locator("pre code") const chunks = ["/* multi", "line\ncomment *", "/\nconst message = `hel", "lo ${1 + 2}`\n", "const pattern = /a+b/g"] + for (let index = 1; index <= chunks.length; index++) { const text = chunks.slice(0, index).join("") await harness.getByLabel("Markdown text").fill(`\`\`\`ts\n${text}`) await expect(code).toHaveText(text) } + await expect(code.locator('span[style*="color"]')).not.toHaveCount(0) await harness.getByLabel("Markdown text").fill(`\`\`\`ts\n${chunks.join("")}\n\`\`\``) await harness.getByLabel("Streaming").uncheck() @@ -674,6 +713,7 @@ for (const streaming of [false, true]) { story("keeps remote images browser-owned and rejects unsafe image sources", async ({ page }) => { await page.route("https://images.example/chart.png", (route) => { expect(route.request().headers().authorization).toBeUndefined() + return route.fulfill({ contentType: "image/png", body: png }) }) await page.evaluate(async (fixture) => { @@ -728,7 +768,7 @@ story("keeps scripts and external resources inactive inside local SVG images", a await preview.close() }) -story("loads file URLs and leaves unreadable images as alt text", async ({ page }) => { +story("loads file URLs and Windows paths, and leaves unreadable images as alt text", async ({ page }) => { const requested = new Set() await page.route("**/api/fs/read/**", async (route) => { const url = new URL(route.request().url()) @@ -743,18 +783,21 @@ story("loads file URLs and leaves unreadable images as alt text", async ({ page const { mountMarkdown } = await import(fixture) await mountMarkdown({ images: true, - text: "![Available](file:///C:/tmp/chart%25.png)\n\n![Unavailable](file:///tmp/missing.png)", + // Marked percent-encodes the backslashes of a Windows image path, here inside a table cell. + text: "![Available](file:///C:/tmp/chart%25.png)\n\n![Unavailable](file:///tmp/missing.png)\n\n| Windows |\n| --- |\n| ![Windows](C:\\tmp\\windows.png) |", }) }, fixture) const harness = page.getByTestId("markdown-fixture") + + for (const name of ["Available", "Windows"]) + await expect + .poll(() => + harness.getByRole("button", { name, exact: true }).evaluate((image: HTMLImageElement) => image.naturalWidth), + ) + .toBe(1) await expect - .poll(() => - harness - .getByRole("button", { name: "Available", exact: true }) - .evaluate((image: HTMLImageElement) => image.naturalWidth), - ) - .toBe(1) - await expect.poll(() => [...requested].sort()).toEqual(["/api/fs/read/chart%25.png", "/api/fs/read/missing.png"]) + .poll(() => [...requested].sort()) + .toEqual(["/api/fs/read/chart%25.png", "/api/fs/read/missing.png", "/api/fs/read/windows.png"]) await expect(harness.getByRole("button", { name: "Unavailable" })).not.toHaveAttribute("src") await harness.getByLabel("Markdown text").fill("Still usable") await expect(harness.locator('[data-component="markdown"]')).toHaveText("Still usable") diff --git a/packages/session-ui/src/components/markdown-image.ts b/packages/session-ui/src/components/markdown-image.ts index 84e895d12c6..cf6214f5ea6 100644 --- a/packages/session-ui/src/components/markdown-image.ts +++ b/packages/session-ui/src/components/markdown-image.ts @@ -1,15 +1,22 @@ import type { ReadMarkdownImage } from "../context/markdown" export function localImagePath(source: string) { - const value = source.trim().replaceAll("\\", "/") + // Marked percent-encodes image sources, so `C:\tmp\chart.png` arrives as `C:%5Ctmp%5Cchart.png`. + const value = source.trim().replace(/\\|%5c/gi, "/") + if (!value || /[\u0000-\u001f\u007f]/.test(value) || value.startsWith("//")) return + if (/^file:/i.test(value)) { if (!URL.canParse(value)) return const url = new URL(value) + if (url.hostname && url.hostname !== "localhost") return + return decodePath(url.pathname.replace(/^\/([a-z]:\/)/i, "$1")) } + if (/^[a-z][a-z\d+.-]*:/i.test(value) && !/^[a-z]:\//i.test(value)) return + return decodePath(value) } @@ -19,22 +26,29 @@ export function localImagePath(source: string) { */ export function localLinkPath(href: string) { const value = href.trim() + if (!value || value.startsWith("#") || value.startsWith("?")) return + return localImagePath(value.split(/[?#]/, 1)[0] ?? "") } function decodePath(value: string) { try { const path = decodeURIComponent(value) + if (/[\u0000-\u001f\u007f]/.test(path) || path.startsWith("//") || path.startsWith("\\\\")) return + return path } catch { return } } +type ImageEntry = { controller: AbortController; result: Promise; url?: string } + export function createMarkdownImages(read: ReadMarkdownImage) { - const entries = new Map; url?: string }>() + const entries = new Map() + return { update(root: HTMLElement) { const images = Array.from(root.querySelectorAll("img[data-local-image]")) @@ -42,31 +56,37 @@ export function createMarkdownImages(read: ReadMarkdownImage) { entries.forEach((entry, path) => { if (paths.has(path)) return entry.controller.abort() + if (entry.url) URL.revokeObjectURL(entry.url) entries.delete(path) }) images.forEach((image) => { const path = image.dataset.localImage + if (!path) return const existing = entries.get(path) - const entry = existing ?? { + + const entry: ImageEntry = existing ?? { controller: new AbortController(), - result: Promise.resolve(undefined), - url: undefined as string | undefined, + result: Promise.resolve(undefined), } + if (!existing) { entries.set(path, entry) entry.result = read(path, entry.controller.signal) .then(async (blob) => { if (!blob || entry.controller.signal.aborted) return + // SVG documents must not inherit the app origin if opened outside the image element. if (blob.type === "image/svg+xml") return `data:image/svg+xml;charset=utf-8,${encodeURIComponent(await blob.text())}` entry.url = URL.createObjectURL(blob) + return entry.url }) .catch(() => undefined) } + void entry.result.then((url) => { if (!url || entry.controller.signal.aborted || !root.contains(image) || image.dataset.localImage !== path) return @@ -77,6 +97,7 @@ export function createMarkdownImages(read: ReadMarkdownImage) { dispose() { entries.forEach((entry) => { entry.controller.abort() + if (entry.url) URL.revokeObjectURL(entry.url) }) entries.clear()