Skip to content

A platform for community discussion. Free, open, simple.

DEV: Prevent moderators from bulk-deleting another moderator's posts (#38505)

Isaac Janzenae634d81d22b
diff --git a/lib/guardian/post_guardian.rb b/lib/guardian/post_guardian.rb
index ef26be572b6..0222e575bc7 100644
--- a/lib/guardian/post_guardian.rb
+++ b/lib/guardian/post_guardian.rb
@@ -133,7 +133,7 @@ module PostGuardian
end
def can_delete_all_posts?(user)
- is_staff? && user && !user.admin? &&
+ is_staff? && user && !user.admin? && (!user.moderator? || is_admin?) &&
(
is_admin? ||
(
diff --git a/spec/lib/guardian/post_guardian_spec.rb b/spec/lib/guardian/post_guardian_spec.rb
index 4a300cd7089..642e77c230e 100644
--- a/spec/lib/guardian/post_guardian_spec.rb
+++ b/spec/lib/guardian/post_guardian_spec.rb
@@ -861,6 +861,11 @@ RSpec.describe PostGuardian do
expect(Guardian.new(actor).can_delete_all_posts?(admin)).to be_falsey
end
+ it "is false if user is a moderator" do
+ another_moderator = Fabricate(:moderator, created_at: 1.day.ago)
+ expect(Guardian.new(actor).can_delete_all_posts?(another_moderator)).to be_falsey
+ end
+
it "is true if number of posts is small" do
user = Fabricate(:user, created_at: 1.day.ago)
user.user_stat.update!(post_count: 1)
@@ -904,6 +909,11 @@ RSpec.describe PostGuardian do
expect(Guardian.new(actor).can_delete_all_posts?(admin)).to be_falsey
end
+ it "is true if user is a moderator" do
+ another_moderator = Fabricate(:moderator, created_at: 1.day.ago)
+ expect(Guardian.new(actor).can_delete_all_posts?(another_moderator)).to be_truthy
+ end
+
it "is true if number of posts is small" do
u = Fabricate(:user, created_at: 1.day.ago)
u.stubs(:post_count).returns(1)
diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rb
index 4dd277f7ba3..9b18128cf16 100644
--- a/spec/requests/admin/users_controller_spec.rb
+++ b/spec/requests/admin/users_controller_spec.rb
@@ -2522,6 +2522,15 @@ RSpec.describe Admin::UsersController do
before { sign_in(moderator) }
include_examples "post batch deletion possible"
+
+ context "when target user is another moderator" do
+ fab!(:target_moderator, :moderator)
+
+ it "denies access with a 403 response" do
+ put "/admin/users/#{target_moderator.id}/delete_posts_batch.json"
+ expect(response.status).to eq(403)
+ end
+ end
end
context "when logged in as a non-staff user" do
@@ -2606,6 +2615,15 @@ RSpec.describe Admin::UsersController do
before { sign_in(moderator) }
include_examples "delete_posts_decider accessible", :moderator
+ context "when target user is another moderator" do
+ fab!(:target_moderator, :moderator)
+
+ it "denies access with a 403 response" do
+ post "/admin/users/#{target_moderator.id}/delete_posts_decider.json"
+ expect(response.status).to eq(403)
+ end
+ end
+
context "when user has too many posts to delete" do
fab!(:target_user) do
user = Fabricate(:user)