From 8753449dbb89b25b13fd23efb3fcd61e4b3e08ee Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Sat, 24 Jun 2023 05:30:07 +0200 Subject: [PATCH] Simplify CloudFlare header check. --- Library/Homebrew/utils/curl.rb | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/Library/Homebrew/utils/curl.rb b/Library/Homebrew/utils/curl.rb index 69cfc6cb3f..d480c0ef7b 100644 --- a/Library/Homebrew/utils/curl.rb +++ b/Library/Homebrew/utils/curl.rb @@ -242,17 +242,7 @@ module Utils return false if response[:headers].blank? return false unless [403, 503].include?(response[:status_code].to_i) - set_cookie_header = Array(response[:headers]["set-cookie"]) - has_cloudflare_cookie_header = set_cookie_header.compact.any? do |cookie| - cookie.match?(/^(__cfduid|__cf_bm)=/i) - end - - server_header = Array(response[:headers]["server"]) - has_cloudflare_server = server_header.compact.any? do |server| - server.match?(/^cloudflare/i) - end - - has_cloudflare_cookie_header && has_cloudflare_server + [*response[:headers]["server"]].any? { |server| server.match?(/^cloudflare/i) } end # Check if a URL is protected by Incapsula (e.g. corsair.com).