Skip to content

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

SECURITY: hide total_rows for restricted post action types

Alan Guo Xiang Tan8817a6d34be6
diff --git a/app/controllers/post_action_users_controller.rb b/app/controllers/post_action_users_controller.rb
index a9adac60c43..029266a11b0 100644
--- a/app/controllers/post_action_users_controller.rb
+++ b/app/controllers/post_action_users_controller.rb
@@ -27,7 +27,9 @@ class PostActionUsersController < ApplicationController
post_actions =
DiscoursePluginRegistry.apply_modifier(:post_action_users_list, post_actions, post)
- if !guardian.can_see_post_actors?(post.topic, post_action_type_id)
+ can_see_actors = guardian.can_see_post_actors?(post.topic, post_action_type_id)
+
+ if !can_see_actors
raise Discourse::InvalidAccess if current_user.blank?
post_actions = post_actions.where(user_id: current_user.id)
end
@@ -44,7 +46,7 @@ class PostActionUsersController < ApplicationController
),
}
- data[:total_rows_post_action_users] = total_count if total_count > page_size
+ data[:total_rows_post_action_users] = total_count if can_see_actors && total_count > page_size
render_json_dump(data)
end
diff --git a/spec/requests/post_action_users_controller_spec.rb b/spec/requests/post_action_users_controller_spec.rb
index 36f425ab9e2..c6258e06acb 100644
--- a/spec/requests/post_action_users_controller_spec.rb
+++ b/spec/requests/post_action_users_controller_spec.rb
@@ -4,12 +4,58 @@ RSpec.describe PostActionUsersController do
fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }
let(:post) { Fabricate(:post, user: sign_in(user)) }
- describe "index" do
+ describe "#index" do
describe "when limit params is invalid" do
include_examples "invalid limit params",
"/post_action_users.json",
described_class::INDEX_LIMIT
end
+
+ it "does not include total_rows_post_action_users for restricted action types" do
+ notify_mod = PostActionType.types[:notify_moderators]
+
+ PostActionCreator.new(post.user, post, notify_mod, message: "first report").perform
+ PostActionCreator.new(
+ Fabricate(:user, refresh_auto_groups: true),
+ post,
+ notify_mod,
+ message: "second report",
+ ).perform
+
+ get "/post_action_users.json",
+ params: {
+ id: post.id,
+ post_action_type_id: notify_mod,
+ limit: 1,
+ }
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["post_action_users"].map { |u| u["id"] }).to eq([user.id])
+ expect(response.parsed_body["total_rows_post_action_users"]).to be_nil
+ end
+
+ it "includes total_rows_post_action_users for restricted action types when staff" do
+ notify_mod = PostActionType.types[:notify_moderators]
+
+ PostActionCreator.new(post.user, post, notify_mod, message: "first report").perform
+ PostActionCreator.new(
+ Fabricate(:user, refresh_auto_groups: true),
+ post,
+ notify_mod,
+ message: "second report",
+ ).perform
+
+ sign_in(Fabricate(:admin))
+
+ get "/post_action_users.json",
+ params: {
+ id: post.id,
+ post_action_type_id: notify_mod,
+ limit: 1,
+ }
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["post_action_users"].map { |u| u["id"] }).to eq([user.id])
+ expect(response.parsed_body["total_rows_post_action_users"]).to eq(2)
+ end
end
context "with render" do