diff --git a/bots.txt b/bots.txt index f450731..2ba0cb2 100644 --- a/bots.txt +++ b/bots.txt @@ -13015,3 +13015,216 @@ 99.97.209.247 99.98.83.95 null +159.69.202.229 +167.172.244.121 +213.167.243.138 +217.113.194.184 +217.113.194.185 +217.113.194.187 +217.113.194.232 +217.113.194.233 +217.113.194.241 +47.128.123.94 +47.128.27.27 +47.128.47.251 +66.23.193.50 +66.249.66.9 +66.249.73.20 +142.93.95.123 +143.198.150.132 +144.76.59.202 +154.54.249.218 +159.196.245.77 +217.113.194.186 +217.113.194.190 +217.113.194.234 +217.113.194.237 +217.113.194.240 +217.113.194.251 +47.128.47.27 +142.93.95.123 +143.198.150.132 +144.76.59.202 +154.54.249.218 +159.196.245.77 +167.172.244.121 +217.113.194.186 +217.113.194.190 +217.113.194.234 +217.113.194.237 +217.113.194.240 +217.113.194.241 +217.113.194.251 +47.128.47.27 +66.249.66.9 +217.113.194.187 +217.113.194.188 +217.113.194.191 +23.125.202.206 +65.21.61.25 +66.249.66.10 +66.249.66.11 +66.249.73.1 +137.184.238.228 +15.204.210.152 +159.69.246.219 +174.138.53.241 +174.24.72.13 +185.191.171.5 +217.113.194.184 +217.113.194.185 +217.113.194.189 +47.187.209.246 +5.68.206.9 +66.23.193.50 +74.80.208.127 +81.0.163.204 +85.208.96.203 +99.98.83.95 +108.247.89.226 +185.191.171.18 +185.191.171.19 +192.227.155.22 +217.105.22.226 +37.187.131.9 +47.128.119.198 +47.128.50.13 +47.128.50.156 +66.249.66.73 +74.80.208.185 +85.208.96.201 +114.119.151.108 +114.79.21.176 +147.185.133.162 +195.74.52.204 +45.138.25.8 +46.4.40.54 +47.128.124.63 +47.128.127.6 +47.128.23.36 +47.128.29.215 +75.156.60.17 +95.216.74.99 +104.244.75.156 +114.119.153.11 +116.203.89.167 +135.181.143.221 +167.172.244.121 +47.128.121.131 +47.128.38.219 +47.128.46.178 +51.81.244.96 +66.249.66.11 +71.227.196.23 +74.80.208.127 +185.191.171.10 +185.191.171.13 +202.78.166.217 +47.128.57.106 +66.249.73.2 +96.61.124.216 +167.172.244.121 +185.191.171.10 +185.191.171.13 +195.74.52.204 +202.78.166.217 +47.128.46.178 +47.128.57.106 +66.249.66.10 +66.249.73.2 +74.80.208.127 +96.61.124.216 +138.201.92.193 +185.191.171.4 +5.161.119.172 +66.249.66.9 +71.227.196.23 +74.48.200.174 +76.241.26.223 +138.201.124.57 +66.249.73.2 +80.114.18.134 +83.135.85.201 +83.251.77.188 +95.216.36.171 +138.201.124.57 +66.249.73.2 +80.114.18.134 +83.135.85.201 +83.251.77.188 +95.216.36.171 +142.93.3.121 +167.172.244.121 +178.174.198.186 +5.161.205.122 +64.124.8.175 +66.249.66.10 +74.80.208.127 +98.245.252.172 +143.42.10.39 +148.251.28.156 +185.191.171.12 +24.199.96.160 +66.23.193.50 +85.208.96.194 +95.160.178.133 +143.42.10.39 +148.251.28.156 +167.172.244.121 +185.191.171.12 +24.199.96.160 +66.23.193.50 +66.249.66.10 +74.80.208.127 +85.208.96.194 +95.160.178.133 +104.244.75.156 +167.172.244.121 +17.241.219.108 +185.191.171.3 +66.249.66.10 +68.183.113.10 +74.80.208.127 +76.155.223.3 +95.216.204.176 +155.138.226.183 +164.92.69.167 +47.128.29.117 +47.128.34.254 +68.127.190.132 +74.208.61.81 +89.106.207.78 +157.90.18.110 +167.172.244.121 +193.162.14.166 +195.154.122.181 +198.16.191.254 +223.160.230.59 +38.175.194.11 +45.13.66.98 +47.128.120.205 +47.128.127.0 +47.128.49.185 +47.128.56.28 +47.128.59.48 +54.36.148.232 +66.249.73.5 +74.80.208.127 +85.119.82.137 +85.208.96.195 +85.208.96.205 +47.128.123.161 +47.128.45.66 +54.36.148.17 +65.97.62.18 +195.154.123.103 +54.36.148.125 +54.36.148.137 +54.36.148.148 +54.36.148.162 +54.36.148.163 +54.36.148.225 +54.36.148.81 +54.36.149.52 +54.36.149.81 +54.36.149.85 diff --git a/crawlers.txt b/crawlers.txt index f83c620..c805cb8 100644 --- a/crawlers.txt +++ b/crawlers.txt @@ -128,3 +128,4 @@ CensysInspect FediList WhatsApp Go-http-client +Yakihonne diff --git a/firewall2.sh b/firewall2.sh index 017a9a2..cd9400b 100755 --- a/firewall2.sh +++ b/firewall2.sh @@ -28,7 +28,7 @@ NFT_DROP='counter drop' NFT_ACCEPT='counter accept' NFT='/usr/sbin/nft' NFT_CACHE='/tmp/nft.cache' -TMP_BLOCK='/opt/firewall/tmp-blocked.txt' +TMP_BLOCK='/tmp/tmp-blocked.txt' #### SAVED_BOTS='/opt/firewall/bots.txt' CRAWLER_DB='/opt/firewall/crawlers.txt' @@ -95,7 +95,7 @@ bot-search() { if [ "$CHECK" = "" ]; then $NFT add rule ip filter input ip saddr $i $NFT_DROP - echo $i >> $TMP_BLOCK + echo $i >> $SAVED_BOTS else echo echo "Skipping Duplicate IP $i" @@ -135,7 +135,7 @@ basic-security() { # $NFT -f /opt/firewall/ipv6-filter.nft # $NFT add rule ip6 filter input icmpv6 type nd-neighbor-solicit $NFT_DROP # $NFT add rule ip6 filter input icmpv6 type nd-router-advert $NFT_DROP - $NFT add rule filter input count drop; + $NFT add rule filter input drop; } virtualization() { @@ -264,7 +264,7 @@ trust() { import(){ -STATS=( $( cat $TMP_BLOCK | sort -u ) ) +STATS=( $( cat $SAVED_BOTS | sort -u ) ) for i in "${STATS[@]}"; do if [[ $i == *":"* ]]; then echo "Skipping ipv6" @@ -359,10 +359,10 @@ status() { echo " 502: $GATEWAY" echo echo "Active Dropped Blocked Traffic:" - $NFT list table filter | grep drop | grep -Evi "bytes 0" + $NFT list table filter | grep drop | grep -Evi "0 bytes 0 drop" echo - #echo "Rate-limited IP's:" - #cat $TMP_BLOCK | sort -u + echo "Rate-limited IP's:" + cat $TMP_BLOCK | sort -u echo $MENU_BOTTOM } @@ -378,7 +378,7 @@ stop() { $NFT insert rule filter input ct state established $NFT_ACCEPT $NFT insert rule filter input iif lo $NFT_ACCEPT - #$NFT -f /opt/firewall/ipv6-filter.nft + $NFT -f /opt/firewall/ipv6-filter.nft # $NFT add rule ip6 filter input icmpv6 type nd-neighbor-solicit $NFT_ACCEPT # $NFT add rule ip6 filter input icmpv6 type nd-router-advert $NFT_ACCEPT } @@ -394,6 +394,7 @@ forgive() { done echo "Clearing old $TMP_BLOCK" + echo > $TMP_BLOCK } saved-attackers() { diff --git a/nft.rules b/nft.rules index 3f5b9fb..333bd90 100644 --- a/nft.rules +++ b/nft.rules @@ -1,178 +1,14 @@ table ip filter { chain input { - type filter hook input priority filter; policy accept; + type filter hook input priority filter; policy drop; iif "lo" counter accept ct state established counter accept iif "docker0" counter accept - ip saddr 104.152.208.206 counter drop - ip saddr 114.119.142.69 counter drop - ip saddr 1.145.171.82 counter drop - ip saddr 114.119.142.14 counter drop - ip saddr 114.119.152.50 counter drop - ip saddr 104.28.193.116 counter drop - ip saddr 114.119.153.11 counter drop - ip saddr 114.79.21.176 counter drop - ip saddr 136.38.232.155 counter drop - ip saddr 129.80.249.156 counter drop - ip saddr 162.247.74.27 counter drop - ip saddr 160.16.228.67 counter drop - ip saddr 116.203.188.112 counter drop - ip saddr 149.88.104.22 counter drop - ip saddr 164.90.228.186 counter drop - ip saddr 156.146.51.79 counter drop - ip saddr 149.102.254.67 counter drop - ip saddr 167.172.138.0 counter drop - ip saddr 161.35.141.61 counter drop - ip saddr 167.172.244.121 counter drop - ip saddr 167.235.11.110 counter drop - ip saddr 168.119.6.104 counter drop - ip saddr 17.241.219.250 counter drop - ip saddr 168.90.66.214 counter drop - ip saddr 17.241.227.88 counter drop - ip saddr 174.138.53.241 counter drop - ip saddr 172.56.201.121 counter drop - ip saddr 174.238.14.31 counter drop - ip saddr 185.170.167.18 counter drop - ip saddr 185.107.57.65 counter drop - ip saddr 185.191.126.213 counter drop - ip saddr 185.191.171.1 counter drop - ip saddr 185.191.171.10 counter drop - ip saddr 185.191.171.12 counter drop - ip saddr 178.239.16.217 counter drop - ip saddr 178.132.108.51 counter drop - ip saddr 185.191.171.15 counter drop - ip saddr 185.191.171.6 counter drop - ip saddr 185.191.171.13 counter drop - ip saddr 185.191.171.4 counter drop - ip saddr 185.213.154.240 counter drop - ip saddr 185.93.3.195 counter drop - ip saddr 185.97.32.8 counter drop - ip saddr 186.214.115.200 counter drop - ip saddr 185.213.154.205 counter drop - ip saddr 193.138.218.215 counter drop - ip saddr 185.191.171.7 counter drop - ip saddr 188.217.57.18 counter drop - ip saddr 192.210.137.3 counter drop - ip saddr 194.127.173.36 counter drop - ip saddr 199.16.243.10 counter drop - ip saddr 198.98.52.24 counter drop - ip saddr 199.195.251.202 counter drop - ip saddr 199.195.253.180 counter drop - ip saddr 200.5.49.101 counter drop - ip saddr 199.195.251.148 counter drop - ip saddr 199.195.253.124 counter drop - ip saddr 212.95.52.76 counter drop - ip saddr 209.141.55.26 counter drop - ip saddr 23.154.177.31 counter drop - ip saddr 23.154.177.9 counter drop - ip saddr 23.154.177.15 counter drop - ip saddr 23.129.64.135 counter drop - ip saddr 38.175.194.11 counter drop - ip saddr 4.227.115.128 counter drop - ip saddr 40.77.167.7 counter drop - ip saddr 40.77.167.255 counter drop - ip saddr 41.23.164.79 counter drop - ip saddr 43.153.59.211 counter drop - ip saddr 47.128.118.1 counter drop - ip saddr 47.128.113.181 counter drop - ip saddr 47.128.119.74 counter drop - ip saddr 47.128.120.79 counter drop - ip saddr 47.128.120.198 counter drop - ip saddr 44.227.217.144 counter drop - ip saddr 47.128.121.41 counter drop - ip saddr 47.128.122.102 counter drop - ip saddr 47.128.122.61 counter drop - ip saddr 45.83.220.209 counter drop - ip saddr 45.83.220.203 counter drop - ip saddr 47.128.124.84 counter drop - ip saddr 47.128.17.208 counter drop - ip saddr 47.128.124.170 counter drop - ip saddr 47.128.18.233 counter drop - ip saddr 47.128.23.202 counter drop - ip saddr 47.128.124.215 counter drop - ip saddr 47.128.20.161 counter drop - ip saddr 47.128.31.45 counter drop - ip saddr 47.128.28.128 counter drop - ip saddr 47.128.32.75 counter drop - ip saddr 47.128.32.4 counter drop - ip saddr 47.128.17.154 counter drop - ip saddr 47.128.33.75 counter drop - ip saddr 47.128.17.38 counter drop - ip saddr 47.128.21.243 counter drop - ip saddr 47.128.39.185 counter drop - ip saddr 47.128.39.161 counter drop - ip saddr 47.128.41.32 counter drop - ip saddr 47.128.44.180 counter drop - ip saddr 47.128.44.157 counter drop - ip saddr 47.128.44.178 counter drop - ip saddr 47.128.45.84 counter drop - ip saddr 47.128.44.84 counter drop - ip saddr 47.128.28.14 counter drop - ip saddr 47.128.33.79 counter drop - ip saddr 47.128.33.29 counter drop - ip saddr 47.128.39.135 counter drop - ip saddr 47.128.44.236 counter drop - ip saddr 47.128.47.169 counter drop - ip saddr 47.128.53.14 counter drop - ip saddr 47.128.53.161 counter drop - ip saddr 47.128.52.161 counter drop - ip saddr 47.128.47.67 counter drop - ip saddr 47.128.50.217 counter drop - ip saddr 47.128.59.23 counter drop - ip saddr 47.128.60.215 counter drop - ip saddr 47.128.59.255 counter drop - ip saddr 47.128.54.75 counter drop - ip saddr 47.128.61.166 counter drop - ip saddr 47.128.97.19 counter drop - ip saddr 47.128.61.74 counter drop - ip saddr 47.128.97.90 counter drop - ip saddr 47.128.98.85 counter drop - ip saddr 47.128.63.50 counter drop - ip saddr 47.128.97.162 counter drop - ip saddr 5.255.101.45 counter drop - ip saddr 5.255.231.200 counter drop - ip saddr 51.158.202.215 counter drop - ip saddr 65.20.100.225 counter drop - ip saddr 62.74.0.136 counter drop - ip saddr 47.128.98.162 counter drop - ip saddr 52.225.77.213 counter drop - ip saddr 66.23.193.50 counter drop - ip saddr 66.249.66.14 counter drop - ip saddr 66.249.66.10 counter drop - ip saddr 66.249.66.70 counter drop - ip saddr 47.128.97.204 counter drop - ip saddr 65.97.62.18 counter drop - ip saddr 47.128.98.90 counter drop - ip saddr 66.249.66.16 counter drop - ip saddr 66.249.66.11 counter drop - ip saddr 66.249.66.71 counter drop - ip saddr 66.249.66.72 counter drop - ip saddr 66.249.66.73 counter drop - ip saddr 66.249.66.74 counter drop - ip saddr 66.249.73.20 counter drop - ip saddr 66.249.73.1 counter drop - ip saddr 66.249.66.9 counter drop - ip saddr 66.249.73.5 counter drop - ip saddr 66.249.73.4 counter drop - ip saddr 66.249.73.6 counter drop - ip saddr 68.183.48.167 counter drop - ip saddr 73.91.143.64 counter drop - ip saddr 73.52.168.171 counter drop - ip saddr 73.133.69.133 counter drop - ip saddr 74.80.208.185 counter drop - ip saddr 82.69.107.189 counter drop - ip saddr 74.80.208.127 counter drop - ip saddr 85.208.96.193 counter drop - ip saddr 85.208.96.199 counter drop - ip saddr 85.208.96.201 counter drop - ip saddr 85.208.96.204 counter drop - ip saddr 93.115.0.36 counter drop - ip saddr 75.3.228.240 counter drop + ip saddr 143.42.10.39 counter drop + ip saddr 148.251.28.156 counter drop + ip saddr 24.199.96.160 counter drop ip saddr 85.208.96.194 counter drop - ip saddr 95.108.213.148 counter drop - ip saddr 85.208.96.195 counter drop - ip saddr 96.44.135.166 counter drop - ip saddr 85.208.96.211 counter drop + ip saddr 95.160.178.133 counter drop tcp dport 57692 counter accept udp dport 57692 counter accept tcp dport 80 counter accept @@ -213,6 +49,22 @@ table ip filter { log log counter drop drop + ip saddr 104.244.75.156 counter drop + ip saddr 167.172.244.121 counter drop + ip saddr 17.241.219.108 counter drop + ip saddr 185.191.171.3 counter drop + ip saddr 66.249.66.10 counter drop + ip saddr 68.183.113.10 counter drop + ip saddr 74.80.208.127 counter drop + ip saddr 76.155.223.3 counter drop + ip saddr 95.216.204.176 counter drop + ip saddr 155.138.226.183 counter drop + ip saddr 164.92.69.167 counter drop + ip saddr 47.128.29.117 counter drop + ip saddr 47.128.34.254 counter drop + ip saddr 68.127.190.132 counter drop + ip saddr 74.208.61.81 counter drop + ip saddr 89.106.207.78 counter drop } chain forward { diff --git a/safe.txt b/safe.txt index 3bb3e81..8c50383 100644 --- a/safe.txt +++ b/safe.txt @@ -29,3 +29,6 @@ pleroma soapbox videojs ActivityRelay +detroit +Momostr +GuzzleHttp