diff --git a/bots.txt b/bots.txt index 9d25065..4bf20b2 100644 --- a/bots.txt +++ b/bots.txt @@ -1,40 +1,71 @@ -154.54.249.218 167.172.244.121 -173.252.83.7 -217.113.194.183 -217.113.194.187 -217.113.194.188 -217.113.194.238 -217.113.194.240 -217.113.194.241 -217.113.194.254 -57.141.5.2 -57.141.5.20 -57.141.5.27 66.249.66.10 -69.171.249.9 167.172.244.121 +193.168.176.239 +65.21.61.25 +85.208.96.203 +85.208.96.210 +217.113.194.182 217.113.194.188 217.113.194.190 217.113.194.232 -217.113.194.233 +217.113.194.235 217.113.194.236 -57.141.5.21 -173.252.83.62 +217.113.194.238 +217.113.194.241 +217.113.194.186 +217.113.194.187 217.113.194.254 -57.141.5.10 -66.249.66.10 -69.171.230.13 -71.227.196.23 -172.183.79.4 -20.97.191.37 -38.175.200.210 +154.54.249.218 +217.113.194.185 +217.113.194.191 +217.113.194.233 +217.113.194.251 +217.113.194.189 +157.90.7.190 +217.113.194.184 +217.113.194.237 +217.113.194.239 +217.113.194.183 +217.113.194.234 +168.119.6.104 +87.250.224.3 +217.113.194.240 +38.175.194.11 +185.191.171.15 +185.191.171.6 +174.138.53.241 +4.231.99.75 +85.208.96.209 +154.54.249.213 +185.191.171.11 +198.235.24.205 +20.55.14.175 +185.191.171.9 +188.165.194.82 +185.191.171.12 66.249.66.9 -69.171.230.26 -57.141.5.18 -57.141.5.25 -173.252.107.32 -173.252.107.9 -57.141.5.15 -69.171.249.22 +66.249.66.10 +85.208.96.198 +51.222.253.18 +66.249.66.11 +66.249.66.3 +20.55.118.240 +185.191.171.3 +167.172.244.121 +168.119.6.104 +185.191.171.3 +217.113.194.182 +217.113.194.185 +217.113.194.188 +217.113.194.189 +217.113.194.190 +217.113.194.236 +217.113.194.237 +217.113.194.238 +66.249.66.9 +185.191.171.19 +66.249.66.7 +173.252.107.10 +85.208.96.202 diff --git a/crawlers.txt b/crawlers.txt index 146db87..16d553d 100644 --- a/crawlers.txt +++ b/crawlers.txt @@ -126,9 +126,9 @@ Barkrowler Googlebot-Image CensysInspect FediList -WhatsApp Go-http-client Yakihonne GNUsocialBot ONEPLUS -Lalilulelo +#Lalilulelo +Friendica diff --git a/firewall2.sh b/firewall2.sh index c52dda2..bdf8d43 100755 --- a/firewall2.sh +++ b/firewall2.sh @@ -458,7 +458,12 @@ module-lightning(){ } message(){ +BOT_ACCOUNT="blockbot@detroitriotcity.com" echo "$1" | /root/go/bin/algia dm-post -u 33c74427f3b2b73d5e38f3e6c991c122a55d204072356f71da49a0e209fb6940 --stdin + if [[ $1 = *detroit* ]]; then + toot activate $BOT_ACCOUNT + toot post ":emergency: :hacker_p: :hacker_e: :hacker_d: :hacker_o: :trans: :hacker_a: :hacker_l: :hacker_e: :hacker_r: :hacker_t: :emergency2: $1" -m /root/detroit/akkoma/blockbot/pedo.png + fi } watch() { @@ -503,10 +508,11 @@ test-bots() { TEST=( $( cat $SAVED_BOTS)) for i in "${TEST[@]}"; do DATA=$(grep $i $NGINX_ACCESS | grep -Evi -f $CRAWLER_DB) - if [ "$data" = "" ];then + if [ "$DATA" = "" ];then echo "No Data. Probably OK" else echo $DATA + echo read -p 'Press Enter to Continue ' -e fi done diff --git a/nft.rules b/nft.rules index 9deeb07..441d629 100644 --- a/nft.rules +++ b/nft.rules @@ -9,136 +9,68 @@ table ip filter { tcp dport 80 counter accept tcp dport 443 counter accept tcp dport 22 counter accept + ip saddr 185.191.171.3 counter drop + ip saddr 20.55.118.240 counter drop + ip saddr 66.249.66.3 counter drop + ip saddr 66.249.66.11 counter drop + ip saddr 51.222.253.18 counter drop + ip saddr 85.208.96.198 counter drop ip saddr 66.249.66.10 counter drop - ip saddr 217.113.194.240 counter drop - ip saddr 173.252.83.7 counter drop - ip saddr 217.113.194.241 counter drop - ip saddr 173.252.83.41 counter drop - ip saddr 172.183.79.4 counter drop - ip saddr 69.171.249.9 counter drop - ip saddr 217.113.194.234 counter drop - ip saddr 185.213.154.205 counter drop - ip saddr 217.113.194.237 counter drop - ip saddr 66.220.149.23 counter drop - ip saddr 217.113.194.238 counter drop - ip saddr 217.113.194.254 counter drop - ip saddr 217.113.194.239 counter drop - ip saddr 217.113.194.235 counter drop - ip saddr 154.54.249.218 counter drop - ip saddr 69.171.249.28 counter drop - ip saddr 217.113.194.236 counter drop - ip saddr 217.113.194.233 counter drop - ip saddr 217.113.194.232 counter drop - ip saddr 66.220.149.19 counter drop - ip saddr 57.141.5.17 counter drop - ip saddr 185.213.154.205 counter drop - ip saddr 173.252.87.4 counter drop - ip saddr 69.171.249.37 counter drop - ip saddr 65.97.62.18 counter drop - ip saddr 173.252.107.115 counter drop - ip saddr 168.119.6.104 counter drop - ip saddr 69.171.230.114 counter drop - ip saddr 173.252.70.112 counter drop - ip saddr 69.171.230.5 counter drop - ip saddr 66.220.149.62 counter drop - ip saddr 66.220.149.10 counter drop - ip saddr 57.141.5.19 counter drop + ip saddr 66.249.66.9 counter drop + ip saddr 185.191.171.12 counter drop + ip saddr 188.165.194.82 counter drop + ip saddr 23.154.177.5 counter drop + ip saddr 23.154.177.27 counter drop ip saddr 185.191.171.9 counter drop - ip saddr 173.252.87.116 counter drop - ip saddr 167.94.146.52 counter drop - ip saddr 69.171.249.112 counter drop - ip saddr 66.220.149.28 counter drop - ip saddr 217.113.194.251 counter drop - ip saddr 185.191.171.6 counter drop - ip saddr 173.252.87.27 counter drop - ip saddr 173.252.107.116 counter drop - ip saddr 69.171.249.23 counter drop + ip saddr 23.154.177.5 counter drop + ip saddr 23.154.177.27 counter drop + ip saddr 23.154.177.24 counter drop + ip saddr 20.55.14.175 counter drop + ip saddr 23.154.177.5 counter drop + ip saddr 23.154.177.27 counter drop + ip saddr 23.154.177.24 counter drop + ip saddr 198.235.24.205 counter drop ip saddr 185.191.171.11 counter drop - ip saddr 173.252.83.57 counter drop - ip saddr 69.171.249.5 counter drop - ip saddr 217.113.194.190 counter drop - ip saddr 173.252.83.45 counter drop - ip saddr 173.252.107.19 counter drop - ip saddr 69.171.230.14 counter drop - ip saddr 57.141.5.7 counter drop - ip saddr 217.30.11.246 counter drop - ip saddr 217.113.194.189 counter drop - ip saddr 217.113.194.185 counter drop - ip saddr 66.249.66.75 counter drop - ip saddr 57.141.5.23 counter drop - ip saddr 69.171.230.1 counter drop - ip saddr 217.113.194.188 counter drop - ip saddr 217.113.194.182 counter drop - ip saddr 66.220.149.115 counter drop - ip saddr 217.113.194.186 counter drop - ip saddr 217.113.194.184 counter drop + ip saddr 142.122.74.38 counter drop ip saddr 154.54.249.213 counter drop - ip saddr 66.249.66.5 counter drop - ip saddr 57.141.5.6 counter drop - ip saddr 52.81.207.51 counter drop - ip saddr 217.113.194.191 counter drop - ip saddr 217.113.194.187 counter drop - ip saddr 217.113.194.183 counter drop - ip saddr 106.75.99.100 counter drop - ip saddr 106.75.101.79 counter drop - ip saddr 57.141.5.20 counter drop - ip saddr 52.81.33.66 counter drop - ip saddr 52.80.214.58 counter drop - ip saddr 57.141.5.25 counter drop - ip saddr 52.81.237.92 counter drop - ip saddr 65.21.61.25 counter drop - ip saddr 173.252.70.2 counter drop ip saddr 85.208.96.209 counter drop - ip saddr 85.208.96.206 counter drop - ip saddr 66.249.66.72 counter drop - ip saddr 185.191.171.10 counter drop - ip saddr 185.191.171.15 counter drop - ip saddr 57.141.5.9 counter drop - ip saddr 57.141.5.29 counter drop - ip saddr 57.141.5.15 counter drop - ip saddr 174.246.137.36 counter drop - ip saddr 57.141.5.11 counter drop - ip saddr 69.171.249.114 counter drop - ip saddr 185.191.171.19 counter drop - ip saddr 173.252.83.26 counter drop - ip saddr 173.252.83.18 counter drop - ip saddr 69.171.230.9 counter drop - ip saddr 69.171.230.31 counter drop - ip saddr 57.141.5.3 counter drop - ip saddr 57.141.5.16 counter drop - ip saddr 57.141.5.12 counter drop - ip saddr 71.227.196.23 counter drop - ip saddr 57.141.5.10 counter drop - ip saddr 49.49.236.96 counter drop ip saddr 4.231.99.75 counter drop ip saddr 174.138.53.241 counter drop - ip saddr 173.252.69.1 counter drop - ip saddr 57.141.5.8 counter drop - ip saddr 57.141.5.14 counter drop - ip saddr 173.252.83.9 counter drop - ip saddr 173.252.83.46 counter drop - ip saddr 64.124.8.236 counter drop - ip saddr 57.141.5.13 counter drop - ip saddr 185.191.171.2 counter drop - ip saddr 85.208.96.200 counter drop - ip saddr 82.63.9.156 counter drop - ip saddr 173.252.83.58 counter drop - ip saddr 173.252.107.112 counter drop - ip saddr 68.235.44.201 counter drop - ip saddr 66.220.149.56 counter drop - ip saddr 66.23.193.50 counter drop - ip saddr 57.141.5.18 counter drop - ip saddr 96.44.135.166 counter drop - ip saddr 69.171.249.11 counter drop - ip saddr 66.249.66.74 counter drop + ip saddr 185.191.171.6 counter drop + ip saddr 185.191.171.15 counter drop ip saddr 38.175.194.11 counter drop - ip saddr 173.252.70.6 counter drop - ip saddr 57.141.5.4 counter drop - ip saddr 57.141.5.27 counter drop - ip saddr 185.191.171.14 counter drop - ip saddr 173.252.83.22 counter drop - ip saddr 173.252.83.11 counter drop - ip saddr 172.190.111.152 counter drop + ip saddr 217.113.194.240 counter drop + ip saddr 87.250.224.3 counter drop + ip saddr 168.119.6.104 counter drop + ip saddr 217.113.194.234 counter drop + ip saddr 217.113.194.183 counter drop + ip saddr 217.113.194.239 counter drop + ip saddr 217.113.194.237 counter drop + ip saddr 217.113.194.184 counter drop + ip saddr 157.90.7.190 counter drop + ip saddr 217.113.194.189 counter drop + ip saddr 217.113.194.251 counter drop + ip saddr 217.113.194.233 counter drop + ip saddr 217.113.194.191 counter drop + ip saddr 217.113.194.185 counter drop + ip saddr 154.54.249.218 counter drop + ip saddr 217.113.194.254 counter drop + ip saddr 217.113.194.187 counter drop + ip saddr 217.113.194.186 counter drop + ip saddr 217.113.194.241 counter drop + ip saddr 217.113.194.238 counter drop + ip saddr 217.113.194.236 counter drop + ip saddr 217.113.194.235 counter drop + ip saddr 217.113.194.232 counter drop + ip saddr 217.113.194.190 counter drop + ip saddr 217.113.194.188 counter drop + ip saddr 217.113.194.182 counter drop + ip saddr 90.76.255.143 counter drop + ip saddr 85.208.96.210 counter drop + ip saddr 85.208.96.203 counter drop + ip saddr 65.21.61.25 counter drop + ip saddr 90.76.255.143 counter drop + ip saddr 193.168.176.239 counter drop ip saddr 167.172.244.121 counter drop tcp dport 3000 counter accept udp dport 3000 counter accept diff --git a/safe.txt b/safe.txt index b0dca1a..9c7e3a6 100644 --- a/safe.txt +++ b/safe.txt @@ -1,6 +1,7 @@ emoji assets favicon +WhatsApp avatar inbox kuma @@ -56,3 +57,4 @@ danksquad illegitimate majestic12 nicecrew +Mitra