do not patch URI use for zone-identifier ipv6, instead do not use it

It was clarified in
https://github.com/ruby/ipaddr/issues/52#issuecomment-1399289675 that
there is no bug in `uri`, but rather that ipv6 addresses with
zone-identifier aren't supposed to be used in uris.
This commit is contained in:
HoneyryderChuck 2023-01-22 00:35:33 +00:00
parent a218463c73
commit eb34c823f7
4 changed files with 8 additions and 31 deletions

View File

@ -160,7 +160,6 @@ module HTTPX
module URIExtensions
# uri 0.11 backport, ships with ruby 3.1
refine URI::Generic do
public :set_host
def non_ascii_hostname
@non_ascii_hostname

View File

@ -6,11 +6,10 @@ module HTTPX
class UDP
include Loggable
def initialize(uri, _, options)
ip = IPAddr.new(uri.host)
@host = ip.to_s
@port = uri.port
@io = UDPSocket.new(ip.family)
def initialize(ip, port, options)
@host = ip
@port = port
@io = UDPSocket.new(IPAddr.new(ip).family)
@options = options
end

View File

@ -132,9 +132,7 @@ module HTTPX
def try_clone_connection(connection, family)
connection.family ||= family
if connection.family == family
return connection
end
return connection if connection.family == family
new_connection = connection.class.new(connection.type, connection.origin, connection.options)
new_connection.family = family

View File

@ -21,21 +21,7 @@ module HTTPX
packet_size: 512,
timeouts: Resolver::RESOLVE_TIMEOUT,
}
end
# nameservers for ipv6 are misconfigured in certain systems;
# this can use an unexpected endless loop
# https://gitlab.com/honeyryderchuck/httpx/issues/56
DEFAULTS[:nameserver].select! do |nameserver|
begin
IPAddr.new(nameserver)
true
rescue IPAddr::InvalidAddressError
false
end
end if DEFAULTS[:nameserver]
DEFAULTS.freeze
end.freeze
DNS_PORT = 53
@ -318,13 +304,8 @@ module HTTPX
ip, port = @nameserver[@ns_index]
port ||= DNS_PORT
uri = URI::Generic.build(scheme: "udp", port: port)
# uri.hostname = ip
# link-local IPv6 address may have a zone identifier, but URI does not support that yet.
uri.set_host(ip)
type = IO.registry(uri.scheme)
log { "resolver: server: #{uri}..." }
@io = type.new(uri, [IPAddr.new(ip)], @options)
log { "resolver: server: #{ip}:#{port}..." }
@io = UDP.new(ip, port, @options)
end
def transition(nextstate)