A platform for community discussion. Free, open, simple.
FIX: Prevent topic titles from breaking Solved's QAPage JSON-LD (#45094)
Arpit Jalanea64cc528550
diff --git a/plugins/discourse-solved/app/services/discourse_solved/build_schema_markup.rb b/plugins/discourse-solved/app/services/discourse_solved/build_schema_markup.rbindex a17cf3f3642..e355d3aeffc 100644--- a/plugins/discourse-solved/app/services/discourse_solved/build_schema_markup.rb+++ b/plugins/discourse-solved/app/services/discourse_solved/build_schema_markup.rb@@ -65,17 +65,14 @@ class DiscourseSolved::BuildSchemaMarkup).serializable_hashjson =- MultiJson- .dump(- "@context" => "http://schema.org",- "@type" => "QAPage",- "name" => topic.title,- "datePublished" => topic.created_at,- "mainEntity" => question_json,- )- .gsub("</", "<\\/")- .html_safe+ MultiJson.dump(+ "@context" => "http://schema.org",+ "@type" => "QAPage",+ "name" => topic.title,+ "datePublished" => topic.created_at,+ "mainEntity" => question_json,+ )- "<script type=\"application/ld+json\">#{json}</script>"+ "<script type=\"application/ld+json\">#{ERB::Util.json_escape(json)}</script>"endenddiff --git a/plugins/discourse-solved/spec/services/discourse_solved/build_schema_markup_spec.rb b/plugins/discourse-solved/spec/services/discourse_solved/build_schema_markup_spec.rbindex 3c500ddf9ac..b7a041fba28 100644--- a/plugins/discourse-solved/spec/services/discourse_solved/build_schema_markup_spec.rb+++ b/plugins/discourse-solved/spec/services/discourse_solved/build_schema_markup_spec.rb@@ -276,6 +276,23 @@ RSpec.describe DiscourseSolved::BuildSchemaMarkup doit { is_expected.to fail_a_policy(:has_answers) }end+ context "when the topic title contains an HTML comment opener and a script tag" do+ fab!(:reply) { Fabricate(:post, topic:) }++ before do+ SiteSetting.solved_add_schema_markup = "always"+ topic.update!(title: "Why does <!--<script> break my template?")+ end++ it "keeps the script element closed and the title intact" do+ fragment = Nokogiri::HTML5.fragment("#{result[:html]}<p></p>")+ schema = JSON.parse(fragment.at_css('script[type="application/ld+json"]').content)++ expect(fragment.children.map(&:name)).to eq(%w[script p])+ expect(schema["name"]).to eq(topic.title)+ end+ end+context "when there is an accepted answer and suggested answers" dofab!(:answer_user, :user)fab!(:answer_post) { Fabricate(:post, topic:, user: answer_user, like_count: 3) }