1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/ipaddr] Disallow leading zeros in mask

Browse Source 
https://github.com/ruby/ipaddr/commit/f49d2d49a4
This commit is contained in:
Jeremy Evans 2019-06-04 18:58:15 -07:00 committed by Hiroshi SHIBATA
parent 38da84296c
commit abad5e10e8
No known key found for this signature in database
GPG Key ID: F9CF13417264FAC2
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ipaddr.rb
View File

@ -495,8 +495,11 @@ class IPAddr
def mask!(mask) def mask!(mask)
case mask case mask
when String when String
if mask =~ /\A\d+\z/ case mask
when /\A(0|[1-9]+\d*)\z/
prefixlen = mask.to_i prefixlen = mask.to_i
when /\A\d+\z/
raise InvalidPrefixError, "leading zeros in prefix"
else else
m = IPAddr.new(mask) m = IPAddr.new(mask)
if m.family != @family if m.family != @family

2
test/test_ipaddr.rb
View File

@ -92,6 +92,8 @@ class TC_IPAddr < Test::Unit::TestCase
assert_raise(IPAddr::InvalidAddressError) { IPAddr.new("[2001:200:300::]\nINVALID") } assert_raise(IPAddr::InvalidAddressError) { IPAddr.new("[2001:200:300::]\nINVALID") }
assert_raise(IPAddr::InvalidAddressError) { IPAddr.new("192.168.0.1/32\nINVALID") } assert_raise(IPAddr::InvalidAddressError) { IPAddr.new("192.168.0.1/32\nINVALID") }
assert_raise(IPAddr::InvalidAddressError) { IPAddr.new("192.168.0.1/32/20") } assert_raise(IPAddr::InvalidAddressError) { IPAddr.new("192.168.0.1/32/20") }
assert_raise(IPAddr::InvalidPrefixError) { IPAddr.new("192.168.0.1/032") }
assert_raise(IPAddr::InvalidPrefixError) { IPAddr.new("::1/0128") }
assert_raise(IPAddr::InvalidPrefixError) { IPAddr.new("::1/255.255.255.0") } assert_raise(IPAddr::InvalidPrefixError) { IPAddr.new("::1/255.255.255.0") }
assert_raise(IPAddr::InvalidPrefixError) { IPAddr.new("::1/129") } assert_raise(IPAddr::InvalidPrefixError) { IPAddr.new("::1/129") }
assert_raise(IPAddr::InvalidPrefixError) { IPAddr.new("192.168.0.1/33") } assert_raise(IPAddr::InvalidPrefixError) { IPAddr.new("192.168.0.1/33") }