A platform for community discussion. Free, open, simple.
SECURITY: Stored XSS in suspension and silencing reasons on user profiles and cards (#40963)
Sam2ec39d2e5d61
diff --git a/app/models/user.rb b/app/models/user.rbindex 04703856ef2..2113f073642 100644--- a/app/models/user.rb+++ b/app/models/user.rb@@ -10,6 +10,9 @@ class User < ActiveRecord::BaseDEFAULT_FEATURED_BADGE_COUNT = 3MAX_SIMILAR_USERS = 10+ STAFF_REASON_SANITIZER = Rails::Html::SafeListSanitizer.new+ STAFF_REASON_ALLOWED_TAGS = %w[a br].freeze+ STAFF_REASON_ALLOWED_ATTRIBUTES = %w[href rel target].freezedeprecate_column :flag_level, drop_from: "3.2"@@ -1372,7 +1375,7 @@ class User < ActiveRecord::Basedef full_silence_reasontext = silenced_record.try(:details) if silenced?return text if text.blank?- PrettyText.cleanup(text.gsub("\n", "<br>"))+ sanitize_staff_reason(text)enddef silence_reason@@ -1398,7 +1401,7 @@ class User < ActiveRecord::Basedef full_suspend_reasontext = suspend_record.try(:details) if suspended?return text if text.blank?- PrettyText.cleanup(text.gsub("\n", "<br>"))+ sanitize_staff_reason(text)enddef suspend_reason@@ -1409,6 +1412,14 @@ class User < ActiveRecord::Basenilend+ def sanitize_staff_reason(text)+ STAFF_REASON_SANITIZER.sanitize(+ PrettyText.cleanup(text.gsub("\n", "<br>")),+ tags: STAFF_REASON_ALLOWED_TAGS,+ attributes: STAFF_REASON_ALLOWED_ATTRIBUTES,+ )+ end+def suspended_messagereturn nil unless suspended?diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rbindex a58da5020d1..f272289e63e 100644--- a/spec/requests/users_controller_spec.rb+++ b/spec/requests/users_controller_spec.rb@@ -5274,6 +5274,33 @@ RSpec.describe UsersController doexpect(parsed["trust_level"]).to be_presentend+ it "sanitizes suspension and silencing reasons" do+ payload = "public <img src=x onerror=alert(1)> reason"+ penalized_user = Fabricate(:user)+ penalized_user.user_stat.update!(post_count: 1)++ UserSuspender.new(+ penalized_user,+ suspended_till: 2.days.from_now,+ reason: payload,+ by_user: admin,+ ).suspend+ UserSilencer.new(+ penalized_user,+ admin,+ keep_posts: true,+ reason: payload,+ silenced_till: 2.days.from_now,+ ).silence++ get "/u/#{penalized_user.username}/card.json"++ expect(response.status).to eq(200)+ user_json = response.parsed_body["user"]+ expect(user_json["suspend_reason"]).to eq("public reason")+ expect(user_json["silence_reason"]).to eq("public reason")+ end+it "should have http status 403 for anonymous user when profiles are hidden" doSiteSetting.hide_user_profiles_from_public = trueget "/u/#{user.username}/card.json"