FEATURE: screened IP address range can be entered like 192.* instead …

…of 192.*.*.*
discourse · Sep 24, 2014 · d96acde · d96acde
1 parent b156748
commit d96acde
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/app/models/screened_ip_address.rb b/app/models/screened_ip_address.rb
@@ -29,12 +29,15 @@ def ip_address=(val)
     if num_wildcards == 0
       write_attribute(:ip_address, val)
     else
-      v = val.gsub(/\/.*/, '')
+      v = val.gsub(/\/.*/, '') # strip ranges like "/16" from the end if present
       if v[v.index('*')..-1] =~ /[^\.\*]/
         self.errors.add(:ip_address, :invalid)
         return
       end
-      write_attribute(:ip_address, "#{v.gsub('*', '0')}/#{32 - (num_wildcards * 8)}")
+      parts = v.split('.')
+      (4 - parts.size).times { parts << '*' } # support strings like 192.*
+      v = parts.join('.')
+      write_attribute(:ip_address, "#{v.gsub('*', '0')}/#{32 - (v.count('*') * 8)}")
     end
 
   # this gets even messier, Ruby 1.9.2 raised a different exception to Ruby 2.0.0

diff --git a/spec/models/screened_ip_address_spec.rb b/spec/models/screened_ip_address_spec.rb
@@ -76,6 +76,8 @@ def test_bad_value(arg)
       test_good_value("123.12.*.*",    "123.12.0.0/16")
       test_good_value("123.12.1.*",    "123.12.1.0/24")
       test_good_value("123.12.*.*/16", "123.12.0.0/16")
+      test_good_value("123.12.*",      "123.12.0.0/16")
+      test_good_value("123.*",         "123.0.0.0/8")
     end
 
     it "handles bad input" do