diff --git a/anti-ad-easylist.txt b/anti-ad-easylist.txt index 2d9a366c..cbf661ab 100644 --- a/anti-ad-easylist.txt +++ b/anti-ad-easylist.txt @@ -1,7 +1,7 @@ !Title: anti-AD -!Version: 20210507001947 +!Version: 20210507003429 !Homepage: https://github.com/privacy-protection-tools/anti-AD -!Total lines: 38050 +!Total lines: 38011 @@||ads.taboola.com^ @@||tracker.eu.org^ @@||stats.uptimerobot.com^ @@ -39,6 +39,8 @@ @@||tracking-protection.cdn.mozilla.net^ @@||skydrivesync.policies.live.net^ @@||dxcloud.episerver.net^ +@@||advertisement.*.alibabadns.com^ +@@||advertisement.alibabacorp.sm.cn^ /^(\S+\.)?9377[a-z0-9]{2}\.com$/$dnstype=A /^(\S+\.)?ad(s?[\d]+|m|s)?\./ @@||ads.amazon^ @@ -49,6 +51,7 @@ @@||ads.tiktok.com^ @@||ads.twitter.com^ @@||adm.10jqka.com.cn^ +/^(\S+\.)?advert/ /^(\S+\.)?affiliat(es?[0-9a-z]*?|ion[0-9\-a-z]*?|ly[0-9a-z\-]*?)\./ /^(\S+\.)?s?metrics\./ /^(\S+\.)?afgr[\d]{1,2}\.com$/ @@ -3287,37 +3290,6 @@ ||adversaldisplay.com^ ||adversalservers.com^ ||adverserve.net^ -||advertarium.com.ua^ -||advertbox.us^ -||adverti.io^ -||advertica-cdn.com^ -||advertica.ae^ -||adverticum.net^ -||advertise.com^ -||advertisegame.com^ -||advertiserurl.com^ -||advertisespace.com^ -||advertiseworld.com^ -||advertiseyourgame.com^ -||advertising.com^ -||advertising365.com^ -||advertisingiq.com^ -||advertisingsex.com^ -||advertisingvalue.info^ -||advertjunction.com^ -||advertlane.com^ -||advertlets.com^ -||advertmarketing.com^ -||advertmedias.com^ -||advertnative.com^ -||advertnetworks.com^ -||advertom.com^ -||advertone.ru^ -||advertpay.net^ -||advertrtb.com^ -||advertserve.com^ -||advertstream.com^ -||advertur.ru^ ||advfeeds.com^ ||advg.jp^ ||widgetcf.adviceiq.com^ @@ -4361,7 +4333,6 @@ ||aoidf3.com^ ||b-aws.aol.com^ ||adinfo.aol.com^ -||advertising.aol.com^ ||dynamic.aol.com^ ||free.aol.com^ ||im.aol.de^ @@ -5246,8 +5217,6 @@ ||baiapk.com^ ||baichuanbi.wang^ ||game.baichuanhd.cn^ -||advertise.baicizhan.com^ -||advertise.baicizhan.org^ ||baidu-taobao-av.com^ ||a.baidu.cn^ ||adscdn.baidu.cn^ @@ -11266,7 +11235,6 @@ ||duroternout.info^ ||durpygckli.com^ ||wew.dushiwenxue.net^ -||advertising.dushu.io^ ||securecookies.dustin.dk^ ||securecookies.dustin.fi^ ||securecookies.dustin.no^ @@ -20468,7 +20436,6 @@ ||hit.webcentre.lycos.co.uk^ ||beacon.lycos.com^ ||adbuyer3.lycos.com^ -||advertising.lycos.com^ ||client.sidesearch.lycos.com^ ||cm8.lycos.com^ ||guestworld.tripod.lycos.com^ @@ -22230,7 +22197,6 @@ ||log2.mtime.cn^ ||logx.mtime.cn^ ||logx.mtime.com^ -||advert.mting.info^ ||ee.mtmfjdo.cn^ ||m.mtmfjdo.cn^ ||mtmob.com^ @@ -26657,7 +26623,6 @@ ||qnemxzckwx.com^ ||qneowzuyfzyfs.com^ ||qngqlrxscxlvh.com^ -||advertisement.glb.qnniu.com^ ||qnpov.cn^ ||qnsr.com^ ||qnvljz.info^ @@ -31921,7 +31886,6 @@ ||rgmseo.thejewellershop.com^ ||thejierou.net^ ||jobs.thejobnetwork.com^ -||advert.api.thejoyrun.com^ ||click.mail.theknot.com^ ||email.member.theknot.com^ ||sp.theleafchronicle.com^ @@ -36355,7 +36319,6 @@ ||xunkhuczqnuf.com^ ||xunlaile.com^ ||adsp.xunlei.com^ -||advertpay.vip.xunlei.com^ ||api-u-ssl.xunlei.com^ ||kkpgv2.xunlei.com^ ||live.xunlei.com^ @@ -36364,12 +36327,10 @@ ||soagw.pw.xunlei.com^ ||stat.download.xunlei.com^ ||upgrade.xl9.xunlei.com^ -||advertpay-vip-ssl.xunlei.com^ ||api-shoulei-ssl.xunlei.com^ ||ct.niu.xunlei.com^ ||mou.niu.xunlei.com^ ||scene.vip.xunlei.com^ -||watch.advertising.speed.cdn.vip.xunlei.com^ ||xunyibaike.com^ ||xunzhuo123.com^ ||xuossk3tu6hb.com^ diff --git a/anti-ad-easylist.txt.md5 b/anti-ad-easylist.txt.md5 index 3c8863b9..313498b6 100644 --- a/anti-ad-easylist.txt.md5 +++ b/anti-ad-easylist.txt.md5 @@ -1 +1 @@ -405ab58d659fc8aa02c0c82c6992287d \ No newline at end of file +4552b4133ae01c0803a1199bd5c464d5 \ No newline at end of file diff --git a/scripts/tools/easylist-extend.php b/scripts/tools/easylist-extend.php index ec5e4b8f..5592e7ea 100644 --- a/scripts/tools/easylist-extend.php +++ b/scripts/tools/easylist-extend.php @@ -13,12 +13,12 @@ error_reporting(7); date_default_timezone_set('Asia/Shanghai'); define('START_TIME', microtime(true)); define('ROOT_DIR', dirname(__DIR__) . '/'); -define('LIB_DIR', ROOT_DIR . 'lib/'); +const LIB_DIR = ROOT_DIR . 'lib/'; $black_domain_list = require_once LIB_DIR . 'black_domain_list.php'; require_once LIB_DIR . 'addressMaker.class.php'; -define('WILDCARD_SRC', ROOT_DIR . 'origin-files/wildcard-src-easylist.txt'); -define('WHITERULE_SRC', ROOT_DIR . 'origin-files/whiterule-src-easylist.txt'); +const WILDCARD_SRC = ROOT_DIR . 'origin-files/wildcard-src-easylist.txt'; +const WHITERULE_SRC = ROOT_DIR . 'origin-files/whiterule-src-easylist.txt'; $ARR_MERGED_WILD_LIST = array( 'ad*.udn.com$dnstype=A|CNAME' => null, @@ -138,7 +138,7 @@ $ARR_MERGED_WILD_LIST = array( $ARR_REGEX_LIST = array( '/^(\S+\.)?9377[a-z0-9]{2}\.com$/' => ['m' => '$dnstype=A'], '/^(\S+\.)?ad(s?[\d]+|m|s)?\./' => null, -// '/^(\S+\.)?advert/$dnstype=~CNAME' => null, // TODO dnstype工作不正常,暂时关闭此规则 + '/^(\S+\.)?advert/' => null, // TODO dnstype工作不正常,目前主要影响ali系的CNAME,专门加了白名单 '/^(\S+\.)?affiliat(es?[0-9a-z]*?|ion[0-9\-a-z]*?|ly[0-9a-z\-]*?)\./' => null, // fixed #406 '/^(\S+\.)?s?metrics\./' => null, // TODO 覆盖面很大 '/^(\S+\.)?afgr[\d]{1,2}\.com$/' => null, @@ -225,7 +225,8 @@ $ARR_WHITE_RULE_LIST = array( '@@||tracking-protection.cdn.mozilla.net^' => 1, // #407 '@@||skydrivesync.policies.live.net^' => 1, // #409 '@@||dxcloud.episerver.net^' => 1, // #418 - + '@@||advertisement.*.alibabadns.com^' => 1, // #410 ,TODO 等dnstype工作正常就去除 + '@@||advertisement.alibabacorp.sm.cn^' => 1, // #412, TODO 等dnstype工作正常就去除 ); //针对上游赦免规则anti-AD不予赦免的规则,即赦免名单的黑名单