Skip to content

Commit

Permalink
Merge pull request #8613 from reitermarkus/cask-audit-url
Browse files Browse the repository at this point in the history
Only audit appcast URL if specified and check its contents.
  • Loading branch information
reitermarkus authored Sep 5, 2020
2 parents 8fe9652 + 6194155 commit 39f0784
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions Library/Homebrew/cask/audit.rb
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ def check_token_bad_words
add_warning "cask token contains .app" if token.end_with? ".app"

if /-(?<designation>alpha|beta|rc|release-candidate)$/ =~ cask.token &&
cask.tap.official? &&
cask.tap&.official? &&
cask.tap != "homebrew/cask-versions"
add_warning "cask token contains version designation '#{designation}'"
end
Expand Down Expand Up @@ -561,7 +561,7 @@ def get_repo_data(regex)
end

def check_denylist
return if cask.tap&.user != "Homebrew"
return unless cask.tap&.official?
return unless reason = Denylist.reason(cask.token)

add_error "#{cask.token} is not allowed: #{reason}"
Expand All @@ -570,15 +570,15 @@ def check_denylist
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
Expand Down

0 comments on commit 39f0784

Please sign in to comment.