github-pages-health-check 1.7.4 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03a16a95ebcc2d31fe9f0de07cc2a00018d8a604
-  data.tar.gz: 4358dbd798f76a759a8876daf4d7811f14b6c135
+  metadata.gz: 031aea2c1fdce16fab8803dd54bbbb7d58273a6f
+  data.tar.gz: 15f224dee340c769356de80232c27e2117ff9af4
 SHA512:
-  metadata.gz: 794287ba5221e2c5ea8506594167309b9a9de12c6b887206b5b4a575b3c42e9b3b86918e506624cf6da134a72510ceeebfb0125c8cabb0ee0b66ba88559008b9
-  data.tar.gz: fe84086c554d3faf80742e607086cbbcf7eeb04a114edb7871200dc860849e9549d44189948fa80c9d27df796da221d34279f2473861982e083390d97a3696c6
+  metadata.gz: 4cac9adfa7bf2d73c6003d90232ddea0bd56b5f84d00816e476b29f56167614133fdfca442a3235978758afde298501d084fdd5b85864dcd2cef6486fe9af357
+  data.tar.gz: ef4efb97d297f0640a391b9ef15e7750648dfc519b3807fbcf554c6adb15edec2b240e91bc96e56d3ec6dab7c6f8e5fc3a38597cb127b38286703862d35c4b7e

data/lib/github-pages-health-check.rb

@@ -28,11 +28,12 @@ module GitHubPages
     autoload :Checkable,  "github-pages-health-check/checkable"
     autoload :Domain,     "github-pages-health-check/domain"
     autoload :Repository, "github-pages-health-check/repository"
+    autoload :Resolver,   "github-pages-health-check/resolver"
     autoload :Site,       "github-pages-health-check/site"
     autoload :Printer,    "github-pages-health-check/printer"
 
     # DNS and HTTP timeout, in seconds
-    TIMEOUT = 5
+    TIMEOUT = 7
 
     HUMAN_NAME = "GitHub Pages Health Check".freeze
     URL = "https://github.com/github/pages-health-check".freeze

data/lib/github-pages-health-check/caa.rb

@@ -47,15 +47,10 @@ module GitHubPages
       end
 
       def query(domain)
-        resolver = Dnsruby::Resolver.new
-        resolver.retry_times = 2
-        resolver.query_timeout = 2
-        begin
-          resolver.query(domain, Dnsruby::Types::CAA).answer
-        rescue Dnsruby::ResolvError => e
-          @error = e
-          []
-        end
+        GitHubPages::HealthCheck::Resolver.new(domain).query(Dnsruby::Types::CAA)
+      rescue Dnsruby::ResolvError, Dnsruby::ResolvTimeout => e
+        @error = e
+        []
       end
     end
   end

data/lib/github-pages-health-check/domain.rb

@@ -253,7 +253,7 @@ module GitHubPages
           GitHubPages::HealthCheck.without_warnings do
             next if host.nil?
             REQUESTED_RECORD_TYPES
-              .map { |type| resolver.query(absolute_domain, type).answer }
+              .map { |type| resolver.query(type) }
               .flatten.uniq
           end
         end
@@ -262,10 +262,7 @@ module GitHubPages
       end
 
       def resolver
-        @resolver ||= Dnsruby::Resolver.new
-        @resolver.retry_times = 2
-        @resolver.query_timeout = 2
-        @resolver
+        @resolver ||= GitHubPages::HealthCheck::Resolver.new(absolute_domain)
       end
 
       # Are we even able to get the DNS record?

data/lib/github-pages-health-check/resolver.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module GitHubPages
+  module HealthCheck
+    class Resolver
+      DEFAULT_RESOLVER_OPTIONS = {
+        :retry_times => 2,
+        :query_timeout => 5,
+        :dnssec => true
+      }.freeze
+
+      PREFERS_AUTHORITATIVE_ANSWER = [
+        Dnsruby::Types::A,
+        Dnsruby::Types::CAA,
+        Dnsruby::Types::MX
+      ].freeze
+
+      class << self
+        def default_resolver
+          @default_resolver ||= Dnsruby::Resolver.new(DEFAULT_RESOLVER_OPTIONS)
+        end
+      end
+
+      attr_reader :domain
+
+      def initialize(domain)
+        @domain = domain
+      end
+
+      # rubocop:disable Metrics/AbcSize
+      def query(type)
+        if PREFERS_AUTHORITATIVE_ANSWER.include?(type)
+          answer = authoritative_resolver.query(domain, type).answer
+          return answer unless answer.empty?
+        end
+
+        self.class.default_resolver.query(domain, type).answer
+      rescue Dnsruby::ResolvTimeout, Dnsruby::ResolvError
+        self.class.default_resolver.query(domain, type).answer
+      end
+      # rubocop:enable Metrics/AbcSize
+
+      private
+
+      def authoritative_resolver
+        return self.class.default_resolver if nameservers.nil? || nameservers.empty?
+
+        Dnsruby::Resolver.new(DEFAULT_RESOLVER_OPTIONS.merge(:nameservers => nameservers))
+      end
+
+      def nameservers
+        @nameservers ||= begin
+          self.class.default_resolver.query(domain, Dnsruby::Types::NS).answer.map do |rr|
+            next rr.nsdname.to_s if rr.type == Dnsruby::Types::NS
+          end.compact
+        end
+      end
+    end
+  end
+end

data/lib/github-pages-health-check/version.rb

@@ -2,6 +2,6 @@
 
 module GitHubPages
   module HealthCheck
-    VERSION = "1.7.4".freeze
+    VERSION = "1.8.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github-pages-health-check
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.8.0
 platform: ruby
 authors:
 - GitHub, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-01 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -201,6 +201,7 @@ files:
 - lib/github-pages-health-check/errors/not_served_by_pages_error.rb
 - lib/github-pages-health-check/printer.rb
 - lib/github-pages-health-check/repository.rb
+- lib/github-pages-health-check/resolver.rb
 - lib/github-pages-health-check/site.rb
 - lib/github-pages-health-check/version.rb
 - script/bootstrap