Merge branch 'armitage' of https://github.com/rsmudge/metasploit-framework into rsmudge-armitage

data/armitage/whatsnew.txt

@@ -1,6 +1,16 @@
 Armitage Changelog
 ==================
 
+5 Jul 12
+--------
+- Login -> psexec now sets a different LPORT for each host it's
+  launched against when using a reverse payload. Fixes a bug where
+  using a reverse connect payload against X hosts didn't work.
+- Progressbar Cancel button now works with the Sync Files button
+  in View -> Downloads and View -> Loot
+- Fixed a potential deadlock with the Sync Files feature
+- Clicking the Size column in View -> Downloads now sorts properly
+
 24 Jun 12
 ---------
 - Meterpreter -> Kill now uses session.stop RPC call

external/source/armitage/resources/about.html

@@ -3,7 +3,7 @@
 		<center><h1>Armitage 1.44-dev</h1></center>
 
 		<p>An attack management tool for Metasploit&reg;
-		<br />Release: 24 Jun 12</p>
+		<br />Release: 5 Jul 12</p>
 		<br />
 		<p>Developed by:</p>
 

external/source/armitage/scripts/collaborate.sl

@@ -11,11 +11,10 @@ sub createEventLogTab {
 	this('$console $client');
 
 	if ($client is $null && $console is $null) {
-		$client = [new ConsoleClient: $null, $mclient, "armitage.poll", "armitage.push", $null, "", $null];
         	$console = [new ActivityConsole: $preferences];
+		$client = [new ConsoleClient: $console, $mclient, "armitage.poll", "armitage.push", $null, "", $null];
 		setupEventStyle($console);
 		logCheck($console, "all", "events");
-	        [$client setWindow: $console];
 		[$client setEcho: $null];
 		[$console updatePrompt: "> "];
 	}

external/source/armitage/scripts/downloads.sl

@@ -46,6 +46,9 @@ sub createDownloadBrowser {
 	$sorter = [new TableRowSorter: $model];
         [$sorter toggleSortOrder: 0];
 	[$sorter setComparator: 0, &compareHosts];
+	[$sorter setComparator: 3, {
+		return $1 <=> $2;
+	}];
 	[$sorter setComparator: 4, {
 		return convertDate($1) <=> convertDate($2);
 	}];

external/source/armitage/scripts/loot.sl

@@ -63,10 +63,17 @@ sub _downloadLoot {
 		closef($handle);
 
 		[$progress setProgress: $index + 1];
+
+		if ([$progress isCanceled]) {
+			break;
+		}
 	}
-	[$progress close];
-	showError("File(s) saved to:\n $+ $dest");
-	[gotoFile([new java.io.File: $dest])];
+
+	dispatchEvent(lambda({
+		[$progress close];
+		showError("File(s) saved to:\n $+ $dest");
+		[gotoFile([new java.io.File: $dest])];
+	}, \$dest, \$progress));
 }
 
 sub showLoot {

external/source/armitage/scripts/passhash.sl

@@ -194,6 +194,7 @@ sub pass_the_hash {
 				if ([$reverse isSelected]) {
 					%options["LHOST"] = $MY_ADDRESS;
 					%options["PAYLOAD"] = "windows/meterpreter/reverse_tcp";
+					%options["LPORT"] = randomPort();
 				}
 				else if (isIPv6($host)) {
 					%options["PAYLOAD"] = "windows/meterpreter/bind_ipv6_tcp";

external/source/armitage/whatsnew.txt

@@ -1,6 +1,16 @@
 Armitage Changelog
 ==================
 
+5 Jul 12
+--------
+- Login -> psexec now sets a different LPORT for each host it's
+  launched against when using a reverse payload. Fixes a bug where
+  using a reverse connect payload against X hosts didn't work.
+- Progressbar Cancel button now works with the Sync Files button
+  in View -> Downloads and View -> Loot
+- Fixed a potential deadlock with the Sync Files feature
+- Clicking the Size column in View -> Downloads now sorts properly
+
 24 Jun 12
 ---------
 - Meterpreter -> Kill now uses session.stop RPC call