浏览代码

Update CDN & Reject & Global Hosts

SukkaW 4 月之前
父节点
当前提交
32cea41f04

+ 13 - 0
Build/validate-gfwlist.ts

@@ -10,6 +10,7 @@ import { $$fetch } from './lib/fetch-retry';
 import runAgainstSourceFile from './lib/run-against-source-file';
 import { nullthrow } from 'foxts/guard';
 import { Buffer } from 'node:buffer';
+import { GLOBAL } from '../Source/non_ip/global';
 
 export async function getTopOneMillionDomains() {
   const { parse: csvParser } = await import('csv-parse');
@@ -132,6 +133,18 @@ export async function parseGfwList() {
     runAgainstSourceFile(path.resolve(OUTPUT_SURGE_DIR, 'domainset/cdn.conf'), callback, 'domainset')
   ]);
 
+  Object.values(GLOBAL).forEach(({ domains }) => {
+    domains.forEach(domain => {
+      if (domain[0] === '$') {
+        callback(domain.slice(1), false);
+      } else if (domain[0] === '+') {
+        callback(domain.slice(1), true);
+      } else {
+        callback(domain, true);
+      }
+    });
+  });
+
   whiteSet.forEach(domain => gfwListTrie.whitelist(domain, true));
 
   const kwfilter = createKeywordFilter([...keywordSet]);

+ 25 - 4
Source/domainset/cdn.conf

@@ -467,6 +467,7 @@ cms.typenetwork.com
 
 # >> Amazon CDN
 .ssl-images-amazon.com
+.images-amazon.com
 .media-amazon.com
 .cloudfront.net
 assets.aboutamazon.com
@@ -551,6 +552,7 @@ content.powerapps.com
 cdn.sapphire.microsoftapp.net
 edgestorewebpme-d2hnhfgbgnfmfuha.z01.azurefd.net
 learn-attachment.microsoft.com
+alcdn.msauth.net
 # Microsoft CSP Violation Report
 csp.microsoft.com
 # uses Azure Blob Storage
@@ -620,6 +622,9 @@ embedwistia-a.akamaihd.net
 embed-ssl.wistia.com
 embed-cloudfront.wistia.com
 .doppiocdn.com
+.doppiocdn.org
+.doppiocdn.net
+.doppiocdn.live
 .alonestreaming.com
 .thisiscdn.com
 .video-cdn.net
@@ -637,6 +642,7 @@ static-cdn.bytegiftia.top
 .image8899.net
 .rrcdnbf3.com
 .myvideos.info
+media-hls.growcdnssedge.com
 # vimeo
 player.vimeo.com
 .vimeocdn.com
@@ -906,6 +912,7 @@ i.111666.best
 .2img.net
 i.servimg.com
 .tutu1.space
+img.imoutomoe.net
 
 # >> Shopify
 cdn.shopify.com
@@ -3047,8 +3054,6 @@ g-static.ap4r.com
 .strpst.com
 .stripst.com
 .stripcdn.com
-.doppiocdn.net
-.doppiocdn.live
 .striiiipst.com
 
 # >> FS.com
@@ -3675,7 +3680,6 @@ assets.kraken.com
 cdn.prowritingaid.com
 assets.prowritingaid.com
 .bestjavcdn.com
-.doppiocdn.org
 .myavlive.com
 .teraboxcdn.com
 static2.avg.com
@@ -3804,7 +3808,7 @@ assets.ontrack.com
 img.applealmond.com
 img.hentaihaven.xxx
 .cdn-one.com
-assets.dwncdn.net
+.dwncdn.net
 .scribdassets.com
 cdn.reimu.net
 img.reimu.net
@@ -5027,3 +5031,20 @@ imgs02.aventertainments.com
 .capcutstatic.com
 .directupload.net
 img.voguehk.com
+.t8cdn.com
+cdn.roof.ai
+static-images.remax.com
+media.remax-prod.eng.remax.tech
+.lllcdn.autos
+cdn.lineicons.com
+assets.porndig.com
+cdn-static-push.porndig.com
+image-cdn.porndig.com
+img.javynow.com
+fastly-gce.allmovie.com
+fastly-s3.allmovie.com
+cdn.imago-images.com
+cdn.moeload.com
+cdn-1.porn87.com
+cdn-2.porn87.com
+cdn-3.porn87.com

+ 1 - 0
Source/domainset/reject.conf

@@ -1176,6 +1176,7 @@ user.ground.news
 analytics.immersivetranslate.com
 analytics.blender.org
 probe.whatismyipaddress.com
+o.send.now
 
 cdn.perfops.net
 rum-cdn.perfops.net

+ 5 - 0
Source/non_ip/cdn.conf

@@ -119,3 +119,8 @@ DOMAIN-WILDCARD,s*.hanime1
 DOMAIN-WILDCARD,img-*.now.com
 DOMAIN-WILDCARD,assets.*.imaga.co
 DOMAIN-KEYWORD,static.grammarly.com
+DOMAIN-WILDCARD,cdn*.pigav.com
+DOMAIN-WILDCARD,fastly-*.allmovie.com
+DOMAIN-WILDCARD,cdn*.porn87.com
+DOMAIN-WILDCARD,cdn*.pornhost.com
+DOMAIN-WILDCARD,cdn*.boysfood.com

+ 14 - 0
Source/non_ip/global.conf

@@ -804,6 +804,7 @@ DOMAIN-SUFFIX,he.net
 DOMAIN-SUFFIX,hentaifox.com
 DOMAIN-SUFFIX,hentaiplay.net
 DOMAIN-SUFFIX,hentaipaw.com
+DOMAIN-SUFFIX,hentaistream.com
 DOMAIN-SUFFIX,heroku.com
 DOMAIN-SUFFIX,herokuapp.com
 DOMAIN-SUFFIX,hetzner.com
@@ -877,6 +878,7 @@ DOMAIN-SUFFIX,javlibrary.com
 DOMAIN-SUFFIX,javtrailers.com
 DOMAIN-SUFFIX,javtsunami.com
 DOMAIN-SUFFIX,javwind.com
+DOMAIN-SUFFIX,javynow.com
 DOMAIN-SUFFIX,jirachecklist.com
 DOMAIN-SUFFIX,jkforum.net
 DOMAIN-SUFFIX,jotform.com
@@ -902,6 +904,7 @@ DOMAIN-SUFFIX,komoot.com
 DOMAIN-SUFFIX,komoot.net
 DOMAIN-SUFFIX,ko-fi.com
 DOMAIN-SUFFIX,knock.app
+DOMAIN-SUFFIX,knowyourmeme.com
 DOMAIN-SUFFIX,kucoin.com
 DOMAIN-SUFFIX,kwai.com
 DOMAIN-SUFFIX,laby.net
@@ -958,6 +961,7 @@ DOMAIN-SUFFIX,mobile01.com
 DOMAIN-SUFFIX,modrinth.com
 DOMAIN-SUFFIX,moegirl.tw
 DOMAIN-SUFFIX,moegirl.uk
+DOMAIN-SUFFIX,moeload.com
 DOMAIN-SUFFIX,mojang.com
 DOMAIN-SUFFIX,monica.im
 # moomoo.com is a special case, it is owned by Chinese, use tencent cloud, its CDN and NS, yet has been DNS polluted
@@ -970,6 +974,7 @@ DOMAIN-SUFFIX,mozilla.org
 DOMAIN-SUFFIX,muku.tv
 DOMAIN-SUFFIX,mullvad.net
 DOMAIN-SUFFIX,myanimelist.net
+DOMAIN-SUFFIX,myanimeshelf.com
 DOMAIN-SUFFIX,myfreecams.com
 DOMAIN-SUFFIX,mypikpak.com
 DOMAIN-SUFFIX,myspace.com
@@ -1014,6 +1019,7 @@ DOMAIN-SUFFIX,obsproject.com
 DOMAIN-SUFFIX,odysee.com
 DOMAIN-SUFFIX,ok.ru
 DOMAIN-SUFFIX,olelive.com
+DOMAIN-SUFFIX,olevod.com
 DOMAIN-SUFFIX,olympics.com
 DOMAIN-SUFFIX,one.com
 DOMAIN,community.oneplus.com
@@ -1034,6 +1040,7 @@ DOMAIN-SUFFIX,pastebin.com
 DOMAIN-SUFFIX,patreon.com
 DOMAIN-SUFFIX,peeringdb.com
 DOMAIN-SUFFIX,perplexity.ai
+DOMAIN-SUFFIX,pigav.com
 DOMAIN-SUFFIX,pin.it
 DOMAIN-KEYWORD,pinterest
 DOMAIN-SUFFIX,pinterest.com
@@ -1058,7 +1065,10 @@ DOMAIN-SUFFIX,pximg.net
 DOMAIN-SUFFIX,playboy.com
 DOMAIN-SUFFIX,plurk.com
 DOMAIN-SUFFIX,poeditor.com
+DOMAIN-SUFFIX,porn87.com
+DOMAIN-SUFFIX,porndig.com
 DOMAIN-SUFFIX,pornhd.com
+DOMAIN-SUFFIX,pornhost.com
 DOMAIN-SUFFIX,pornhub.com
 DOMAIN-SUFFIX,pornhub.org
 DOMAIN-SUFFIX,pornmd.com
@@ -1137,6 +1147,7 @@ DOMAIN-SUFFIX,sketch.cloud
 DOMAIN-SUFFIX,sketch.com
 DOMAIN-SUFFIX,skk.moe
 DOMAIN-SUFFIX,slack.com
+DOMAIN-SUFFIX,slackhq.com
 DOMAIN-SUFFIX,sleazyfork.org
 DOMAIN-SUFFIX,slideshare.net
 DOMAIN-SUFFIX,sm.ms
@@ -1226,6 +1237,7 @@ DOMAIN-SUFFIX,tronscan.org
 DOMAIN-SUFFIX,trustpilot.com
 DOMAIN-SUFFIX,trustpilot.net
 DOMAIN-SUFFIX,truthsocial.com
+DOMAIN-SUFFIX,tube8.com
 DOMAIN-SUFFIX,tumblr.com
 DOMAIN-SUFFIX,tunein.com
 DOMAIN-SUFFIX,turbobit.net
@@ -1234,8 +1246,10 @@ DOMAIN-SUFFIX,typora.io
 DOMAIN-SUFFIX,udn.com
 DOMAIN-SUFFIX,ubuntu.com
 DOMAIN-SUFFIX,ubuntu-touch.io
+DOMAIN-SUFFIX,umblr.com
 DOMAIN-SUFFIX,upcitemdb.com
 DOMAIN-SUFFIX,updownradar.com
+DOMAIN-SUFFIX,upjav.org
 DOMAIN-SUFFIX,uptodown.com
 DOMAIN-SUFFIX,uptimerobot.com
 DOMAIN-SUFFIX,upornia.com

+ 1 - 0
Source/non_ip/global.ts

@@ -145,6 +145,7 @@ export const GLOBAL: Record<string, DNSMapping> = {
       'wikivoyage.org',
       'wiktionary.org',
       'wmfusercontent.org',
+      'wmflabs.org',
       'w.wiki'
     ]
   }

+ 1 - 0
Source/non_ip/my_tw.conf

@@ -3,6 +3,7 @@
 DOMAIN,hanime1.me
 DOMAIN-SUFFIX,cdn.hinet.net
 DOMAIN,av.jkforum.net
+DOMAIN,avbebe.com
 
 DOMAIN-WILDCARD,*.ffzy-online?.com
 DOMAIN-WILDCARD,*.ffzy-play?.com