Homebrew · MikeMcQuaid · Nov 24, 2018 · Oct 10, 2018 · Oct 10, 2018 · Oct 10, 2018
diff --git a/Library/Homebrew/cask/audit.rb b/Library/Homebrew/cask/audit.rb
@@ -1,6 +1,7 @@
 require "cask/checkable"
 require "cask/download"
 require "digest"
+require "utils/curl"
 require "utils/git"
 
 module Cask
@@ -30,6 +31,7 @@ def run!
       check_generic_artifacts
       check_token_conflicts
       check_download
+      check_https_availability
       check_single_pre_postflight
       check_single_uninstall_zap
       check_untrusted_pkg
@@ -317,5 +319,19 @@ def check_download
     rescue => e
       add_error "download not possible: #{e.message}"
     end
+
+    def check_https_availability
+      return unless download
+      if !cask.url.blank? && !cask.url.using
+        check_url_for_https_availability(cask.url, user_agents: [cask.url.user_agent])
+      end
+      check_url_for_https_availability(cask.appcast) unless cask.appcast.blank?
+      check_url_for_https_availability(cask.homepage) unless cask.homepage.blank?
+    end
+
+    def check_url_for_https_availability(url_to_check, user_agents: [:default])
+      problem = curl_check_http_content(url_to_check.to_s, user_agents: user_agents)
+      add_error problem if problem
+    end
   end
 end
diff --git a/Library/Homebrew/test/cask/cmd/home_spec.rb b/Library/Homebrew/test/cask/cmd/home_spec.rb
@@ -8,13 +8,13 @@
   it_behaves_like "a command that handles invalid options"
 
   it "opens the homepage for the specified Cask" do
-    expect(described_class).to receive(:open_url).with("https://example.com/local-caffeine")
+    expect(described_class).to receive(:open_url).with("https://example.com")
     described_class.run("local-caffeine")
   end
 
   it "works for multiple Casks" do
-    expect(described_class).to receive(:open_url).with("https://example.com/local-caffeine")
-    expect(described_class).to receive(:open_url).with("https://example.com/local-transmission")
+    expect(described_class).to receive(:open_url).with("https://example.com")
+    expect(described_class).to receive(:open_url).with("https://example.com")
     described_class.run("local-caffeine", "local-transmission")
   end
 

diff --git a/Library/Homebrew/test/cask/cmd/info_spec.rb b/Library/Homebrew/test/cask/cmd/info_spec.rb
@@ -10,7 +10,7 @@
       described_class.run("local-caffeine")
     }.to output(<<~EOS).to_stdout
       local-caffeine: 1.2.3
-      https://example.com/local-caffeine
+      https://example.com
       Not installed
       From: https://github.com/Homebrew/homebrew-cask/blob/master/Casks/local-caffeine.rb
       ==> Name
@@ -39,15 +39,15 @@
     let(:expected_output) {
       <<~EOS
         local-caffeine: 1.2.3
-        https://example.com/local-caffeine
+        https://example.com
         Not installed
         From: https://github.com/Homebrew/homebrew-cask/blob/master/Casks/local-caffeine.rb
         ==> Name
         None
         ==> Artifacts
         Caffeine.app (App)
         local-transmission: 2.61
-        https://example.com/local-transmission
+        https://example.com
         Not installed
         From: https://github.com/Homebrew/homebrew-cask/blob/master/Casks/local-transmission.rb
         ==> Name
@@ -69,7 +69,7 @@
       described_class.run("with-caveats")
     }.to output(<<~EOS).to_stdout
       with-caveats: 1.2.3
-      https://example.com/local-caffeine
+      https://example.com
       Not installed
       From: https://github.com/Homebrew/homebrew-cask/blob/master/Casks/with-caveats.rb
       ==> Name
@@ -95,7 +95,7 @@
       described_class.run("with-conditional-caveats")
     }.to output(<<~EOS).to_stdout
       with-conditional-caveats: 1.2.3
-      https://example.com/local-caffeine
+      https://example.com
       Not installed
       From: https://github.com/Homebrew/homebrew-cask/blob/master/Casks/with-conditional-caveats.rb
       ==> Name
@@ -110,7 +110,7 @@
       described_class.run("with-languages")
     }.to output(<<~EOS).to_stdout
       with-languages: 1.2.3
-      https://example.com/local-caffeine
+      https://example.com
       Not installed
       From: https://github.com/Homebrew/homebrew-cask/blob/master/Casks/with-languages.rb
       ==> Name
@@ -127,7 +127,7 @@
       described_class.run("without-languages")
     }.to output(<<~EOS).to_stdout
       without-languages: 1.2.3
-      https://example.com/local-caffeine
+      https://example.com
       Not installed
       From: https://github.com/Homebrew/homebrew-cask/blob/master/Casks/without-languages.rb
       ==> Name

diff --git a/Library/Homebrew/test/cask/cmd/internal_stanza_spec.rb b/Library/Homebrew/test/cask/cmd/internal_stanza_spec.rb
@@ -3,7 +3,7 @@
     command = described_class.new("homepage", "local-caffeine")
     expect {
       command.run
-    }.to output("https://example.com/local-caffeine\n").to_stdout
+    }.to output("https://example.com\n").to_stdout
   end
 
   it "raises an exception when stanza is unknown/unsupported" do

diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/bad-checksum.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/bad-checksum.rb
@@ -3,7 +3,7 @@
   sha256 'badbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadb'
 
   url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'https://example.com/local-caffeine'
+  homepage 'https://example.com'
 
   app 'Caffeine.app'
 end
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/installer-with-uninstall.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/installer-with-uninstall.rb
@@ -3,7 +3,7 @@
   sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'https://example.com/local-caffeine'
+  homepage 'https://example.com'
 
   installer manual: 'Caffeine.app'
 

diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/invalid/invalid-header-format.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/invalid/invalid-header-format.rb
@@ -3,7 +3,7 @@
   sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'https://example.com/local-caffeine'
+  homepage 'https://example.com'
 
   app 'Caffeine.app'
 end
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/invalid/invalid-header-token-mismatch.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/invalid/invalid-header-token-mismatch.rb
@@ -3,7 +3,7 @@
   sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'https://example.com/local-caffeine'
+  homepage 'https://example.com'
 
   app 'Caffeine.app'
 end
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/invalid/invalid-header-version.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/invalid/invalid-header-version.rb
@@ -3,7 +3,7 @@
   sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'https://example.com/local-caffeine'
+  homepage 'https://example.com'
 
   app 'Caffeine.app'
 end
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/invalid/invalid-two-homepage.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/invalid/invalid-two-homepage.rb
@@ -3,7 +3,7 @@
   sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'https://example.com/local-caffeine'
+  homepage 'https://example.com'
   homepage 'https://www.example.com/local-caffeine'
 
   app 'Caffeine.app'

diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/invalid/invalid-two-url.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/invalid/invalid-two-url.rb
@@ -4,7 +4,7 @@
 
   url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
   url 'https://example.com/caffeine.zip'
-  homepage 'https://example.com/local-caffeine'
+  homepage 'https://example.com'
 
   app 'Caffeine.app'
 end
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/invalid/invalid-two-version.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/invalid/invalid-two-version.rb
@@ -4,7 +4,7 @@
   sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'https://example.com/local-caffeine'
+  homepage 'https://example.com'
 
   app 'Caffeine.app'
 end
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/local-caffeine.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/local-caffeine.rb
@@ -3,7 +3,7 @@
   sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'https://example.com/local-caffeine'
+  homepage 'https://example.com'
 
   app 'Caffeine.app'
 end
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/local-transmission.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/local-transmission.rb
@@ -4,7 +4,7 @@
   sha256 'e44ffa103fbf83f55c8d0b1bea309a43b2880798dae8620b1ee8da5e1095ec68'
 
   url "file://#{TEST_FIXTURE_DIR}/cask/transmission-2.61.dmg"
-  homepage 'https://example.com/local-transmission'
+  homepage 'https://example.com'
 
   app 'Transmission.app'
 end
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/missing-checksum.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/missing-checksum.rb
@@ -2,7 +2,7 @@
   version '1.2.3'
 
   url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'https://example.com/local-caffeine'
+  homepage 'https://example.com'
 
   app 'Caffeine.app'
 end
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/no-checksum.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/no-checksum.rb
@@ -3,7 +3,7 @@
   sha256 :no_check
 
   url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'https://example.com/local-caffeine'
+  homepage 'https://example.com'
 
   app 'Caffeine.app'
 end
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/outdated/bad-checksum.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/outdated/bad-checksum.rb
@@ -3,7 +3,7 @@
   sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'https://example.com/local-caffeine'
+  homepage 'https://example.com'
 
   app 'Caffeine.app'
 end
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/outdated/local-caffeine.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/outdated/local-caffeine.rb
@@ -3,7 +3,7 @@
   sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'https://example.com/local-caffeine'
+  homepage 'https://example.com'
 
   app 'Caffeine.app'
 end
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/outdated/local-transmission.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/outdated/local-transmission.rb
@@ -3,7 +3,7 @@
   sha256 'e44ffa103fbf83f55c8d0b1bea309a43b2880798dae8620b1ee8da5e1095ec68'
 
   url "file://#{TEST_FIXTURE_DIR}/cask/transmission-2.61.dmg"
-  homepage 'https://example.com/local-transmission'
+  homepage 'https://example.com'
 
   app 'Transmission.app'
 end
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/outdated/version-latest.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/outdated/version-latest.rb
@@ -3,7 +3,7 @@
   sha256 :no_check
 
   url "file://#{TEST_FIXTURE_DIR}/cask/caffeines.zip"
-  homepage 'https://example.com/local-caffeine'
+  homepage 'https://example.com'
 
   app 'Caffeine Mini.app'
   app 'Caffeine Pro.app'

diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/version-latest.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/version-latest.rb
@@ -3,7 +3,7 @@
   sha256 :no_check
 
   url "file://#{TEST_FIXTURE_DIR}/cask/caffeines.zip"
-  homepage 'https://example.com/local-caffeine'
+  homepage 'https://example.com'
 
   app 'Caffeine Mini.app'
   app 'Caffeine Pro.app'

diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/will-fail-if-upgraded.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/will-fail-if-upgraded.rb
@@ -3,7 +3,7 @@
   sha256 'e44ffa103fbf83f55c8d0b1bea309a43b2880798dae8620b1ee8da5e1095ec68'
 
   url "file://#{TEST_FIXTURE_DIR}/cask/transmission-2.61.dmg"
-  homepage 'https://example.com/local-transmission'
+  homepage 'https://example.com'
 
   app 'container'
 end
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/with-alt-target.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/with-alt-target.rb
@@ -3,7 +3,7 @@
   sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'https://example.com/local-caffeine'
+  homepage 'https://example.com'
 
   app 'Caffeine.app', target: 'AnotherName.app'
 end
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/with-caveats.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/with-caveats.rb
@@ -3,7 +3,7 @@
   sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'https://example.com/local-caffeine'
+  homepage 'https://example.com'
 
   app 'Caffeine.app'
 

diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/with-conditional-caveats.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/with-conditional-caveats.rb
@@ -3,7 +3,7 @@
   sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'https://example.com/local-caffeine'
+  homepage 'https://example.com'
 
   app 'Caffeine.app'
 

diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/with-installer-manual.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/with-installer-manual.rb
@@ -3,7 +3,7 @@
   sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'https://example.com/local-caffeine'
+  homepage 'https://example.com'
 
   installer manual: 'Caffeine.app'
 end
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/with-languages.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/with-languages.rb
@@ -12,7 +12,7 @@
   end
 
   url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'https://example.com/local-caffeine'
+  homepage 'https://example.com'
 
   app 'Caffeine.app'
 end
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/with-two-apps-correct.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/with-two-apps-correct.rb
@@ -3,7 +3,7 @@
   sha256 '3178fbfd1ea5d87a2a0662a4eb599ebc9a03888e73f37538d9f3f6ee69d2368e'
 
   url "file://#{TEST_FIXTURE_DIR}/cask/caffeines.zip"
-  homepage 'https://example.com/local-caffeine'
+  homepage 'https://example.com'
 
   app 'Caffeine Mini.app'
   app 'Caffeine Pro.app'

diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/with-two-apps-subdir.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/with-two-apps-subdir.rb
@@ -3,7 +3,7 @@
   sha256 'd687c22a21c02bd8f07da9302c8292b93a04df9a929e3f04d09aea6c76f75c65'
 
   url "file://#{TEST_FIXTURE_DIR}/cask/caffeines-subdir.zip"
-  homepage 'https://example.com/local-caffeine'
+  homepage 'https://example.com'
 
   app 'Caffeines/Caffeine Mini.app'
   app 'Caffeines/Caffeine Pro.app'

diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/without-languages.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/without-languages.rb
@@ -3,7 +3,7 @@
   sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'https://example.com/local-caffeine'
+  homepage 'https://example.com'
 
   app 'Caffeine.app'
 end