Commit Graph

16492 Commits

Author SHA1 Message Date
benpturner 20b605e7cb Remove duplicate exec 2015-06-07 18:11:11 +01:00
RageLtMan 537dc6e218 Update Payload Cached Sizes fails in PSH Script
When attempting to update cached payload sizes which utilize the
Rex::Powershell functionality, the BRE block which appropriates
initial code is called with the 'code' variable being a nil which
results in:

```
lib/rex/powershell/script.rb:40:in `initialize': no implicit
conversion of nil into String (TypeError)
```

This throws a conditional into the File.open call which presents an
empty string instead of a nil. This still results in the rescue
block having to catch the exception, but manages to keep the
payload size updating script happy an retains consistent
behavior.
2015-06-07 11:42:24 -04:00
RageLtMan a46510465d Fix older Windows payloads to not require UUID
Default Windows payload to not include_send_uuid for compatibility.
2015-06-07 02:58:31 -04:00
HD Moore bd36908383 Fix #5500 by checking for session.respond_to?(:response_timeout) 2015-06-06 17:07:03 -05:00
William Vu d4ddc53856 Fix #5499, small fix for line clearing 2015-06-06 15:58:45 -05:00
William Vu f761d411c4 Adjust line clearing to cover only the text 2015-06-06 15:58:23 -05:00
William Vu 89e7dc6cf2 Land #5499, polish dem spinners 2015-06-06 15:21:09 -05:00
HD Moore 2942cb165f Land #5415, changes spaces in PSH shell output 2015-06-06 14:55:33 -05:00
HD Moore fe09d9888e Small rework of the spinners, clear the line when done 2015-06-06 14:30:42 -05:00
HD Moore c80017992a A dirty patch for a number of Net::DNS/dns_enum issues 2015-06-06 13:48:52 -05:00
HD Moore cec20ec5d9 Handle a rare corner case 2015-06-06 11:46:19 -05:00
HD Moore 6b05302059 Fixes #5459, refactors LoginScanner::SNMP 2015-06-06 00:50:55 -05:00
wchen-r7 4b6dcbb9d9 remove junk method 2015-06-05 22:03:56 -05:00
wchen-r7 7ca15f1ae1 Update select_payload doc 2015-06-05 21:06:20 -05:00
wchen-r7 4e058c942e Fix typo 2015-06-05 21:04:22 -05:00
wchen-r7 a7fa434e89 If exploit list is empty, have the option to return content 2015-06-05 21:03:24 -05:00
wchen-r7 fb8abe54fc This will continue loading the rest of the exploits 2015-06-05 17:52:40 -05:00
wchen-r7 188b15b17f Fix the symbol vs string prob 2015-06-05 16:18:56 -05:00
Brent Cook 0f4304c2dd Land #5494, handle short reads from mysql 2015-06-05 12:52:04 -05:00
Brent Cook bb9439e463 land #5487, refactor and fix save function for db_nmap 2015-06-05 12:31:23 -05:00
wchen-r7 e1c30e973d Fix SRVHOST 2015-06-05 12:14:43 -05:00
William Vu 15916f0ab0 Backport an upstream fix for a nil header
https://github.com/tmtm/ruby-mysql/commit/353d5951da1089432eac063b793b6561361be78a
https://github.com/tmtm/ruby-mysql/commit/7c984ea66e9cca61b1e6e99647138c99f44a5ba5
2015-06-05 11:51:40 -05:00
wchen-r7 f8c5e5a70a Don't show "Server stopped" 2015-06-05 11:16:43 -05:00
wchen-r7 ecdeeea5c6 Make sure super is called 2015-06-05 11:11:40 -05:00
wchen-r7 be60f964c6 Call super for cleanup 2015-06-05 10:50:52 -05:00
wchen-r7 69968fc9f1 Merge branch 'upstream-master' into bapv2 2015-06-04 23:36:24 -05:00
wchen-r7 910ae8a480 Fix #5461, actually stop a job from the RPC service
Fix #5461. The RPC service is incorrectly using the wrong method to
stop a job, this patch should fix that.
2015-06-04 23:09:55 -05:00
William Vu a53a68cfc2 Refactor db_nmap and fix the save option 2015-06-04 18:40:19 -05:00
OJ 26785b34f1 Land #5483 : Use the correct help output for the ps command 2015-06-05 07:30:15 +10:00
Brent Cook 346ea40d66 fix some alignment, add usage 2015-06-04 16:14:31 -05:00
Brent Cook 06cc759080 Use the correct help output for the ps command
It should not look like this:

```
meterpreter > ps -h
Usage: ps [ options ]

OPTIONS:
 -S       Search string to filter by
 -h 		This help menu
```

It should not not look like this:

```
meterpreter > ps -h
Use the command with no arguments to see all running processes.
The following options can be used to filter those results:

OPTIONS:

    -A <opt>  Filters processes on architecture (x86 or x86_64)
    -S <opt>  String to search for (converts to regex)
    -U <opt>  Filters processes on the user using the supplied RegEx
    -h        Help menu.
    -s        Show only SYSTEM processes
```
2015-06-04 16:06:07 -05:00
wchen-r7 7de78c1d69 Land #5447, more info about using the deprecated report_auth_info 2015-06-04 12:37:22 -05:00
wchen-r7 be709ba370 Merge branch 'upstream-master' into bapv2 2015-06-04 10:33:07 -05:00
David Maloney 5d68a8167b handle unicode changes
changed everything to utf-8 , so several sizes
on the ruby side needed to be changed to account for this

MSP-12358
2015-06-02 12:46:21 -05:00
Samuel Huckins 27ddee4241 Merge branch 'master' of github.com:rapid7/metasploit-framework 2015-06-02 08:54:47 -05:00
jvazquez-r7 d22dda2bab Provide more context and references 2015-06-01 10:33:40 -05:00
benpturner 9d1a7cead4 New modules to support 64bit process powershell. 2015-06-01 16:11:23 +01:00
Samuel Huckins a0bcbd1fe5 Merge branch 'master' of github.com:rapid7/metasploit-framework 2015-06-01 09:55:20 -05:00
Brent Cook 64e86165ef remove android meterpreter bins, update to payloads 1.0.2
This switches us to using the Android payload files from the
metasploit-payloads gem
2015-06-01 09:14:31 -05:00
Brent Cook 70ef1b83f9 Merge branch 'master' into land-5366-android 2015-06-01 09:07:55 -05:00
wchen-r7 5c890004b8 Do stop_service in cleanup 2015-05-29 18:32:57 -05:00
wchen-r7 28d35a5bf4 Update doc 2015-05-29 18:03:56 -05:00
wchen-r7 58c5767330 Don't need stderr.puts 2015-05-29 17:41:29 -05:00
wchen-r7 0384b115e9 Fix reload bug 2015-05-29 17:41:02 -05:00
OJ 3dd3ef5edb Merge branch 'upstrea/master' into winhttp-ie-proxy 2015-05-30 08:03:43 +10:00
jvazquez-r7 af326a4f88 Use compatible_payloads instead of copy and paste 2015-05-29 16:55:19 -05:00
Brent Cook 6d488c63d4 php UUIDOptions->UUID::Options 2015-05-29 16:33:03 -05:00
Brent Cook b8a8e65c2c Merge branch 'master' into land-5394-uuid-tracker 2015-05-29 16:22:45 -05:00
Brent Cook 7b0006a1b2 Merge branch 'master' into land-5394-uuid-tracker 2015-05-29 15:41:31 -05:00
Brent Cook 96a1e1b344 Land #5367, add UUID stagers 2015-05-29 15:18:53 -05:00