From 67808cce3dd67a98e56081f27c5884e77af3d7e6 Mon Sep 17 00:00:00 2001 From: gently <1243610+gentlyxu@users.noreply.github.com> Date: Mon, 17 Feb 2020 17:10:15 +0800 Subject: [PATCH] update rules,white list. --- adblock-for-dnsmasq.conf | 5 +-- anti-ad-domains.txt | 5 +-- anti-ad-easylist.txt | 80 ++++++++++++++++++++++++++++++++++++--- anti-ad-surge.txt | 5 +-- lib/white_domain_list.php | 1 + tools/easylist-extend.php | 6 +-- 6 files changed, 85 insertions(+), 17 deletions(-) diff --git a/adblock-for-dnsmasq.conf b/adblock-for-dnsmasq.conf index 1583db4f..605dbf60 100644 --- a/adblock-for-dnsmasq.conf +++ b/adblock-for-dnsmasq.conf @@ -1,7 +1,7 @@ #TITLE=anti-AD -#VER=20200213134331 +#VER=20200217090846 #URL=https://github.com/privacy-protection-tools/anti-AD -#TOTAL_LINES=31604 +#TOTAL_LINES=31603 address=/0024aaaa.com/ address=/0026645142c89aeb1.com/ address=/003store.com/ @@ -4017,7 +4017,6 @@ address=/feed.baidu.com/ address=/fexclick.baidu.com/ address=/g.baidu.com/ address=/gimg.baidu.com/ -address=/gsp0.baidu.com/ address=/gsp2.baidu.com/ address=/gsp3.baidu.com/ address=/hc.baidu.com/ diff --git a/anti-ad-domains.txt b/anti-ad-domains.txt index b01959f4..a05509d4 100644 --- a/anti-ad-domains.txt +++ b/anti-ad-domains.txt @@ -1,7 +1,7 @@ #TITLE=anti-AD -#VER=20200213134331 +#VER=20200217090846 #URL=https://github.com/privacy-protection-tools/anti-AD -#TOTAL_LINES=36060 +#TOTAL_LINES=36059 0024aaaa.com 0026645142c89aeb1.com 003store.com @@ -4843,7 +4843,6 @@ feed.baidu.com fexclick.baidu.com g.baidu.com gimg.baidu.com -gsp0.baidu.com gsp2.baidu.com gsp3.baidu.com hc.baidu.com diff --git a/anti-ad-easylist.txt b/anti-ad-easylist.txt index 6d7c3af2..bd818658 100644 --- a/anti-ad-easylist.txt +++ b/anti-ad-easylist.txt @@ -1,7 +1,7 @@ !TITLE=anti-AD -!VER=20200215122600 +!VER=20200217090846 !URL=https://github.com/privacy-protection-tools/anti-AD -!TOTAL_LINES=30349 +!TOTAL_LINES=30419 ||201*.myhard.com^ ||8*.tianya.cn^ ||a*.chajiaotong.com^ @@ -212,14 +212,76 @@ ||0xxd.com^ ||0z5jn.cn^ ||1-cl0ud.com^ -/^[1-2]\.[0-9a-z\.\-]+\.(com|cn|net|cc|me)$/ +||1.01fy.cn^ +||1.1010pic.com^ +||2.1010pic.com^ +||1.11467.com^ +||1.15lu.com^ +||1.32xp.com^ +||1.51sxue.cn^ +||1.5646.cn^ +||1.66law.cn^ ||92caijing.com^ +||1.ajiyuming.com^ +||1.arpun.com^ +||1.bangdan5.com^ +||1.bh5.com.cn^ +||1.cjcp.cn^ +||1.cn716.com^ +||1.codesdq.com^ +||1.codezh.com^ +||1.dwx365.com^ +||1.feihua.com^ +||1.feihua.net.cn^ +||1.glook.cn^ +||1.guyaheng.com^ +||1.hao123.com^ ||as1.m.hao123.com^ ||mini.hao123.com^ +||1.hnyouneng.com^ +||1.huilv.cc^ +||1.huobiwang.cc^ +||1.hysou.com^ +||1.ideng.com^ +||1.isanxia.com^ +||1.jiqie.cn^ +||1.kuaidiwo.cn^ +||1.lvshi567.com^ +||1.mgff.com^ ||mm100.com^ +||1.pncdn.cn^ ||100.pncdn.cn^ +||1.proewildfire.cn^ +||1.qjhm.net^ +||1.rr95.com^ +||1.sj33.net^ +||1.snzfj.net^ +||1.soufy.cn^ +||1.tongquee.com^ +||1.ttxs123.net^ +||1.tulaoshi.com^ +||1.tuxi.com.cn^ +||2.tuxi.com.cn^ +||1.uc129.com^ +||1.ufc123.com^ +||1.v-x.com.cn^ +||1.vsimg.com^ +||1.wenzhangba.cn^ +||1.win7china.com^ +||2.win7china.com^ +||1.xiaopin5.com^ +||1.xilu.com^ ||tongj.xilu.com^ ||newspage.xilu.com^ +||1.xspic.com^ +||1.yac8.net^ +||1.yuexw.com^ +||1.yxzw.com.cn^ +||1.zhev.com.cn^ +||1.zhuangxiu567.com^ +||1.zou114.com^ +||1.zuowenjun.com^ +||1.zw3e.com^ ||1000dy.com^ ||100669.com^ ||100cpc.com^ @@ -398,6 +460,9 @@ ||1x26q3.cn^ ||1x3x.com^ ||1yk851od.com^ +||2.haoxue360.com^ +||2.heiyange.com^ +||2.rengshu.com^ ||200218.com^ ||2005net.net^ ||200summit.com^ @@ -10216,6 +10281,8 @@ ||foydnzdtjcjg.com^ ||fp.jj59.com^ ||fp.nanrenwo.net^ +||1.nanrenwo.net^ +||2.nanrenwo.net^ ||kuhou.com^ ||fpb1.apple886.com^ ||fpb1.gxfin.com^ @@ -26724,6 +26791,10 @@ ||018520.com^ ||0x5.me^ ||allyes.com.cn^ +||1.bashenghuo.com^ +||2.bashenghuo.com^ +||1.chcx.cn^ +||1.wps.cn^ ||android-lrcresource.wps.cn^ ||api.mini.wps.cn^ ||crashes.mo.wps.cn^ @@ -26739,6 +26810,7 @@ ||push.wps.cn^ ||spinfo.wps.cn^ ||teinfo.wps.cn^ +||1.xiaozhizhijia.com^ ||114so.cn^ ||1178.shucong.com^ ||1234xm.com^ @@ -30348,6 +30420,4 @@ @@||*push-apple.com.akadns.net^ @@||tracking.epicgames.com^ @@||tracker.eu.org^ -@@||1.itzmx.com^ @@||stats.uptimerobot.com^ -@@||2.taobao.com^ diff --git a/anti-ad-surge.txt b/anti-ad-surge.txt index 6f97ab0c..feaa6470 100644 --- a/anti-ad-surge.txt +++ b/anti-ad-surge.txt @@ -1,7 +1,7 @@ #TITLE=anti-AD -#VER=20200213134331 +#VER=20200217090846 #URL=https://github.com/privacy-protection-tools/anti-AD -#TOTAL_LINES=31604 +#TOTAL_LINES=31603 DOMAIN-SUFFIX,0024aaaa.com DOMAIN-SUFFIX,0026645142c89aeb1.com DOMAIN-SUFFIX,003store.com @@ -4017,7 +4017,6 @@ DOMAIN-SUFFIX,feed.baidu.com DOMAIN-SUFFIX,fexclick.baidu.com DOMAIN-SUFFIX,g.baidu.com DOMAIN-SUFFIX,gimg.baidu.com -DOMAIN-SUFFIX,gsp0.baidu.com DOMAIN-SUFFIX,gsp2.baidu.com DOMAIN-SUFFIX,gsp3.baidu.com DOMAIN-SUFFIX,hc.baidu.com diff --git a/lib/white_domain_list.php b/lib/white_domain_list.php index 1fd8750e..c85931e5 100644 --- a/lib/white_domain_list.php +++ b/lib/white_domain_list.php @@ -50,6 +50,7 @@ return array( 'tanx.com' => 0, //饿了么店铺异常 'promotion.aliyun.com' => 0, //阿里云控制台 'rarbg.to' => 0, //BT站 + 'gsp0.baidu.com' => 0, //百度贴吧相关 'herokuapp.com' => -1, diff --git a/tools/easylist-extend.php b/tools/easylist-extend.php index efc179ac..760c787d 100644 --- a/tools/easylist-extend.php +++ b/tools/easylist-extend.php @@ -70,7 +70,7 @@ $ARR_MERGED_WILD_LIST = array( $ARR_REGEX_LIST = array( '/01daa\.[a-z]+\.com$/' => null, '/9377[a-z]{2}\.com$/' => null, - '/^[1-2]\.[0-9a-z\.\-]+\.(com|cn|net|cc|me)$/' => null, +// '/^[1-2]\.[0-9a-z\.\-]+\.(com|cn|net|cc|me)$/' => null, // '/^a1\.[0-9a-z\.]+\.(com|cn|org|net|me)$/' => null, '/^ad([0-9]|m|s)?\./' => null, '/^([a-z0-9\-\.]+\.)?affiliat(es|ion|e)\./' => null, @@ -94,9 +94,9 @@ $ARR_WHITE_RULE_LIST = array( '@@||*push-apple.com.akadns.net^' => 1, //强制加白, 苹果推送2.courier-push-apple.com.akadns.net '@@||tracking.epicgames.com^' => 0, '@@||tracker.eu.org^' => 1, //强制加白，BT tracker，有形如2.tracker.eu.org的域 - '@@||1.itzmx.com^' => 0, //PT tracker +// '@@||1.itzmx.com^' => 0, //PT tracker '@@||stats.uptimerobot.com^' => 0, //uptimerobot监测相关 - '@@||2.taobao.com^' => 1, //闲鱼 +// '@@||2.taobao.com^' => 1, //闲鱼 ); //针对上游赦免规则anti-AD不予赦免的规则，即赦免名单的黑名单