From c36a9c9678a5fd77d8599a4b4db40e4658f33b20 Mon Sep 17 00:00:00 2001 From: SukkaW Date: Mon, 29 Jun 2026 19:07:08 +0800 Subject: [PATCH] Fix IPInfo Tracking Reject --- Build/build-reject-domainset.ts | 6 +++++- Build/constants/reject-data-source.ts | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Build/build-reject-domainset.ts b/Build/build-reject-domainset.ts index c2aba871..94e6023f 100644 --- a/Build/build-reject-domainset.ts +++ b/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, 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, ENFORCED_BLACKLIST_FROM_WHITELIST } 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 @@ -239,6 +239,10 @@ export const buildRejectDomainSet = task(require.main === module, __filename)(as rejectNonIpRulesetOutput.done() ]); + ENFORCED_BLACKLIST_FROM_WHITELIST.forEach(domain => { + filterRuleWhitelistDomainSets.delete(domain); + }); + // whitelist span.traceChildSync('whitelist', () => { for (const domain of filterRuleWhitelistDomainSets) { diff --git a/Build/constants/reject-data-source.ts b/Build/constants/reject-data-source.ts index c54aca64..21ad21dd 100644 --- a/Build/constants/reject-data-source.ts +++ b/Build/constants/reject-data-source.ts @@ -550,6 +550,12 @@ export const PREDEFINED_WHITELIST = [ 'hbbtv.kika.de' ]; +export const ENFORCED_BLACKLIST_FROM_WHITELIST: string[] = [ + // https://adguardteam.github.io/AdGuardSDNSFilter/Filters/exclusions.txt exclude entire ipinfo.io, not good + // we want to block a.ipinfo.io, pixel.ipinfo.io, and v.ipinfo.io + '.ipinfo.io' +]; + 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']