From d71f35beddfbafd3115dc7eacba1c7514596689c Mon Sep 17 00:00:00 2001
From: Xi Xu <i@xi-xu.me>
Date: Thu, 2 Apr 2026 19:58:18 +0800
Subject: [PATCH] ci: avoid false positives in upstream response checks

---
 .github/workflows/build-and-publish.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
index 6cf8088..215604b 100644
--- a/.github/workflows/build-and-publish.yml
+++ b/.github/workflows/build-and-publish.yml
@@ -121,13 +121,17 @@ jobs:
             curl --fail --show-error --silent --location --retry 3 --retry-delay 2 --retry-all-errors "$@"
           }
 
+          response_looks_invalid() {
+            head -n 5 "$1" | grep -Eiq '^(429([[:space:]:]|$)|<!DOCTYPE html|<html)|Too Many Requests'
+          }
+
           fetch_plain_list() {
             local url="$1"
             local dest="$2"
             local tmp
             tmp=$(mktemp)
             curl_retry "$url" -o "$tmp"
-            if grep -Eiq '^(429|<!DOCTYPE html|<html)|Too Many Requests' "$tmp"; then
+            if response_looks_invalid "$tmp"; then
               echo "::error::Unexpected response while fetching ${url}"
               head -n 5 "$tmp"
               return 1
@@ -141,7 +145,7 @@ jobs:
             local tmp
             tmp=$(mktemp)
             curl_retry "$url" -o "$tmp"
-            if grep -Eiq '^(429|<!DOCTYPE html|<html)|Too Many Requests' "$tmp"; then
+            if response_looks_invalid "$tmp"; then
               echo "::error::Unexpected response while fetching ${url}"
               head -n 5 "$tmp"
               return 1
@@ -171,7 +175,7 @@ jobs:
           cd custom
           echo ipleak.net >> ../community/data/geolocation-\!cn && echo browserleaks.org >> ../community/data/geolocation-\!cn
           for file in ../community/data/*; do
-            if grep -Eiq '^(429|<!DOCTYPE html|<html)|Too Many Requests' "$file"; then
+            if head -n 5 "$file" | grep -Eiq '^(429([[:space:]:]|$)|<!DOCTYPE html|<html)|Too Many Requests'; then
               echo "::error file=${file}::Unexpected upstream response detected in ruleset input"
               head -n 5 "$file"
               exit 1