瀏覽代碼

Disable Bot Net Filters Data, too many IPs

SukkaW 9 月之前
父節點
當前提交
99011086fe
共有 2 個文件被更改,包括 1 次插入22 次删除
  1. 1 11
      Build/build-reject-domainset.ts
  2. 0 11
      Build/constants/reject-data-source.ts

+ 1 - 11
Build/build-reject-domainset.ts

@@ -6,7 +6,7 @@ import { processHostsWithPreload } from './lib/parse-filter/hosts';
 import { processDomainListsWithPreload } from './lib/parse-filter/domainlists';
 import { processFilterRulesWithPreload } from './lib/parse-filter/filters';
 
-import { HOSTS, ADGUARD_FILTERS, PREDEFINED_WHITELIST, DOMAIN_LISTS, HOSTS_EXTRA, DOMAIN_LISTS_EXTRA, ADGUARD_FILTERS_EXTRA, ADGUARD_FILTERS_WHITELIST, PHISHING_HOSTS_EXTRA, PHISHING_DOMAIN_LISTS_EXTRA, BOTNET_FILTER, BOGUS_NXDOMAIN_DNSMASQ } from './constants/reject-data-source';
+import { HOSTS, ADGUARD_FILTERS, PREDEFINED_WHITELIST, DOMAIN_LISTS, HOSTS_EXTRA, DOMAIN_LISTS_EXTRA, ADGUARD_FILTERS_EXTRA, ADGUARD_FILTERS_WHITELIST, PHISHING_HOSTS_EXTRA, PHISHING_DOMAIN_LISTS_EXTRA, BOGUS_NXDOMAIN_DNSMASQ } from './constants/reject-data-source';
 import { readFileIntoProcessedArray } from './lib/fetch-text-by-line';
 import { task } from './trace';
 // tldts-experimental is way faster than tldts, but very little bit inaccurate
@@ -186,16 +186,6 @@ export const buildRejectDomainSet = task(require.main === module, __filename)(as
         })
       ),
 
-      span.traceChildAsync(
-        'get botnet ips',
-        () => fetchAssets(...BOTNET_FILTER, true, true)
-      ).then(arr => {
-        if (arr.length > 2000) {
-          throw new Error('Too many botnet ips, please check the source of BOTNET_FILTER');
-        }
-        return rejectIPOutput.bulkAddAnyCIDR(arr, false);
-      }),
-
       span.traceChildAsync(
         'get bogus nxdomain ips',
         () => fetchAssets(...BOGUS_NXDOMAIN_DNSMASQ, true, false)

+ 0 - 11
Build/constants/reject-data-source.ts

@@ -563,17 +563,6 @@ export const PREDEFINED_WHITELIST = [
   'hbbtv.kika.de'
 ];
 
-export const BOTNET_FILTER = [
-  'https://malware-filter.pages.dev/botnet-filter-dnscrypt-blocked-ips.txt',
-  [
-    'https://botnet-filter.pages.dev/botnet-filter-dnscrypt-blocked-ips.txt',
-    'https://malware-filter.gitlab.io/malware-filter/botnet-filter-dnscrypt-blocked-ips.txt',
-    'https://malware-filter.gitlab.io/botnet-filter/botnet-filter-dnscrypt-blocked-ips.txt'
-    // 'https://curbengh.github.io/botnet-filter/botnet-filter-dnscrypt-blocked-ips.txt',
-    // https://curbengh.github.io/malware-filter/botnet-filter-dnscrypt-blocked-ips.txt
-  ]
-] as const;
-
 export const BOGUS_NXDOMAIN_DNSMASQ = [
   'https://cdn.jsdelivr.net/gh/felixonmars/dnsmasq-china-list@master/bogus-nxdomain.china.conf',
   ['https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/bogus-nxdomain.china.conf']