Open platform to collect and prioritize feedback
fix(ui): keep entity-encoded text as text in plain-text previews
Matt Roberts668343ef84fd
diff --git a/public/components/common/Markdown.spec.tsx b/public/components/common/Markdown.spec.tsxnew file mode 100644index 000000000..d84b853ac--- /dev/null+++ b/public/components/common/Markdown.spec.tsx@@ -0,0 +1,19 @@+import React from "react"+import { render } from "@testing-library/react"+import { Markdown } from "./Markdown"++describe("<Markdown style='plainText' />", () => {+ const payloads = ["<img src=x onerror=alert(1)>", "<script>alert(1)</script>", "`<img src=x onerror=alert(1)>`"]++ payloads.forEach((text) => {+ test(`renders entity-encoded markup as text: ${text}`, () => {+ const { container } = render(<Markdown style="plainText" maxLength={300} text={text} />)+ expect(container.querySelector("img, script")).toBeNull()+ })+ })++ test("shows special characters as typed", () => {+ const { container } = render(<Markdown style="plainText" text={"Jane's & Jim's > [Matt](https://example.com) <b>hi</b>"} />)+ expect(container.textContent).toEqual("Jane's & Jim's > Matt <b>hi</b>")+ })+})diff --git a/public/pages/Home/components/ShareFeedback.tsx b/public/pages/Home/components/ShareFeedback.tsxindex cfe65917d..1176bb4a2 100644--- a/public/pages/Home/components/ShareFeedback.tsx+++ b/public/pages/Home/components/ShareFeedback.tsx@@ -6,7 +6,7 @@ import { Modal, CloseIcon, Form, Button, Input, LegalFooter } from "@fider/compoimport { useFider } from "@fider/hooks"import { Trans } from "@lingui/react/macro"import { actions, Failure, querystring, classSet, cache } from "@fider/services"-import { plainText } from "@fider/services/markdown"+import { toText } from "@fider/services/markdown"import { i18n } from "@lingui/core"import { Tag } from "@fider/models"import { SimilarPosts } from "../components/SimilarPosts"@@ -120,7 +120,7 @@ export const ShareFeedback: React.FC<ShareFeedbackProps> = (props) => {// Get the truncated markdown content and convert to plain textconst truncatedMarkdown = description.substring(0, newlineIndex)- const autoTitle = plainText(truncatedMarkdown)+ const autoTitle = toText(truncatedMarkdown)handleTitleChange(autoTitle, false)}diff --git a/public/services/markdown.spec.ts b/public/services/markdown.spec.tsindex eb303c748..dd4398f4e 100644--- a/public/services/markdown.spec.ts+++ b/public/services/markdown.spec.ts@@ -81,14 +81,23 @@ testCases.forEach((x) => {})testCases.forEach((x) => {- test(`Can parse markdown ${x.input} to ${x.expectedPlainText} (plain text)`, () => {- const result = markdown.plainText(x.input)+ test(`Can convert markdown ${x.input} to ${x.expectedPlainText} (text)`, () => {+ const result = markdown.toText(x.input)expect(result).toEqual(x.expectedPlainText)})})describe("XSS prevention", () => {- const xssInputs = ["<script>alert(1)</script>", "<img src=x onerror=alert(1)>", "<svg onload=alert(1)>", '<a href="javascript:alert(1)">click</a>']+ const xssInputs = [+ "<script>alert(1)</script>",+ "<img src=x onerror=alert(1)>",+ "<svg onload=alert(1)>",+ '<a href="javascript:alert(1)">click</a>',+ // Entity-encoded markup must stay text, not be decoded back into HTML+ "<img src=x onerror=alert(1)>",+ "<script>alert(1)</script>",+ "`<img src=x onerror=alert(1)>`",+ ]xssInputs.forEach((input) => {test(`full mode neutralizes: ${input}`, () => {diff --git a/public/services/markdown.ts b/public/services/markdown.tsindex 0a5714962..7c4ed7df7 100644--- a/public/services/markdown.ts+++ b/public/services/markdown.ts@@ -94,7 +94,12 @@ export const full = (input: string): string => {return sanitize(marked(encodeHTML(input), { renderer: fullRenderer }).trim())}+// HTML with the formatting stripped, safe to insert as HTML (<Markdown style="plainText" />)export const plainText = (input: string): string => {- const text = sanitize(marked(input, { renderer: plainTextRenderer }).trim())- return decodeHtmlEntities(text).trim()+ return sanitize(marked(encodeHTML(input), { renderer: plainTextRenderer }).trim())+}++// Plain text with entities decoded (e.g. auto-generated titles). Never insert the result as HTML+export const toText = (input: string): string => {+ return decodeHtmlEntities(plainText(input)).trim()}