kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Add support for IPv6 link local addresses to resolv

Browse source 
Now that it should work correctly, test that every address returned
by Socket.ip_address_list is resolvable.

Socket works with IPv6 link local addresses, and ipaddr now does
as well, so I think resolv should support them.

Fixes [Bug #17112]
This commit is contained in:
Jeremy Evans 2020-08-24 12:39:08 -07:00
parent fcde1e0e62
commit 2f12af42f7
Notes: git 2020-11-08 06:48:10 +09:00 
Merged: https://github.com/ruby/ruby/pull/3452
2 changed files with 45 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
lib/resolv.rb
View file

@ -2459,6 +2459,28 @@ class Resolv
(\d+)\.(\d+)\.(\d+)\.(\d+)
\z/x
##
# IPv6 link local address format fe80:b:c:d:e:f:g:h%em1
Regex_8HexLinkLocal = /\A
fe80
(?::[0-9A-Fa-f]{1,4}){7}
%[0-9A-Za-z]+
\z/x
##
# Compressed IPv6 link local address format fe80::b%em1
Regex_CompressedHexLinkLocal = /\A
fe80:
(?:
((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?) ::
((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)
|
:((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)
)?
:[0-9A-Fa-f]{1,4}%[0-9A-Za-z]+
\z/x
##
# A composite IPv6 address Regexp.
@ -2466,7 +2488,10 @@ class Resolv
(?:#{Regex_8Hex}) |
(?:#{Regex_CompressedHex}) |
(?:#{Regex_6Hex4Dec}) |
(?:#{Regex_CompressedHex4Dec})/x
(?:#{Regex_CompressedHex4Dec}) |
(?:#{Regex_8HexLinkLocal}) |
(?:#{Regex_CompressedHexLinkLocal})
/x
##
# Creates a new IPv6 address from +arg+ which may be:

19
test/resolv/test_addr.rb
View file

@ -16,6 +16,25 @@ class TestResolvAddr < Test::Unit::TestCase
}
end
def test_valid_ipv6_link_local_address
bug17112 = "[ruby-core:99539]"
assert_not_match(Resolv::IPv6::Regex, "fe80::1%", bug17112)
assert_not_match(Resolv::IPv6::Regex, "fe80:2:3:4:5:6:7:8%", bug17112)
assert_not_match(Resolv::IPv6::Regex, "fe90::1%em1", bug17112)
assert_not_match(Resolv::IPv6::Regex, "1:2:3:4:5:6:7:8%em1", bug17112)
assert_match(Resolv::IPv6::Regex, "fe80:2:3:4:5:6:7:8%em1", bug17112)
assert_match(Resolv::IPv6::Regex, "fe80::20d:3aff:fe7d:9760%eth0", bug17112)
assert_match(Resolv::IPv6::Regex, "fe80::1%em1", bug17112)
end
def test_valid_socket_ip_address_list
Socket.ip_address_list.each do |addr|
ip = addr.ip_address
assert_match(Resolv::AddressRegex, ip)
assert_equal(ip, Resolv.getaddress(ip))
end
end
def test_invalid_byte_comment
bug9273 = '[ruby-core:59239] [Bug #9273]'
Tempfile.create('resolv_test_addr_') do |tmpfile|