diff --git a/adblock-for-dnsmasq.conf b/adblock-for-dnsmasq.conf index 043d1276..c1354ba6 100644 --- a/adblock-for-dnsmasq.conf +++ b/adblock-for-dnsmasq.conf @@ -1,7 +1,7 @@ #TITLE=anti-AD -#VER=20210521192007 +#VER=20210521210545 #URL=https://github.com/privacy-protection-tools/anti-AD -#TOTAL_LINES=42378 +#TOTAL_LINES=42379 address=/00-gov.cn/ address=/kwcdn.000dn.com/ address=/kwcscdn.000dn.com/ @@ -23871,7 +23871,7 @@ address=/i1.services.social.microsoft.com/ address=/ieonline.microsoft.com/ address=/ieonlinews.microsoft.com/ address=/mobile.pipe.aria.microsoft.com/ -address=/events.data.microsoft.com/ +address=/nw-umwatson.events.data.microsoft.com/ address=/redir.metaservices.microsoft.com/ address=/settings-sandbox.data.microsoft.com/ address=/settings-win-ppe.data.microsoft.com/ @@ -23882,6 +23882,7 @@ address=/statsfe1.ws.microsoft.com/ address=/statsfe2.ws.microsoft.com/ address=/telemetry.urs.microsoft.com/ address=/teredo.ipv6.microsoft.com/ +address=/umwatsonc.events.data.microsoft.com/ address=/vortex-sandbox.data.microsoft.com/ address=/vortex-win-sandbox.data.microsoft.com/ address=/vortex.data.glbdns2.microsoft.com/ diff --git a/anti-ad-adguard.txt b/anti-ad-adguard.txt index 6f6596e6..4c3dce52 100644 --- a/anti-ad-adguard.txt +++ b/anti-ad-adguard.txt @@ -1,7 +1,7 @@ !Title: anti-AD -!Version: 20210521192007 +!Version: 20210521210546 !Homepage: https://github.com/privacy-protection-tools/anti-AD -!Total lines: 41698 +!Total lines: 41705 @@||ads.taboola.com^ @@||tracker.eu.org^ @@||stats.uptimerobot.com^ @@ -39,6 +39,12 @@ @@||tracking-protection.cdn.mozilla.net^ @@||skydrivesync.policies.live.net^ @@||dxcloud.episerver.net^ +@@||static3.iask.cn^ +@@||login-ishare.iask.com.cn^ +@@||wechat.ishare.iask.com.cn^ +@@||dw.iask.com.cn^ +@@||settings-win.data.microsoft.com^ +@@||insideruser.microsoft.com^ ||*serror*.wo.com.cn^$dnstype=A|CNAME ||8*.tianya.cn^ ||ac*.786ip.com^ @@ -23585,7 +23591,7 @@ ||ieonline.microsoft.com^ ||ieonlinews.microsoft.com^ ||mobile.pipe.aria.microsoft.com^ -||events.data.microsoft.com^ +||nw-umwatson.events.data.microsoft.com^ ||redir.metaservices.microsoft.com^ ||settings-sandbox.data.microsoft.com^ ||settings-win-ppe.data.microsoft.com^ @@ -23596,6 +23602,7 @@ ||statsfe2.ws.microsoft.com^ ||telemetry.urs.microsoft.com^ ||teredo.ipv6.microsoft.com^ +||umwatsonc.events.data.microsoft.com^ ||vortex-sandbox.data.microsoft.com^ ||vortex-win-sandbox.data.microsoft.com^ ||vortex.data.glbdns2.microsoft.com^ diff --git a/anti-ad-adguard.txt.md5 b/anti-ad-adguard.txt.md5 index f86db11f..a208ee7a 100644 --- a/anti-ad-adguard.txt.md5 +++ b/anti-ad-adguard.txt.md5 @@ -1 +1 @@ -f175fb46e29ebbe8af2c4d152c09b2a8 \ No newline at end of file +0476eafdfcc304c952edb5cdaa84216a \ No newline at end of file diff --git a/anti-ad-clash.yaml b/anti-ad-clash.yaml index 9164c826..682ae2af 100644 --- a/anti-ad-clash.yaml +++ b/anti-ad-clash.yaml @@ -1,7 +1,7 @@ #TITLE=anti-AD -#VER=20210521192008 +#VER=20210521210546 #URL=https://github.com/privacy-protection-tools/anti-AD -#TOTAL_LINES=42378 +#TOTAL_LINES=42379 #RULE-SET,AntiAd,REJECT payload: @@ -23874,7 +23874,7 @@ payload: - '+.ieonline.microsoft.com' - '+.ieonlinews.microsoft.com' - '+.mobile.pipe.aria.microsoft.com' - - '+.events.data.microsoft.com' + - '+.nw-umwatson.events.data.microsoft.com' - '+.redir.metaservices.microsoft.com' - '+.settings-sandbox.data.microsoft.com' - '+.settings-win-ppe.data.microsoft.com' @@ -23885,6 +23885,7 @@ payload: - '+.statsfe2.ws.microsoft.com' - '+.telemetry.urs.microsoft.com' - '+.teredo.ipv6.microsoft.com' + - '+.umwatsonc.events.data.microsoft.com' - '+.vortex-sandbox.data.microsoft.com' - '+.vortex-win-sandbox.data.microsoft.com' - '+.vortex.data.glbdns2.microsoft.com' diff --git a/anti-ad-domains.txt b/anti-ad-domains.txt index 06875b05..dd64e119 100644 --- a/anti-ad-domains.txt +++ b/anti-ad-domains.txt @@ -1,7 +1,7 @@ #TITLE=anti-AD -#VER=20210521192008 +#VER=20210521210546 #URL=https://github.com/privacy-protection-tools/anti-AD -#TOTAL_LINES=47992 +#TOTAL_LINES=47991 00-gov.cn kwcdn.000dn.com kwcscdn.000dn.com @@ -27408,7 +27408,6 @@ i1.services.social.microsoft.com ieonline.microsoft.com ieonlinews.microsoft.com mobile.pipe.aria.microsoft.com -events.data.microsoft.com nw-umwatson.events.data.microsoft.com oca.telemetry.microsoft.com redir.metaservices.microsoft.com diff --git a/anti-ad-easylist.txt b/anti-ad-easylist.txt index 930d5dd3..37aa0280 100644 --- a/anti-ad-easylist.txt +++ b/anti-ad-easylist.txt @@ -1,7 +1,7 @@ !Title: anti-AD -!Version: 20210521192007 +!Version: 20210521210546 !Homepage: https://github.com/privacy-protection-tools/anti-AD -!Total lines: 39307 +!Total lines: 39310 @@||ads.taboola.com^ @@||tracker.eu.org^ @@||stats.uptimerobot.com^ @@ -43,6 +43,8 @@ @@||login-ishare.iask.com.cn^ @@||wechat.ishare.iask.com.cn^ @@||dw.iask.com.cn^ +@@||settings-win.data.microsoft.com^ +@@||insideruser.microsoft.com^ /^(\S+\.)?9377[a-z0-9]{2}\.com$/$dnstype=A /^(\S+\.)?ad(s?[\d]+|m|s)?\./ @@||ads.amazon^ @@ -22168,7 +22170,7 @@ ||ieonline.microsoft.com^ ||ieonlinews.microsoft.com^ ||mobile.pipe.aria.microsoft.com^ -||events.data.microsoft.com^ +||nw-umwatson.events.data.microsoft.com^ ||redir.metaservices.microsoft.com^ ||settings-sandbox.data.microsoft.com^ ||settings-win-ppe.data.microsoft.com^ @@ -22179,6 +22181,7 @@ ||statsfe2.ws.microsoft.com^ ||telemetry.urs.microsoft.com^ ||teredo.ipv6.microsoft.com^ +||umwatsonc.events.data.microsoft.com^ ||vortex-sandbox.data.microsoft.com^ ||vortex-win-sandbox.data.microsoft.com^ ||vortex.data.glbdns2.microsoft.com^ diff --git a/anti-ad-easylist.txt.md5 b/anti-ad-easylist.txt.md5 index ad7abe4c..2a36ae01 100644 --- a/anti-ad-easylist.txt.md5 +++ b/anti-ad-easylist.txt.md5 @@ -1 +1 @@ -c6410f756b9897c1e07acb976539a3e7 \ No newline at end of file +570de632cb2f201a0fce5629f911249e \ No newline at end of file diff --git a/anti-ad-smartdns.conf b/anti-ad-smartdns.conf index ab53ad43..ae811d39 100644 --- a/anti-ad-smartdns.conf +++ b/anti-ad-smartdns.conf @@ -1,7 +1,7 @@ #TITLE=anti-AD for SmartDNS -#VER=20210521192008 +#VER=20210521210546 #URL=https://github.com/privacy-protection-tools/anti-AD -#TOTAL_LINES=42378 +#TOTAL_LINES=42379 address /00-gov.cn/# address /kwcdn.000dn.com/# address /kwcscdn.000dn.com/# @@ -23871,7 +23871,7 @@ address /i1.services.social.microsoft.com/# address /ieonline.microsoft.com/# address /ieonlinews.microsoft.com/# address /mobile.pipe.aria.microsoft.com/# -address /events.data.microsoft.com/# +address /nw-umwatson.events.data.microsoft.com/# address /redir.metaservices.microsoft.com/# address /settings-sandbox.data.microsoft.com/# address /settings-win-ppe.data.microsoft.com/# @@ -23882,6 +23882,7 @@ address /statsfe1.ws.microsoft.com/# address /statsfe2.ws.microsoft.com/# address /telemetry.urs.microsoft.com/# address /teredo.ipv6.microsoft.com/# +address /umwatsonc.events.data.microsoft.com/# address /vortex-sandbox.data.microsoft.com/# address /vortex-win-sandbox.data.microsoft.com/# address /vortex.data.glbdns2.microsoft.com/# diff --git a/anti-ad-surge.txt b/anti-ad-surge.txt index 3a8f466b..1d153d23 100644 --- a/anti-ad-surge.txt +++ b/anti-ad-surge.txt @@ -1,7 +1,7 @@ #TITLE=anti-AD -#VER=20210521192007 +#VER=20210521210546 #URL=https://github.com/privacy-protection-tools/anti-AD -#TOTAL_LINES=42378 +#TOTAL_LINES=42379 DOMAIN-SUFFIX,00-gov.cn DOMAIN-SUFFIX,kwcdn.000dn.com DOMAIN-SUFFIX,kwcscdn.000dn.com @@ -23871,7 +23871,7 @@ DOMAIN-SUFFIX,i1.services.social.microsoft.com DOMAIN-SUFFIX,ieonline.microsoft.com DOMAIN-SUFFIX,ieonlinews.microsoft.com DOMAIN-SUFFIX,mobile.pipe.aria.microsoft.com -DOMAIN-SUFFIX,events.data.microsoft.com +DOMAIN-SUFFIX,nw-umwatson.events.data.microsoft.com DOMAIN-SUFFIX,redir.metaservices.microsoft.com DOMAIN-SUFFIX,settings-sandbox.data.microsoft.com DOMAIN-SUFFIX,settings-win-ppe.data.microsoft.com @@ -23882,6 +23882,7 @@ DOMAIN-SUFFIX,statsfe1.ws.microsoft.com DOMAIN-SUFFIX,statsfe2.ws.microsoft.com DOMAIN-SUFFIX,telemetry.urs.microsoft.com DOMAIN-SUFFIX,teredo.ipv6.microsoft.com +DOMAIN-SUFFIX,umwatsonc.events.data.microsoft.com DOMAIN-SUFFIX,vortex-sandbox.data.microsoft.com DOMAIN-SUFFIX,vortex-win-sandbox.data.microsoft.com DOMAIN-SUFFIX,vortex.data.glbdns2.microsoft.com diff --git a/anti-ad-surge2.txt b/anti-ad-surge2.txt index eef99d00..39988135 100644 --- a/anti-ad-surge2.txt +++ b/anti-ad-surge2.txt @@ -1,7 +1,7 @@ #TITLE=anti-AD -#VER=20210521192007 +#VER=20210521210546 #URL=https://github.com/privacy-protection-tools/anti-AD -#TOTAL_LINES=42378 +#TOTAL_LINES=42379 #DOMAIN-SET,https://anti-ad.net/surge2.txt,REJECT .00-gov.cn @@ -23873,7 +23873,7 @@ .ieonline.microsoft.com .ieonlinews.microsoft.com .mobile.pipe.aria.microsoft.com -.events.data.microsoft.com +.nw-umwatson.events.data.microsoft.com .redir.metaservices.microsoft.com .settings-sandbox.data.microsoft.com .settings-win-ppe.data.microsoft.com @@ -23884,6 +23884,7 @@ .statsfe2.ws.microsoft.com .telemetry.urs.microsoft.com .teredo.ipv6.microsoft.com +.umwatsonc.events.data.microsoft.com .vortex-sandbox.data.microsoft.com .vortex-win-sandbox.data.microsoft.com .vortex.data.glbdns2.microsoft.com diff --git a/scripts/lib/black_domain_list.php b/scripts/lib/black_domain_list.php index 38ea12b2..c0148590 100644 --- a/scripts/lib/black_domain_list.php +++ b/scripts/lib/black_domain_list.php @@ -588,7 +588,6 @@ return array( ), 'microsoft.com' => array( 'mobile.pipe.aria.microsoft.com', - 'events.data.microsoft.com', ), 'leixjun.com' => array(//恶意诱导下载app 'leixjun.com', diff --git a/scripts/tools/adguard-extend.php b/scripts/tools/adguard-extend.php index be9cce68..35f12eea 100644 --- a/scripts/tools/adguard-extend.php +++ b/scripts/tools/adguard-extend.php @@ -184,6 +184,12 @@ $ARR_WHITE_RULE_LIST = array( '@@||tracking-protection.cdn.mozilla.net^' => 1, // #407 '@@||skydrivesync.policies.live.net^' => 1, // #409 '@@||dxcloud.episerver.net^' => 1, // #418 + '@@||static3.iask.cn^' => 1, // #429 + '@@||login-ishare.iask.com.cn^' => 1, // #429 + '@@||wechat.ishare.iask.com.cn^' => 1, // #429 + '@@||dw.iask.com.cn^' => 1, // #429 + '@@||settings-win.data.microsoft.com^' => 1, // #426 + '@@||insideruser.microsoft.com^' => 1, // #426 ); //针对上游赦免规则anti-AD不予赦免的规则,即赦免名单的黑名单 diff --git a/scripts/tools/easylist-extend.php b/scripts/tools/easylist-extend.php index 6de5ac5d..5f97b941 100644 --- a/scripts/tools/easylist-extend.php +++ b/scripts/tools/easylist-extend.php @@ -229,6 +229,8 @@ $ARR_WHITE_RULE_LIST = array( '@@||login-ishare.iask.com.cn^' => 1, // #429 '@@||wechat.ishare.iask.com.cn^' => 1, // #429 '@@||dw.iask.com.cn^' => 1, // #429 + '@@||settings-win.data.microsoft.com^' => 1, // #426 + '@@||insideruser.microsoft.com^' => 1, // #426 ); //针对上游赦免规则anti-AD不予赦免的规则,即赦免名单的黑名单