github-pages-health-check 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac5d338582ae0432d783ad6e2ce77e87d1954c16
-  data.tar.gz: c91280a688eab7f1bfc1f916546edfb43171a436
+  metadata.gz: 55c8b9311f05c9c89c57e74f4e47700964f97b16
+  data.tar.gz: 7bf75965fb566b0bd9c6a5945cb073bea18a6fdc
 SHA512:
-  metadata.gz: 8bf0a5e6b95798219f6d89553e6fd2ff01219242fe8a89f12476fa234289737f664fd1d0b599f099c071aa6c692d186db7884d7bd12acc5dd52925151c8e4ba4
-  data.tar.gz: 4af63470b8f55dcaf48126cdac6543cd9f1a88d2c38c9f8c571116184fbf508d5ed4ce29877a6b39d608b05a9f8bd0c33c4ebea7556057a73d702d897c23931e
+  metadata.gz: 611f792db12ab0f8ea674a4368c2300126340a0da1a2d4d6c0e8974ac07b498a0d488d01b1ecd193c314b473357836b25743daa6f538ffd71be3462aca7b2806
+  data.tar.gz: af8a4e34b798af708a3df0cbe8dafaa5d49e7b987ba9e1ac846d1f215ce278f5f37d2f34c0e71dacfa22e5d8cf0366b8b3bd6675a87a9271c31d0a7a1c16fcb4

data/config/fastly-ips.txt

@@ -0,0 +1,14 @@
+23.235.32.0/20
+43.249.72.0/22
+103.244.50.0/24
+103.245.222.0/23
+103.245.224.0/24
+104.156.80.0/20
+151.101.0.0/16
+157.52.64.0/18
+172.111.64.0/18
+185.31.16.0/22
+199.27.72.0/21
+199.232.0.0/16
+202.21.128.0/24
+203.57.145.0/24

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

@@ -19,7 +19,9 @@ end
 module GitHubPages
   module HealthCheck
 
-    autoload :CloudFlare, "github-pages-health-check/cloudflare"
+    autoload :CDN,        "github-pages-health-check/cdn"
+    autoload :CloudFlare, "github-pages-health-check/cdns/cloudflare"
+    autoload :Fastly,     "github-pages-health-check/cdns/fastly"
     autoload :Error,      "github-pages-health-check/error"
     autoload :Errors,     "github-pages-health-check/errors"
     autoload :Checkable,  "github-pages-health-check/checkable"

data/lib/github-pages-health-check/{cloudflare.rb → cdn.rb}

@@ -1,22 +1,23 @@
 module GitHubPages
   module HealthCheck
-    class CloudFlare
+    class CDN
       include Singleton
 
       # Internal: The path of the config file.
-      attr_reader :path
+      attr_reader :name, :path
 
       # Public: Does cloudflare control this address?
       def self.controls_ip?(address)
         instance.controls_ip?(address)
       end
 
-      # Internal: Create a new cloudflare info instance.
+      # Internal: Create a new CDN info instance.
       def initialize(options = {})
+        @name = options.fetch(:name) { self.class.name.split("::").last.downcase }
         @path = options.fetch(:path) { default_config_path }
       end
 
-      # Internal: Does cloudflare control this address?
+      # Internal: Does this CDN control this address?
       def controls_ip?(address)
         ranges.any? { |range| range.include?(address) }
       end
@@ -34,7 +35,7 @@ module GitHubPages
       end
 
       def default_config_path
-        File.expand_path("../../config/cloudflare-ips.txt", File.dirname(__FILE__))
+        File.expand_path("../../config/#{name}-ips.txt", File.dirname(__FILE__))
       end
     end
   end

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

@@ -0,0 +1,8 @@
+module GitHubPages
+  module HealthCheck
+    # Instance of the CloudFlare CDN for checking IP ownership
+    # Specifically not namespaced to avoid a breaking change
+    class CloudFlare < CDN
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+module GitHubPages
+  module HealthCheck
+    # Instance of the Fastly CDN for checking IP ownership
+    # Specifically not namespaced to avoid a breaking change
+    class Fastly < CDN
+    end
+  end
+end

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

@@ -4,10 +4,14 @@ module GitHubPages
 
       attr_reader :host
 
-      LEGACY_IP_ADDRESSES = %w[
-        207.97.227.245
-        204.232.175.78
-        199.27.73.133
+      LEGACY_IP_ADDRESSES = [
+        # Legacy GitHub Datacenter
+        "207.97.227.245",
+        "204.232.175.78",
+
+        # Legacy Fastly Datacenter
+        "199.27.73.133",
+        "199.27.76.133"
       ].freeze
 
       CURRENT_IP_ADDRESSES = %w[
@@ -16,7 +20,7 @@ module GitHubPages
       ].freeze
 
       HASH_METHODS = [
-        :host, :uri, :dns_resolves?, :proxied?, :cloudflare_ip?,
+        :host, :uri, :dns_resolves?, :proxied?, :cloudflare_ip?, :fastly_ip?,
         :old_ip_address?, :a_record?, :cname_record?, :valid_domain?,
         :apex_domain?, :should_be_a_record?, :cname_to_github_user_domain?,
         :cname_to_pages_dot_github_dot_com?, :cname_to_fastly?,
@@ -36,8 +40,8 @@ module GitHubPages
       def check!
         raise Errors::InvalidDomainError.new(domain: self) unless valid_domain?
         raise Errors::InvalidDNSError.new(domain: self)    unless dns_resolves?
-        return true if proxied?
         raise Errors::DeprecatedIPError.new(domain: self)      if deprecated_ip?
+        return true if proxied?
         raise Errors::InvalidARecordError.new(domain: self)    if invalid_a_record?
         raise Errors::InvalidCNAMEError.new(domain: self)      if invalid_cname?
         raise Errors::NotServedByPagesError.new(domain: self)  unless served_by_pages?
@@ -138,10 +142,12 @@ module GitHubPages
 
       # Does the domain resolve to a CloudFlare-owned IP
       def cloudflare_ip?
-        return unless dns?
-        dns.all? do |answer|
-          answer.class == Net::DNS::RR::A && CloudFlare.controls_ip?(answer.address)
-        end
+        cdn_ip?(CloudFlare)
+      end
+
+      # Does the domain resolve to a Fastly-owned IP
+      def fastly_ip?
+        cdn_ip?(Fastly)
       end
 
       # Does this non-GitHub-pages domain proxy a GitHub Pages site?
@@ -154,7 +160,7 @@ module GitHubPages
         return unless dns?
         return true if cloudflare_ip?
         return false if pointed_to_github_pages_ip? || cname_to_github_user_domain?
-        return false if cname_to_pages_dot_github_dot_com? || cname_to_fastly?
+        return false if cname_to_pages_dot_github_dot_com? || cname_to_fastly? || fastly_ip?
         served_by_pages?
       end
 
@@ -268,6 +274,14 @@ module GitHubPages
       def scheme
         @scheme ||= github_domain? ? "https" : "http"
       end
+
+      # Does the domain resolve to a CDN-owned IP
+      def cdn_ip?(cdn)
+        return unless dns?
+        dns.all? do |answer|
+          answer.class == Net::DNS::RR::A && cdn.controls_ip?(answer.address)
+        end
+      end
     end
   end
 end

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

@@ -33,6 +33,10 @@ module GitHubPages
       end
       alias_method :message_formatted, :message_with_url
 
+      def to_s
+        "#{message_with_url} (#{self.class.name.split('::').last})".gsub("\n", " ").squeeze(" ").strip
+      end
+
       private
 
       def username

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

@@ -1,5 +1,5 @@
 module GitHubPages
   module HealthCheck
-    VERSION = "1.1.2"
+    VERSION = "1.2.0"
   end
 end

data/script/check-cdn-ips

@@ -0,0 +1,20 @@
+#!/bin/bash -e
+
+script/update-cdn-ips >/dev/null 2>&1
+files=( cloudflare fastly)
+
+# `git diff --quiet` suppresses output and sets a return code
+# 0 - no changes
+# 1 - changes
+for file in "${files[@]}"
+do
+  if git diff -w --quiet --cached "config/$file-ips.txt"
+  then
+    echo "$file IP list is up-to-date."
+  else
+    echo git reset "config/$file-ips.txt"
+    git reset --quiet "config/$file-ips.txt"
+    echo "*** $file IP list is out of date! Run script/update-cdn-ips!"
+    exit 1
+  fi
+done

data/script/cibuild

@@ -5,5 +5,5 @@ set -ex
 script/bootstrap
 
 script/test
-script/check-cloudflare-ips
+script/check-cdn-ips
 bundle exec gem build github-pages-health-check.gemspec

data/script/update-cdn-ips

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+#/ Usage script/update-ips
+#/ updates config/cloudflare-ips.txt and config/fastly-ips.txt
+
+require 'open-uri'
+require 'json'
+
+SOURCES = {
+  cloudflare: "https://www.cloudflare.com/ips-v4",
+  fastly: "https://api.fastly.com/public-ip-list"
+}
+
+SOURCES.each do |source, url|
+  file = "config/#{source}-ips.txt"
+  puts "Fetching #{url}..."
+  data = open(url).read
+  data = JSON.parse(data)["addresses"].join("\n") if source == :fastly
+  File.write(file, data)
+  `git add --verbose #{file}`
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github-pages-health-check
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - GitHub, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-dns
@@ -164,10 +164,13 @@ files:
 - LICENSE.md
 - README.md
 - config/cloudflare-ips.txt
+- config/fastly-ips.txt
 - github-pages-health-check.gemspec
 - lib/github-pages-health-check.rb
+- lib/github-pages-health-check/cdn.rb
+- lib/github-pages-health-check/cdns/cloudflare.rb
+- lib/github-pages-health-check/cdns/fastly.rb
 - lib/github-pages-health-check/checkable.rb
-- lib/github-pages-health-check/cloudflare.rb
 - lib/github-pages-health-check/domain.rb
 - lib/github-pages-health-check/error.rb
 - lib/github-pages-health-check/errors.rb
@@ -186,12 +189,12 @@ files:
 - lib/github-pages-health-check/version.rb
 - script/bootstrap
 - script/check
-- script/check-cloudflare-ips
+- script/check-cdn-ips
 - script/cibuild
 - script/console
 - script/release
 - script/test
-- script/update-cloudflare-ips
+- script/update-cdn-ips
 homepage: https://github.com/github/github-pages-health-check
 licenses:
 - MIT
@@ -212,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Checks your GitHub Pages site for commons DNS configuration issues

data/script/check-cloudflare-ips

@@ -1,17 +0,0 @@
-#!/bin/bash -e
-
-script/update-cloudflare-ips >/dev/null 2>&1
-
-# `git diff --quiet` suppresses output and sets a return code
-# 0 - no changes
-# 1 - changes
-if git diff -w --quiet --cached config/cloudflare-ips.txt
-then
-  echo CloudFlare IP list is up-to-date.
-  exit 0
-else
-  echo git reset config/cloudflare-ips.txt
-  git reset --quiet config/cloudflare-ips.txt
-  echo '*** CloudFlare IP list is out of date! Run script/update-cloudflare-ips!'
-  exit 1
-fi

data/script/update-cloudflare-ips

@@ -1,14 +0,0 @@
-#!/bin/bash -e
-#/ Usage script/update-cloudflare-ips
-#/ updates config/cloudflare-ips.txt
-
-source=https://www.cloudflare.com/ips-v4
-dest=config/cloudflare-ips.txt
-
-echo '====>' Downloading $source
-curl --silent --fail $source | tee $dest
-echo # cover for a missing newline
-
-echo '====>' git add $dest
-git diff -w $dest
-git add --verbose $dest