From 9a0c8b59194c271fe2af378eea632e3df57132d6 Mon Sep 17 00:00:00 2001 From: SukkaW Date: Mon, 3 Jun 2024 21:31:55 +0800 Subject: [PATCH] Fix: proper reject hosts generation --- Build/lib/parse-filter.ts | 6 ++++-- Source/non_ip/domestic.conf | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Build/lib/parse-filter.ts b/Build/lib/parse-filter.ts index b22a43c8..130601d9 100644 --- a/Build/lib/parse-filter.ts +++ b/Build/lib/parse-filter.ts @@ -477,10 +477,11 @@ function parse($line: string, gorhill: PublicSuffixList, result: [string, ParseT if (domain) { result[0] = domain; result[1] = whiteIncludeAllSubDomain ? ParseType.WhiteIncludeSubdomain : ParseType.WhiteAbsolute; + return result; } result[0] = `[parse-filter E0001] (white) invalid domain: ${JSON.stringify({ - line, sliced, sliceStart, sliceEnd + line, sliced, sliceStart, sliceEnd, domain })}`; result[1] = ParseType.ErrorMessage; return result; @@ -557,9 +558,10 @@ function parse($line: string, gorhill: PublicSuffixList, result: [string, ParseT if (domain) { result[0] = domain; result[1] = ParseType.BlackIncludeSubdomain; + return result; } - result[0] = `[paparse-filter E0003] (black) invalid domain: ${sliced}`; + result[0] = `[parse-filter E0003] (black) invalid domain: ${JSON.stringify({ sliced, domain })}`; result[1] = ParseType.ErrorMessage; return result; } diff --git a/Source/non_ip/domestic.conf b/Source/non_ip/domestic.conf index 250a7ec9..7dae4495 100644 --- a/Source/non_ip/domestic.conf +++ b/Source/non_ip/domestic.conf @@ -521,6 +521,7 @@ DOMAIN-SUFFIX,msstatic.com DOMAIN-SUFFIX,mubu.com DOMAIN-SUFFIX,myzaker.com DOMAIN-SUFFIX,neea.cn +DOMAIN-SUFFIX,ntp.org.cn DOMAIN-SUFFIX,nubia.cn DOMAIN-SUFFIX,nubia.com DOMAIN,ocsp.digicert.cn