GithubFollow/Surge_by_SukkaW
1
0
Fork 0
mirror of https://github.com/SukkaW/Surge.git synced 2025-12-14 02:00:37 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Reject Extra no longer includes phising data

Browse Source
This commit is contained in:
SukkaW 2025-04-19 21:05:49 +08:00
parent dc107297c1
commit 25f79585ed
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Build/build-reject-domainset.ts
View File

@ -6,7 +6,7 @@ import { processHostsWithPreload } from './lib/parse-filter/hosts';
import { processDomainListsWithPreload } from './lib/parse-filter/domainlists'; import { processDomainListsWithPreload } from './lib/parse-filter/domainlists';
import { processFilterRulesWithPreload } from './lib/parse-filter/filters'; import { processFilterRulesWithPreload } from './lib/parse-filter/filters';
import { HOSTS, ADGUARD_FILTERS, PREDEFINED_WHITELIST, DOMAIN_LISTS, HOSTS_EXTRA, DOMAIN_LISTS_EXTRA, ADGUARD_FILTERS_EXTRA, PHISHING_DOMAIN_LISTS_EXTRA, ADGUARD_FILTERS_WHITELIST } from './constants/reject-data-source'; import { HOSTS, ADGUARD_FILTERS, PREDEFINED_WHITELIST, DOMAIN_LISTS, HOSTS_EXTRA, DOMAIN_LISTS_EXTRA, ADGUARD_FILTERS_EXTRA, ADGUARD_FILTERS_WHITELIST } from './constants/reject-data-source';
import { readFileIntoProcessedArray } from './lib/fetch-text-by-line'; import { readFileIntoProcessedArray } from './lib/fetch-text-by-line';
import { task } from './trace'; import { task } from './trace';
// tldts-experimental is way faster than tldts, but very little bit inaccurate // tldts-experimental is way faster than tldts, but very little bit inaccurate
@ -62,8 +62,7 @@ export const buildRejectDomainSet = task(require.main === module, __filename)(as
'Build from:', 'Build from:',
...HOSTS_EXTRA.map(host => ` - ${host[0]}`), ...HOSTS_EXTRA.map(host => ` - ${host[0]}`),
...DOMAIN_LISTS_EXTRA.map(domainList => ` - ${domainList[0]}`), ...DOMAIN_LISTS_EXTRA.map(domainList => ` - ${domainList[0]}`),
...ADGUARD_FILTERS_EXTRA.map(filter => ` - ${Array.isArray(filter) ? filter[0] : filter}`), ...ADGUARD_FILTERS_EXTRA.map(filter => ` - ${Array.isArray(filter) ? filter[0] : filter}`)
...PHISHING_DOMAIN_LISTS_EXTRA.map(domainList => ` - ${domainList[0]}`)
]); ]);
const appendArrayToRejectOutput = rejectOutput.addFromDomainset.bind(rejectOutput); const appendArrayToRejectOutput = rejectOutput.addFromDomainset.bind(rejectOutput);
@ -118,8 +117,7 @@ export const buildRejectDomainSet = task(require.main === module, __filename)(as
addArrayElementsToSet(filterRuleWhitelistDomainSets, blackDomains); addArrayElementsToSet(filterRuleWhitelistDomainSets, blackDomains);
addArrayElementsToSet(filterRuleWhitelistDomainSets, blackDomainSuffixes, suffix => '.' + suffix); addArrayElementsToSet(filterRuleWhitelistDomainSets, blackDomainSuffixes, suffix => '.' + suffix);
}) })
), )
getPhishingDomains(childSpan).then(appendArrayToRejectExtraOutput)
].flat())); ].flat()));
if (foundDebugDomain.value) { if (foundDebugDomain.value) {
@ -152,7 +150,7 @@ export const buildRejectDomainSet = task(require.main === module, __filename)(as
const rejectOutputAdGuardHome = new AdGuardHomeOutput(span, 'reject-adguardhome', OUTPUT_INTERNAL_DIR) const rejectOutputAdGuardHome = new AdGuardHomeOutput(span, 'reject-adguardhome', OUTPUT_INTERNAL_DIR)
.withTitle('Sukka\'s Ruleset - Blocklist for AdGuardHome') .withTitle('Sukka\'s Ruleset - Blocklist for AdGuardHome')
.withDescription([ .withDescription([
'The domainset supports AD blocking, tracking protection, privacy protection, anti-phishing, anti-mining' 'The AdGuardHome ruleset supports AD blocking, tracking protection, privacy protection, anti-phishing, anti-mining'
]); ]);
rejectOutputAdGuardHome.domainTrie = rejectOutput.domainTrie; rejectOutputAdGuardHome.domainTrie = rejectOutput.domainTrie;
@ -163,5 +161,6 @@ export const buildRejectDomainSet = task(require.main === module, __filename)(as
.addFromRuleset(readLocalRejectDropRulesetPromise) .addFromRuleset(readLocalRejectDropRulesetPromise)
.addFromRuleset(readLocalRejectNoDropRulesetPromise) .addFromRuleset(readLocalRejectNoDropRulesetPromise)
.addFromDomainset(readLocalRejectExtraDomainsetPromise) .addFromDomainset(readLocalRejectExtraDomainsetPromise)
.addFromDomainset(getPhishingDomains(span))
.write(); .write();
}); });