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

Merge pull request #8711 from reitermarkus/cloudflare

Browse Source 
Check for CloudFlare protection on status code 403.
This commit is contained in:
Markus Reiter 2020-09-12 22:26:36 +02:00 committed by GitHub
commit a47b4b432a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,9 +143,9 @@ def curl_check_http_content(url, user_agents: [:default], check_content: false,
unless http_status_ok?(details[:status]) unless http_status_ok?(details[:status])
# Check if the URL is protected by CloudFlare. # Check if the URL is protected by CloudFlare.
if details[:status].to_i == 503 && if [403, 503].include?(details[:status].to_i) &&
details[:file].include?("set-cookie: __cfduid=") && details[:headers].include?("set-cookie: __cfduid=") &&
details[:file].include?("server: cloudflare") details[:headers].include?("server: cloudflare")
return return
end end
@ -236,6 +236,7 @@ def curl_http_content_headers_and_checksum(url, hash_needed: false, user_agent:
status: status_code, status: status_code,
etag: headers[%r{ETag: ([wW]/)?"(([^"]|\\")*)"}, 2], etag: headers[%r{ETag: ([wW]/)?"(([^"]|\\")*)"}, 2],
content_length: headers[/Content-Length: (\d+)/, 1], content_length: headers[/Content-Length: (\d+)/, 1],
headers: headers,
file_hash: output_hash, file_hash: output_hash,
file: output, file: output,
} }