th: etc etc host host s s

9 months ago · 6a5351ede0
parent 472eec8ae1
commit 6a5351ede0
1 changed files with 13 additions and 4 deletions
--- a/app/lib/request.rb
+++ b/app/lib/request.rb
@ -261,11 +261,20 @@ class Request
        begin
          addresses = [IPAddr.new(host)]
        rescue IPAddr::InvalidAddressError
+          begin
            Resolv::DNS.open do |dns|
              dns.timeouts = 5
              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)
            end
+          rescue ResolvError
+            # 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)
+            end
+          end
        end

        socks = []