From 38a34b5d7f3422c217dd21d30cb949a247c5ff91 Mon Sep 17 00:00:00 2001
From: SukkaW <isukkaw@gmail.com>
Date: Mon, 19 Dec 2022 23:39:21 +0800
Subject: [PATCH] Update CDN Hosts

---
 Build/build-phishing-domainset.js | 14 ++++---
 List/domainset/cdn.conf           | 70 +++++++++++++++++++++++++++----
 Source/non_ip/cdn.conf            |  1 +
 3 files changed, 73 insertions(+), 12 deletions(-)

diff --git a/Build/build-phishing-domainset.js b/Build/build-phishing-domainset.js
index 66fb87b6..1bdca909 100644
--- a/Build/build-phishing-domainset.js
+++ b/Build/build-phishing-domainset.js
@@ -66,18 +66,21 @@ const BLACK_TLD = Array.from(new Set([
           continue;
         }
 
+        const tld = tldts.getPublicSuffix(domain, { allowPrivateDomains: true });
+        if (!tld || !BLACK_TLD.includes(tld)) continue;
+
         domainCountMap[apexDomain] ||= 0;
         domainCountMap[apexDomain] += 1;
 
         // Add more weight if the domain is long enough
         if (domain.length > 45) {
-          domainCountMap[apexDomain] += 1.5;
+          domainCountMap[apexDomain] += 4;
         } else if (domain.length > 35) {
-          domainCountMap[apexDomain] += 1;
+          domainCountMap[apexDomain] += 3;
         } else if (domain.length > 30) {
-          domainCountMap[apexDomain] += 0.5;
+          domainCountMap[apexDomain] += 2;
         } else if (domain.length > 25) {
-          domainCountMap[apexDomain] += 0.25;
+          domainCountMap[apexDomain] += 1;
         }
 
         const subdomain = tldts.getSubdomain(domain, { allowPrivateDomains: true });
@@ -88,11 +91,12 @@ const BLACK_TLD = Array.from(new Set([
     }
   }
 
+  console.log(domainCountMap);
+
   const results = [];
   Object.entries(domainCountMap).forEach(([domain, count]) => {
     if (
       count >= 5
-      && BLACK_TLD.some(tld => domain.endsWith(tld))
     ) {
       results.push('.' + domain);
     }
diff --git a/List/domainset/cdn.conf b/List/domainset/cdn.conf
index 28feac13..d6b9c5b4 100644
--- a/List/domainset/cdn.conf
+++ b/List/domainset/cdn.conf
@@ -195,7 +195,14 @@ edgedl.me.gvt3.com
 edgedl.me.gvt4.com
 edgedl.me.gvt5.com
 
-# >> Adobe Fonts
+# >> Adobe
+wwwimages2.adobe.com
+.adobeccstatic.com
+assets.adobedtm.com
+# MyPortfolio
+pro2-ui-assets-s3-fy.myportfolio.com
+cdn.myportfolio.com
+# Adobe Fonts
 p.typekit.net
 p.typekit.com
 use.typekit.net
@@ -401,6 +408,9 @@ pics.dmm.co.jp
 i.vgy.me
 placeimg.com
 thumbsnap.com
+pengtu.cc
+# imgix custom domain
+www.datocms-assets.com
 
 # >> Medium
 cdn-client.medium.com
@@ -517,6 +527,9 @@ cdn.linkmink.com
 static.scroll.com
 assets.scroll.com
 
+participants.evolv.ai
+media.evolv.ai
+
 # >> Atlassian
 wac-cdn.atlassian.com
 wac-cdn-2.atlassian.com
@@ -617,6 +630,22 @@ cdn.segment.com
 .w3s.link
 .cthd.icu
 
+# >> Mastodon
+media.cmx.edu.kg
+s3.acg.mn
+cdn.fosstodon.org
+img.pawoo.net
+static-cdn.mastodon.social
+assets.toot.cafe
+media.mstdn.io
+media-cdn.comfy.social
+media.hachyderm.io
+assets.orz.uno
+media.orz.uno
+media.mas.to
+media.e4le.me
+medias.meow.social
+
 # BackBlaze
 f000.backblazeb2.com
 f001.backblazeb2.com
@@ -624,6 +653,13 @@ f002.backblazeb2.com
 f003.backblazeb2.com
 f004.backblazeb2.com
 
+# Storj
+link.storjshare.io
+
+# Wasabi
+s3.eu-central-2.wasabisys.com
+.s3.wasabisys.com
+
 # >> General CDN
 # LottieFiles
 assets0.lottiefiles.com
@@ -897,12 +933,6 @@ thumbs2.sendvid.com
 # status.io
 static.status.io
 image.status.io
-# Mastodon
-media.cmx.edu.kg
-s3.acg.mn
-cdn.fosstodon.org
-img.pawoo.net
-static-cdn.mastodon.social
 # Framer
 .framerusercontent.com
 .framerstatic.com
@@ -924,6 +954,12 @@ cfl.dropboxstatic.com
 .winudf.com
 .cdnpure.com
 static.apkpure.com
+# chess24.com
+assets.chess24.com
+cdn.chess24.com
+# adguard.com
+cdn.adguard.com
+cdn.adtidy.org
 # Others
 .yelpcdn.com
 cf-images.us-east-1.prod.boltdns.net
@@ -1067,3 +1103,23 @@ cms-assets.webediamovies.pro
 .img2.acsta.net
 .img3.acsta.net
 media.tenor.com
+api.qrserver.com
+imgcdn.91pic.org
+cdn7.pornmaster.fun
+cdn10.hiftporn.fun
+cdne-pics.youjizz.com
+img2.tnaflix.com
+img3.lltaohuaxiang.com
+img.bigcloud.cyou
+img.biguz.net
+img.bttimg.com
+.avximg.com
+pcz.javidol.org
+pic.cdnclouder.com
+pics.x-n-x-x.pro
+mixin-images.zeromesh.net
+ddcdn.comtucdncom.com
+img2.xiangbinjun.com
+img.biguz.net
+static.heavy-r.com
+thumbs.gfycat.com
diff --git a/Source/non_ip/cdn.conf b/Source/non_ip/cdn.conf
index 8e31206e..2b0a743e 100644
--- a/Source/non_ip/cdn.conf
+++ b/Source/non_ip/cdn.conf
@@ -42,4 +42,5 @@ DOMAIN-SUFFIX,csb.app
 DOMAIN-SUFFIX,azurestaticapps.net
 # >> AWS S3
 DOMAIN-SUFFIX,s3.amazonaws.com
+DOMAIN-SUFFIX,s3.us-west-2.amazonaws.com
 # --- [AWS S3 Replace Me] ---