Commit Graph

12720 Commits

Author SHA1 Message Date
OJ 72c641fcab Land #7889 - use a better check for whether rhosts exists 2017-01-31 07:49:14 +10:00
Brent Cook 76529278b8 make sure we can actually invoke auto targeting before adding it 2017-01-30 05:24:57 -06:00
Brent Cook 7d32166c70 use a better check for whether rhosts exists 2017-01-29 19:18:23 -06:00
OJ d8511d1ad5 Add exception when SESSION doesn't exist 2017-01-30 10:26:23 +10:00
William Vu b44e7ff733 Fix argument passing for deprecated scripts
This allows the scripts to continue working while warning the user.

See also: c59b5eaa2f.
2017-01-29 14:14:55 -06:00
Brent Cook 4480ea7877 Land #7827, Cisco Firepower Management Console LoginScanner 2017-01-27 16:26:40 -06:00
Brent Cook 39761a9d23 Land #7882, allow Ruby 2.1 to continue working for now. 2017-01-27 12:19:14 -06:00
Metasploit 95449a846b Bump version of framework to 4.13.17 2017-01-27 10:02:17 -08:00
darkbushido 39d702ebd9 changing the syntax to work with ruby 2.1
Fixes #7881
2017-01-27 11:20:26 -06:00
h00die 07694b98de Land #7874: A login scanner for Advantech WebAccess 2017-01-26 18:17:01 -05:00
William Vu c59b5eaa2f Fix #7823, legacy_script_to_post_module fixes 2017-01-26 16:26:00 -06:00
wchen-r7 781bc8420a Add Advantech WebAccess LoginScanner module 2017-01-26 13:54:50 -06:00
OJ a3cf400566 Re-set the TLV names for migration stuff 2017-01-24 07:36:56 +10:00
bwatters 253e39e18c Land #7680, Fix #7679, LoginScanner should abort if there is no creds to try 2017-01-23 14:08:32 -06:00
wchen-r7 5de09d3455 Check username & password options 2017-01-23 11:42:04 -06:00
Jeffrey Martin 2c8cd80a2b revert change to TLV_TYPE_MIGRATE_LEN in #7856 2017-01-23 09:23:32 -06:00
Jeffrey Martin 677d070179 make tlv enum of migrate length consistent 2017-01-23 09:19:53 -06:00
Pearce Barry 9b16cdf602 Land #7845, Fix Msf::Exploit::EXE shellcode/template mismatch 2017-01-22 16:09:41 -06:00
Brent Cook 414977125f Merge remote-tracking branch 'upstream/master' into land-7847- 2017-01-22 14:11:40 -06:00
Brent Cook f61314d2d6 Land #7856, Fix incorrect translations in TLV inspection code 2017-01-22 11:08:05 -06:00
Brent Cook ac2ceca5e3 Land #7804, Switch the creds command to use named options 2017-01-22 10:49:19 -06:00
Brent Cook 6a2d036ea8 depend on regular rb-readline, bugs fixed upstream 2017-01-22 10:20:05 -06:00
Brent Cook 99047fa8a1 be stricter in what we accept for payload uri
datastore needs to contain something to produce a valid URI
2017-01-22 10:20:04 -06:00
Brent Cook 9581f18392 handle nil pathname 2017-01-22 10:20:04 -06:00
Brent Cook dc506c1dd6 present? is not a method of Pathname 2017-01-22 10:20:04 -06:00
Brent Cook 836da6177f Cipher::Cipher is deprecated 2017-01-22 10:20:03 -06:00
Brent Cook f69b4a330e handle Ruby 2.4 Fixnum/Bignum -> Integer deprecations 2017-01-22 10:20:03 -06:00
Brent Cook 441222c2b5 Merge remote-tracking branch 'upstream/master' into land-7787- 2017-01-22 09:44:11 -06:00
William Webb 5d08e0b24e Land #7858, Make shell_command_token time out again 2017-01-21 13:18:37 -06:00
Tim 67ec66cc83 Land #7846, add CSV and vCard support to dump_contacts 2017-01-21 16:46:14 +08:00
William Vu a7fac41172 Make shell_command_token time out again 2017-01-20 23:09:22 -06:00
William Vu 84513fd83c Add exception for HttpClient
Since it uses Rex::Proto::Http, which then uses Rex::Socket::Tcp.
2017-01-20 20:00:27 -06:00
William Vu 89b2f087fc Add TCP/UDP hint to RPORT
Caveat: works with mixins only (tenuously).
2017-01-20 19:50:40 -06:00
William Vu e0094897a1 Add CSV and vCard support to dump_contacts 2017-01-20 19:18:50 -06:00
OJ 7e50ce09c0 Fix TLV inspect issue 2017-01-21 09:17:20 +10:00
Metasploit c2e4a50924 Bump version of framework to 4.13.16 2017-01-20 10:02:29 -08:00
Tim 64e7f13067 improve error detection 2017-01-19 16:40:35 +07:00
Tim c1e30b632b fix #7725, inject into the Activity constructor 2017-01-19 16:24:26 +07:00
Tim f8f764aefc fix #7617, invalid register when hooking smali code 2017-01-19 14:52:30 +07:00
William Vu d8da7c6d43 Fix Msf::Exploit::EXE shellcode/template mismatch
Initialize EXE options unless code is supplied with platform/arch.
2017-01-19 00:07:35 -06:00
Brent Cook b94eefe724 Land #7771, Add history deduplication 2017-01-18 21:06:42 -06:00
William Vu ef487f6be5 Remove history clearing 2017-01-18 14:55:12 -06:00
David Maloney d564f5d60a don't add auto targets to things without rhost
Things like browser exploits don't have remote host options
which is what auto targeting relies on, so it does not make sense
to include the auto-targeting in these exploits

7837
2017-01-17 11:40:07 -06:00
William Vu 77c78fa5f4 Move Rex::Text::Table workspace output to -v 2017-01-15 23:15:14 -06:00
William Vu 38382bb61a Convert workspace command to Rex::Text::Table
Still can't get over how it's called "loots." :D
2017-01-15 03:26:35 -06:00
William Vu b86c1f0465 Land #7823, legacy_script_to_post_module check 2017-01-13 17:37:41 -06:00
James Lee 3c0ce8eafb Fix some rubocop complaints 2017-01-13 17:24:23 -06:00
wchen-r7 a687073416 Add Cisco Firepower Management Console LoginScanner 2017-01-13 16:59:20 -06:00
James Lee 7f839a04f3 Land #7825, don't double-load plugins 2017-01-13 14:07:32 -06:00
Metasploit 56ed8bc021 Bump version of framework to 4.13.15 2017-01-13 10:05:02 -08:00