Refine blacklist mode

Specify domain and sub-domain
Keep up with upstream behavior 18f0a8301a
2021-01-28 09:17:25 +08:00 · 2021-01-21 17:57:04 +08:00 · 2021-01-21 16:42:50 +08:00 · 2021-01-01 09:31:50 +08:00
2 changed files with 24 additions and 38 deletions
--- a/.github/workflows/run.yml
+++ b/.github/workflows/run.yml
@ -18,6 +18,7 @@ jobs:
          echo "TAG_NAME=$(date +%Y%m%d%H%M)" >> $GITHUB_ENV
          echo "custom_icloud=https://raw.githubusercontent.com/Loyalsoldier/domain-list-custom/release/icloud.txt" >> $GITHUB_ENV
          echo "custom_tld_not_cn=https://raw.githubusercontent.com/Loyalsoldier/domain-list-custom/release/tld-!cn.txt" >> $GITHUB_ENV
+          echo "custom_private=https://raw.githubusercontent.com/Loyalsoldier/domain-list-custom/release/private.txt" >> $GITHUB_ENV
          echo "Loyalsoldier_reject=https://raw.githubusercontent.com/Loyalsoldier/v2ray-rules-dat/release/reject-list.txt" >> $GITHUB_ENV
          echo "Loyalsoldier_proxy=https://raw.githubusercontent.com/Loyalsoldier/v2ray-rules-dat/release/proxy-list.txt" >> $GITHUB_ENV
          echo "Loyalsoldier_direct=https://raw.githubusercontent.com/Loyalsoldier/v2ray-rules-dat/release/direct-list.txt" >> $GITHUB_ENV
@ -49,15 +50,23 @@ jobs:
          echo "payload:" > apple.txt
          curl -sSL ${felixonmars_apple} | perl -ne '/^server=\/([^\/]+)\// && print "  - |+.$1|\n"' | sed "s/|/'/g" >> apple.txt

+      - name: Generate private.txt file
+        run: |
+          echo "payload:" > private.txt
+          curl -sSL ${custom_private} | awk -F ':' '/^full:/ {printf "  - |%s|\n", $2}' | sed "s/|/'/g" >> private.txt
+          curl -sSL ${custom_private} | awk -F ':' '/^domain:/ {printf "  - |+.%s|\n", $2}' | sed "s/|/'/g" >> private.txt
+
      - name: Generate direct.txt file
        run: |
          echo "payload:" > direct.txt
-          curl -sSL ${Loyalsoldier_direct} | grep -Ev "^(regexp|keyword):" | perl -ne '/^(domain:|full:)?([-_a-zA-Z0-9]+(\.[-_a-zA-Z0-9]+)*)/ && print "  - |+.$2|\n"' | sed "s/|/'/g" >> direct.txt
+          curl -sSL ${Loyalsoldier_direct} | grep -Ev "^(regexp|keyword):" | perl -ne '/^(full:)([-_a-zA-Z0-9]+(\.[-_a-zA-Z0-9]+)*)/ && print "  - |$2|\n"' | sed "s/|/'/g" >> direct.txt
+          curl -sSL ${Loyalsoldier_direct} | grep -Ev "^(regexp|keyword):" | perl -ne '/^(domain:)?([-_a-zA-Z0-9]+(\.[-_a-zA-Z0-9]+)*)/ && print "  - |+.$2|\n"' | sed "s/|/'/g" >> direct.txt

      - name: Generate proxy.txt file
        run: |
          echo "payload:" > proxy.txt
-          curl -sSL ${Loyalsoldier_proxy} | grep -Ev "^(regexp|keyword):" | perl -ne '/^(domain:|full:)?([-_a-zA-Z0-9]+(\.[-_a-zA-Z0-9]+)*)/ && print "  - |+.$2|\n"' | sed "s/|/'/g" >> proxy.txt
+          curl -sSL ${Loyalsoldier_proxy} | grep -Ev "^(regexp|keyword):" | perl -ne '/^(full:)([-_a-zA-Z0-9]+(\.[-_a-zA-Z0-9]+)*)/ && print "  - |$2|\n"' | sed "s/|/'/g" >> proxy.txt
+          curl -sSL ${Loyalsoldier_proxy} | grep -Ev "^(regexp|keyword):" | perl -ne '/^(domain:)?([-_a-zA-Z0-9]+(\.[-_a-zA-Z0-9]+)*)/ && print "  - |+.$2|\n"' | sed "s/|/'/g" >> proxy.txt

      - name: Generate reject.txt file
        run: |
@ -86,13 +95,12 @@ jobs:

      - name: Generate telegramcidr.txt file
        run: |
-          echo "payload:" > telegramcidr.txt
          curl -sSL ${telegram_cidr} | perl -ne '/(.+\/\d+)/ && print "  - |$1|\n"' | sed "s/|/'/g" >> telegramcidr.txt

      - name: Move files to publish directory
        run: |
          mkdir -p publish
-          install -p {apple,icloud,google,proxy,direct,reject,gfw,greatfire,tld-not-cn,cncidr,lancidr,telegramcidr}.txt ./publish/
+          install -p {apple,icloud,google,proxy,direct,reject,private,gfw,greatfire,tld-not-cn,cncidr,lancidr,telegramcidr}.txt ./publish/

      - name: Release and upload assets
        uses: softprops/action-gh-release@v1
--- a/README.md
+++ b/README.md
@ -29,6 +29,9 @@
 - **广告域名列表 reject.txt**：
  - [https://raw.githubusercontent.com/Loyalsoldier/clash-rules/release/reject.txt](https://raw.githubusercontent.com/Loyalsoldier/clash-rules/release/reject.txt)
  - [https://cdn.jsdelivr.net/gh/Loyalsoldier/clash-rules@release/reject.txt](https://cdn.jsdelivr.net/gh/Loyalsoldier/clash-rules@release/reject.txt)
+- **私有网络专用域名列表 private.txt**：
+  - [https://raw.githubusercontent.com/Loyalsoldier/clash-rules/release/private.txt](https://raw.githubusercontent.com/Loyalsoldier/clash-rules/release/private.txt)
+  - [https://cdn.jsdelivr.net/gh/Loyalsoldier/clash-rules@release/private.txt](https://cdn.jsdelivr.net/gh/Loyalsoldier/clash-rules@release/private.txt)
 - **Apple 域名列表 apple.txt**：
  - [https://raw.githubusercontent.com/Loyalsoldier/clash-rules/release/apple.txt](https://raw.githubusercontent.com/Loyalsoldier/clash-rules/release/apple.txt)
  - [https://cdn.jsdelivr.net/gh/Loyalsoldier/clash-rules@release/apple.txt](https://cdn.jsdelivr.net/gh/Loyalsoldier/clash-rules@release/apple.txt)
@ -109,6 +112,13 @@ rule-providers:
    path: ./ruleset/direct.yaml
    interval: 86400

+  private:
+    type: http
+    behavior: domain
+    url: "https://cdn.jsdelivr.net/gh/Loyalsoldier/clash-rules@release/private.txt"
+    path: ./ruleset/private.yaml
+    interval: 86400
+
  gfw:
    type: http
    behavior: domain
@ -180,6 +190,7 @@ rules:
  - PROCESS-NAME,WebTorrent,DIRECT
  - DOMAIN,clash.razord.top,DIRECT
  - DOMAIN,yacd.haishan.me,DIRECT
+  - RULE-SET,private,DIRECT
  - RULE-SET,reject,REJECT
  - RULE-SET,icloud,DIRECT
  - RULE-SET,apple,DIRECT
@ -218,45 +229,12 @@ rules:
  - PROCESS-NAME,WebTorrent,DIRECT
  - DOMAIN,clash.razord.top,DIRECT
  - DOMAIN,yacd.haishan.me,DIRECT
+  - RULE-SET,private,DIRECT
  - RULE-SET,reject,REJECT
  - RULE-SET,tld-not-cn,PROXY
  - RULE-SET,gfw,PROXY
  - RULE-SET,greatfire,PROXY
  - RULE-SET,telegramcidr,PROXY
-  - GEOIP,AE,PROXY
-  - GEOIP,AU,PROXY
-  - GEOIP,BR,PROXY
-  - GEOIP,CA,PROXY
-  - GEOIP,DE,PROXY
-  - GEOIP,DK,PROXY
-  - GEOIP,ES,PROXY
-  - GEOIP,FI,PROXY
-  - GEOIP,FR,PROXY
-  - GEOIP,GB,PROXY
-  - GEOIP,GR,PROXY
-  - GEOIP,HK,PROXY
-  - GEOIP,ID,PROXY
-  - GEOIP,IL,PROXY
-  - GEOIP,IN,PROXY
-  - GEOIP,IQ,PROXY
-  - GEOIP,IR,PROXY
-  - GEOIP,IT,PROXY
-  - GEOIP,JP,PROXY
-  - GEOIP,KR,PROXY
-  - GEOIP,MO,PROXY
-  - GEOIP,MY,PROXY
-  - GEOIP,NL,PROXY
-  - GEOIP,NO,PROXY
-  - GEOIP,NZ,PROXY
-  - GEOIP,PH,PROXY
-  - GEOIP,RU,PROXY
-  - GEOIP,SA,PROXY
-  - GEOIP,SG,PROXY
-  - GEOIP,TH,PROXY
-  - GEOIP,TR,PROXY
-  - GEOIP,TW,PROXY
-  - GEOIP,US,PROXY
-  - GEOIP,VN,PROXY
  - MATCH,DIRECT
 ```
Author	SHA1	Message	Date
Loyalsoldier	5441d199cf	Refine blacklist mode	2021-01-28 09:17:25 +08:00
loyalsoldier	49f7eb8a57	Specify domain and sub-domain Keep up with upstream behavior `18f0a8301a`	2021-01-21 17:57:04 +08:00
loyalsoldier	1e7b435701	Add private domain list	2021-01-21 16:42:50 +08:00
loyalsoldier	7f13203f06	Refine telegram CIDR	2021-01-01 09:31:50 +08:00