From 9f26d11fef547407ac3764032415d07f5ca0f846 Mon Sep 17 00:00:00 2001 From: SukkaW Date: Fri, 25 Oct 2024 08:05:57 +0800 Subject: [PATCH] Update Reject & Domestic Rules --- Build/constants/reject-data-source.ts | 1 + Build/lib/rules/base.ts | 2 -- Build/lib/rules/domainset.ts | 21 +++++++++++++++++++++ Source/domainset/reject_sukka.conf | 5 ++++- Source/non_ip/domestic.conf | 3 +++ Source/non_ip/reject.conf | 11 +++++++++-- 6 files changed, 38 insertions(+), 5 deletions(-) diff --git a/Build/constants/reject-data-source.ts b/Build/constants/reject-data-source.ts index 194d8337..914f55e0 100644 --- a/Build/constants/reject-data-source.ts +++ b/Build/constants/reject-data-source.ts @@ -386,6 +386,7 @@ export const PREDEFINED_WHITELIST = [ 'email.accounts.bitly.com', // Fuck Peter Lowe Hosts 'adsense.google.com', // Fuck Peter Lowe Hosts 'api.vip.miui.com', // Fuck Goodbye Xiaomi Ads + 'api.comm.miui.com', // Xiaomi MIUI phone number database update URL '.ai.api.xiaomi.com', // Fuck Goodbye Xiaomi Ads 'm.stripe.com', // EasyPrivacy only blocks m.stripe.com wwith $third-party, // yet stupid AdGuardDNSFilter blocks all of it. Stupid AdGuard diff --git a/Build/lib/rules/base.ts b/Build/lib/rules/base.ts index a8052777..6d3aaa20 100644 --- a/Build/lib/rules/base.ts +++ b/Build/lib/rules/base.ts @@ -241,8 +241,6 @@ export abstract class RuleOutput { } private guardPendingPromise() { - console.log('Pending promise:', this.pendingPromise); - // reverse invariant if (this.pendingPromise !== null) { console.trace('Pending promise:', this.pendingPromise); diff --git a/Build/lib/rules/domainset.ts b/Build/lib/rules/domainset.ts index c0d030c1..389050b3 100644 --- a/Build/lib/rules/domainset.ts +++ b/Build/lib/rules/domainset.ts @@ -128,6 +128,27 @@ export class DomainsetOutput extends RuleOutput { results.push(`/${keyword}/`); } + for (const ipGroup of [this.ipcidr, this.ipcidrNoResolve]) { + for (const ipcidr of ipGroup) { + if (ipcidr.endsWith('/32')) { + results.push(`||${ipcidr.slice(0, -3)}`); + } else if (ipcidr.endsWith('.0/24')) { + results.push(`||${ipcidr.slice(0, -6)}.*`); + } else { + results.push(`||${ipcidr}^`); + } + } + } + for (const ipGroup of [this.ipcidr6, this.ipcidr6NoResolve]) { + for (const ipcidr of ipGroup) { + if (ipcidr.endsWith('/128')) { + results.push(`||${ipcidr.slice(0, -4)}`); + } else { + results.push(`||${ipcidr}`); + } + } + } + return results; } } diff --git a/Source/domainset/reject_sukka.conf b/Source/domainset/reject_sukka.conf index 977988f0..d9483340 100644 --- a/Source/domainset/reject_sukka.conf +++ b/Source/domainset/reject_sukka.conf @@ -1962,6 +1962,7 @@ tongji.meizu.com .kingdata.ksyun.com .api.miwifi.com +.log.miwifi.com adv.sec.miui.com adv.sec.intl.miui.com @@ -1976,12 +1977,14 @@ api.miui.security.xiaomi.com .auth.be.sec.miui.com .adfuture.cn sa.api.intl.miui.com +.port.sec.miui.com .tracking.miui.com .tracking.intl.miui.com .tracking.india.miui.com .tracking.rus.miui.com - +.data.kuiniuca.com +.sentry.d.xiaomi.net # MI AI Engine location salesforce-like service: isjike.com .log-sdk.clickwifi.net diff --git a/Source/non_ip/domestic.conf b/Source/non_ip/domestic.conf index badc47e8..44f25937 100644 --- a/Source/non_ip/domestic.conf +++ b/Source/non_ip/domestic.conf @@ -91,6 +91,7 @@ DOMAIN-SUFFIX,id6.me # >> China Unicom DOMAIN-SUFFIX,wo.cn +DOMAIN-SUFFIX,wo.com.cn DOMAIN-SUFFIX,10010.com DOMAIN-SUFFIX,chinaunicom.cn @@ -106,6 +107,7 @@ DOMAIN-SUFFIX,cmvideo.cn DOMAIN-SUFFIX,miguvideo.com # > DiDi +DOMAIN-SUFFIX,didi.cn DOMAIN-SUFFIX,didichuxing.com DOMAIN-SUFFIX,didialift.com DOMAIN-SUFFIX,didiglobal.com @@ -416,6 +418,7 @@ DOMAIN-SUFFIX,cailianpress.com DOMAIN-SUFFIX,cls.cn DOMAIN-SUFFIX,camera360.com DOMAIN-SUFFIX,camscanner.com +DOMAIN-SUFFIX,ccrgt.com DOMAIN-SUFFIX,cdnjtzy.com DOMAIN-SUFFIX,cnnic.cn DOMAIN-SUFFIX,cnnic.com.cn diff --git a/Source/non_ip/reject.conf b/Source/non_ip/reject.conf index 59c4aa19..e2f41f6c 100644 --- a/Source/non_ip/reject.conf +++ b/Source/non_ip/reject.conf @@ -239,7 +239,7 @@ IP-CIDR,182.254.118.119/32,no-resolve # Zhihu # refer: https://github.com/lwd-temp/anti-ip-attribution/issues/24 -IP-CIDR,118.89.204.198/23,no-resolve +IP-CIDR,118.89.204.198/32,no-resolve IP-CIDR6,2402:4e00:1200:ed00:0:9089:6dac:96b6/128,no-resolve # OPPO @@ -251,7 +251,14 @@ DOMAIN,httpdns-push.heytapmobile.com # Xiaomi IP-CIDR,203.119.204.66/32,no-resolve -URL-REGEX,^http://(.*)/sign_d\?host\= +IP-CIDR,203.107.1.66/32,no-resolve +IP-CIDR,203.107.1.35/32,no-resolve +IP-CIDR,59.82.99.47/32,no-resolve +URL-REGEX,^http://(.*)/\d+/sign_d\?host\= + +# Pingduoduo +IP-CIDR,114.110.97.97/32,no-resolve +IP-CIDR,101.35.204.35/32,no-resolve # DiDi DOMAIN,hd.xiaojukeji.com