Skip to content

A platform for community discussion. Free, open, simple.

SECURITY: Sanitize category hashtag style and id attributes before rendering (#43700)

Penar Musarajae6bd3cd87c2
diff --git a/frontend/discourse/app/lib/hashtag-types/category.js b/frontend/discourse/app/lib/hashtag-types/category.js
index 15eaa17d09b..52e7849fab0 100644
--- a/frontend/discourse/app/lib/hashtag-types/category.js
+++ b/frontend/discourse/app/lib/hashtag-types/category.js
@@ -61,17 +61,21 @@ export default class CategoryHashtagType extends HashtagTypeBase {
generateIconHTML(hashtag) {
hashtag.preloaded ? this.onLoad(hashtag) : this.load(hashtag.id);
+ const styleType = ["square", "icon", "emoji"].includes(hashtag.style_type)
+ ? hashtag.style_type
+ : "square";
+ const hashtagId = Number.parseInt(hashtag.id, 10);
let style = "";
- if (hashtag.style_type === "icon" && hashtag.icon) {
+ if (styleType === "icon" && hashtag.icon) {
style = iconHTML(hashtag.icon);
}
- if (hashtag.style_type === "emoji" && hashtag.emoji) {
+ if (styleType === "emoji" && hashtag.emoji) {
style = dReplaceEmoji(`:${hashtag.emoji}:`);
}
- const colorCssClass = `hashtag-color--${this.type}-${hashtag.id}`;
- return `<span class="hashtag-category-${hashtag.style_type} ${colorCssClass}">${style}</span>`;
+ const colorCssClass = `hashtag-color--${this.type}-${hashtagId}`;
+ return `<span class="hashtag-category-${styleType} ${colorCssClass}">${style}</span>`;
}
isLoaded(id) {
diff --git a/spec/system/hashtag_decoration_spec.rb b/spec/system/hashtag_decoration_spec.rb
new file mode 100644
index 00000000000..44b51a3823e
--- /dev/null
+++ b/spec/system/hashtag_decoration_spec.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+describe "Hashtag decoration" do
+ fab!(:attacker) { Fabricate(:trust_level_1, refresh_auto_groups: true) }
+ fab!(:viewer, :user)
+ fab!(:category)
+
+ let(:composer) { PageObjects::Components::Composer.new }
+
+ it "does not inject HTML from hostile hashtag attributes" do
+ title = "Hashtag attribute injection"
+ payload = <<~HTML.squish
+ <a class="hashtag-cooked" data-type="category" data-id="#{category.id}" data-slug="#{category.slug}" data-style-type="square&quot;&gt;&lt;img data-hashtag-style-xss src=x&gt;">
+ <span class="hashtag-icon-placeholder"></span><span>#{category.name}</span></a>
+ <a class="hashtag-cooked" data-type="category" data-id="#{category.id}&quot;&gt;&lt;img data-hashtag-id-xss src=x&gt;" data-slug="#{category.slug}" data-style-type="square">
+ <span class="hashtag-icon-placeholder"></span><span>#{category.name}</span></a>
+ HTML
+
+ sign_in(attacker)
+ visit("/new-topic")
+ composer.fill_title(title)
+ composer.fill_content(payload)
+ composer.create
+
+ topic = Topic.find_by!(title: title)
+
+ using_session(:viewer) do
+ sign_in(viewer)
+ visit("/t/#{topic.slug}/#{topic.id}")
+
+ expect(page).to have_no_css(".cooked img[data-hashtag-style-xss]")
+ expect(page).to have_no_css(".cooked img[data-hashtag-id-xss]")
+ end
+ end
+end