A platform for community discussion. Free, open, simple.
SECURITY: Sanitize flag reason HTML in review timeline
Alan Guo Xiang Tan8c4e6c549b8d
diff --git a/frontend/discourse/app/components/reviewable/timeline.gjs b/frontend/discourse/app/components/reviewable/timeline.gjsindex 699baee068a..0f6b3fb9c50 100644--- a/frontend/discourse/app/components/reviewable/timeline.gjs+++ b/frontend/discourse/app/components/reviewable/timeline.gjs@@ -9,6 +9,7 @@ import ReviewableNoteForm from "discourse/components/reviewable/note-form";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import escape from "discourse/lib/escape";+import { sanitize } from "discourse/lib/text";import { and, eq } from "discourse/truth-helpers";import DButton from "discourse/ui-kit/d-button";import DDecoratedHtml from "discourse/ui-kit/d-decorated-html";@@ -108,7 +109,7 @@ export default class ReviewableTimeline extends Component {user: score.user,icon: "flag",titleKey: "review.timeline.flagged_as_by",- description: trustHTML(flaggedDescription),+ description: trustHTML(sanitize(flaggedDescription)),score: {count: 0,type: score.score_type.type,diff --git a/frontend/discourse/tests/integration/components/reviewable/timeline-test.gjs b/frontend/discourse/tests/integration/components/reviewable/timeline-test.gjsnew file mode 100644index 00000000000..d0539ad0050--- /dev/null+++ b/frontend/discourse/tests/integration/components/reviewable/timeline-test.gjs@@ -0,0 +1,38 @@+import { render } from "@ember/test-helpers";+import { module, test } from "qunit";+import ReviewableTimeline from "discourse/components/reviewable/timeline";+import { setupRenderingTest } from "discourse/tests/helpers/component-test";++module("Integration | Component | Reviewable | Timeline", function (hooks) {+ setupRenderingTest(hooks);++ function reviewableWithReason(reason) {+ return {+ reviewable_scores: [+ {+ created_at: "2024-01-01T00:00:00.000Z",+ user: { id: 1, username: "system" },+ score_type: { type: "needs_approval", title: "Needs Approval" },+ reason,+ },+ ],+ };+ }++ test("sanitizes dangerous markup in a flag reason but preserves safe links", async function (assert) {+ const reviewable = reviewableWithReason(+ `Spam detected <img src=x onerror=alert(1)> <a href="javascript:alert(2)">phish</a> <a href="/admin">see settings</a>`+ );++ await render(+ <template><ReviewableTimeline @reviewable={{reviewable}} /></template>+ );++ assert+ .dom(".timeline-event__description")+ .hasHtml(+ '<p>Spam detected <img src=""> <a>phish</a> <a href="/admin">see settings</a></p>',+ "renders the sanitized flag reason"+ );+ });+});