A platform for community discussion. Free, open, simple.
FIX: Allow only sanitized strings in admin notices (#39796)
Penar Musarajf104fe160a58
diff --git a/app/models/admin_notice.rb b/app/models/admin_notice.rbindex 9bc8f557a5f..8a7322bb039 100644--- a/app/models/admin_notice.rb+++ b/app/models/admin_notice.rb@@ -1,15 +1,23 @@# frozen_string_literal: trueclass AdminNotice < ActiveRecord::Base+ MESSAGE_ALLOWED_TAGS = %w[a pre ul li].freeze+ MESSAGE_ALLOWED_ATTRIBUTES = %w[href target rel].freeze+ MESSAGE_SANITIZER = Rails::Html::SafeListSanitizer.new+validates :identifier, presence: trueenum :priority, %i[low high].freezeenum :subject, %i[problem].freezedef message- I18n.t(- "dashboard.#{subject}.#{identifier}",- **details.symbolize_keys.merge(base_path: Discourse.base_path),+ MESSAGE_SANITIZER.sanitize(+ I18n.t(+ "dashboard.#{subject}.#{identifier}",+ **details.symbolize_keys.merge(base_path: Discourse.base_path),+ ),+ tags: MESSAGE_ALLOWED_TAGS,+ attributes: MESSAGE_ALLOWED_ATTRIBUTES,)endenddiff --git a/plugins/discourse-patreon/spec/lib/api_spec.rb b/plugins/discourse-patreon/spec/lib/api_spec.rbindex b726b0f72c8..ac4d029dc52 100644--- a/plugins/discourse-patreon/spec/lib/api_spec.rb+++ b/plugins/discourse-patreon/spec/lib/api_spec.rb@@ -49,8 +49,8 @@ RSpec.describe Patreon::Api dostub_url(401, url)described_class.campaign_dataexpect(ProblemCheckTracker[:access_token_invalid].blips).to eq(1)- expect(AdminNotice.find_by(identifier: :access_token_invalid).message).to eq(- I18n.t("dashboard.problem.access_token_invalid", base_path: Discourse.base_path),+ expect(AdminNotice.find_by(identifier: :access_token_invalid).message).to include(+ "www.patreon.com/platform/documentation/clients",)enddiff --git a/spec/jobs/poll_mailbox_spec.rb b/spec/jobs/poll_mailbox_spec.rbindex 432712b65da..ec373707ee9 100644--- a/spec/jobs/poll_mailbox_spec.rb+++ b/spec/jobs/poll_mailbox_spec.rb@@ -47,7 +47,7 @@ RSpec.describe Jobs::PollMailbox doi18n_key = "dashboard.problem.poll_pop3_auth_error"- expect(AdminNotice.find_by(identifier: "poll_pop3_auth_error").message).to eq(+ expect(AdminNotice.find_by(identifier: "poll_pop3_auth_error").message).to match_html(I18n.t(i18n_key, base_path: Discourse.base_path),)end@@ -59,7 +59,7 @@ RSpec.describe Jobs::PollMailbox doi18n_key = "dashboard.problem.poll_pop3_timeout"- expect(AdminNotice.find_by(identifier: "poll_pop3_timeout").message).to eq(+ expect(AdminNotice.find_by(identifier: "poll_pop3_timeout").message).to match_html(I18n.t(i18n_key, base_path: Discourse.base_path),)enddiff --git a/spec/services/problem_check_spec.rb b/spec/services/problem_check_spec.rbindex 711eb56df8f..a98d9134493 100644--- a/spec/services/problem_check_spec.rb+++ b/spec/services/problem_check_spec.rb@@ -18,6 +18,18 @@ RSpec.describe ProblemCheck do"failing_check"endend+ UnsafeDetailsCheck =+ Class.new(described_class) do+ def call+ ProblemCheck::Problem.new(+ "Unsafe problem",+ details: {+ detail: "<img src=x onerror=alert(1)>Unsafe",+ link_url: 'https://example.com" onclick="alert(1)',+ },+ )+ end+ endPassingCheck =Class.new(described_class) dodef call@@ -39,6 +51,7 @@ RSpec.describe ProblemCheck doDisabledCheck,MultiTargetCheck,FailingCheck,+ UnsafeDetailsCheck,PassingCheck,],&example@@ -51,6 +64,7 @@ RSpec.describe ProblemCheck doObject.send(:remove_const, MultiTargetCheck.name)Object.send(:remove_const, PluginCheck.name)Object.send(:remove_const, FailingCheck.name)+ Object.send(:remove_const, UnsafeDetailsCheck.name)Object.send(:remove_const, PassingCheck.name)end@@ -62,6 +76,7 @@ RSpec.describe ProblemCheck dolet(:multi_target_check) { MultiTargetCheck }let(:plugin_check) { PluginCheck }let(:failing_check) { FailingCheck }+ let(:unsafe_details_check) { UnsafeDetailsCheck }let(:passing_check) { PassingCheck }describe ".[]" do@@ -140,6 +155,32 @@ RSpec.describe ProblemCheck doit { expect { failing_check.new.run }.to change { ProblemCheckTracker.failing.count }.by(1) }end+ context "when problem details contain unsafe HTML" do+ before do+ I18n.backend.store_translations(+ :en,+ dashboard: {+ problem: {+ unsafe_details_check: 'Problem <a href="%{link_url}">details</a>: %{detail}',+ },+ },+ )+ end++ it "sanitizes problem details rendered in admin notice messages" do+ unsafe_details_check.new.run++ message = AdminNotice.find_by!(identifier: "unsafe_details_check").message++ aggregate_failures do+ expect(message).to include('<a href="https://example.com">details</a>')+ expect(message).to include("Unsafe")+ expect(message).not_to include("onclick")+ expect(message).not_to include("<img")+ end+ end+ end+context "when check is passing" doit { expect { passing_check.new.run }.to change { ProblemCheckTracker.passing.count }.by(1) }end