Merge pull request #19 from github/follow-redirects

Follow redirects when checking served_by_pages?

Author: benbalter

github-pages-health-check.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency("net-dns", "~> 0.6")
   s.add_dependency("public_suffix", "~> 1.4")
+  s.add_dependency("typhoeus", "~> 0.7")
   s.add_development_dependency("rspec", "~> 3.0")
   s.add_development_dependency("pry")
   s.add_development_dependency("gem-release")

lib/github-pages-health-check.rb

@@ -4,6 +4,7 @@
 require "public_suffix"
 require "singleton"
 require "net/http"
+require 'typhoeus'
 require_relative "github-pages-health-check/version"
 require_relative "github-pages-health-check/cloudflare"
 require_relative "github-pages-health-check/error"
@@ -117,18 +118,8 @@ def to_hash
     end
 
     def served_by_pages?
-      scheme = github_domain? ? "https" : "http"
-      uri = URI("#{scheme}://#{domain}")
-      response = Net::HTTP.get_response(uri)
-      if response.is_a? Net::HTTPRedirection
-        for t in 1..3
-          response = Net::HTTP.get_response(uri)
-          break if response.is_a? Net::HTTPSuccess
-        end
-      end
-      response.to_hash["server"] == ["GitHub.com"]
-    rescue
-      false
+      response = Typhoeus.head(uri, followlocation: true)
+      response.success? && response.headers["Server"] == "GitHub.com"
     end
 
     def to_json
@@ -190,5 +181,13 @@ def without_warnings(&block)
     def absolute_domain
       domain.end_with?(".") ? domain : "#{domain}."
     end
+
+    def scheme
+      @scheme ||= github_domain? ? "https" : "http"
+    end
+
+    def uri
+      @uri ||= URI("#{scheme}://#{domain}")
+    end
   end
 end

spec/github_pages_health_check_spec.rb

@@ -150,13 +150,13 @@ def cname_packet(domain)
   end
 
   it "knows when a domain is served by pages" do
-    check = GitHubPages::HealthCheck.new "chooosealicense.com"
-    expect(check.valid?).to eql(true)
+    check = GitHubPages::HealthCheck.new "choosealicense.com"
+    expect(check.served_by_pages?).to eql(true)
   end
 
   it "knows when a GitHub domain is served by pages" do
     check = GitHubPages::HealthCheck.new "mac.github.com"
-    expect(check.valid?).to eql(true)
+    expect(check.served_by_pages?).to eql(true)
   end
 
   it "knows when an apex domain using A records is served by pages" do
@@ -165,12 +165,17 @@ def cname_packet(domain)
     # HTTP/1.1 302 Found
     # Location: /
     check = GitHubPages::HealthCheck.new "getbootstrap.com"
-    expect(check.valid?).to eql(true)
+    expect(check.served_by_pages?).to eql(true)
+  end
+
+  it "knows when a domain with a redirect is served by pages" do
+    check = GitHubPages::HealthCheck.new "management.cio.gov"
+    expect(check.served_by_pages?).to eql(true)
   end
 
   it "knows when a domain isn't served by pages" do
-    check = GitHubPages::HealthCheck.new "github.com"
-    expect(check.valid?).to eql(false)
+    check = GitHubPages::HealthCheck.new "google.com"
+    expect(check.served_by_pages?).to eql(false)
     expect(check.reason.class).to eql(GitHubPages::HealthCheck::NotServedByPages)
     expect(check.reason.message).to eql("Domain does not resolve to the GitHub Pages server")
   end