From de9805d6fa95a79920065722de418de7b4acb9b6 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 7 May 2019 08:39:42 +0900 Subject: [PATCH 1/2] Raise if extra slashes follow https://bugs.ruby-lang.org/issues/15832 --- lib/ipaddr.rb | 2 +- test/test_ipaddr.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb index 7fff54b..7bebf45 100644 --- a/lib/ipaddr.rb +++ b/lib/ipaddr.rb @@ -567,7 +567,7 @@ def initialize(addr = '::', family = Socket::AF_UNSPEC) raise AddressFamilyError, "unsupported address family: #{family}" end end - prefix, prefixlen = addr.split('/') + prefix, prefixlen = addr.split('/', 2) if prefix =~ /\A\[(.*)\]\z/i prefix = $1 family = Socket::AF_INET6 diff --git a/test/test_ipaddr.rb b/test/test_ipaddr.rb index 1aa24eb..281656a 100644 --- a/test/test_ipaddr.rb +++ b/test/test_ipaddr.rb @@ -91,6 +91,7 @@ def test_s_new assert_raise(IPAddr::InvalidAddressError) { IPAddr.new("[192.168.1.2]/120") } 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/20") } 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("192.168.0.1/33") } From f49d2d49a4c7fad0435ddb6a5cb1ba3beb6fc7b4 Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Tue, 4 Jun 2019 18:58:15 -0700 Subject: [PATCH 2/2] Disallow leading zeros in mask --- lib/ipaddr.rb | 5 ++++- test/test_ipaddr.rb | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb index 7bebf45..d59a28d 100644 --- a/lib/ipaddr.rb +++ b/lib/ipaddr.rb @@ -496,8 +496,11 @@ def set(addr, *family) def mask!(mask) case mask when String - if mask =~ /\A\d+\z/ + case mask + when /\A(0|[1-9]+\d*)\z/ prefixlen = mask.to_i + when /\A\d+\z/ + raise InvalidPrefixError, "leading zeros in prefix" else m = IPAddr.new(mask) if m.family != @family diff --git a/test/test_ipaddr.rb b/test/test_ipaddr.rb index 281656a..cc2bb71 100644 --- a/test/test_ipaddr.rb +++ b/test/test_ipaddr.rb @@ -92,6 +92,8 @@ def test_s_new 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/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/129") } assert_raise(IPAddr::InvalidPrefixError) { IPAddr.new("192.168.0.1/33") }