Skip to content

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

SECURITY: Restrict deleted posts index endpoint to staff only

Isaac Janzenf8ed7af44790
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index a4cdbbaf7f0..3ae2609759c 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -723,7 +723,7 @@ class PostsController < ApplicationController
def deleted_posts
params.permit(:offset, :limit)
- guardian.ensure_can_see_deleted_posts!
+ guardian.ensure_can_see_deleted_posts_for_user!
user = fetch_user_from_params
offset = [params[:offset].to_i, 0].max
diff --git a/lib/guardian/post_guardian.rb b/lib/guardian/post_guardian.rb
index 0222e575bc7..934e8489404 100644
--- a/lib/guardian/post_guardian.rb
+++ b/lib/guardian/post_guardian.rb
@@ -394,6 +394,10 @@ module PostGuardian
@user.in_any_groups?(SiteSetting.delete_all_posts_and_topics_allowed_groups_map)
end
+ def can_see_deleted_posts_for_user?
+ is_staff?
+ end
+
def can_view_raw_email?(post)
post && @user.in_any_groups?(SiteSetting.view_raw_email_allowed_groups_map)
end
diff --git a/spec/lib/guardian/post_guardian_spec.rb b/spec/lib/guardian/post_guardian_spec.rb
index 642e77c230e..28710d7f0cf 100644
--- a/spec/lib/guardian/post_guardian_spec.rb
+++ b/spec/lib/guardian/post_guardian_spec.rb
@@ -1215,6 +1215,19 @@ RSpec.describe PostGuardian do
end
end
+ describe "#can_see_deleted_posts_for_user?" do
+ it "returns true for staff" do
+ expect(Guardian.new(admin).can_see_deleted_posts_for_user?).to eq(true)
+ expect(Guardian.new(moderator).can_see_deleted_posts_for_user?).to eq(true)
+ end
+
+ it "returns false for non-staff users in delete_all_posts_and_topics_allowed_groups" do
+ SiteSetting.delete_all_posts_and_topics_allowed_groups = Group::AUTO_GROUPS[:trust_level_4]
+
+ expect(Guardian.new(trust_level_4).can_see_deleted_posts_for_user?).to eq(false)
+ end
+ end
+
describe "#can_see_post_actors?" do
let(:topic) { Fabricate(:topic, user: coding_horror) }
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index d7cb7f32df7..3455928d266 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -2918,6 +2918,17 @@ RSpec.describe PostsController do
expect(data[0]["id"]).to eq(post_deleted_by_admin.id)
expect(data[0]["deleted_by"]["id"]).to eq(admin.id)
end
+
+ it "denies access to non-staff users in delete_all_posts_and_topics_allowed_groups" do
+ group = Fabricate(:group)
+ non_staff_user = Fabricate(:user, refresh_auto_groups: true)
+ group.add(non_staff_user)
+ SiteSetting.delete_all_posts_and_topics_allowed_groups = "1|2|#{group.id}"
+
+ sign_in(non_staff_user)
+ get "/posts/#{user.username}/deleted.json"
+ expect(response).to be_forbidden
+ end
end
end