Browse Source

Fix Reject Hosts parsing

SukkaW 3 years ago
parent
commit
aeb33a169f
3 changed files with 9 additions and 1 deletions
  1. 4 0
      Build/lib/is-domain-loose.js
  2. 3 1
      Build/lib/parse-filter.js
  3. 2 0
      Source/domainset/reject_sukka.conf

+ 4 - 0
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;

+ 3 - 1
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;
         }
       }
     }

+ 2 - 0
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