Skip to content

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

SECURITY: search_users usernames parameter bypasses user-visibility scoping (#41477)

Isaac Janzen679f801eb62e
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 8011ae2f44e..bdb0db7b214 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1290,7 +1290,12 @@ class UsersController < ApplicationController
if usernames.blank?
UserSearch.new(term, options).search
else
- User.where(username_lower: usernames).includes(:user_option).limit(limit)
+ UserSearch
+ .new(term, options)
+ .scoped_users
+ .where(username_lower: usernames)
+ .includes(:user_option)
+ .limit(limit)
end
to_render = serialize_found_users(results)
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 51ba5382542..fa9f8fe998c 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -5569,6 +5569,34 @@ RSpec.describe UsersController do
expect(json["users"].map { |u| u["username"] }).to match_array(users.map(&:username))
end
+ it "excludes users hidden by the regular user search scope" do
+ SiteSetting.must_approve_users = true
+
+ visible_user = Fabricate(:user, username: "vis_user", approved: true)
+ suspended_user =
+ Fabricate(:user, username: "susp_user", approved: true, suspended_till: 1.year.from_now)
+ inactive_user = Fabricate(:user, username: "inact_user", active: false, approved: true)
+ unapproved_user = Fabricate(:user, username: "unapp_user", approved: false)
+ staged_user = Fabricate(:user, username: "stage_user", approved: true, staged: true)
+
+ get "/u/search/users.json",
+ params: {
+ usernames: [
+ visible_user,
+ suspended_user,
+ inactive_user,
+ unapproved_user,
+ staged_user,
+ ].map(&:username).join(","),
+ }
+
+ expect(response.status).to eq(200)
+ json = response.parsed_body
+ expect(json["users"].map { |user| user["username"] }).to contain_exactly(
+ visible_user.username,
+ )
+ end
+
it "searches groups if include_groups = true" do
users = Fabricate.times(3, :user)
group = Fabricate(:group)