treehouse
/
mastodon
19
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

th: smile sweet sadistic surprise service
ci/woodpecker/push/woodpecker Pipeline was successful Details 

should've just hardcoded instead but noooooooooooo

"needs to be decent"
main
kouhai dev 2024-02-12 02:35:47 -08:00
parent 7719de5665
commit 34f677cd03
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/lib/request.rb
View File

@ -268,12 +268,22 @@ class Request
addresses = addresses.filter { |addr| addr.is_a?(Resolv::IPv6) }.take(2) + addresses.filter { |addr| !addr.is_a?(Resolv::IPv6) }.take(2)
end
rescue ResolvError
end
if addresses.empty?
# try /etc/hosts file
# https://github.com/mastodon/mastodon/issues/9436
Resolv::Hosts.open do |dns|
addresses = dns.getaddresses(host)
addresses = addresses.filter { |addr| addr.is_a?(Resolv::IPv6) }.take(2) + addresses.filter { |addr| !addr.is_a?(Resolv::IPv6) }.take(2)
Resolv::Hosts.new.each_address(host) do |address|
case address
when Resolv::IPv4::Regex
addresses << Resolv::IPv4.create(address)
when Resolv::IPv6::Regex
addresses << Resolv::IPv6.create(address)
else
raise ResolvError.new("cannot interpret as address: #{address}")
end
end
addresses = addresses.filter { |addr| addr.is_a?(Resolv::IPv6) }.take(2) + addresses.filter { |addr| !addr.is_a?(Resolv::IPv6) }.take(2)
end
end