From 20c820eeb08bcad24ded522abfab01a8442ce379 Mon Sep 17 00:00:00 2001
From: Darren Kitchen <darren@hak5.org>
Date: Fri, 7 Apr 2017 15:45:59 +1000
Subject: [PATCH] Updated nmapper for Bash Bunny v1.1

---
 payloads/library/nmapper/payload.txt | 39 +++++++++++++++++-----------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/payloads/library/nmapper/payload.txt b/payloads/library/nmapper/payload.txt
index 37dcf1c0..095714b6 100644
--- a/payloads/library/nmapper/payload.txt
+++ b/payloads/library/nmapper/payload.txt
@@ -2,7 +2,7 @@
 #
 # Title:         Nmapper for Bash Bunny
 # Author:        Hak5Darren
-# Version:       1.0
+# Version:       1.1
 #
 # Scans target with nmap using specified options
 # Saves sequential logs to mass storage loot folder
@@ -13,21 +13,23 @@
 # White..........Switching to Mass Storage (optional)
 # Green..........Finished
 # 
-
 # See nmap --help for options. Default "-O --fuzzy" profiles target OS.
 NMAP_OPTIONS="-O --fuzzy"
 LOOTDIR=/root/udisk/loot/nmap
 
-# Set LED Red while setting up attack
-LED R
 
+
+######## INITIALIZATION ########
+LED SETUP
 # Use RNDIS for Windows. Mac/*nix use ECM_ETHERNET
 ATTACKMODE RNDIS_ETHERNET 
 #ATTACKMODE ECM_ETHERNET
+GET TARGET_IP
+GET TARGET_HOSTNAME
 
-# Source bunny_helpers.sh to get environment variable TARGET_IP and TARGET_HOSTNAME
-source bunny_helpers.sh
 
+
+######## MAKE LOOT DIRECTORY ########
 # Setup named logs in loot directory
 mkdir -p $LOOTDIR
 HOST=${TARGET_HOSTNAME}
@@ -36,20 +38,27 @@ HOST=${TARGET_HOSTNAME}
 COUNT=$(ls -lad $LOOTDIR/$HOST*.log | wc -l)
 COUNT=$((COUNT+1))
 
-# Check target IP address. If unset, blink RED and end.
+
+
+######## ERROR IF NO TARGET IP ########
 if [ -z "${TARGET_IP}" ]; then
-    LED R 100
+    LED FAIL
 	exit 1
 fi
 
-# Set LED, nmap target and sync filesystem before optionally switching to mass storage
-LED G R
+
+
+######## ATTACK ########
+LED ATTACK
 nmap $NMAP_OPTIONS $TARGET_IP >> $LOOTDIR/$HOST-$COUNT.log
+
+
+
+######## CLEANUP ########
+LED CLEANUP
 sync
 
-# Optionally become mass storage when scan completes
-#LED R G B
-#ATTACKMODE STORAGE
 
-# Payload complete. Set LED green
-LED G
+
+######## FINISH ########
+LED FINISH