A platform for community discussion. Free, open, simple.
SECURITY: Normalize and escape topic featured links
OsamaSayegh6679d9a50834
diff --git a/app/models/topic.rb b/app/models/topic.rbindex 16b81c36ca0..012b4046485 100644--- a/app/models/topic.rb+++ b/app/models/topic.rb@@ -227,6 +227,7 @@ class Topic < ActiveRecord::Baseerrors.add(:featured_link)endend+ validate :normalize_featured_link, if: -> { featured_link.present? && featured_link_changed? }validates :external_id,allow_nil: true,@@ -2001,6 +2002,14 @@ class Topic < ActiveRecord::BaseMiniSuffix.domain(UrlHelper.encode_and_parse(featured_link).hostname)end+ def normalize_featured_link+ return if errors[:featured_link].present?++ self.featured_link = UrlHelper.normalized_encode(featured_link)+ rescue ArgumentError, URI::Error, Addressable::URI::InvalidURIError+ errors.add(:featured_link, :invalid)+ end+def self.private_message_topics_count_per_day(start_date, end_date, topic_subtype)private_messages.with_subtype(topic_subtype)diff --git a/frontend/discourse/app/lib/render-topic-featured-link.js b/frontend/discourse/app/lib/render-topic-featured-link.jsindex 9db3b2f4221..f01afad2101 100644--- a/frontend/discourse/app/lib/render-topic-featured-link.js+++ b/frontend/discourse/app/lib/render-topic-featured-link.js@@ -1,3 +1,4 @@+import escape from "discourse/lib/escape";import { renderIcon } from "discourse/lib/icon-library";import User from "discourse/models/user";@@ -44,11 +45,11 @@ export function extractLinkMeta(topic) {export default function renderTopicFeaturedLink(topic) {const meta = extractLinkMeta(topic);if (meta) {- return `<a class="topic-featured-link" rel="${meta.rel}" target="${+ return `<a class="topic-featured-link" rel="${escape(meta.rel)}" target="${escape(meta.target- }" href="${meta.href}">${renderIcon("string", "up-right-from-square")} ${+ )}" href="${escape(meta.href)}">${renderIcon("string", "up-right-from-square")} ${escape(meta.domain- }</a>`;+ )}</a>`;} else {return "";}diff --git a/frontend/discourse/tests/unit/lib/render-topic-featured-link-test.js b/frontend/discourse/tests/unit/lib/render-topic-featured-link-test.jsnew file mode 100644index 00000000000..3142fbf9c26--- /dev/null+++ b/frontend/discourse/tests/unit/lib/render-topic-featured-link-test.js@@ -0,0 +1,46 @@+import { setupTest } from "ember-qunit";+import { module, test } from "qunit";+import renderTopicFeaturedLink from "discourse/lib/render-topic-featured-link";++function buildTopic(featuredLink, domain) {+ return {+ get(key) {+ if (key === "featured_link") {+ return featuredLink;+ }+ if (key === "featured_link_root_domain") {+ return domain;+ }+ },+ siteSettings: { exclude_rel_nofollow_domains: "" },+ };+}++module("Unit | Utility | render-topic-featured-link", function (hooks) {+ setupTest(hooks);++ test("escapes a featured link containing quotes so it cannot inject attributes", function (assert) {+ const topic = buildTopic(+ 'https://example.com/?"onclick="alert(document.cookie)"',+ "example.com"+ );++ const div = document.createElement("div");+ div.innerHTML = renderTopicFeaturedLink(topic);+ const link = div.querySelector("a.topic-featured-link");++ assert+ .dom(link)+ .doesNotHaveAttribute("onclick", "does not inject an onclick handler");+ assert+ .dom(link)+ .hasAttribute(+ "href",+ 'https://example.com/?"onclick="alert(document.cookie)"',+ "keeps the link target as a single href value"+ );+ assert+ .dom(link)+ .containsText("example.com", "still renders the domain text");+ });+});diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rbindex b7163e26594..1a11d2d38ea 100644--- a/spec/models/topic_spec.rb+++ b/spec/models/topic_spec.rb@@ -3226,6 +3226,27 @@ RSpec.describe Topic doexpect(topic.featured_link).to eq("https://github.com/discourse/discourse")end+ it "normalizes unsafe characters in the featured link before saving" do+ topic.featured_link = 'https://example.com/?"onclick="alert(1)"'++ expect(topic.save).to be_truthy+ expect(topic.featured_link).to eq("https://example.com/?%22onclick=%22alert(1)%22")+ end++ it "preserves an already percent-encoded featured link without double-encoding" do+ topic.featured_link = "https://en.wikipedia.org/wiki/C%2B%2B?q=a%20b"++ expect(topic.save).to be_truthy+ expect(topic.featured_link).to eq("https://en.wikipedia.org/wiki/C%2B%2B?q=a%20b")+ end++ it "rejects a featured link that cannot be normalized instead of storing it raw" do+ topic.featured_link = 'https://evil.com/?"onclick="alert(1)"&pad=' + ("a" * 2000)++ expect(topic).not_to be_valid+ expect(topic.errors[:featured_link]).to be_present+ end+context "when category restricts present" dolet!(:link_category) { Fabricate(:link_category) }let(:link_topic) { Fabricate(:topic, category: link_category) }