remove :: and 0.0.0.0 (#2780)

[skip ci]

.github/workflows/test-pr.yml

@@ -34,7 +34,7 @@ jobs:
           mv dlc.dat TEST-${{ github.run_number }}-dlc.dat
 
       - name: Upload TEST-${{ github.run_number }}-dlc.dat
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: TEST-${{ github.run_number }}-dlc.dat
           path: TEST-${{ github.run_number }}-dlc.dat

data/amazon

@@ -33,6 +33,7 @@ aboutamazon.in
 aboutamazon.it
 aboutamazon.jp
 aboutamazon.pl
+aboutamazon.sg
 alexafund.cn @cn
 alexafund.com.cn @cn
 amaaozn.com
@@ -42,24 +43,35 @@ amazon-lantern.com
 amazon-launchpad.com
 amazon.ae
 amazon.ca
+amazon.cl
 amazon.cn @cn
 amazon.co.jp
 amazon.co.uk
+amazon.co.za
 amazon.com
 amazon.com.au
+amazon.com.be
 amazon.com.br
+amazon.com.co
 amazon.com.mx
+amazon.com.ng
 amazon.com.tr
 amazon.de
 amazon.dev
+amazon.eg
 amazon.es
 amazon.fr
+amazon.ie
 amazon.in
 amazon.it
 amazon.jobs
 amazon.jp
+amazon.lu
 amazon.nl
+amazon.pl
 amazon.red
+amazon.sa
+amazon.se
 amazon.sg
 amazonalexavoxcon.com
 amazonauthorinsights.com
@@ -103,6 +115,7 @@ media-amazon.com
 primeday.cn @cn
 primeday.com.cn @cn
 primeday.info
+seattlespheres.com
 siege-amazon.com
 ssl-images-amazon.com
 ueberamazon.de

data/apple

@@ -752,6 +752,7 @@ courier-push-apple.com.akadns.net
 full:amp-api-edge-lb-cn.itunes-apple.com.akadns.net @cn
 full:amp-api-edge-lb.itunes-apple.com.akadns.net @cn
 full:amp-api-edge.apps.apple.com @cn
+full:amp-api-edge.music.apple.com @cn
 full:amp-api-search-edge.apps.apple.com @cn
 full:amp-api.apps.apple.com @cn
 full:amp-api.music.apple.com @cn
@@ -782,6 +783,8 @@ full:js-cdn.music.apple.com @cn
 full:km.support.apple.com @cn
 full:maps.apple.com @cn
 full:misc-assets.itunes.apple.com @cn
+full:musicstatus.music.apple.com @cn
+full:mvod.itunes.apple.com @cn
 full:myapp.itunes.apple.com @cn
 full:np-edge.itunes.apple.com @cn
 full:osxapps.itunes.apple.com @cn
@@ -794,6 +797,7 @@ full:se2.itunes.apple.com @cn
 full:search.itunes.apple.com @cn
 full:sf-api-token-service.itunes.apple.com @cn
 full:sp.itunes.apple.com @cn
+full:speedysub.music.apple.com @cn
 full:streamingaudio.itunes.apple.com @cn
 full:su.itunes.apple.com @cn
 full:sync.itunes.apple.com @cn

data/aws

@@ -40,6 +40,7 @@ awssecworkshops.com
 awsstatic.com
 awsthinkbox.com
 awstrack.me
+awswaf.com
 cdkworkshop.com
 cloudfront.com
 cloudfront.net

data/category-dev

@@ -123,6 +123,7 @@ notepad-plus-plus.org
 openresty.org
 openssl.org
 opensuse.org
+packagecloud.io
 packagist.org
 pcre.org
 phantomjs.org

data/category-gov-ru

@@ -18,8 +18,10 @@ cbr.ru          # Central Bank of Russia
 cikrf.ru        # Central Electoral Commission of the Russian Federation
 ebs.ru          # Unified Biometric System
 goskey.ru       # GosKey - an electronic signature on a smartphone
+grfc.ru         # General radio frequency center
 izbirkom.ru     # Information on ongoing elections and referendums
 kremlin.ru      # Online representation of the President of Russia
+mil.ru          # Ministry of Defense of the Russian Federation
 nalog.ru        # Federal Tax Service
 xn--80ajghhoc2aj1c8b.xn--p1ai # Honest Sign - State Labeling System
 

data/category-ip-geo-detect

@@ -3,6 +3,7 @@
 2ip.ua
 abstractapi.com
 bigdatacloud.net
+check-host.net
 db-ip.com
 extreme-ip-lookup.com
 fraudguard.io

data/category-porn

@@ -2700,6 +2700,7 @@ jav.guru
 jav.la
 jav.land
 jav.place
+jav.sb
 jav.si
 jav.wine
 jav01.cc
@@ -2762,6 +2763,7 @@ javhdporn.net
 javher.com
 javheroine.com
 javhihi.com
+javhub.com
 javhub.me
 javhub.net
 javidol.org
@@ -2795,6 +2797,7 @@ javprime.net
 javpub.me
 javpush.com
 javqd.com
+javquick.com
 javrank.com
 javrate.com
 javrave.club

data/category-social-media-!cn

@@ -13,3 +13,12 @@ include:twitter
 include:vk
 
 truthsocial.com
+
+# Mastodon
+# * We can not make a comprehensive domain list of all Mastodon instances.
+# * Many more dynamic/random instance domains are not listed here.
+# * geosite:mastodon is not provided to avoid creating excessive expectations among users.
+joinmastodon.org
+mastodon.online
+mastodon.social
+pawoo.net

data/geolocation-cn

@@ -180,6 +180,10 @@ wuyou.net # 无忧启动论坛
 x-station.cn # X电站
 znds.com # 智能电视网
 
+# DCC Forum（心跳文学部中文论坛）
+edgemonix.top # 图床
+monika.love
+
 423down.com # 423Down
 acwifi.net # 路由器技术分享
 appinn.com # 小众软件

data/perplexity

@@ -2,4 +2,5 @@ perplexity.ai
 perplexity.com
 pplx.ai
 
+full:ppl-ai-file-upload.s3.amazonaws.com
 full:pplx-res.cloudinary.com

data/private

@@ -22,7 +22,6 @@ internal
 
 # References: https://www.iana.org/assignments/locally-served-dns-zones/locally-served-dns-zones.xhtml
 # https://www.rfc-editor.org/rfc/rfc6303.html
-0.in-addr.arpa
 2.0.192.in-addr.arpa
 10.in-addr.arpa
 16.172.in-addr.arpa
@@ -47,7 +46,6 @@ internal
 168.192.in-addr.arpa
 254.169.in-addr.arpa
 255.255.255.255.in-addr.arpa
-0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa
 8.b.d.0.1.0.0.2.ip6.arpa
 8.e.f.ip6.arpa

data/sina

@@ -19,13 +19,14 @@ th.weibo.com @!cn
 tw.weibo.com @!cn
 us.weibo.com @!cn
 videoself.cn
-wbimg.com
 wbimg.cn
+wbimg.com
 wcdn.cn
 weibo.cn
 weibo.com
 weibo.com.cn
 weibocdn.com
+weibopay.com
 xhaiwai.com
 
 # Ads/tracking

data/yandex

@@ -53,6 +53,7 @@ yandexadexchange.net
 yandexcloud.net
 yandexcom.net
 yandexmetrica.com
+yandexwebcache.net
 yandexwebcache.org
 yastat.net
 yastatic-net.ru

main.go

@@ -263,9 +263,6 @@ func (p *Processor) loadData(listName string, path string) error {
 }
 
 func isMatchAttrFilters(entry *Entry, incFilter *Inclusion) bool {
-	if len(incFilter.MustAttrs) == 0 && len(incFilter.BanAttrs) == 0 {
-		return true
-	}
 	if len(entry.Attrs) == 0 {
 		return len(incFilter.MustAttrs) == 0
 	}
@@ -352,15 +349,13 @@ func (p *Processor) resolveList(plname string) error {
 	for _, dentry := range pl.Entries { // Add direct entries
 		roughMap[dentry.Plain] = dentry
 	}
-	for _, inc := range pl.Inclusions {
+	for _, inc := range pl.Inclusions { // Add included entries
-		if _, exist := p.plMap[inc.Source]; !exist {
-			return fmt.Errorf("list %q includes a non-existent list: %q", plname, inc.Source)
-		}
 		if err := p.resolveList(inc.Source); err != nil {
-			return err
+			return fmt.Errorf("failed to resolve inclusion %q: %w", inc.Source, err)
 		}
+		isFullInc := len(inc.MustAttrs) == 0 && len(inc.BanAttrs) == 0
 		for _, ientry := range p.finalMap[inc.Source] {
-			if isMatchAttrFilters(ientry, inc) { // Add included entries
+			if isFullInc || isMatchAttrFilters(ientry, inc) {
 				roughMap[ientry.Plain] = ientry
 			}
 		}