diff --git a/firewall_pleroma_rejects.sh b/firewall_pleroma_rejects.sh index 744b972..afabbc4 100755 --- a/firewall_pleroma_rejects.sh +++ b/firewall_pleroma_rejects.sh @@ -50,54 +50,56 @@ function gen_rule() # Generates rule for IP if it is not in ignorelist. local ip="${1}" local domain="${2}" # Regular expressions of IPs to ignore. - local -a ignorelist=("^2001:41d0:302:1100:" # masto.host - "^217\.182\.80\.236$" - "^178\.33\.220\.14[0-3]$" - "^176\.31\.213\.22[89]$" - "^176\.31\.213\.23[01]$" - "^54\.38\.247\.97$" - "^54\.37\.254\.138$" - "^54\.37\.254\.14[12]$" - "^54\.37\.254\.2[56]$" - "^54\.37\.254\.3[19]$" - "^54\.37\.254\.46$" - "^145\.239\.141\.74$" - "^51\.38\.62\.175$" - "^2a06:98c[0-7]:" # CloudFlare 2a06:98c0::/29 - "^2400:cb00:" # CloudFlare 2400:cb00::/32 - "^2606:4700:" # CloudFlare 2606:4700::/32 - "^2803:f800:" # CloudFlare 2803:f800::/32 - "^2405:b500:" # CloudFlare 2405:b500::/32 - "^2405:8100:" # CloudFlare 2405:8100::/32 - "^2c0f:f248:" # CloudFlare 2c0f:f248::/32 - "^104\.1[6-9]\." # CloudFlare 104.16.0.0/12 - "^104\.2[0-9]\." - "^104\.3[01]\." - "^172\.6[4-9]\." # CloudFlare 172.64.0.0/13 - "^172\.7[01]\." - "^162\.15[89]\." # CloudFlare 162.158.0.0/15 - "^198\.41\.12[89]\." # CloudFlare 198.41.128.0/17 - "^198\.41\.1[3-5][0-9]\." - "^141\.101\.6[4-9]\." # CloudFlare 141.101.64.0/18 - "^141\.101\.[7-9][0-9]\." - "^141\.101\.1[01][0-9]\." - "^141\.101\.12[0-7]\." - "^108\.162\.19[2-9]\." # CloudFlare 108.162.192.0/18 - "^108\.162\.2[0-9]+\." - "^173\.245\.4[89]\." # CloudFlare 173.245.48.0/20 - "^173\.245\.5[0-9]\." - "^173\.245\.6[0-3]\." - "^190\.93\.2[45][0-9]\." # CloudFlare 190.93.240.0/20 - "^188\.114\.9[6-9]\." # CloudFlare 188.114.96.0/20 - "^188\.114\.10[0-9]\." - "^188\.114\.111\." - "^103\.21\.24[4-7]\." # CloudFlare 103.21.244.0/22 - "^103\.22\.20[0-3]\." # CloudFlare 103.22.200.0/22 - "^197\.234\.24[0-3]" # CloudFlare 197.234.240.0/22 - "^131\.0\.7[2-5]\." # CloudFlare 131.0.72.0/22 - "^2602:ffdb:100:1:" # Shared IP: pleroma.site, - "^172\.93\.5\.40$" # juche.town - ) + local -a ignorelist=( + "^2001:41d0:302:1100:" # masto.host + "^217\.182\.80\.236$" + "^178\.33\.220\.14[0-3]$" + "^176\.31\.213\.22[89]$" + "^176\.31\.213\.23[01]$" + "^54\.38\.247\.97$" + "^54\.37\.254\.138$" + "^54\.37\.254\.14[12]$" + "^54\.37\.254\.2[56]$" + "^54\.37\.254\.3[19]$" + "^54\.37\.254\.46$" + "^145\.239\.141\.74$" + "^51\.38\.62\.175$" + "^2a06:98c[0-7]:" # CloudFlare 2a06:98c0::/29 + "^2400:cb00:" # CloudFlare 2400:cb00::/32 + "^2606:4700:" # CloudFlare 2606:4700::/32 + "^2803:f800:" # CloudFlare 2803:f800::/32 + "^2405:b500:" # CloudFlare 2405:b500::/32 + "^2405:8100:" # CloudFlare 2405:8100::/32 + "^2c0f:f248:" # CloudFlare 2c0f:f248::/32 + "^104\.1[6-9]\." # CloudFlare 104.16.0.0/12 + "^104\.2[0-9]\." + "^104\.3[01]\." + "^172\.6[4-9]\." # CloudFlare 172.64.0.0/13 + "^172\.7[01]\." + "^162\.15[89]\." # CloudFlare 162.158.0.0/15 + "^198\.41\.12[89]\." # CloudFlare 198.41.128.0/17 + "^198\.41\.1[3-5][0-9]\." + "^141\.101\.6[4-9]\." # CloudFlare 141.101.64.0/18 + "^141\.101\.[7-9][0-9]\." + "^141\.101\.1[01][0-9]\." + "^141\.101\.12[0-7]\." + "^108\.162\.19[2-9]\." # CloudFlare 108.162.192.0/18 + "^108\.162\.2[0-9]+\." + "^173\.245\.4[89]\." # CloudFlare 173.245.48.0/20 + "^173\.245\.5[0-9]\." + "^173\.245\.6[0-3]\." + "^190\.93\.2[45][0-9]\." # CloudFlare 190.93.240.0/20 + "^188\.114\.9[6-9]\." # CloudFlare 188.114.96.0/20 + "^188\.114\.10[0-9]\." + "^188\.114\.111\." + "^103\.21\.24[4-7]\." # CloudFlare 103.21.244.0/22 + "^103\.22\.20[0-3]\." # CloudFlare 103.22.200.0/22 + "^197\.234\.24[0-3]" # CloudFlare 197.234.240.0/22 + "^131\.0\.7[2-5]\." # CloudFlare 131.0.72.0/22 + "^2602:ffdb:100:1:fc89:b2ff:fe77:1664$" # Shared IPs: pleroma.site, + "^172\.93\.5\.40$" # juche.town + ) + # Read and apply user modifications to ignorelist. local extra_ignores="$(get_config_dir)/ignorelist.user" if [[ -e "${extra_ignores}" ]]; then