Commit Graph

10812 Commits (adfb663343334f9cd51b9d780563cffb7cabf935)

Author SHA1 Message Date
OJ e796e56c6c Modify the staging process 2015-06-24 13:22:33 +10:00
wchen-r7 d59c418df6 Fix #5591
Fix #5591
2015-06-23 19:10:14 -05:00
wchen-r7 1af12fd11f Glassfish version 9 2015-06-23 19:09:14 -05:00
William Vu dffc516d6d
Land #5583, Android Meterpreter commands fix 2015-06-23 14:39:37 -05:00
Trevor Rosen 4e3a2b2b35
Upstream merge 2015-06-23 14:11:28 -05:00
HD Moore 3141d4e465 Relocate the mkdir to synced_update 2015-06-23 10:44:15 -07:00
Brent Cook 67e711998b Do not create the payloads.json file until first usage 2015-06-23 12:21:04 -05:00
Brent Cook e75287875b hack android-specific commands back to life 2015-06-22 20:41:58 -05:00
Brent Cook e696d2f3dc Merge branch 'master' into land-5348-ntds 2015-06-22 17:18:13 -05:00
Brent Cook ba340ecec1
Land #5543, add transport delete command 2015-06-22 16:58:47 -05:00
Brent Cook 6a0a410cad fix minor issue typing 'transport remove'
meterpreter > transport remove
[-] Error running command transport: NoMethodError undefined method `end_with?' for nil:NilClass
2015-06-22 16:56:16 -05:00
Trevor Rosen 275e5ff15d Merge branch 'master' into bug/MSP-12834/crawler-choke-on-save 2015-06-22 14:20:35 -05:00
Trevor Rosen d53067b0b7
Fix ctype handling for body-less pages
#5515
2015-06-22 14:17:29 -05:00
Brent Cook 732192aeaf move ntds from priv to extapi 2015-06-22 09:04:08 -05:00
jvazquez-r7 bf7e0695d0
Land #5570, @todb-r7 Removes references to Iconv gem, since it's deprecated 2015-06-19 17:19:03 -05:00
Brent Cook 252b573ea8
Land #5547, configurable auto session timeout 2015-06-19 15:35:33 -05:00
wchen-r7 0b0cc3631b
Land #5569, Correct service name for mssql for scanner detection 2015-06-19 15:33:05 -05:00
wchen-r7 bd097e3264
Land #5497, Refactor LoginScanner::SNMP to be fast and less buggy 2015-06-19 14:57:36 -05:00
jvazquez-r7 34d5d92646
Land #5555, @Th3R3p0's support for for RFB Version 4 2015-06-19 14:15:04 -05:00
Greg Mikeska d672ac1601
Correct service name for mssql for scanner detection 2015-06-19 13:54:31 -05:00
jvazquez-r7 7eeb8805ee
Do minor code cleanup 2015-06-19 13:37:02 -05:00
Tod Beardsley 01e37386dd
Add some YARD docs to the ebcdic methods 2015-06-19 12:59:47 -05:00
Tod Beardsley a004c72068
Get rid of the encode test and iconv fallback 2015-06-19 12:30:20 -05:00
Tod Beardsley afe5bb54c3
Get rid of the fall through methods 2015-06-19 12:24:07 -05:00
Tod Beardsley 34ece37f26
First off, iconv is gone, and zlib is stdlib 2015-06-19 12:17:43 -05:00
OJ 8656add0ad Add uri parameter when removing http/s transports 2015-06-19 10:55:22 +10:00
Brent Cook 7f27fd0cf2 adjust for user name size changes 2015-06-18 11:17:08 -05:00
g0tmi1k ce9481d2b7 Inconstancy - If datastore['VERBOSE'] vs vprint 2015-06-18 09:27:01 +01:00
Th3R3p0 8ea09532c8 removed a debugging line 2015-06-17 13:13:00 -04:00
Th3R3p0 e30b0e0cda forced client to version 3 for servers and added comments. This adds support for RFB version 4 servers. Tested on 004.001 2015-06-17 12:57:24 -04:00
Th3R3p0 772a5dd7df Created array and added support for version 4 2015-06-17 12:31:51 -04:00
William Vu dc07938668
Land #5550, custom exe_filename for to_exe_vba 2015-06-16 19:10:49 -05:00
g0tmi1k 37546c7e18 to_exe_vbs - Allow for exe_filename to be defined 2015-06-17 01:13:33 +01:00
g0tmi1k b40e9f6d46 util/exe - replace tabs with spaces
...formatting should be okay still
2015-06-17 01:10:18 +01:00
g0tmi1k 3410782fe9 Capitalized 'Accepted' 2015-06-16 19:42:32 +01:00
OJ 9dbdaf13ea Add AutoVerifySessionTimeout Meterpreter advanced option 2015-06-17 00:20:59 +10:00
OJ 9573c7e415 Implement transport remove 2015-06-16 11:38:59 +10:00
William Vu 8d640a0c8f
Land #5527, multi/handler -> exploit/multi/handler 2015-06-15 10:23:26 -05:00
HD Moore ab6f3a7373 Fix #5531, the ```stage_payload``` method does not take arguments. 2015-06-13 18:26:56 -05:00
g0tmi1k 6dcc9b7dab More inconsistencies 2015-06-12 21:59:15 +01:00
HD Moore 7c91aee7a8 Dont use a "connected" to keep compat with BSD 2015-06-09 20:33:46 -05:00
David Maloney 2a474c8375
Merge branch 'master' into feature/MSP-12358/ntds-dump-module 2015-06-08 11:42:03 -05:00
wchen-r7 5a6a16c4ec Resolve #4326, remove msfpayload & msfencode. Use msfvenom instead!
msfpayload and msfencode are no longer in metasploit. Please use
msfvenom instead.

Resolves #4326
2015-06-08 11:30:04 -05:00
HD Moore edcd1e3bf9
Land #5504, handle cases where the script may be empty 2015-06-07 14:20:00 -05:00
HD Moore 1f11cd5470
Lands #5446, support for 64-bit native powershell payloads 2015-06-07 14:16:19 -05:00
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
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
William Vu 15916f0ab0 Backport an upstream fix for a nil header
353d5951da
7c984ea66e
2015-06-05 11:51:40 -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
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
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
wchen-r7 defda01d87 Some doc 2015-05-29 15:09:29 -05:00
wchen-r7 b33ace2f44 Put is_payload_compatible? in exploit.rb 2015-05-29 15:07:59 -05:00
jvazquez-r7 1be04a9e7e
Land #5182, @m-1-k-3's exploit for Dlink UPnP SOAP-Header Injection 2015-05-29 14:49:09 -05:00
jvazquez-r7 8b2e49eabc
Do code cleanup 2015-05-29 14:45:47 -05:00
Brent Cook 340792aae4 don't jump past the uuid sender on win32/tcp connect 2015-05-29 14:34:27 -05:00
Brent Cook 7d5af66fa0 Merge branch 'master' into land-5367-uuid-stagers 2015-05-29 13:00:35 -05:00
Brent Cook 8f747d2541
Land #5382, add meterpreter session reconnect RPC call 2015-05-29 12:53:15 -05:00
Samuel Huckins f6a8982fd7 Merge branch 'master' of github.com:rapid7/metasploit-framework
Please enter a commit message to explain why this merge is necessary,
2015-05-29 12:49:45 -05:00
wchen-r7 737559bcbb
Land #5180, VBA Powershell for Office Macro 2015-05-28 19:55:27 -05:00
Samuel Huckins 19106a3ea4 Merge branch 'master' of git://github.com/rapid7/metasploit-framework 2015-05-28 08:15:12 -05:00
Spencer McIntyre 24b4dacec5
Land #5408, @g0tmi1k fixes verbiage and whitespace 2015-05-27 21:02:02 -04:00
wchen-r7 583fccdbc8 Resolve #5404, Check payload compatibility when using set payload
Resolve #5404. This patch will check payload compatibility when
you are using set payload in msfconsole.
2015-05-27 18:28:08 -05:00
Brent Cook d76a9c6565
Land #5409, update cmd stager documentation.
Merge remote-tracking branch 'upstream/pr/5409' into upstream-master
2015-05-26 10:34:03 -05:00
benpturner abd4ab548d Edit spaces within the powershell session command 2015-05-25 20:10:29 +01:00
OJ 43f7054a5c Refactor base64 stub into base module
As per @zeroSteiner's suggestion.
2015-05-25 11:51:01 +10:00
OJ 9e50114082
Merge branch 'upstream/master' into uuid-stagers 2015-05-25 11:22:35 +10:00
OJ 9042f141ff Implement the IPv6 UUID bind stagers 2015-05-25 11:21:28 +10:00
Spencer McIntyre 6fb2da4f62 Fix #5391, cmd stager documentation fixes 2015-05-23 13:56:49 -04:00
Michael Messner 10baf1ebb6 echo stager 2015-05-23 15:50:35 +02:00
jvazquez-r7 d10b20b7a3
Land #5251, @hmoore-r7's second opportunity to Oracle connect
SYSTEM shouldn't have SYSDBA privileges by default anymore
2015-05-22 17:47:41 -05:00
jvazquez-r7 41a86b2e9b
add vprint_status 2015-05-22 17:46:56 -05:00
jvazquez-r7 c201955fdf
Land #5387, @wchen-r7's user-configurable HTTP timeout
Fixes #5219, Add connection timeout and response timeout for HttpClient
2015-05-22 15:36:11 -05:00