diff --git a/bin/blackhole.sh b/bin/blackhole.sh index 3e19c801..4e2371b6 100755 --- a/bin/blackhole.sh +++ b/bin/blackhole.sh @@ -16,7 +16,8 @@ if [ "$1" == "" ]; echo "### This script will download and add blackhole routes for known mass scanners in an attempt to decrease the chance of detection." echo "### IPs are neither curated or verified, use at your own risk!" echo "###" - echo "### Routes are not added permanently, if you wish a persistent solution add this script to /etc/rc.local to be started after boot." + echo "### As long as is not executed the routes will be re-added on T-Pot start through ." + echo "### Check with or if blackhole is enabled." echo echo "Usage: blackhole.sh add (add blackhole routes)" echo " blackhole.sh del (delete blackhole routes)" diff --git a/bin/dps.sh b/bin/dps.sh index d3274ab1..6a481099 100755 --- a/bin/dps.sh +++ b/bin/dps.sh @@ -17,14 +17,36 @@ myBLUE="" myWHITE="" myMAGENTA="" +# Blackhole Status +myBLACKHOLE_STATUS=$(ip r | grep "blackhole" -c) +if [ "$myBLACKHOLE_STATUS" -gt "500" ]; + then + myBLACKHOLE_STATUS="${myGREEN}ENABLED" + else + myBLACKHOLE_STATUS="${myRED}DISABLED" +fi + +function fuGETTPOT_STATUS { +# T-Pot Status +myTPOT_STATUS=$(systemctl status tpot | grep "Active" | awk '{ print $2 }') +if [ "$myTPOT_STATUS" == "Active" ]; + then + echo "${myGREEN}ACTIVE" + else + echo "${myRED}INACTIVE" +fi +} + function fuGETSTATUS { grc --colour=on docker ps -f status=running -f status=exited --format "table {{.Names}}\t{{.Status}}\t{{.Ports}}" | grep -v "NAME" | sort } function fuGETSYS { -printf "========| System |========\n" -printf "%+10s %-20s\n" "Date: " "$(date)" -printf "%+10s %-20s\n" "Uptime: " "$(uptime | cut -b 2-)" +printf "[ ========| System |======== ]\n" +printf "${myBLUE}%+11s ${myWHITE}%-20s\n" "DATE: " "$(date)" +printf "${myBLUE}%+11s ${myWHITE}%-20s\n" "UPTIME: " "$(uptime | cut -b 2-)" +printf "${myMAGENTA}%+11s %-20s\n" "T-POT: " "$(fuGETTPOT_STATUS)" +printf "${myMAGENTA}%+11s %-20s\n" "BLACKHOLE: " "$myBLACKHOLE_STATUS${myWHITE}" echo } diff --git a/bin/updateip.sh b/bin/updateip.sh index 232e01e6..93a25e6d 100755 --- a/bin/updateip.sh +++ b/bin/updateip.sh @@ -10,12 +10,20 @@ if [ "$myEXTIP" = "" ]; myEXTIP=$myLOCALIP fi -myBLACKHOLE_STATUS=$(ip r | grep "blackhole" -c) -if [ "$myBLACKHOLE_STATUS" -gt "3000" ]; +# Load Blackhole routes if enabled +myBLACKHOLE_FILE1="/etc/blackhole/mass_scanner.txt" +myBLACKHOLE_FILE2="/etc/blackhole/mass_scanner_cidr.txt" +if [ -f "$myBLACKHOLE_FILE1" ] || [ -f "$myBLACKHOLE_FILE2" ]; then - myBLACKHOLE_STATUS="| BLACKHOLING MASS SCANNERS: [ ENABLED ]" + /opt/tpot/bin/blackhole.sh add +fi + +myBLACKHOLE_STATUS=$(ip r | grep "blackhole" -c) +if [ "$myBLACKHOLE_STATUS" -gt "500" ]; + then + myBLACKHOLE_STATUS="| BLACKHOLE: [ ENABLED ]" else - myBLACKHOLE_STATUS="| BLACKHOLING MASS SCANNERS: [ DISABLED ]" + myBLACKHOLE_STATUS="| BLACKHOLE: [ DISABLED ]" fi mySSHUSER=$(cat /etc/passwd | grep 1000 | cut -d ':' -f1)