From b3ee0ff102248c46ba974a60e0a14d8b8438ed4a Mon Sep 17 00:00:00 2001 From: Mitchell Krog Date: Thu, 27 Jun 2019 11:06:08 +0200 Subject: [PATCH] FIX and TEST new template REF: #201 --- .dev-tools/globalblacklist-testing.template | 220 ++++++++++---------- 1 file changed, 110 insertions(+), 110 deletions(-) diff --git a/.dev-tools/globalblacklist-testing.template b/.dev-tools/globalblacklist-testing.template index 658263393..b142efd8f 100644 --- a/.dev-tools/globalblacklist-testing.template +++ b/.dev-tools/globalblacklist-testing.template @@ -7712,6 +7712,116 @@ map $http_referer $bad_referer { geo $validate_client { default 0; +# ---------------------------------------------- +# Whitelist all your OWN IP addresses and Ranges +# ---------------------------------------------- + +# -------------------------------------------------------------------------------------- +# WHITELIST all your own IP addresses using the include file below. + # New Method Uses the include file below so that when pulling future updates your + # whitelisted IP addresses are automatically now included for you. + # Read Comments inside whitelist-ips.conf for customization tips. + # Updating the main globalblacklist.conf file will not touch your custom include files + # whitelist-ips.conf reigns supreme !!! + # Whatever you add to whitelist-ips.conf will be whitelisted FULL STOP + # Anything blacklisted above this line will be over-ridden by whitelist-ips.conf +# -------------------------------------------------------------------------------------- + +# -------------------------------------------------------------------------- +# START WHITELISTED IP RANGES ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### +# -------------------------------------------------------------------------- + + include /etc/nginx/bots.d/whitelist-ips.conf; + +# ------------------------------------------------------------------------ +# END WHITELISTED IP RANGES ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### +# ------------------------------------------------------------------------ + +# -------------------------- +# WHITELIST Google IP Ranges +# -------------------------- + +# START GOOGLE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### + 108.177.0.0/17 0; + 172.217.0.0/16 0; + 173.194.0.0/16 0; + 2001:4860:4000::/36 0; + 203.208.60.0/24 0; + 207.126.144.0/20 0; + 209.85.128.0/17 0; + 216.239.32.0/19 0; + 216.58.192.0/19 0; + 2404:6800:4000::/36 0; + 2607:f8b0:4000::/36 0; + 2800:3f0:4000::/36 0; + 2a00:1450:4000::/36 0; + 2c0f:fb50:4000::/36 0; + 35.192.0.0/12 0; + 64.18.0.0/20 0; + 64.233.160.0/19 0; + 64.68.80.0/21 0; + 65.52.0.0/14 0; + 66.102.0.0/20 0; + 66.249.64.0/19 0; + 72.14.192.0/18 0; + 74.125.0.0/16 0; +# END GOOGLE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### + +# ------------------------ +# WHITELIST Bing IP Ranges +# ------------------------ + +# START BING IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### + 131.253.21.0/24 0; + 131.253.22.0/23 0; + 131.253.24.0/21 0; + 131.253.24.0/22 0; + 131.253.32.0/20 0; + 157.54.0.0/15 0; + 157.56.0.0/14 0; + 157.60.0.0/16 0; + 199.30.16.0/24 0; + 199.30.27.0/24 0; + 207.46.0.0/16 0; + 40.112.0.0/13 0; + 40.120.0.0/14 0; + 40.124.0.0/16 0; + 40.125.0.0/17 0; + 40.74.0.0/15 0; + 40.76.0.0/14 0; + 40.80.0.0/12 0; + 40.96.0.0/12 0; +# END BING IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### + +# ------------------------------ +# WHITELIST Cloudflare IP Ranges +# ------------------------------ + +# START CLOUDFLARE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### + 103.21.244.0/22 0; + 103.22.200.0/22 0; + 103.31.4.0/22 0; + 104.16.0.0/12 0; + 108.162.192.0/18 0; + 131.0.72.0/22 0; + 141.101.64.0/18 0; + 162.158.0.0/15 0; + 172.64.0.0/13 0; + 173.245.48.0/20 0; + 188.114.96.0/20 0; + 190.93.240.0/20 0; + 197.234.240.0/22 0; + 198.41.128.0/17 0; + 199.27.128.0/21 0; + 2400:cb00::/32 0; + 2405:8100::/32 0; + 2405:b500::/32 0; + 2606:4700::/32 0; + 2803:f800::/32 0; + 2a06:98c0::/29 0; + 2c0f:f248::/32 0; +# END CLOUDFLARE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### + # ------------------------------------- # BLOCK known Wordpress Theme Detectors # ------------------------------------- @@ -17782,91 +17892,6 @@ geo $validate_client { 46.101.115.65 1; # END KNOWN BAD IP ADDRESSES ### DO NOT EDIT THIS LINE AT ALL ### -# -------------------------- -# WHITELIST Google IP Ranges -# -------------------------- - -# START GOOGLE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### - 108.177.0.0/17 0; - 172.217.0.0/16 0; - 173.194.0.0/16 0; - 2001:4860:4000::/36 0; - 203.208.60.0/24 0; - 207.126.144.0/20 0; - 209.85.128.0/17 0; - 216.239.32.0/19 0; - 216.58.192.0/19 0; - 2404:6800:4000::/36 0; - 2607:f8b0:4000::/36 0; - 2800:3f0:4000::/36 0; - 2a00:1450:4000::/36 0; - 2c0f:fb50:4000::/36 0; - 35.192.0.0/12 0; - 64.18.0.0/20 0; - 64.233.160.0/19 0; - 64.68.80.0/21 0; - 65.52.0.0/14 0; - 66.102.0.0/20 0; - 66.249.64.0/19 0; - 72.14.192.0/18 0; - 74.125.0.0/16 0; -# END GOOGLE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### - -# ------------------------ -# WHITELIST Bing IP Ranges -# ------------------------ - -# START BING IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### - 131.253.21.0/24 0; - 131.253.22.0/23 0; - 131.253.24.0/21 0; - 131.253.24.0/22 0; - 131.253.32.0/20 0; - 157.54.0.0/15 0; - 157.56.0.0/14 0; - 157.60.0.0/16 0; - 199.30.16.0/24 0; - 199.30.27.0/24 0; - 207.46.0.0/16 0; - 40.112.0.0/13 0; - 40.120.0.0/14 0; - 40.124.0.0/16 0; - 40.125.0.0/17 0; - 40.74.0.0/15 0; - 40.76.0.0/14 0; - 40.80.0.0/12 0; - 40.96.0.0/12 0; -# END BING IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### - -# ------------------------------ -# WHITELIST Cloudflare IP Ranges -# ------------------------------ - -# START CLOUDFLARE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### - 103.21.244.0/22 0; - 103.22.200.0/22 0; - 103.31.4.0/22 0; - 104.16.0.0/12 0; - 108.162.192.0/18 0; - 131.0.72.0/22 0; - 141.101.64.0/18 0; - 162.158.0.0/15 0; - 172.64.0.0/13 0; - 173.245.48.0/20 0; - 188.114.96.0/20 0; - 190.93.240.0/20 0; - 197.234.240.0/22 0; - 198.41.128.0/17 0; - 199.27.128.0/21 0; - 2400:cb00::/32 0; - 2405:8100::/32 0; - 2405:b500::/32 0; - 2606:4700::/32 0; - 2803:f800::/32 0; - 2a06:98c0::/29 0; - 2c0f:f248::/32 0; -# END CLOUDFLARE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### - # ------------------------------------------------- # BLACKLIST IP addresses and IP Ranges Customizable # ------------------------------------------------- @@ -17890,31 +17915,6 @@ geo $validate_client { # END BLACKLISTED IPS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### # ------------------------------------------------------------------ -# ---------------------------------------------- -# Whitelist all your OWN IP addresses and Ranges -# ---------------------------------------------- - -# -------------------------------------------------------------------------------------- -# WHITELIST all your own IP addresses using the include file below. - # New Method Uses the include file below so that when pulling future updates your - # whitelisted IP addresses are automatically now included for you. - # Read Comments inside whitelist-ips.conf for customization tips. - # Updating the main globalblacklist.conf file will not touch your custom include files - # whitelist-ips.conf reigns supreme !!! - # Whatever you add to whitelist-ips.conf will be whitelisted FULL STOP - # Anything blacklisted above this line will be over-ridden by whitelist-ips.conf -# -------------------------------------------------------------------------------------- - -# -------------------------------------------------------------------------- -# START WHITELISTED IP RANGES ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### -# -------------------------------------------------------------------------- - - include /etc/nginx/bots.d/whitelist-ips.conf; - -# ------------------------------------------------------------------------ -# END WHITELISTED IP RANGES ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### -# ------------------------------------------------------------------------ - } # --------------------------------------------------------------------------------------