Skip to content

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

FIX: Render hashtag slugs as text nodes in Email::Styles (#42352)

Mark VanLandingham7d6d383b4d39
diff --git a/lib/email/styles.rb b/lib/email/styles.rb
index 9dc14a94e2c..ce5648bd526 100644
--- a/lib/email/styles.rb
+++ b/lib/email/styles.rb
@@ -472,9 +472,7 @@ module Email
.search(".hashtag-cooked")
.each do |hashtag|
hashtag.children.each(&:remove)
- hashtag.add_child(<<~HTML)
- <span>##{hashtag["data-slug"]}</span>
- HTML
+ hashtag.add_child(hashtag.document.create_text_node("##{hashtag["data-slug"]}"))
end
end
diff --git a/spec/lib/email/sender_spec.rb b/spec/lib/email/sender_spec.rb
index 3ecaacabe14..c6d66c66b73 100644
--- a/spec/lib/email/sender_spec.rb
+++ b/spec/lib/email/sender_spec.rb
@@ -586,14 +586,14 @@ RSpec.describe Email::Sender do
)
end
- it "changes the hashtags to the slug with a # symbol beforehand rather than the full name of the resource" do
+ it "changes hashtags to their slug with a # symbol rather than the full resource name" do
category = Fabricate(:category, slug: "dev")
reply.update!(raw: reply.raw + "\n wow this is #dev")
reply.rebake!
Email::Sender.new(message, :valid_type).send
expected = <<~HTML
- <a class="hashtag-cooked" href=\"#{Discourse.base_url}#{category.url}\" data-type=\"category\" data-slug=\"dev\" data-id=\"#{category.id}\" data-style-type=\"square\" style=\"text-decoration:none;font-weight:bold;color:#006699\"><span>#dev</span>
- HTML
+ <a class="hashtag-cooked" href="#{Discourse.base_url}#{category.url}" data-type="category" data-slug="dev" data-id="#{category.id}" data-style-type="square" style="text-decoration:none;font-weight:bold;color:#006699">#dev</a>
+ HTML
expect(message.html_part.body.to_s).to include(expected.chomp)
end
diff --git a/spec/requests/admin/email_controller_spec.rb b/spec/requests/admin/email_controller_spec.rb
index 17c7620dfa4..3f962c4c7b9 100644
--- a/spec/requests/admin/email_controller_spec.rb
+++ b/spec/requests/admin/email_controller_spec.rb
@@ -201,6 +201,29 @@ RSpec.describe Admin::EmailController do
}
expect(response.status).to eq(200)
end
+
+ it "does not turn a post attribute into executable HTML" do
+ attacker = Fabricate(:user, trust_level: TrustLevel[1])
+ payload =
+ '<a class="hashtag-cooked" data-slug="&lt;img src=x onerror=alert(1)&gt;">ignored</a>'
+
+ freeze_time 1.day.ago do
+ sign_in(attacker)
+ post "/posts.json", params: { title: "Attacker-created topic", raw: payload }
+ expect(response.status).to eq(200)
+ end
+
+ sign_in(admin)
+ get "/admin/email/preview-digest.json",
+ params: {
+ last_seen_at: 1.week.ago,
+ username: admin.username,
+ }
+
+ expect(response.status).to eq(200)
+ preview = Nokogiri::HTML5.parse(response.parsed_body["html_content"])
+ expect(preview.at_css("img[onerror='alert(1)']")).to be_nil
+ end
end
shared_examples "preview digest inaccessible" do