Feat: check regexp before build (#3064 )

Co-authored-by: Loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
picacg-ads: split from picacg
2025-12-23 02:47:18 +07:00 · 2025-12-16 23:40:25 +08:00 · 2025-12-16 21:42:59 +08:00 · 2025-12-16 21:42:59 +08:00 · 2025-12-16 21:24:37 +08:00 · 2025-12-16 21:13:11 +08:00
12 changed files with 148 additions and 1 deletions
--- a/data/18comic
+++ b/data/18comic
@@ -5,11 +5,47 @@
 18comic.company
 18comic.org
 18comic.vip
+asjmapihost.cc
+cdnblackmyth.club
+cdnmhws.cc
+cdnmhwscc.vip
+cdnuc.vip
+cdnxxx-proxy.co
+cdnxxx-proxy.xyz
+jm-comic2.cc
+jm18c-bbm.cc
+jm18c-bbm.net
+jm18c-uoi.net
+jm365.work
+jm365.xyz
+jmapibranch1.cc
+jmapibranch2.cc
+jmapibranch3.cc
+jmapinode.biz
+jmapinode.vip
+jmapinode.xyz
+jmapinode1.top
+jmapinode2.top
+jmapinode3.top
+jmapinodeudzn.net
+jmapinodeudzn.xyz
+jmapiproxy1.cc
+jmapiproxy1.monster
+jmapiproxy2.cc
+jmapiproxy3.cc
+jmapiproxy4.cc
+jmapiproxyxxx.vip
+jmcomic.group
 jmcomic.ltd
 jmcomic.me
 jmcomic.mobi
 jmcomic.moe
+jmcomic.rocks
+jmcomic-fb.vip
+jmcomic-zzz.one
+jmcomic-zzz.org
 jmcomic1.city
 jmcomic1.me
 jmcomic1.mobi
+jmcomic1.rocks
 jmcomic2.moe
--- a/data/category-ads
+++ b/data/category-ads
@@ -38,6 +38,7 @@ include:newrelic-ads
 include:ogury-ads
 include:ookla-speedtest-ads
 include:openx-ads
+include:picacg-ads
 include:pocoiq-ads
 include:pubmatic-ads
 include:qihoo360-ads
--- a/data/category-ru
+++ b/data/category-ru
@@ -23,5 +23,6 @@ include:mailru-group
 include:okko
 include:ozon
 include:rutube
+include:wink
 include:x5
 include:yandex
--- a/data/ctyun
+++ b/data/ctyun
@@ -0,0 +1,69 @@
+# 天翼云
+# 京ICP备2021034386号
+ctadns.cn
+bjctyiptv.cn
+cqctyiptv.cn
+ctacdn.cn
+ctaigw.cn
+ctbcdn.com
+ctcdn.cn
+ctcdn.com.cn
+ctcdnov.net
+ctcloudzos.cn
+ctcns.cn
+ctdcdn.com
+ctdns.cn
+ctdns.com.cn
+ctdns.net
+ctecdn.cn
+ctecx.cn
+ctgcdn.com
+cthcdn.cn
+cthcdn.com
+cthcdn.net
+ctlcdn.cn
+ctlcdn.com
+ctlcdn.net
+ctmcdn.cn
+ctovcdn.com
+ctrender.com
+ctwcdn.cn
+ctxcdn.cn
+ctxcdn.com
+ctxcdn.net
+ctxirang.cn
+ctxirang.com
+ctycdn.cn
+ctycdn.net
+ctycdn.net.cn
+ctydoh.cn
+ctyecx.cn
+ctyiptv.cn
+ctyun.cn
+ctyun.com.cn
+ctyuncdn.cn
+ctyuncs.cn
+ctyuninner.com
+ctyunmds.cn
+ctyunwaf.cn
+ctyunwaf.com
+ctyunwaf1.com
+ctyunwaf3.cn
+ctyunxs.cn
+ctyunzos.cn
+ctzcdn.cn
+ctzcdn.com
+edgecloudx.cn
+faasapp.cn
+faasdev.cn
+fjctyiptv.cn
+gdctyiptv.cn
+gsctyiptv.cn
+gsjtyiptv.cn
+gzctyiptv.cn
+jsctyiptv.cn
+modelers.cn
+scctyiptv.cn
+snctyiptv.cn
+ynctyiptv.cn
+ynjtyiptv.cn
--- a/data/geolocation-cn
+++ b/data/geolocation-cn
@@ -54,6 +54,7 @@ include:aws-cn
 include:baishancloud
 include:bootcdn
 include:cloudflare-cn
+include:ctyun
 include:dwion
 include:maocloud
 include:qingcloud
--- a/data/google-ads
+++ b/data/google-ads
@@ -49,6 +49,7 @@ partnerad.l.google.com @ads
 urchin.com @ads

 full:analytics.google.com @ads
-full:fundingchoicesmessages.google.com @ads
+# https://github.com/AdguardTeam/FiltersRegistry/pull/1154
+# full:fundingchoicesmessages.google.com @ads

 regexp:^adservice\.google\.([a-z]{2}|com?)(\.[a-z]{2})?$ @ads
--- a/data/ookla-speedtest
+++ b/data/ookla-speedtest
@@ -13,3 +13,6 @@ webtest.net
 full:www.speedtest.net.cdn.cloudflare.net

 include:ookla-speedtest-ads
+
+# SpeedTest Node
+ookla-speedtest-central.hgconair.hgc.com.hk # HGC Global Communications 香港環電
--- a/data/picacg
+++ b/data/picacg
@@ -1,3 +1,5 @@
+include:picacg-ads
+
 bikaa.xyz
 bikac.xyz
 bikaios.xyz
@@ -8,3 +10,7 @@ picacn.xyz
 picacomic.com
 picacomic.xyz
 wikawika.xyz
+
+# Image Resource Domain like `img.diwodiwo.xyz` `s3.diwodiwo.xyz` `storage.diwodiwo.xyz` `storage-b.diwodiwo.xyz`
+diwodiwo.xyz
+
--- a/data/picacg-ads
+++ b/data/picacg-ads
@@ -0,0 +1,2 @@
+full:ad-channel.diwodiwo.xyz @ads
+full:ad-display.diwodiwo.xyz @ads
--- a/data/umeng-ads
+++ b/data/umeng-ads
@@ -1,6 +1,24 @@
 aaid.umeng.com @ads
 alog.umeng.com @ads
 alog.umengcloud.com @ads
+alogs.umeng.com @ads
+alogus.umeng.com @ads
+ar.umeng.com @ads
+aspect-upush.umeng.com @ads
+audid.umeng.com @ads
+ccs.umeng.com @ads
+cnlogs.umeng.com @ads
+cnlogs.umengcloud.com @ads
+# https://github.com/TG-Twilight/AWAvenue-Ads-Rule/issues/185
+# errlog.umeng.com @ads
+# errnewlog.umeng.com @ads
+new-aaid.umeng.com @ads
+new-aaid.umeng.com.gds.alibabadns.com @ads
+oc.umeng.com @ads
+plbslog.umeng.com @ads
+resolve.umeng.com @ads
+ulogs.umeng.com @ads
+ulogs.umengcloud.com @ads
 utoken.umeng.com @ads

 # CNZZ
--- a/data/wink
+++ b/data/wink
@@ -0,0 +1,3 @@
+ngenix.net
+restream-media.net
+wink.ru
--- a/main.go
+++ b/main.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"regexp"
 	"sort"
 	"strconv"
 	"strings"
@@ -71,6 +72,11 @@ func (l *ParsedList) toProto() (*router.GeoSite, error) {
 				Attribute: entry.Attrs,
 			})
 		case "regexp":
+			// check regexp validity to avoid runtime error
+			_, err := regexp.Compile(entry.Value)
+			if err != nil {
+				return nil, fmt.Errorf("invalid regexp in list %s: %s", l.Name, entry.Value)
+			}
 			site.Domain = append(site.Domain, &router.Domain{
 				Type:      router.Domain_Regex,
 				Value:     entry.Value,
Author	SHA1	Message	Date
风扇滑翔翼	93bfcfd142	Feat: check regexp before build (#3064 ) Co-authored-by: Loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>	2025-12-16 23:40:25 +08:00
DeepChirp	cbe19f0562	picacg-ads: split from picacg	2025-12-16 21:42:59 +08:00
DeepChirp	ea99bef4a2	google-ads: comment out problematic rule	2025-12-16 21:42:59 +08:00
深鸣	9b01521761	ctyun: add new entry (#3059 )	2025-12-16 21:24:37 +08:00
深鸣	8d50851b58	umeng-ads: add more domains (#3060 )	2025-12-16 21:13:11 +08:00
sklimoff	16923730a4	Add wink and include it in category-ru (#3058 )	2025-12-16 21:06:32 +08:00
Luo Chen	7e3137a0d1	Fix #3055 (#3056 )	2025-12-16 09:54:53 +08:00
tooadstool	6b4c09860b	Add Ookla Speedtest Central to the list (#3053 ) * Add Ookla Speedtest Central to the list * Update ookla-speedtest --------- Co-authored-by: rootmelo92118 <32770959+rootmelo92118@users.noreply.github.com>	2025-12-15 22:40:47 +08:00
Jiew-KueJwiaeng	6a11042b92	Update 18comic & picacg (#2695 ) * Update 18comic * Update picacg * Update 18comic --------- Co-authored-by: rootmelo92118 <32770959+rootmelo92118@users.noreply.github.com>	2025-12-15 22:38:15 +08:00