A platform for community discussion. Free, open, simple.
SECURITY: Hide IP from flagged regular users
Isaac Janzen596a7ccfe5d0
diff --git a/app/serializers/flagged_user_serializer.rb b/app/serializers/flagged_user_serializer.rbindex 0ddc83c4f1a..74d9f02fd6a 100644--- a/app/serializers/flagged_user_serializer.rb+++ b/app/serializers/flagged_user_serializer.rb@@ -31,6 +31,10 @@ class FlaggedUserSerializer < BasicUserSerializerobject.ip_address.try(:to_s)end+ def include_ip_address?+ scope.can_see_ip?+ end+def flags_agreedobject.user_stat.flags_agreedenddiff --git a/spec/serializers/flagged_user_serializer_spec.rb b/spec/serializers/flagged_user_serializer_spec.rbindex 7c43e6b88f7..80b9c94125f 100644--- a/spec/serializers/flagged_user_serializer_spec.rb+++ b/spec/serializers/flagged_user_serializer_spec.rb@@ -21,4 +21,35 @@ RSpec.describe FlaggedUserSerializer dojson = serializer.as_jsonexpect(json[:email]).to eq("[email protected]")end++ describe "#ip_address" do+ fab!(:user)++ before { flagged_user.update!(ip_address: "1.2.3.4") }++ it "includes ip_address for admins" do+ json =+ FlaggedUserSerializer.new(flagged_user, scope: Guardian.new(admin), root: false).as_json+ expect(json[:ip_address]).to eq("1.2.3.4")+ end++ it "includes ip_address for moderators when moderators_view_ips is enabled" do+ SiteSetting.moderators_view_ips = true+ json =+ FlaggedUserSerializer.new(flagged_user, scope: Guardian.new(moderator), root: false).as_json+ expect(json[:ip_address]).to eq("1.2.3.4")+ end++ it "does not include ip_address for moderators when moderators_view_ips is disabled" do+ SiteSetting.moderators_view_ips = false+ json =+ FlaggedUserSerializer.new(flagged_user, scope: Guardian.new(moderator), root: false).as_json+ expect(json[:ip_address]).to be_nil+ end++ it "does not include ip_address for regular users" do+ json = FlaggedUserSerializer.new(flagged_user, scope: Guardian.new(user), root: false).as_json+ expect(json[:ip_address]).to be_nil+ end+ endend