Skip to content

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

FIX: Staged user emails bypass moderator email visibility setting (#40411)

Roman Rizzi2c5974a4bc66
diff --git a/app/serializers/admin_user_list_serializer.rb b/app/serializers/admin_user_list_serializer.rb
index a87c25787b3..2cd39be484b 100644
--- a/app/serializers/admin_user_list_serializer.rb
+++ b/app/serializers/admin_user_list_serializer.rb
@@ -36,8 +36,12 @@ class AdminUserListSerializer < BasicUserSerializer
def include_email?
# staff members can always see their email
- (scope.is_staff? && (object.id == scope.user.id || object.staged?)) ||
- (@options[:emails_desired] && scope.can_check_emails?(object))
+ return true if scope.is_staff? && object.id == scope.user.id
+
+ staged_or_desired = object.staged? || @options[:emails_desired]
+ return true if staged_or_desired && scope.can_check_emails?(object)
+
+ false
end
alias_method :include_secondary_emails?, :include_email?
diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rb
index d6d81db7e88..bd5dc404d19 100644
--- a/spec/requests/admin/users_controller_spec.rb
+++ b/spec/requests/admin/users_controller_spec.rb
@@ -73,6 +73,21 @@ RSpec.describe Admin::UsersController do
expect(response.parsed_body).to be_present
end
+ it "doesn't return staged user emails when moderators_view_emails is disabled" do
+ SiteSetting.moderators_view_emails = false
+ staged_user = Fabricate(:staged, email: "[email protected]")
+ Fabricate(:secondary_email, user: staged_user, email: "[email protected]")
+
+ get "/admin/users/list.json", params: { query: "staged", show_emails: "true" }
+
+ expect(response.status).to eq(200)
+ listed_user =
+ response.parsed_body.find { |listed_user| listed_user["id"] == staged_user.id }
+ expect(listed_user).to be_present
+ expect(listed_user["email"]).to eq(nil)
+ expect(listed_user["secondary_emails"]).to eq(nil)
+ end
+
it "returns users with the same IP as a user" do
target_user = Fabricate(:user, ip_address: "42.42.42.42")
same_ip_user = Fabricate(:user, ip_address: "42.42.42.42")
diff --git a/spec/serializers/admin_user_list_serializer_spec.rb b/spec/serializers/admin_user_list_serializer_spec.rb
index 9b9b96823cc..3703b99b4e1 100644
--- a/spec/serializers/admin_user_list_serializer_spec.rb
+++ b/spec/serializers/admin_user_list_serializer_spec.rb
@@ -81,13 +81,30 @@ RSpec.describe AdminUserListSerializer do
expect(json[:secondary_emails]).to contain_exactly("[email protected]", "[email protected]")
end
- it "returns a staged user's emails" do
- user.staged = true
+ it "returns a staged user's emails to admins" do
+ user.update!(staged: true)
fabricate_secondary_emails_for(user)
json = serialize(user, admin)
expect(json[:email]).to eq("[email protected]")
expect(json[:secondary_emails]).to contain_exactly("[email protected]", "[email protected]")
end
+
+ it "doesn't return a staged user's emails to moderators when disabled" do
+ SiteSetting.moderators_view_emails = false
+ user.update!(staged: true)
+ fabricate_secondary_emails_for(user)
+ json = serialize(user, moderator)
+ expect(json[:email]).to eq(nil)
+ expect(json[:secondary_emails]).to eq(nil)
+ end
+
+ it "returns a staged user's emails for admins when emails_desired is true" do
+ user.update!(staged: true)
+ fabricate_secondary_emails_for(user)
+ json = serialize(user, admin, emails_desired: true)
+ expect(json[:email]).to eq("[email protected]")
+ expect(json[:secondary_emails]).to contain_exactly("[email protected]", "[email protected]")
+ end
end
describe "#can_be_deleted" do