A platform for community discussion. Free, open, simple.
SECURITY: Do not leak PM post edits to moderators
Penar Musaraj473288219e93
diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rbindex 40485efc518..e8763ce5a1b 100644--- a/app/controllers/admin/reports_controller.rb+++ b/app/controllers/admin/reports_controller.rb@@ -15,6 +15,7 @@ class Admin::ReportsController < Admin::StaffControllerraise Discourse::NotFound unless report_type =~ /\A[a-z0-9\_]+\z/args = parse_params(report_params)+ args[:current_user] = current_userreport = nilreport = Report.find_cached(report_type, args) if (report_params[:cache])@@ -51,6 +52,7 @@ class Admin::ReportsController < Admin::StaffControllerraise Discourse::NotFound if Report.hidden?(report_type, admin: current_user.admin?)args = parse_params(params)+ args[:current_user] = current_userreport = nilreport = Report.find_cached(report_type, args) if (params[:cache])diff --git a/app/models/concerns/reports/post_edits.rb b/app/models/concerns/reports/post_edits.rbindex c096e1ffa95..560f2f346de 100644--- a/app/models/concerns/reports/post_edits.rb+++ b/app/models/concerns/reports/post_edits.rb@@ -81,8 +81,9 @@ module Reports::PostEdits/*limit*/SQL+ builder.join "topics t ON t.id = p.topic_id"+if category_id- builder.join "topics t ON t.id = p.topic_id"if include_subcategoriesbuilder.where("t.category_id IN (?)", Category.subcategory_ids(category_id))else@@ -90,6 +91,12 @@ module Reports::PostEditsendend+ unless report.current_user&.admin?+ builder.where("t.archetype != ?", Archetype.private_message)+ builder.join "categories c ON c.id = t.category_id"+ builder.secure_category(Guardian.new(report.current_user).secure_category_ids)+ end+if editor_usernamebuilder.where("editor.username = ?", editor_username)elsediff --git a/app/models/report.rb b/app/models/report.rbindex cc2f1f54970..2920e472c89 100644--- a/app/models/report.rb+++ b/app/models/report.rb@@ -153,7 +153,8 @@ class Report:available_filters,:legacy,:default_group_by,- :y_axis_title+ :y_axis_title,+ :current_userdef self.default_days30@@ -195,6 +196,7 @@ class Reportreport.limit,report.filters.blank? ? nil : MultiJson.dump(report.filters),SCHEMA_VERSION,+ report.current_user&.id,].compact.map(&:to_s).join(":")end@@ -315,6 +317,7 @@ class Reportreport.average = opts[:average] if opts[:average]report.percent = opts[:percent] if opts[:percent]report.filters = opts[:filters] if opts[:filters]+ report.current_user = opts[:current_user] if opts[:current_user]report.labels = Report.default_labelsreport.legacy = LEGACY_REPORTS.include?(type) if SiteSetting.reporting_improvementsdiff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rbindex 1e1c1a3de2e..a3284ac0f2c 100644--- a/spec/models/report_spec.rb+++ b/spec/models/report_spec.rb@@ -851,6 +851,63 @@ RSpec.describe Report doexpect(report_with_two_edits.data.count).to be(2)endend++ context "with private message edits" do+ fab!(:admin)+ fab!(:moderator)+ fab!(:editor, :user)+ fab!(:pm_post, :private_message_post)++ before { pm_post.revise(editor, { raw: "updated private message body" }) }++ it "excludes PM edits for moderators" do+ report = Report.find("post_edits", current_user: moderator)+ expect(report.data).to be_empty+ end++ it "excludes PM edits when current_user is nil" do+ report = Report.find("post_edits")+ expect(report.data).to be_empty+ end++ it "includes PM edits for admins" do+ report = Report.find("post_edits", current_user: admin)+ expect(report.data.count).to eq(1)+ end+ end++ context "with secure category edits" do+ fab!(:admin)+ fab!(:moderator)+ fab!(:editor, :user)+ fab!(:group)+ fab!(:secure_category) do+ category = Fabricate(:category)+ category.set_permissions(group => :full)+ category.save!+ category+ end+ fab!(:secure_topic) { Fabricate(:topic, category: secure_category) }+ fab!(:secure_post) { Fabricate(:post, topic: secure_topic) }++ before { secure_post.revise(editor, { raw: "updated secure post body" }) }++ it "excludes secure category edits for moderators without access" do+ report = Report.find("post_edits", current_user: moderator)+ expect(report.data).to be_empty+ end++ it "includes secure category edits for admins" do+ report = Report.find("post_edits", current_user: admin)+ expect(report.data.count).to eq(1)+ end++ it "includes secure category edits for moderators with group access" do+ group.add(moderator)+ report = Report.find("post_edits", current_user: moderator)+ expect(report.data.count).to eq(1)+ end+ endenddescribe "moderator activity" do