From be3bf444a66ea49c936f8ca6e00a701944db8eb3 Mon Sep 17 00:00:00 2001 From: Loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com> Date: Wed, 3 Nov 2021 23:13:50 +0800 Subject: [PATCH] Feat: use CIDR from repo @Loyalsoldier/geoip --- .github/workflows/run.yml | 23 +++++++++++++---------- README.md | 5 +++-- parts/telegram_ips.txt | 21 --------------------- 3 files changed, 16 insertions(+), 33 deletions(-) delete mode 100644 parts/telegram_ips.txt diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 4e92f93..73e5248 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -27,18 +27,21 @@ jobs: echo "Loyalsoldier_greatfire=https://raw.githubusercontent.com/Loyalsoldier/v2ray-rules-dat/release/greatfire.txt" >> $GITHUB_ENV echo "felixonmars_apple=https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/apple.china.conf" >> $GITHUB_ENV echo "felixonmars_google=https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/google.china.conf" >> $GITHUB_ENV - echo "ipipnet_chinaiplist=https://raw.githubusercontent.com/17mon/china_ip_list/master/china_ip_list.txt" >> $GITHUB_ENV - echo "telegram_cidr=https://core.telegram.org/resources/cidr.txt" >> $GITHUB_ENV + echo "cn_cidr=https://raw.githubusercontent.com/Loyalsoldier/geoip/release/text/cn.txt" >> $GITHUB_ENV + echo "telegram_cidr=https://raw.githubusercontent.com/Loyalsoldier/geoip/release/text/telegram.txt" >> $GITHUB_ENV shell: bash - name: Checkout the default branch uses: actions/checkout@v2 + - name: Make directory + run: | + mkdir -p ruleset + - name: Generate icloud.txt file run: | curl -sSL ${custom_icloud} | grep -E "^full:" | awk -F ':' '{printf "%s\n", $2}' > icloud.txt curl -sSL ${custom_icloud} | grep -E "^domain:" | awk -F ':' '{printf ".%s\n", $2}' >> icloud.txt - mkdir -p ruleset curl -sSL ${custom_icloud} | grep -E "^full:" | awk -F ':' '{printf "DOMAIN,%s\n", $2}' > ruleset/icloud.txt curl -sSL ${custom_icloud} | grep -E "^domain:" | awk -F ':' '{printf "DOMAIN-SUFFIX,%s\n", $2}' >> ruleset/icloud.txt @@ -95,22 +98,22 @@ jobs: - name: Generate cncidr.txt file run: | - curl -sSL ${ipipnet_chinaiplist} | perl -ne '/^(\d{1,3}(\.\d{1,3}){3}\/\d{1,2})/ && print "IP-CIDR,$1\n"' > cncidr.txt - curl -sSL ${ipipnet_chinaiplist} | perl -ne '/^(\d{1,3}(\.\d{1,3}){3}\/\d{1,2})/ && print "IP-CIDR,$1\n"' > ruleset/cncidr.txt + curl -sSL ${cn_cidr} | perl -ne '/^(\d{1,3}(\.\d{1,3}){3}\/\d{1,2})/ && print "IP-CIDR,$1\n"' > cncidr.txt + curl -sSL ${cn_cidr} | perl -ne '/^(\d{1,3}(\.\d{1,3}){3}\/\d{1,2})/ && print "IP-CIDR,$1\n"' > ruleset/cncidr.txt + curl -sSL ${cn_cidr} | grep ":" | perl -ne '/(.+\/\d+)/ && print "IP-CIDR6,$1\n"' >> cncidr.txt + curl -sSL ${cn_cidr} | grep ":" | perl -ne '/(.+\/\d+)/ && print "IP-CIDR6,$1\n"' >> ruleset/cncidr.txt - name: Generate telegramcidr.txt file run: | - cp parts/telegram_ips.txt telegramcidr.txt - cp parts/telegram_ips.txt ruleset/telegramcidr.txt - curl -sSL ${telegram_cidr} | perl -ne '/^(\d{1,3}(\.\d{1,3}){3}\/\d{1,2})/ && print "IP-CIDR,$1\n"' >> telegramcidr.txt - curl -sSL ${telegram_cidr} | perl -ne '/^(\d{1,3}(\.\d{1,3}){3}\/\d{1,2})/ && print "IP-CIDR,$1\n"' >> ruleset/telegramcidr.txt + curl -sSL ${telegram_cidr} | perl -ne '/^(\d{1,3}(\.\d{1,3}){3}\/\d{1,2})/ && print "IP-CIDR,$1\n"' > telegramcidr.txt + curl -sSL ${telegram_cidr} | perl -ne '/^(\d{1,3}(\.\d{1,3}){3}\/\d{1,2})/ && print "IP-CIDR,$1\n"' > ruleset/telegramcidr.txt curl -sSL ${telegram_cidr} | grep ":" | perl -ne '/(.+\/\d+)/ && print "IP-CIDR6,$1\n"' >> telegramcidr.txt curl -sSL ${telegram_cidr} | grep ":" | perl -ne '/(.+\/\d+)/ && print "IP-CIDR6,$1\n"' >> ruleset/telegramcidr.txt - name: Move files to publish directory run: | mkdir -p publish - install -p {apple,icloud,google,proxy,direct,reject,private,gfw,greatfire,tld-not-cn,cncidr,telegramcidr}.txt ./publish/ + cp *.txt ./publish/ mv ruleset ./publish/ - name: Release and upload assets diff --git a/README.md b/README.md index 8382bb1..6c7ea07 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ - **Telegram 使用的 IP 地址列表 telegramcidr.txt**： - [https://raw.githubusercontent.com/Loyalsoldier/surge-rules/release/telegramcidr.txt](https://raw.githubusercontent.com/Loyalsoldier/surge-rules/release/telegramcidr.txt) - [https://cdn.jsdelivr.net/gh/Loyalsoldier/surge-rules@release/telegramcidr.txt](https://cdn.jsdelivr.net/gh/Loyalsoldier/surge-rules@release/telegramcidr.txt) -- **中国大陆 IPv4 地址列表 cncidr.txt**： +- **中国大陆 IP 地址列表 cncidr.txt**： - [https://raw.githubusercontent.com/Loyalsoldier/surge-rules/release/cncidr.txt](https://raw.githubusercontent.com/Loyalsoldier/surge-rules/release/cncidr.txt) - [https://cdn.jsdelivr.net/gh/Loyalsoldier/surge-rules@release/cncidr.txt](https://cdn.jsdelivr.net/gh/Loyalsoldier/surge-rules@release/cncidr.txt) @@ -91,7 +91,7 @@ - **Telegram 使用的 IP 地址列表 telegramcidr.txt**： - [https://raw.githubusercontent.com/Loyalsoldier/surge-rules/release/ruleset/telegramcidr.txt](https://raw.githubusercontent.com/Loyalsoldier/surge-rules/release/ruleset/telegramcidr.txt) - [https://cdn.jsdelivr.net/gh/Loyalsoldier/surge-rules@release/ruleset/telegramcidr.txt](https://cdn.jsdelivr.net/gh/Loyalsoldier/surge-rules@release/ruleset/telegramcidr.txt) -- **中国大陆 IPv4 地址列表 cncidr.txt**： +- **中国大陆 IP 地址列表 cncidr.txt**： - [https://raw.githubusercontent.com/Loyalsoldier/surge-rules/release/ruleset/cncidr.txt](https://raw.githubusercontent.com/Loyalsoldier/surge-rules/release/ruleset/cncidr.txt) - [https://cdn.jsdelivr.net/gh/Loyalsoldier/surge-rules@release/ruleset/cncidr.txt](https://cdn.jsdelivr.net/gh/Loyalsoldier/surge-rules@release/ruleset/cncidr.txt) @@ -257,6 +257,7 @@ FINAL,DIRECT,dns-failed ## 致谢 +- [@Loyalsoldier/geoip](https://github.com/Loyalsoldier/geoip) - [@Loyalsoldier/v2ray-rules-dat](https://github.com/Loyalsoldier/v2ray-rules-dat) - [@Loyalsoldier/cn-blocked-domain](https://github.com/Loyalsoldier/cn-blocked-domain) - [@v2fly/domain-list-community](https://github.com/v2fly/domain-list-community) diff --git a/parts/telegram_ips.txt b/parts/telegram_ips.txt deleted file mode 100644 index 624198e..0000000 --- a/parts/telegram_ips.txt +++ /dev/null @@ -1,21 +0,0 @@ -IP-CIDR,109.239.140.0/24 -IP-CIDR,149.154.160.0/22 -IP-CIDR,149.154.164.0/22 -IP-CIDR,149.154.168.0/22 -IP-CIDR,149.154.172.0/22 -IP-CIDR,67.198.55.0/24 -IP-CIDR,91.108.12.0/22 -IP-CIDR,91.108.16.0/22 -IP-CIDR,91.108.20.0/22 -IP-CIDR,91.108.20.0/23 -IP-CIDR,91.108.4.0/22 -IP-CIDR,91.108.56.0/22 -IP-CIDR,91.108.56.0/23 -IP-CIDR,91.108.8.0/22 -IP-CIDR,95.161.64.0/20 -IP-CIDR,95.161.84.0/23 -IP-CIDR6,2001:67c:4e8::/48 -IP-CIDR6,2001:b28:f23c::/48 -IP-CIDR6,2001:b28:f23d::/48 -IP-CIDR6,2001:b28:f23f::/48 -IP-CIDR6,2001:b28:f242::/48