Skip to content

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

SECURITY: Restrict group-member sorting by custom user fields to fields visible to the ... (#43984)

Keegan Georgee2f86a443218
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index e387c6be2b2..f86df6c2bc0 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -330,9 +330,10 @@ class GroupsController < ApplicationController
include_custom_fields = params[:include_custom_fields] == "true"
- allowed_fields =
- User.allowed_user_custom_fields(guardian) +
- UserField.all.pluck(:id).map { |fid| "#{User::USER_FIELD_PREFIX}#{fid}" }
+ allowed_fields = User.allowed_user_custom_fields(guardian)
+ if guardian.is_staff?
+ allowed_fields += UserField.all.pluck(:id).map { |fid| "#{User::USER_FIELD_PREFIX}#{fid}" }
+ end
if params[:order] && %w[last_posted_at last_seen_at].include?(params[:order])
order = "#{params[:order]} #{dir} NULLS LAST"
diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index bea2c54f1ca..ea7d84bcc89 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -1058,6 +1058,45 @@ RSpec.describe GroupsController do
expect(response_custom_fields[user_field_name]).to eq("A custom field")
end
+ it "does not sort members by private custom fields for anonymous viewers" do
+ private_user_field = Fabricate(:user_field)
+ private_user_field_name = "user_field_#{private_user_field.id}"
+ first_member = Fabricate(:user, username: "alphabetical_first")
+ second_member = Fabricate(:user, username: "alphabetical_second")
+ group.add(first_member)
+ group.add(second_member)
+
+ UserCustomField.create!(
+ user_id: first_member.id,
+ name: private_user_field_name,
+ value: "second private value",
+ )
+ UserCustomField.create!(
+ user_id: second_member.id,
+ name: private_user_field_name,
+ value: "first private value",
+ )
+
+ get "/groups/#{group.name}/members.json",
+ params: {
+ include_custom_fields: true,
+ order: "custom_field",
+ order_field: private_user_field_name,
+ asc: true,
+ }
+
+ expect(response.status).to eq(200)
+
+ members = response.parsed_body["members"]
+ expect(members.flat_map { |member| member.fetch("custom_fields").values }).not_to include(
+ "first private value",
+ "second private value",
+ )
+ expect(members.map { |member| member["id"] }).to eq(
+ [first_member.id, second_member.id, user.id],
+ )
+ end
+
it "allows sorting by custom fields" do
group.add(user2)
UserCustomField.create!(user_id: user2.id, name: user_field_name, value: "C custom field")