A platform for community discussion. Free, open, simple.
FIX: Screened email list exposes IP addresses to moderators without IP-view permission (#39875)
Sam8801cb3c2fd9
diff --git a/app/serializers/screened_email_serializer.rb b/app/serializers/screened_email_serializer.rbindex 799d122a3f1..b6dbbb80124 100644--- a/app/serializers/screened_email_serializer.rb+++ b/app/serializers/screened_email_serializer.rb@@ -10,4 +10,8 @@ class ScreenedEmailSerializer < ApplicationSerializerdef ip_addressobject.ip_address.try(:to_s)end++ def include_ip_address?+ scope.can_see_ip?+ endenddiff --git a/spec/requests/admin/screened_emails_controller_spec.rb b/spec/requests/admin/screened_emails_controller_spec.rbindex bfecb1c459a..926ab336b35 100644--- a/spec/requests/admin/screened_emails_controller_spec.rb+++ b/spec/requests/admin/screened_emails_controller_spec.rb@@ -30,6 +30,18 @@ RSpec.describe Admin::ScreenedEmailsController doendinclude_examples "screened emails accessible"++ it "does not include IP addresses without permission to view IPs" do+ Fabricate(:screened_email, email: "[email protected]")+ SiteSetting.moderators_view_ips = false++ get "/admin/logs/screened_emails.json"++ expect(response.status).to eq(200)+ email = response.parsed_body.find { |e| e["email"] == "[email protected]" }+ expect(email).to be_present+ expect(email).not_to have_key("ip_address")+ endendcontext "when logged in as a non-staff user" do