GithubFollow/Surge_by_SukkaW
1
0
Fork 0
mirror of https://github.com/SukkaW/Surge.git synced 2026-07-29 12:41:45 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix IPInfo Tracking Reject

Browse Source
This commit is contained in:
SukkaW
2026-06-29 19:07:08 +08:00
parent 0007dd56ca
commit c36a9c9678
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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, 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 { 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
@@ -239,6 +239,10 @@ export const buildRejectDomainSet = task(require.main === module, __filename)(as
rejectNonIpRulesetOutput.done() rejectNonIpRulesetOutput.done()
]); ]);
ENFORCED_BLACKLIST_FROM_WHITELIST.forEach(domain => {
filterRuleWhitelistDomainSets.delete(domain);
});
// whitelist // whitelist
span.traceChildSync('whitelist', () => { span.traceChildSync('whitelist', () => {
for (const domain of filterRuleWhitelistDomainSets) { for (const domain of filterRuleWhitelistDomainSets) {

6
Build/constants/reject-data-source.ts
View File

@@ -550,6 +550,12 @@ export const PREDEFINED_WHITELIST = [
'hbbtv.kika.de' '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 = [ export const BOGUS_NXDOMAIN_DNSMASQ = [
'https://cdn.jsdelivr.net/gh/felixonmars/dnsmasq-china-list@master/bogus-nxdomain.china.conf', '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'] ['https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/bogus-nxdomain.china.conf']