A platform for community discussion. Free, open, simple.
FIX: Staged-user email disclosure to moderators via UserCardSerializer (#41993)
Isaac Janzend91b2d889194
diff --git a/app/serializers/user_card_serializer.rb b/app/serializers/user_card_serializer.rbindex b4edd565de4..9dd656f1caa 100644--- a/app/serializers/user_card_serializer.rb+++ b/app/serializers/user_card_serializer.rb@@ -95,7 +95,8 @@ class UserCardSerializer < BasicUserSerializerenddef include_email?- (object.id && object.id == scope.user.try(:id)) || (scope.is_staff? && object.staged?)+ (object.id && object.id == scope.user.try(:id)) ||+ (object.staged? && scope.can_check_emails?(object))endalias_method :include_secondary_emails?, :include_email?diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rbindex da5a4440539..692c53e177e 100644--- a/spec/requests/users_controller_spec.rb+++ b/spec/requests/users_controller_spec.rb@@ -5463,6 +5463,54 @@ RSpec.describe UsersController doendend+ describe "staged user email visibility" do+ fab!(:staged_user) { Fabricate(:staged, email: "[email protected]") }+ fab!(:secondary_email) do+ Fabricate(:secondary_email, user: staged_user, email: "[email protected]")+ end+ fab!(:email_change_request) do+ Fabricate(+ :email_change_request,+ user: staged_user,+ new_email: "[email protected]",+ )+ end++ before do+ SiteSetting.moderators_view_emails = false+ sign_in(moderator)+ end++ it "respects email visibility for staged users" do+ paths = ["/u/#{staged_user.username}.json", "/u/#{staged_user.username}/card.json"]++ paths.each do |path|+ get path++ expect(response).to have_http_status(:ok)+ user_json = response.parsed_body["user"]+ expect(user_json["email"]).to eq(nil)+ expect(user_json["secondary_emails"]).to eq(nil)+ expect(user_json["unconfirmed_emails"]).to eq(nil)+ expect(response.body).not_to include(staged_user.email)+ expect(response.body).not_to include(secondary_email.email)+ expect(response.body).not_to include(email_change_request.new_email)+ end++ SiteSetting.moderators_view_emails = true++ paths.each do |path|+ get path++ expect(response).to have_http_status(:ok)+ user_json = response.parsed_body["user"]+ expect(user_json["email"]).to eq(staged_user.email)+ expect(user_json["secondary_emails"]).to contain_exactly(secondary_email.email)+ expect(user_json["unconfirmed_emails"]).to contain_exactly(email_change_request.new_email)+ end+ end+ end+describe "#cards" dofab!(:user) { Discourse.system_user }fab!(:user2, :user)