Skip to content

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

SECURITY: Restrict check_username email and user-ID parameters to authorized identity (#43991)

Keegan Georgee1433061b98d
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 0b48bcd3c5a..24fef563586 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -650,7 +650,8 @@ class UsersController < ApplicationController
return render_available_true(username) if changing_case_of_own_username(target_user, username)
checker = UsernameCheckerService.new(allow_reserved_username: current_user&.admin?)
- email = params[:email] || target_user.try(:email)
+ email = target_user&.email
+ email = params[:email] if !email && !SiteSetting.hide_email_address_taken?
result = checker.check_username(username, email)
result[:avatar_template] = User.default_template(username) if result[:available]
render json: result
@@ -713,11 +714,12 @@ class UsersController < ApplicationController
def user_from_params_or_current_user
return current_user if !params[:for_user_id]
- raise Discourse::InvalidAccess if !current_user
+ return User.find(params[:for_user_id]) if current_user&.admin?
- user = User.find(params[:for_user_id])
- guardian.ensure_can_edit_username!(user)
- user
+ if current_user&.id == params[:for_user_id].to_i
+ guardian.ensure_can_edit_username!(current_user)
+ end
+ current_user
end
def create
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 1a5406a006f..3aef6ab74ce 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -2237,18 +2237,95 @@ RSpec.describe UsersController do
end
describe "#check_username" do
- it "rejects anonymous checks against another account" do
- get "/u/check_username.json", params: { username: "AvailableName", for_user_id: user1.id }
+ it "does not disclose staged accounts or user IDs to anonymous username checks" do
+ SiteSetting.hide_email_address_taken = true
+ staged_user = Fabricate(:user, staged: true, email: "[email protected]")
- expect(response.status).to eq(403)
+ get "/u/check_username.json",
+ params: {
+ username: "availableusername",
+ for_user_id: staged_user.id,
+ }
+ known_user_status = response.status
+ known_user_response = response.parsed_body
+
+ get "/u/check_username.json",
+ params: {
+ username: "availableusername",
+ for_user_id: staged_user.id + 1_000_000,
+ }
+ missing_user_status = response.status
+ missing_user_response = response.parsed_body
+
+ get "/u/check_username.json",
+ params: {
+ username: staged_user.username,
+ email: staged_user.email,
+ }
+ matching_email_status = response.status
+ matching_email_response = response.parsed_body
+
+ get "/u/check_username.json",
+ params: {
+ username: staged_user.username,
+ email: "[email protected]",
+ }
+ nonmatching_email_status = response.status
+ nonmatching_email_response = response.parsed_body
+
+ expect(
+ [known_user_status, missing_user_status, matching_email_status, nonmatching_email_status],
+ ).to eq([200, 200, 200, 200])
+ expect(known_user_response).to eq(missing_user_response)
+ expect(matching_email_response).to eq(nonmatching_email_response)
+ expect(matching_email_response["available"]).to eq(false)
+ end
+
+ it "allows anonymous signup to claim a staged account with its matching email when email privacy is disabled" do
+ SiteSetting.hide_email_address_taken = false
+ staged_user = Fabricate(:user, staged: true, email: "[email protected]")
+
+ get "/u/check_username.json",
+ params: {
+ username: staged_user.username,
+ email: staged_user.email,
+ }
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["available"]).to eq(true)
end
- it "rejects checks against another account by a regular user" do
+ it "ignores an ordinary user's target-user parameter" do
+ target_user = Fabricate(:user)
sign_in(user1)
- get "/u/check_username.json", params: { username: "AvailableName", for_user_id: admin.id }
+ get "/u/check_username.json",
+ params: {
+ username: "availableusername",
+ for_user_id: target_user.id,
+ }
+ existing_target_status = response.status
+ existing_target_response = response.parsed_body
- expect(response.status).to eq(403)
+ get "/u/check_username.json",
+ params: {
+ username: "availableusername",
+ for_user_id: target_user.id + 1_000_000,
+ }
+ missing_target_status = response.status
+ missing_target_response = response.parsed_body
+
+ get "/u/check_username.json",
+ params: {
+ username: target_user.username,
+ for_user_id: target_user.id,
+ }
+
+ expect([existing_target_status, missing_target_status, response.status]).to eq(
+ [200, 200, 200],
+ )
+ expect(existing_target_response).to eq(missing_target_response)
+ expect(response.parsed_body["available"]).to eq(false)
end
it "allows a new account to check its own username and avatar" do