rewrite apps

scripts/airodump.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 # Run airodump-ng with no flags
-#set the prompt to the name of the script
+# Set the prompt to the name of the script
 PS1=${PS1//@\\h/@airodump}
 clear
 
 . /opt/pwnix/pwnpad-scripts/px_functions.sh
-
+COMMAND_RUN=""
 f_run(){
 
   # Check for OUI
@@ -14,22 +14,26 @@ f_run(){
   f_log
   # Check for GPS
   f_gps
-  #we have a monitor interface now, so set traps to cleanup
-  trap f_cleanup INT
-  trap f_cleanup KILL
+  # Set traps to cleanup
+  trap f_cleanup TERM
+  trap f_hangup SIGHUP
 
   STD_OPTS="-C0 --manufacturer"
   if [ $opt_log -eq 1 ]; then
     if [ $GPS_STATUS -eq 0 ]; then
-      airodump-ng $STD_OPTS --gpsd -w airodump wlan1mon
+      COMMAND_RUN="airodump-ng ${STD_OPTS} --gpsd -w /opt/pwnix/captures/wireless/airodump wlan1mon"
+      airodump-ng $STD_OPTS --gpsd -w /opt/pwnix/captures/wireless/airodump wlan1mon
     else
-      airodump-ng $STD_OPTS -w airodump wlan1mon
+      COMMAND_RUN="airodump-ng ${STD_OPTS} -w /opt/pwnix/captures/wireless/airodump wlan1mon"
+      airodump-ng $STD_OPTS -w /opt/pwnix/captures/wireless/airodump wlan1mon
     fi
 
   elif [ $opt_log -eq 2 ]; then
     if [ $GPS_STATUS -eq 0 ]; then
+      COMMAND_RUN="airodump-ng ${STD_OPTS} --gpsd wlan1mon"
       airodump-ng $STD_OPTS --gpsd wlan1mon
     else
+      COMMAND_RUN="airodump-ng ${STD_OPTS} wlan1mon"
       airodump-ng $STD_OPTS wlan1mon
     fi
   fi
@@ -63,7 +67,6 @@ f_gps(){
 
   ps ax |grep gpsd |grep -v grep &> /dev/null
   GPSD_STATUS=$?
-
   if [ $GPSD_STATUS -eq 1 ]; then
     ps ax |grep bluenmea |grep -v grep &> /dev/null
     GPS_STATUS=$?
@@ -96,12 +99,19 @@ f_gps_toggle(){
   esac
 }
 
+f_hangup(){
+  pkill $COMMAND_RUN
+  trap - TERM SIGHUP
+  exit 0
+}
+
 f_cleanup(){
+  trap '' INT
   f_mon_disable
-
   if [ $GPS_STATUS -eq 0 ]; then
     f_gps_toggle
   fi
+  trap - INT TERM SIGHUP
 }
 
 f_mon_enable

scripts/blue_hydra.sh

@@ -1,12 +1,25 @@
 #!/bin/bash
 # Bluetooth scanning / logging script using bluelog
-#set the prompt to the name of the script
+# Set the prompt to the name of the script
 PS1=${PS1//@\\h/@blue_hydra}
 clear
 
 bluetooth=1
 . /opt/pwnix/pwnpad-scripts/px_functions.sh
 
+f_intbh(){
+   pkill -f '/bin/blue_hydra'
+   printf "\nBlue_Hydra process killed...\n"
+   f_endsummary
+}
+
+f_cleanup(){
+  printf "\nStopping Services...\n"
+  service bluetooth stop
+  service dbus stop
+  trap - TERM SIGHUP
+}
+
 f_endsummary() {
   clear
   printf "\n[-] Blue_Hydra db file saved to /opt/pwnix/data/blue_hydra/blue_hydra.db\n\n"
@@ -28,6 +41,7 @@ EOF
     printf "\n[-] Blue_Hydra summary saved to $FILENAME\n\n"
   fi
   cd /opt/pwnix/captures/bluetooth
+  f_cleanup
 }
 
 f_savecap() {
@@ -52,8 +66,8 @@ if loud_one=1 f_validate_one hci0; then
   START_TIME=$(date +"%s")
   FILENAME=/opt/pwnix/captures/bluetooth/blue_hydra_${START_TIME}.out
   cd /opt/pwnix/blue_hydra/
-  trap f_endsummary INT
-  trap f_endsummary KILL
+  trap f_endsummary TERM
+  trap f_intbh SIGHUP
   ./bin/blue_hydra
   f_endsummary
 fi

scripts/bluelog.sh

@@ -1,9 +1,16 @@
 #!/bin/bash
 # Bluetooth scanning / logging script using bluelog
-#set the prompt to the name of the script
+# Set the prompt to the name of the script
 PS1=${PS1//@\\h/@bluelog}
 clear
 
+# Cleanup 
+f_hangup(){
+  pkill -f 'bluelog -vtnc -i hci0'
+  trap - SIGHUP
+  exit 0
+}
+
 bluetooth=1
 . /opt/pwnix/pwnpad-scripts/px_functions.sh
 
@@ -15,5 +22,8 @@ cd /opt/pwnix/captures/bluetooth/
 clear
 printf "\n[-] Bluelog scan log saved to /opt/pwnix/captures/bluetooth/\n\n"
 
+# Set traps to cleanup
+trap f_hangup SIGHUP
+
 bluelog -vtnc -i hci0
 fi

scripts/btscan.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # Bluetooth scanning / logging script using hcitool
-#set the prompt to the name of the script
+# Set the prompt to the name of the script
 PS1=${PS1//@\\h/@btscan}
 clear
 

scripts/dnsspoof.sh

@@ -1,12 +1,18 @@
 #!/bin/bash
 # Script to use ettercap to redirect all DNS traffic back to the device
 # Use with SET (site cloner)
-#set the prompt to the name of the script
+# Set the prompt to the name of the script
 PS1=${PS1//@\\h/@dnsspoof}
 clear
 
 . /opt/pwnix/pwnpad-scripts/px_functions.sh
 
+f_hangup(){
+  pkill -f 'ettercap -i wlan1 -T -q -P dns_spoof'
+  trap - SIGHUP
+  exit 0
+}
+
 f_banner(){
   printf "\nEvilAP Ettercap-NG DNS Spoofing Tool\n\n"
   printf "[!] This only works when EvilAP is running!\n"
@@ -17,8 +23,10 @@ f_banner(){
 
 f_run(){
   f_banner
+
+  trap f_hangup SIGHUP
 
-  #ettercap fails if the interface is down
+  # Ettercap fails if the interface is down
   ip link set ${evilap_eth} up
 
   ettercap -i ${evilap_eth} -T -q -P dns_spoof
@@ -29,7 +37,7 @@ if loud_one=1 f_validate_one at0; then
 fi
 if f_validate_one wlan1; then
   if pgrep hostapd-wpe; then
-    #this clear removes the noise from the at0 check
+    # This clear removes the noise from the at0 check
     clear
     evilap_eth="wlan1"
   fi

scripts/dsniff.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 # Cleartext password sniffing on all available interfaces
-#set the prompt to the name of the script
+# Set the prompt to the name of the script
 PS1=${PS1//@\\h/@dsniff}
 clear
 
-#this block controls the features for px_interface_selector
+# This controls the features for px_interface_selector
 include_all=1
 . /opt/pwnix/pwnpad-scripts/px_functions.sh
 
@@ -28,10 +28,11 @@ f_get_logchoice(){
 }
 
 f_run(){
-  #ettercap fails if the interface is down
+  # Ettercap fails if the interface is down
   ip link set $interface up
-  # If user chose to log, log to folder
-  # else just run cmd
+
+  trap f_hangup SIGHUP
+
   if [ $logchoice -eq 1 ]; then
     filename=/opt/pwnix/captures/passwords/dsniff_$(date +%F-%H%M).log
     ettercap -i $interface -u -T -q | tee $filename
@@ -40,6 +41,12 @@ f_run(){
   fi
 }
 
+f_hangup(){
+  pkill -f 'ettercap -i wlan0 -T -q -u'
+  trap - SIGHUP
+  exit 0
+}
+
 f_interface
 f_logging_setup
 f_run

scripts/ettercap.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 # Ettercap ARP cache poison script
-#set the prompt to the name of the script
+# Set the prompt to the name of the script
 PS1=${PS1//@\\h/@ettercap}
 clear
 
-#this block controls the features for px_interface_selector
+# This block controls the features for px_interface_selector
 include_monitor=0
 include_airbase=0
 require_ip=1
@@ -54,8 +54,10 @@ f_run(){
   read -p "Enter target IP of gateway/router: " gw
   printf "\n"
 
-  #ettercap fails if the interface is down
+  # Ettercap fails if the interface is down
   ip link set $interface up
+
+  trap f_hangup SIGHUP
 
    # Check for Kali1 version for target syntax change...
   dpkg --list ettercap-common | grep -q 1:0.8.2-2~kali1
@@ -80,6 +82,12 @@ f_run(){
   ettercap -i $interface -T ${ssl} -q ${log} -M arp:remote ${syntax}/$gw/ ${syntax}/$target1/
 }
 
+f_hangup(){
+  pkill -f 'ettercap -i ${interface} -T ${ssl} -q ${log} -M arp:remote ${syntax}/${gw}/ ${syntax}/${target1}/'
+  trap - SIGHUP
+  exit 0
+}
+
 f_banner
 f_interface
 f_sslfake