diff --git a/data/armitage/armitage.jar b/data/armitage/armitage.jar index 330ad3bc4a..59d2c30eae 100755 Binary files a/data/armitage/armitage.jar and b/data/armitage/armitage.jar differ diff --git a/data/armitage/whatsnew.txt b/data/armitage/whatsnew.txt index 2e7548c4e9..fcceb4c7aa 100755 --- a/data/armitage/whatsnew.txt +++ b/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 diff --git a/external/source/armitage/resources/about.html b/external/source/armitage/resources/about.html index f4119fca2b..1fc755eadf 100644 --- a/external/source/armitage/resources/about.html +++ b/external/source/armitage/resources/about.html @@ -3,7 +3,7 @@
An attack management tool for Metasploit®
-
Release: 24 Jun 12
Developed by:
diff --git a/external/source/armitage/scripts/collaborate.sl b/external/source/armitage/scripts/collaborate.sl index d5958f386c..210bd94cdb 100644 --- a/external/source/armitage/scripts/collaborate.sl +++ b/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: "> "]; } diff --git a/external/source/armitage/scripts/downloads.sl b/external/source/armitage/scripts/downloads.sl index 1e22cf53f6..4e1ccef8f4 100644 --- a/external/source/armitage/scripts/downloads.sl +++ b/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); }]; diff --git a/external/source/armitage/scripts/loot.sl b/external/source/armitage/scripts/loot.sl index 07f0bc74cb..2decd831a7 100644 --- a/external/source/armitage/scripts/loot.sl +++ b/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 { diff --git a/external/source/armitage/scripts/passhash.sl b/external/source/armitage/scripts/passhash.sl index 548e74c6b5..878980f5aa 100644 --- a/external/source/armitage/scripts/passhash.sl +++ b/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"; diff --git a/external/source/armitage/whatsnew.txt b/external/source/armitage/whatsnew.txt index 2e7548c4e9..fcceb4c7aa 100644 --- a/external/source/armitage/whatsnew.txt +++ b/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