From 05cf8f42e0ee754a408473ca4c54de1cf389ef24 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Sat, 5 Sep 2020 04:08:34 +0200 Subject: [PATCH] Only audit appcast URL if specified and check its contents. --- Library/Homebrew/cask/audit.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Library/Homebrew/cask/audit.rb b/Library/Homebrew/cask/audit.rb index db3ffb71e3..ebd9c8035c 100644 --- a/Library/Homebrew/cask/audit.rb +++ b/Library/Homebrew/cask/audit.rb @@ -571,15 +571,15 @@ module Cask 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, user_agents: [:browser]) unless cask.homepage.blank? + check_url_for_https_availability(cask.url, user_agents: [cask.url.user_agent]) if cask.url && !cask.url.using + + check_url_for_https_availability(cask.appcast, check_content: true) if cask.appcast && appcast? + + check_url_for_https_availability(cask.homepage, check_content: true, user_agents: [:browser]) if cask.homepage 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) + def check_url_for_https_availability(url_to_check, **options) + problem = curl_check_http_content(url_to_check.to_s, **options) add_error problem if problem end end