diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index eeeaa7e8..fbe2f8a6 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -30,11 +30,12 @@ jobs: bash linode/downloader.sh bash telegram/downloader.sh bash openai/downloader.sh + bash cloudflare/downloader.sh - name: Create All-In-One ranges run: | - cat google/ipv4.txt amazon/ipv4.txt microsoft/ipv4.txt oracle/ipv4.txt digitalocean/ipv4.txt bing/ipv4.txt github/ipv4.txt facebook/ipv4.txt twitter/ipv4.txt linode/ipv4.txt telegram/ipv4.txt openai/ipv4.txt | sort -V | uniq > all/ipv4.txt - cat google/ipv6.txt amazon/ipv6.txt microsoft/ipv6.txt digitalocean/ipv6.txt github/ipv6.txt facebook/ipv6.txt twitter/ipv6.txt linode/ipv6.txt telegram/ipv6.txt | sort -V | uniq > all/ipv6.txt + cat google/ipv4.txt amazon/ipv4.txt microsoft/ipv4.txt oracle/ipv4.txt digitalocean/ipv4.txt bing/ipv4.txt github/ipv4.txt facebook/ipv4.txt twitter/ipv4.txt linode/ipv4.txt telegram/ipv4.txt openai/ipv4.txt cloudflare/ipv4.txt | sort -V | uniq > all/ipv4.txt + cat google/ipv6.txt amazon/ipv6.txt microsoft/ipv6.txt digitalocean/ipv6.txt github/ipv6.txt facebook/ipv6.txt twitter/ipv6.txt linode/ipv6.txt telegram/ipv6.txt cloudflare/ipv6.txt | sort -V | uniq > all/ipv6.txt - name: Set up Python 3.7 uses: actions/setup-python@v2 @@ -71,6 +72,7 @@ jobs: python utils/merge.py --source=linode/ipv4.txt | sort -V > linode/ipv4_merged.txt python utils/merge.py --source=telegram/ipv4.txt | sort -V > telegram/ipv4_merged.txt python utils/merge.py --source=openai/ipv4.txt | sort -V > openai/ipv4_merged.txt + python utils/merge.py --source=cloudflare/ipv4.txt | sort -V > cloudflare/ipv4_merged.txt python utils/merge.py --source=all/ipv4.txt | sort -V > all/ipv4_merged.txt # ipv6 python utils/merge.py --source=google/ipv6.txt | sort -V > google/ipv6_merged.txt @@ -84,8 +86,9 @@ jobs: python utils/merge.py --source=twitter/ipv6.txt | sort -V > twitter/ipv6_merged.txt python utils/merge.py --source=linode/ipv6.txt | sort -V > linode/ipv6_merged.txt python utils/merge.py --source=telegram/ipv6.txt | sort -V > telegram/ipv6_merged.txt - python utils/merge.py --source=all/ipv6.txt | sort -V > all/ipv6_merged.txt # openai not provide ipv6 + python utils/merge.py --source=cloudflare/ipv6.txt | sort -V > cloudflare/ipv6_merged.txt + python utils/merge.py --source=all/ipv6.txt | sort -V > all/ipv6_merged.txt - name: Commit files env: diff --git a/all/ipv4.txt b/all/ipv4.txt index d06558cd..c2799b2c 100644 --- a/all/ipv4.txt +++ b/all/ipv4.txt @@ -38361,11 +38361,14 @@ 103.4.96.0/22 103.8.172.0/22 103.9.10.0/24 +103.21.244.0/22 +103.22.200.0/22 103.25.156.0/24 103.29.68.0/24 103.29.69.0/24 103.29.70.0/24 103.29.71.0/24 +103.31.4.0/22 103.36.96.0/24 103.246.148.0/23 103.246.150.0/23 @@ -38376,6 +38379,8 @@ 103.253.146.0/24 103.253.147.0/24 103.255.140.0/23 +104.16.0.0/13 +104.24.0.0/14 104.40.0.0/17 104.40.3.53/32 104.40.8.88/32 @@ -39713,6 +39718,7 @@ 108.142.0.0/15 108.143.178.0/28 108.156.0.0/14 +108.162.192.0/18 108.166.224.0/21 108.166.232.0/21 108.166.240.0/21 @@ -40042,6 +40048,7 @@ 130.211.192.0/19 130.211.224.0/20 130.211.240.0/20 +131.0.72.0/22 131.186.0.0/21 131.186.8.0/22 131.186.12.0/25 @@ -41345,6 +41352,7 @@ 140.238.240.0/20 141.0.169.0/24 141.0.170.0/24 +141.101.64.0/18 141.144.192.0/19 141.144.224.0/19 141.145.192.0/19 @@ -43105,6 +43113,7 @@ 161.189.148.0/23 161.193.0.0/18 161.193.128.0/18 +162.158.0.0/15 162.213.232.0/24 162.213.233.0/24 162.213.234.0/23 @@ -43967,6 +43976,7 @@ 170.187.253.0/24 170.187.254.0/24 170.187.255.0/24 +172.64.0.0/13 172.96.97.0/24 172.96.98.0/24 172.96.110.0/24 @@ -45598,6 +45608,7 @@ 173.230.156.0/24 173.230.157.0/24 173.230.158.0/24 +173.245.48.0/20 173.252.64.0/18 173.252.64.0/19 173.252.88.0/21 @@ -45871,6 +45882,7 @@ 188.64.229.0/24 188.64.230.0/24 188.64.231.0/24 +188.114.96.0/20 188.166.0.0/18 188.166.64.0/18 188.166.128.0/22 @@ -45956,6 +45968,7 @@ 188.226.208.0/20 188.226.224.0/20 188.226.240.0/20 +190.93.240.0/20 191.232.16.0/21 191.232.16.16/32 191.232.16.52/32 @@ -46923,6 +46936,8 @@ 195.134.242.0/24 195.134.243.0/24 195.134.252.0/24 +197.234.240.0/22 +198.41.128.0/17 198.58.96.0/24 198.58.97.0/24 198.58.98.0/24 diff --git a/all/ipv4_merged.txt b/all/ipv4_merged.txt index 99e97994..622654d4 100644 --- a/all/ipv4_merged.txt +++ b/all/ipv4_merged.txt @@ -2623,14 +2623,19 @@ 103.4.96.0/22 103.8.172.0/22 103.9.10.0/24 +103.21.244.0/22 +103.22.200.0/22 103.25.156.0/24 103.29.68.0/22 +103.31.4.0/22 103.36.96.0/24 103.246.148.0/22 103.252.112.0/22 103.253.145.0/24 103.253.146.0/23 103.255.140.0/23 +104.16.0.0/13 +104.24.0.0/14 104.40.0.0/14 104.44.88.0/21 104.44.128.0/18 @@ -2708,6 +2713,7 @@ 108.59.80.0/20 108.128.0.0/12 108.156.0.0/14 +108.162.192.0/18 108.166.224.0/19 108.170.192.0/18 108.175.48.0/20 @@ -2857,6 +2863,7 @@ 130.176.224.0/20 130.176.254.0/23 130.211.0.0/16 +131.0.72.0/22 131.186.0.0/21 131.186.8.0/22 131.186.12.0/25 @@ -3145,6 +3152,7 @@ 140.238.0.0/16 141.0.169.0/24 141.0.170.0/24 +141.101.64.0/18 141.144.192.0/18 141.145.192.0/19 141.147.0.0/17 @@ -3524,6 +3532,7 @@ 161.189.0.0/16 161.193.0.0/18 161.193.128.0/18 +162.158.0.0/15 162.213.232.0/22 162.216.16.0/22 162.216.148.0/22 @@ -3617,6 +3626,7 @@ 170.187.144.0/20 170.187.160.0/19 170.187.192.0/18 +172.64.0.0/13 172.96.97.0/24 172.96.98.0/24 172.96.110.0/24 @@ -3789,6 +3799,7 @@ 173.230.152.0/22 173.230.156.0/23 173.230.158.0/24 +173.245.48.0/20 173.252.64.0/18 173.255.112.0/20 173.255.192.0/21 @@ -3848,8 +3859,10 @@ 185.143.16.0/24 185.199.108.0/22 188.64.224.0/21 +188.114.96.0/20 188.166.0.0/16 188.226.128.0/17 +190.93.240.0/20 191.232.16.0/21 191.232.32.0/19 191.232.64.0/20 @@ -3989,6 +4002,8 @@ 195.17.0.0/24 195.134.240.0/22 195.134.252.0/24 +197.234.240.0/22 +198.41.128.0/17 198.58.96.0/21 198.58.104.0/22 198.58.109.0/24 diff --git a/all/ipv6.txt b/all/ipv6.txt index 94048c8b..8df45713 100644 --- a/all/ipv6.txt +++ b/all/ipv6.txt @@ -1428,6 +1428,7 @@ 2a05:d079:a000::/40 2a05:d079:c000::/40 2a05:d079:e000::/40 +2a06:98c0::/29 2a10:f781:10:cee0::/64 2c0f:ef78:1::/48 2c0f:ef78:3::/48 @@ -1442,6 +1443,7 @@ 2c0f:ef78:e::/48 2c0f:ef78:f::/48 2c0f:ef78::/48 +2c0f:f248::/32 2c0f:fb50:4000::/36 2c0f:fb50::/32 240f:80a0:4000::/40 @@ -2376,6 +2378,7 @@ 2400:8905::/32 2400:8906::/32 2400:8907::/32 +2400:cb00::/32 2401:db00::/32 2403:b300:ff00::/48 2404:6800:4000::/36 @@ -2720,6 +2723,8 @@ 2404:c2c0:c000::/36 2404:c2c0::/40 2404:f340::/32 +2405:8100::/32 +2405:b500::/32 2406:da00:800::/64 2406:da00:1000::/40 2406:da00:2000::/40 @@ -13599,6 +13604,7 @@ 2606:50c0:8003::153/128 2606:50c0::/32 2606:73c0::/32 +2606:4700::/32 2606:f40:400::/39 2606:f40:2100::/40 2606:f40:8000::/39 @@ -13752,5 +13758,6 @@ 2800:3f0::/32 2803:6080::/29 2803:6083:712:400::/54 +2803:f800::/32 2804:800:0:7000::/56 2804:800:ff00::/48 diff --git a/all/ipv6_merged.txt b/all/ipv6_merged.txt index eaad56b3..b4232cba 100644 --- a/all/ipv6_merged.txt +++ b/all/ipv6_merged.txt @@ -285,6 +285,7 @@ 2a05:d079:a000::/40 2a05:d079:c000::/40 2a05:d079:e000::/40 +2a06:98c0::/29 2a10:f781:10:cee0::/64 2c0f:ef78:3::/48 2c0f:ef78:5::/48 @@ -294,6 +295,7 @@ 2c0f:ef78:12::/48 2c0f:ef78:c::/46 2c0f:ef78::/47 +2c0f:f248::/32 2c0f:fb50::/32 240f:80a0:4000::/40 240f:80a0:8000::/40 @@ -403,6 +405,7 @@ 2400:8901::/32 2400:8902::/31 2400:8904::/30 +2400:cb00::/32 2401:db00::/32 2403:b300:ff00::/48 2404:6800::/32 @@ -428,6 +431,8 @@ 2404:c2c0:c000::/36 2404:c2c0::/40 2404:f340::/32 +2405:8100::/32 +2405:b500::/32 2406:da00:800::/64 2406:da00:1000::/40 2406:da00:2000::/40 @@ -1846,6 +1851,7 @@ 2606:1f80::/32 2606:50c0::/32 2606:73c0::/32 +2606:4700::/32 2606:f40:400::/39 2606:f40:2100::/40 2606:f40:8000::/39 @@ -1932,5 +1938,6 @@ 2620:120:e000::/40 2800:3f0::/32 2803:6080::/29 +2803:f800::/32 2804:800:0:7000::/56 2804:800:ff00::/48 diff --git a/cloudflare/downloader.sh b/cloudflare/downloader.sh new file mode 100755 index 00000000..08fa7255 --- /dev/null +++ b/cloudflare/downloader.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +# https://www.cloudflare.com/ips/ + +set -euo pipefail +set -x + + + +# get from public ranges +curl -s https://www.cloudflare.com/ips-v4/ > /tmp/cf-ipv4.txt +curl -s https://www.cloudflare.com/ips-v6/ > /tmp/cf-ipv6.txt + + +# sort & uniq +sort -V /tmp/cf-ipv4.txt | uniq > cloudflare/ipv4.txt +sort -V /tmp/cf-ipv6.txt | uniq > cloudflare/ipv6.txt diff --git a/cloudflare/ipv4.txt b/cloudflare/ipv4.txt new file mode 100644 index 00000000..c07acd30 --- /dev/null +++ b/cloudflare/ipv4.txt @@ -0,0 +1,15 @@ +103.21.244.0/22 +103.22.200.0/22 +103.31.4.0/22 +104.16.0.0/13 +104.24.0.0/14 +108.162.192.0/18 +131.0.72.0/22 +141.101.64.0/18 +162.158.0.0/15 +172.64.0.0/13 +173.245.48.0/20 +188.114.96.0/20 +190.93.240.0/20 +197.234.240.0/22 +198.41.128.0/17 diff --git a/cloudflare/ipv4_merged.txt b/cloudflare/ipv4_merged.txt new file mode 100644 index 00000000..c07acd30 --- /dev/null +++ b/cloudflare/ipv4_merged.txt @@ -0,0 +1,15 @@ +103.21.244.0/22 +103.22.200.0/22 +103.31.4.0/22 +104.16.0.0/13 +104.24.0.0/14 +108.162.192.0/18 +131.0.72.0/22 +141.101.64.0/18 +162.158.0.0/15 +172.64.0.0/13 +173.245.48.0/20 +188.114.96.0/20 +190.93.240.0/20 +197.234.240.0/22 +198.41.128.0/17 diff --git a/cloudflare/ipv6.txt b/cloudflare/ipv6.txt new file mode 100644 index 00000000..ff5be1f0 --- /dev/null +++ b/cloudflare/ipv6.txt @@ -0,0 +1,7 @@ +2a06:98c0::/29 +2c0f:f248::/32 +2400:cb00::/32 +2405:8100::/32 +2405:b500::/32 +2606:4700::/32 +2803:f800::/32 diff --git a/cloudflare/ipv6_merged.txt b/cloudflare/ipv6_merged.txt new file mode 100644 index 00000000..ff9afad3 --- /dev/null +++ b/cloudflare/ipv6_merged.txt @@ -0,0 +1,7 @@ +2400:cb00::/32 +2405:8100::/32 +2405:b500::/32 +2606:4700::/32 +2803:f800::/32 +2a06:98c0::/29 +2c0f:f248::/32