From aeb33a169fd637b8149799326268787be900fb17 Mon Sep 17 00:00:00 2001 From: SukkaW Date: Mon, 26 Dec 2022 18:56:25 +0800 Subject: [PATCH] Fix Reject Hosts parsing --- Build/lib/is-domain-loose.js | 4 ++++ Build/lib/parse-filter.js | 4 +++- Source/domainset/reject_sukka.conf | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Build/lib/is-domain-loose.js b/Build/lib/is-domain-loose.js index 8ee21582..89e931f8 100644 --- a/Build/lib/is-domain-loose.js +++ b/Build/lib/is-domain-loose.js @@ -6,6 +6,10 @@ module.exports.isDomainLoose = (domain) => { }; module.exports.normalizeDomain = (domain) => { + if (domain == null) { + return null; + } + const { isIcann, isPrivate, hostname, isIp } = parse(domain, { allowPrivateDomains: true }); if (isIp) { return null; diff --git a/Build/lib/parse-filter.js b/Build/lib/parse-filter.js index 983539e7..910f3543 100644 --- a/Build/lib/parse-filter.js +++ b/Build/lib/parse-filter.js @@ -203,7 +203,7 @@ async function processFilterRules (filterRulesUrl, fallbackUrls, includeThirdPar && (!filter.isRegex()) && (!filter.isFullRegex()) ) { - const hostname = filter.getHostname(); + const hostname = normalizeDomain(filter.getHostname()); if (hostname) { if (filter.isException() || filter.isBadFilter()) { addToWhiteList(hostname); @@ -222,6 +222,8 @@ async function processFilterRules (filterRulesUrl, fallbackUrls, includeThirdPar if (filter.firstParty()) { continue; } + } else { + continue; } } } diff --git a/Source/domainset/reject_sukka.conf b/Source/domainset/reject_sukka.conf index 02c77c86..f4993d52 100644 --- a/Source/domainset/reject_sukka.conf +++ b/Source/domainset/reject_sukka.conf @@ -571,6 +571,8 @@ t.yesware.com .charlestownwyllie.oaklawnnonantum.com .auwrtou.cn +.shockynews.com + # >> Tracking tracking.yorg.app .taginstall.com