From 8cfa0501589116b61eaf4972c9afc7aa87d5420e Mon Sep 17 00:00:00 2001
From: Markus Reiter <me@reitermark.us>
Date: Sat, 12 Sep 2020 20:56:24 +0200
Subject: [PATCH] Check for CloudFlare protection on status code 403.
---
Library/Homebrew/utils/curl.rb | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/Library/Homebrew/utils/curl.rb b/Library/Homebrew/utils/curl.rb
index 4b0992b89b..7ca847b3fc 100644
--- a/Library/Homebrew/utils/curl.rb
+++ b/Library/Homebrew/utils/curl.rb
@@ -143,9 +143,9 @@ def curl_check_http_content(url, user_agents: [:default], check_content: false,
unless http_status_ok?(details[:status])
# Check if the URL is protected by CloudFlare.
- if details[:status].to_i == 503 &&
- details[:file].include?("set-cookie: __cfduid=") &&
- details[:file].include?("server: cloudflare")
+ if [403, 503].include?(details[:status].to_i) &&
+ details[:headers].include?("set-cookie: __cfduid=") &&
+ details[:headers].include?("server: cloudflare")
return
end
@@ -236,6 +236,7 @@ def curl_http_content_headers_and_checksum(url, hash_needed: false, user_agent:
status: status_code,
etag: headers[%r{ETag: ([wW]/)?"(([^"]|\\")*)"}, 2],
content_length: headers[/Content-Length: (\d+)/, 1],
+ headers: headers,
file_hash: output_hash,
file: output,
}
--
GitLab