admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #8613 from reitermarkus/cask-audit-url

Browse Source 
Only audit appcast URL if specified and check its contents.
This commit is contained in:
Markus Reiter 2020-09-05 07:43:05 +02:00 committed by GitHub
commit 39f0784108
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Library/Homebrew/cask/audit.rb
View File

@ -395,7 +395,7 @@ module Cask
add_warning "cask token contains .app" if token.end_with? ".app" add_warning "cask token contains .app" if token.end_with? ".app"
if /-(?<designation>alpha|beta|rc|release-candidate)$/ =~ cask.token && if /-(?<designation>alpha|beta|rc|release-candidate)$/ =~ cask.token &&
cask.tap.official? && cask.tap&.official? &&
cask.tap != "homebrew/cask-versions" cask.tap != "homebrew/cask-versions"
add_warning "cask token contains version designation '#{designation}'" add_warning "cask token contains version designation '#{designation}'"
end end
@ -561,7 +561,7 @@ module Cask
end end
def check_denylist def check_denylist
return if cask.tap&.user != "Homebrew" return unless cask.tap&.official?
return unless reason = Denylist.reason(cask.token) return unless reason = Denylist.reason(cask.token)
add_error "#{cask.token} is not allowed: #{reason}" add_error "#{cask.token} is not allowed: #{reason}"
@ -570,15 +570,15 @@ module Cask
def check_https_availability def check_https_availability
return unless download return unless download
if !cask.url.blank? && !cask.url.using 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.url, user_agents: [cask.url.user_agent])
end check_url_for_https_availability(cask.appcast, check_content: true) if cask.appcast && appcast?
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.homepage, check_content: true, user_agents: [:browser]) if cask.homepage
end end
def check_url_for_https_availability(url_to_check, user_agents: [:default]) def check_url_for_https_availability(url_to_check, **options)
problem = curl_check_http_content(url_to_check.to_s, user_agents: user_agents) problem = curl_check_http_content(url_to_check.to_s, **options)
add_error problem if problem add_error problem if problem
end end
end end