From 5fd390c6004114e83a7e435187b37179e9f990cc Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Fri, 21 Feb 2014 14:14:30 -0500 Subject: [PATCH] FIX: nuke spammer from flags page --- app/models/screened_ip_address.rb | 2 ++ spec/models/screened_ip_address_spec.rb | 3 +++ 2 files changed, 5 insertions(+) diff --git a/app/models/screened_ip_address.rb b/app/models/screened_ip_address.rb index e16c1babf03..f750865edfa 100644 --- a/app/models/screened_ip_address.rb +++ b/app/models/screened_ip_address.rb @@ -23,6 +23,8 @@ class ScreenedIpAddress < ActiveRecord::Base return end + return write_attribute(:ip_address, val) if val.is_a?(IPAddr) + num_wildcards = val.count('*') if num_wildcards == 0 write_attribute(:ip_address, val) diff --git a/spec/models/screened_ip_address_spec.rb b/spec/models/screened_ip_address_spec.rb index f71f3757b63..222ade19c10 100644 --- a/spec/models/screened_ip_address_spec.rb +++ b/spec/models/screened_ip_address_spec.rb @@ -66,6 +66,9 @@ describe ScreenedIpAddress do test_good_value("210.56.12.12", "210.56.12.12") test_good_value("210.56.0.0/16", "210.56.0.0/16") test_good_value("fc00::/7", "fc00::/7") + test_good_value(IPAddr.new("94.99.101.228"), "94.99.101.228") + test_good_value(IPAddr.new("94.99.0.0/16"), "94.99.0.0/16") + test_good_value(IPAddr.new("fc00::/7"), "fc00::/7") end it "translates * characters" do