Skip to content

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

FIX: Honor `delete_all_posts_and_topics_allowed_groups` in `PostDestroyer` (#42783)

Régis Hanole40bd10f2efb
diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rb
index b0e94c2d814..1a02ae9d51b 100644
--- a/app/serializers/current_user_serializer.rb
+++ b/app/serializers/current_user_serializer.rb
@@ -214,7 +214,7 @@ class CurrentUserSerializer < BasicUserSerializer
end
def can_delete_all_posts_and_topics
- object.in_any_groups?(SiteSetting.delete_all_posts_and_topics_allowed_groups_map)
+ scope.can_delete_all_posts_and_topics?
end
def can_upload_avatar
diff --git a/app/services/post_owner_changer.rb b/app/services/post_owner_changer.rb
index 442de2bbe70..ba49f8e092b 100644
--- a/app/services/post_owner_changer.rb
+++ b/app/services/post_owner_changer.rb
@@ -23,7 +23,12 @@ class PostOwnerChanger
if post.is_first_post?
@topic.user = @new_owner
- @topic.recover! if post.user.nil?
+ if post.user.nil?
+ topic_was_deleted = @topic.deleted_at.present?
+ @topic.recover!
+ # only resurrect an OP trashed alongside its topic, not one moderated individually
+ post.recover! if topic_was_deleted && post.deleted_at.present?
+ end
end
post.topic = @topic
diff --git a/lib/guardian.rb b/lib/guardian.rb
index 8a24921f081..7210f20d62a 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -256,6 +256,10 @@ class Guardian
end
alias can_see_flags? can_moderate?
+ def can_delete_all_posts_and_topics?
+ @user.in_any_groups?(SiteSetting.delete_all_posts_and_topics_allowed_groups_map)
+ end
+
def can_tag?(topic)
return false if topic.blank?
diff --git a/lib/guardian/post_guardian.rb b/lib/guardian/post_guardian.rb
index 7d56ccb7ac4..76a24b7a13c 100644
--- a/lib/guardian/post_guardian.rb
+++ b/lib/guardian/post_guardian.rb
@@ -228,7 +228,7 @@ module PostGuardian
return true if is_category_group_moderator?(post.topic&.category)
- return true if user.in_any_groups?(SiteSetting.delete_all_posts_and_topics_allowed_groups_map)
+ return true if can_delete_all_posts_and_topics?
# Can't delete posts in archived topics unless you are staff
return false if post.topic&.archived?
@@ -404,8 +404,7 @@ module PostGuardian
end
def can_see_deleted_posts?(category = nil)
- is_category_group_moderator?(category) ||
- @user.in_any_groups?(SiteSetting.delete_all_posts_and_topics_allowed_groups_map)
+ is_category_group_moderator?(category) || can_delete_all_posts_and_topics?
end
def can_see_deleted_posts_for_user?
diff --git a/lib/guardian/topic_guardian.rb b/lib/guardian/topic_guardian.rb
index 3f786392667..330f6692098 100644
--- a/lib/guardian/topic_guardian.rb
+++ b/lib/guardian/topic_guardian.rb
@@ -148,8 +148,7 @@ module TopicGuardian
return false if topic.blank?
return false if !is_staff? && !can_see_topic?(topic, false)
- if is_category_group_moderator?(topic.category) ||
- user&.in_any_groups?(SiteSetting.delete_all_posts_and_topics_allowed_groups_map)
+ if is_category_group_moderator?(topic.category) || can_delete_all_posts_and_topics?
topic.deleted_at?
else
can_recover_post?(topic.ordered_posts.first)
@@ -161,7 +160,7 @@ module TopicGuardian
return false if topic.is_category_topic?
return false if Discourse.static_doc_topic_ids.include?(topic.id)
return true if is_category_group_moderator?(topic.category) && can_see_topic?(topic)
- return true if user&.in_any_groups?(SiteSetting.delete_all_posts_and_topics_allowed_groups_map)
+ return true if can_delete_all_posts_and_topics?
is_my_own?(topic) && can_delete_own_topic?(topic)
end
@@ -209,8 +208,7 @@ module TopicGuardian
end
def can_see_deleted_topics?(category)
- is_category_group_moderator?(category) ||
- user&.in_any_groups?(SiteSetting.delete_all_posts_and_topics_allowed_groups_map)
+ is_category_group_moderator?(category) || can_delete_all_posts_and_topics?
end
# Accepts an array of `Topic#id` and returns an array of `Topic#id` which the user can see.
diff --git a/lib/post_destroyer.rb b/lib/post_destroyer.rb
index 8024d0ae56a..efd3e4bd061 100644
--- a/lib/post_destroyer.rb
+++ b/lib/post_destroyer.rb
@@ -77,8 +77,8 @@ class PostDestroyer
should_reset_bumped_at = @post.is_last_reply? && [email protected]?
- if delete_removed_posts_after < 1 || post_is_reviewable? ||
- Guardian.new(@user).can_moderate_topic?(@topic) || permanent?
+ if delete_removed_posts_after < 1 || post_is_reviewable? || can_moderate_this_topic? ||
+ permanent?
perform_delete
elsif @user.id == @post.user_id
mark_for_deletion(delete_removed_posts_after)
@@ -114,15 +114,14 @@ class PostDestroyer
end
def recover
- if (post_is_reviewable? || Guardian.new(@user).can_moderate_topic?(@post.topic)) &&
- @post.deleted_at
- staff_recovered
- elsif @user.staff? || @user.id == @post.user_id
- user_recovered
- end
+ staff_recovery = (post_is_reviewable? || can_moderate_this_topic?) && @post.deleted_at.present?
+ user_recovery = !staff_recovery && (@user.staff? || @user.id == @post.user_id)
+
+ staff_recovered if staff_recovery
+ user_recovered if user_recovery
@topic.update_column(:user_id, Discourse::SYSTEM_USER_ID) if [email protected]_id
- @topic.recover!(@user) if @post.is_first_post?
+ @topic.recover!(@user) if (staff_recovery || user_recovery) && @post.is_first_post?
@topic.update_statistics!
Topic.publish_stats_to_clients!(@topic.id, :recovered)
@@ -310,10 +309,18 @@ class PostDestroyer
private
+ def guardian
+ @guardian ||= Guardian.new(@user)
+ end
+
+ def can_moderate_this_topic?
+ guardian.can_moderate_topic?(@topic) || guardian.can_delete_all_posts_and_topics?
+ end
+
def post_is_reviewable?
return true if @user.staff?
- Guardian.new(@user).can_review_topic?(@topic) && Reviewable.exists?(target: @post)
+ guardian.can_review_topic?(@topic) && Reviewable.exists?(target: @post)
end
# we need topics to change if ever a post in them is deleted or created
diff --git a/spec/lib/post_destroyer_spec.rb b/spec/lib/post_destroyer_spec.rb
index d53fb029e71..f8606100929 100644
--- a/spec/lib/post_destroyer_spec.rb
+++ b/spec/lib/post_destroyer_spec.rb
@@ -1580,4 +1580,57 @@ RSpec.describe PostDestroyer do
end
end
end
+
+ describe "members of delete_all_posts_and_topics_allowed_groups" do
+ fab!(:group)
+ fab!(:group_member, :user)
+
+ before do
+ group.add(group_member)
+ SiteSetting.delete_all_posts_and_topics_allowed_groups = "1|2|#{group.id}"
+ end
+
+ it "deletes another user's reply" do
+ reply = create_post(topic: post.topic, user: coding_horror)
+
+ PostDestroyer.new(group_member, reply).destroy
+
+ expect(reply.reload.deleted_at).to be_present
+ expect(reply.user_deleted).to eq(false)
+ end
+
+ it "deletes the topic along with the first post" do
+ PostDestroyer.new(group_member, post).destroy
+
+ expect(post.reload.deleted_at).to be_present
+ expect(Topic.with_deleted.find(post.topic_id).deleted_at).to be_present
+ end
+
+ it "recovers another user's deleted reply" do
+ reply = create_post(topic: post.topic, user: coding_horror)
+ PostDestroyer.new(moderator, reply).destroy
+
+ PostDestroyer.new(group_member, reply.reload).recover
+
+ expect(reply.reload.deleted_at).to eq(nil)
+ end
+
+ it "recovers the topic along with the first post" do
+ PostDestroyer.new(moderator, post).destroy
+
+ PostDestroyer.new(group_member, post.reload).recover
+
+ expect(post.reload.deleted_at).to eq(nil)
+ expect(post.topic.deleted_at).to eq(nil)
+ end
+ end
+
+ it "leaves the topic deleted when recovering a first post the user cannot recover" do
+ PostDestroyer.new(moderator, post).destroy
+
+ PostDestroyer.new(coding_horror, post.reload).recover
+
+ expect(post.reload.deleted_at).to be_present
+ expect(Topic.with_deleted.find(post.topic_id).deleted_at).to be_present
+ end
end
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index ef7c458036b..6891ec7084b 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -416,6 +416,19 @@ RSpec.describe PostsController do
expect(response).to be_forbidden
end
+ it "deletes another user's post for a member of delete_all_posts_and_topics_allowed_groups" do
+ group = Fabricate(:group)
+ group.add(user)
+ SiteSetting.delete_all_posts_and_topics_allowed_groups = "1|2|#{group.id}"
+ post = Fabricate(:post, topic: topic, post_number: 3)
+ sign_in(user)
+
+ delete "/posts/#{post.id}.json"
+
+ expect(response.status).to eq(200)
+ expect(post.reload.deleted_at).to be_present
+ end
+
it "uses a PostDestroyer" do
post = Fabricate(:post, topic_id: topic.id, post_number: 3)
sign_in(moderator)
@@ -555,6 +568,19 @@ RSpec.describe PostsController do
expect(response.status).to eq(200)
end
+ it "deletes the posts for a member of delete_all_posts_and_topics_allowed_groups" do
+ group = Fabricate(:group)
+ group.add(user)
+ SiteSetting.delete_all_posts_and_topics_allowed_groups = "1|2|#{group.id}"
+ sign_in(user)
+
+ delete "/posts/destroy_many.json", params: { post_ids: [post1.id, post2.id] }
+
+ expect(response.status).to eq(200)
+ expect(post1.reload.deleted_at).to be_present
+ expect(post2.reload.deleted_at).to be_present
+ end
+
# bookmark
it "triggers DiscourseEvent with :posts_destroyed and correct params" do
sign_in(poster)
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index a9bd6ec3227..6c30d35e027 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -2104,6 +2104,24 @@ RSpec.describe TopicsController do
end
end
+ describe "with a member of delete_all_posts_and_topics_allowed_groups" do
+ fab!(:group)
+ fab!(:group_member, :user)
+
+ before do
+ group.add(group_member)
+ SiteSetting.delete_all_posts_and_topics_allowed_groups = "1|2|#{group.id}"
+ sign_in(group_member)
+ end
+
+ it "deletes the topic" do
+ delete "/t/#{topic.id}.json"
+
+ expect(response.status).to eq(200)
+ expect(topic.reload.trashed?).to eq(true)
+ end
+ end
+
context "when logged in as a category group moderator who cannot see the topic" do
fab!(:mod_group, :group)
fab!(:cat_mod_user, :user)
@@ -5208,6 +5226,25 @@ RSpec.describe TopicsController do
expect(response.parsed_body["errors"]).to be_present
end
+ it "deletes topics for a member of delete_all_posts_and_topics_allowed_groups" do
+ group = Fabricate(:group)
+ group.add(user)
+ SiteSetting.delete_all_posts_and_topics_allowed_groups = "1|2|#{group.id}"
+ target_topic = Fabricate(:post).topic
+
+ put "/topics/bulk.json",
+ params: {
+ topic_ids: [target_topic.id],
+ operation: {
+ type: "delete",
+ },
+ }
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["topic_ids"]).to contain_exactly(target_topic.id)
+ expect(target_topic.reload.trashed?).to eq(true)
+ end
+
it "can dismiss sub-categories posts as read" do
sub = Fabricate(:category, parent_category_id: category.id)
diff --git a/spec/services/post_owner_changer_spec.rb b/spec/services/post_owner_changer_spec.rb
index 7469e4fd0cf..95f26251100 100644
--- a/spec/services/post_owner_changer_spec.rb
+++ b/spec/services/post_owner_changer_spec.rb
@@ -134,6 +134,39 @@ RSpec.describe PostOwnerChanger do
expect(p4.reload.user).to eq(user_a)
end
+ it "recovers the first post along with a topic deleted when its author was removed" do
+ topic # memoize before the topic is trashed and scoped out of p1.topic
+ PostDestroyer.new(editor, p1).destroy
+ p1.reload.update_columns(user_id: nil)
+
+ PostOwnerChanger.new(
+ post_ids: [p1.id],
+ topic_id: topic.id,
+ new_owner: user_a,
+ acting_user: editor,
+ ).change_owner!
+
+ expect(topic.reload.deleted_at).to eq(nil)
+ expect(p1.reload.deleted_at).to eq(nil)
+ expect(p1.user).to eq(user_a)
+ end
+
+ it "leaves an individually deleted first post deleted when the topic is live" do
+ p1.trash!(editor)
+ p1.reload.update_columns(user_id: nil)
+
+ PostOwnerChanger.new(
+ post_ids: [p1.id],
+ topic_id: topic.id,
+ new_owner: user_a,
+ acting_user: editor,
+ ).change_owner!
+
+ expect(topic.reload.deleted_at).to eq(nil)
+ expect(p1.reload.deleted_at).to be_present
+ expect(p1.user).to eq(user_a)
+ end
+
it "sets 'posted' for TopicUser to true" do
PostOwnerChanger.new(
post_ids: [p1.id],