From cd5525b5602b0e098ad5dd6e79a86a09356f7795 Mon Sep 17 00:00:00 2001 From: SukkaW Date: Thu, 3 Nov 2022 15:16:08 +0800 Subject: [PATCH] Perf: only acquire limited data from parse --- Build/build-phishing-domainset.js | 8 ++------ Build/validate-cdn-conf.js | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Build/build-phishing-domainset.js b/Build/build-phishing-domainset.js index 789de0fd..c1d0b42a 100644 --- a/Build/build-phishing-domainset.js +++ b/Build/build-phishing-domainset.js @@ -54,13 +54,9 @@ const BLACK_TLD = Array.from(new Set([ const domain = line.charCodeAt(0) === 46 ? line.slice(1) : line; - if (line.length > 25) { - const parsed = tldts.parse(domain, { allowPrivateDomains: true }); + if (domain.length > 25) { + const apexDomain = tldts.getDomain(domain, { allowPrivateDomains: true }); - if (parsed.isIp || domain === parsed.publicSuffix) { - continue; - } - const apexDomain = parsed.domain; if (apexDomain) { if (WHITELIST_DOMAIN.has(apexDomain)) { continue; diff --git a/Build/validate-cdn-conf.js b/Build/validate-cdn-conf.js index 8310ae65..9d60945d 100644 --- a/Build/validate-cdn-conf.js +++ b/Build/validate-cdn-conf.js @@ -28,7 +28,7 @@ const SPECIAL_SUFFIXES = new Set([ } const domain = line.charCodeAt(0) === 46 ? line.slice(1) : line; - const parsed = tldts.parse(domain, { allowPrivateDomains: true }); + const parsed = tldts.parse(domain, { allowPrivateDomains: true, detectIp: false }); if ( ( @@ -58,7 +58,7 @@ const SPECIAL_SUFFIXES = new Set([ if (line.startsWith('DOMAIN-SUFFIX')) { const domain = line.slice(14); - const parsed = tldts.parse(domain, { allowPrivateDomains: true }); + const parsed = tldts.parse(domain, { allowPrivateDomains: true, detectIp: false }); if (domain !== parsed.publicSuffix) { if (!SPECIAL_SUFFIXES.has(domain)) {