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

Merge pull request #10402 from Rylan12/audit-url-spec-fix

Browse Source 
utils/curl: use specs when checking http content problems
This commit is contained in:
Mike McQuaid 2021-01-25 09:54:48 +00:00 committed by GitHub
commit 8da7e108a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/resource_auditor.rb
View File

@ -105,7 +105,7 @@ module Homebrew
# pull request. # pull request.
next if url.match?(%r{^https://dl.bintray.com/homebrew/mirror/}) next if url.match?(%r{^https://dl.bintray.com/homebrew/mirror/})
if http_content_problem = curl_check_http_content(url) if http_content_problem = curl_check_http_content(url, specs: specs)
problem http_content_problem problem http_content_problem
end end
elsif strategy <= GitDownloadStrategy elsif strategy <= GitDownloadStrategy

13
Library/Homebrew/utils/curl.rb
View File

@ -151,7 +151,7 @@ module Utils
details[:headers].match?(/^Set-Cookie: incap_ses_/i) details[:headers].match?(/^Set-Cookie: incap_ses_/i)
end end
def curl_check_http_content(url, user_agents: [:default], check_content: false, strict: false) def curl_check_http_content(url, specs: {}, user_agents: [:default], check_content: false, strict: false)
return unless url.start_with? "http" return unless url.start_with? "http"
secure_url = url.sub(/\Ahttp:/, "https:") secure_url = url.sub(/\Ahttp:/, "https:")
@ -160,7 +160,8 @@ module Utils
if url != secure_url if url != secure_url
user_agents.each do |user_agent| user_agents.each do |user_agent|
secure_details = secure_details =
curl_http_content_headers_and_checksum(secure_url, hash_needed: true, user_agent: user_agent) curl_http_content_headers_and_checksum(secure_url, specs: specs, hash_needed: true,
user_agent: user_agent)
next unless http_status_ok?(secure_details[:status]) next unless http_status_ok?(secure_details[:status])
@ -172,7 +173,8 @@ module Utils
details = nil details = nil
user_agents.each do |user_agent| user_agents.each do |user_agent|
details = curl_http_content_headers_and_checksum(url, hash_needed: hash_needed, user_agent: user_agent) details =
curl_http_content_headers_and_checksum(url, specs: specs, hash_needed: hash_needed, user_agent: user_agent)
break if http_status_ok?(details[:status]) break if http_status_ok?(details[:status])
end end
@ -237,12 +239,13 @@ module Utils
"The URL #{url} may be able to use HTTPS rather than HTTP. Please verify it in a browser." "The URL #{url} may be able to use HTTPS rather than HTTP. Please verify it in a browser."
end end
def curl_http_content_headers_and_checksum(url, hash_needed: false, user_agent: :default) def curl_http_content_headers_and_checksum(url, specs: {}, hash_needed: false, user_agent: :default)
file = Tempfile.new.tap(&:close) file = Tempfile.new.tap(&:close)
specs = specs.flat_map { |option, argument| ["--#{option.to_s.tr("_", "-")}", argument] }
max_time = hash_needed ? "600" : "25" max_time = hash_needed ? "600" : "25"
output, _, status = curl_output( output, _, status = curl_output(
"--dump-header", "-", "--output", file.path, "--location", *specs, "--dump-header", "-", "--output", file.path, "--location",
"--connect-timeout", "15", "--max-time", max_time, "--retry-max-time", max_time, url, "--connect-timeout", "15", "--max-time", max_time, "--retry-max-time", max_time, url,
user_agent: user_agent user_agent: user_agent
) )