From bfd1be4a731424fe855e6f42c08791237db7e6ba Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Fri, 23 Jun 2023 18:57:14 +0200
Subject: [PATCH] use the global amazon endpoint and add more IPv4 for
 CloudFront

---
 cloudfront-ips.txt           | 57 ++++++++++++++++++++++++++++++++++++
 make-aws-cloudfront-range.sh |  3 +-
 2 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/cloudfront-ips.txt b/cloudfront-ips.txt
index 7cc4c51..f684cbb 100644
--- a/cloudfront-ips.txt
+++ b/cloudfront-ips.txt
@@ -24,19 +24,35 @@
 130.176.128.0/18
 130.176.192.0/19
 130.176.224.0/20
+13.113.196.64/26
+13.113.203.0/24
+13.124.199.0/24
+13.210.67.128/26
 13.224.0.0/14
+13.228.69.0/24
+13.233.177.192/26
 13.249.0.0/16
 13.32.0.0/15
 13.35.0.0/16
+13.48.32.0/24
+13.54.63.128/26
+13.59.250.0/26
 143.204.0.0/16
 144.220.0.0/16
 15.158.0.0/16
+15.188.184.0/24
+15.207.13.128/25
+15.207.213.128/25
 180.163.57.0/25
 180.163.57.128/26
 18.154.0.0/15
 18.160.0.0/15
 18.164.0.0/15
 18.172.0.0/15
+18.192.142.0/23
+18.200.212.0/23
+18.216.170.128/25
+18.229.220.192/26
 18.238.0.0/15
 18.244.0.0/15
 18.64.0.0/14
@@ -54,12 +70,51 @@
 205.251.252.0/23
 205.251.254.0/24
 216.137.32.0/19
+3.101.158.0/23
+3.10.17.128/25
+3.11.53.0/24
+3.128.93.0/24
+3.134.215.0/24
 3.160.0.0/14
+3.231.2.0/25
+3.234.232.224/27
+3.236.169.192/26
+3.236.48.0/23
+3.29.40.128/26
+3.29.40.192/26
+3.29.40.64/26
+3.29.57.0/26
+3.35.130.128/25
+34.195.252.0/24
+34.216.51.0/25
+34.223.12.224/27
+34.223.80.192/26
+34.226.14.0/24
+35.158.136.0/24
+35.162.63.192/26
+35.167.191.128/26
 36.103.232.0/25
 36.103.232.128/26
+43.218.56.128/26
+43.218.56.192/26
+43.218.56.64/26
+43.218.71.0/26
+44.227.178.0/24
+44.234.108.128/25
+44.234.90.252/30
 52.124.128.0/17
+52.15.127.128/26
+52.199.127.192/26
+52.212.248.0/26
+52.220.191.0/26
 52.222.128.0/17
 52.46.0.0/18
+52.47.139.0/24
+52.52.191.128/26
+52.56.127.0/25
+52.57.254.0/24
+52.66.194.128/26
+52.78.247.128/26
 52.82.128.0/19
 52.84.0.0/15
 54.182.0.0/16
@@ -69,6 +124,7 @@
 54.230.200.0/21
 54.230.208.0/20
 54.230.224.0/19
+54.233.255.128/26
 54.239.128.0/18
 54.239.192.0/19
 54.240.128.0/18
@@ -81,5 +137,6 @@
 65.9.128.0/18
 70.132.0.0/18
 71.152.0.0/17
+99.79.169.0/24
 99.84.0.0/16
 99.86.0.0/16
diff --git a/make-aws-cloudfront-range.sh b/make-aws-cloudfront-range.sh
index 9a1cfa5..78a9f6b 100755
--- a/make-aws-cloudfront-range.sh
+++ b/make-aws-cloudfront-range.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
 
-curl https://d7uri8nf7uskq.cloudfront.net/tools/list-cloudfront-ips | jq -r '.CLOUDFRONT_GLOBAL_IP_LIST  | join("\n")' | sort > cloudfront-ips.txt
+curl -f -s -# https://ip-ranges.amazonaws.com/ip-ranges.json | jq -r '.prefixes[] | select(.service == "CLOUDFRONT") | .ip_prefix' | sort > cloudfront-ips.txt
+#curl https://d7uri8nf7uskq.cloudfront.net/tools/list-cloudfront-ips | jq -r '.CLOUDFRONT_GLOBAL_IP_LIST  | join("\n")' | sort > cloudfront-ips.txt