A platform for community discussion. Free, open, simple.
FIX: escape HTML characters in watched word reason (#39378)
Bannon Tanner0073d3c4e501
diff --git a/app/serializers/reviewable_score_serializer.rb b/app/serializers/reviewable_score_serializer.rbindex 0ee2fbcdc41..77fca6f9f6b 100644--- a/app/serializers/reviewable_score_serializer.rb+++ b/app/serializers/reviewable_score_serializer.rb@@ -93,20 +93,16 @@ class ReviewableScoreSerializer < ApplicationSerializerwords = watched_words_foundif words.nil? || words.empty?- text =- I18n.t("reviewables.reasons.no_context.watched_word", link: link, default: "watched_word")+ I18n.t("reviewables.reasons.no_context.watched_word", link: link, default: "watched_word")else- text =- I18n.t(- "reviewables.reasons.watched_word",- link: link,- words: words.join(", "),- count: words.length,- default: "watched_word",- )+ I18n.t(+ "reviewables.reasons.watched_word",+ link: link,+ words: words.map { |w| CGI.escapeHTML(w) }.join(", "),+ count: words.length,+ default: "watched_word",+ )end-- textenddef watched_words_founddiff --git a/spec/serializers/reviewable_score_serializer_spec.rb b/spec/serializers/reviewable_score_serializer_spec.rbindex 26131063c3d..2b64ca87f94 100644--- a/spec/serializers/reviewable_score_serializer_spec.rb+++ b/spec/serializers/reviewable_score_serializer_spec.rb@@ -99,6 +99,22 @@ RSpec.describe ReviewableScoreSerializer doexpect(queued_reviewable.payload["raw"]).to eq(raw)end+ it "HTML-escapes matched words so angle brackets can't break the rendered reason" do+ score =+ ReviewableScore.new(+ reviewable: reviewable,+ reason: "watched_word",+ context: "<[email protected]>,plain",+ )+ serialized = described_class.new(score, scope: Guardian.new(admin), root: nil)++ expect(serialized.reason).to include(+ "<[email protected]>",+ "plain",+ )+ expect(serialized.reason).not_to include("<notifications@")+ end+it "uses the no-context message if the post has no watched words" doreviewable.target = Fabricate(:post, raw: "This post contains no bad words.")