22d2275ecb
|| session.type == 'powershell'
2015-05-05 09:31:43 +01:00
62fa14326d
Merge branch 'upstream/master' into multi-transport-support
...
Merged with HD's stuff as he fixed up a few things that I had done too.
Conflicts:
lib/msf/base/sessions/meterpreter_options.rb
lib/rex/post/meterpreter/client_core.rb
lib/rex/post/meterpreter/packet_dispatcher.rb
2015-05-05 17:18:01 +10:00
c540ba4b98
Land #5297 : Track machine_id and dead sessions
2015-05-05 17:08:39 +10:00
2949bf053a
Remove old comment from ASM
2015-05-05 13:09:13 +10:00
852961f059
Tweaking of transport behaviour, removal of patch
2015-05-05 11:45:22 +10:00
cf62d1fd7c
Remove patch and old stageless stuff
2015-05-05 09:27:01 +10:00
b42f4f5cd2
Merge branch 'upstream/master' into multi-transport-support
...
Conflicts:
lib/msf/core/payload/windows/stageless_meterpreter.rb
lib/msf/core/payload/windows/x64/stageless_meterpreter.rb
lib/rex/post/meterpreter/client_core.rb
modules/payloads/stages/linux/x86/meterpreter.rb
modules/payloads/stages/windows/meterpreter.rb
modules/payloads/stages/windows/x64/meterpreter.rb
2015-05-05 07:53:54 +10:00
e45bf5cf51
Remove the URI patcher now that it's not used at all
2015-05-05 07:35:49 +10:00
05e4af8162
Land #5214 , initial meterpreter session recovery support
2015-05-04 16:25:27 -05:00
453b1fce50
Spaces
2015-05-04 22:17:08 +01:00
658958d8e7
Allow sessions -c command on powershell
2015-05-04 22:07:22 +01:00
d90c25ecea
Land #5287 , RPC API fixes
2015-05-04 15:44:15 -05:00
0ca0d3d045
Improve nt_create_andx path parsing
2015-05-04 15:20:51 -05:00
e6ea5511ca
update linux and windows meterpreters to use metasploit-payloads
2015-05-04 09:44:36 -05:00
c2dc4677fb
Prevent stagless from overwriting socket
...
Stageless payloads need to have the socket FD left along (ie. 0)
otherwise each of them will think that the socket is already open.
Instead we need to make sure it's left as 0 as per the configuration and
from there the stageless code will fire up a new socket based on the
transport in question.
2015-05-04 22:36:59 +10:00
e835f2b99c
Rejig transport config into module
...
Adjust a few other things along the way, including tidying of code,
removing of dead stuff.
2015-05-04 22:04:34 +10:00
93bf995b32
Reverse tcp support for POSIX
...
Ported the stager and wired in the new work to make the configuration
function.
2015-05-04 20:11:26 +10:00
f42334414a
add recursion limit
2015-05-04 04:00:58 -05:00
9300158c9a
Initial rework of POSIX stuff to handle new configuration
2015-05-04 18:58:55 +10:00
7ff3044552
style cleanups and guard search where not implemented
2015-05-04 03:56:17 -05:00
8cab350275
use the search API when downloading recursive patterns
2015-05-04 03:56:17 -05:00
eefc6f78c6
avoid redownloading files that have not changed
2015-05-04 03:56:16 -05:00
9672a59b05
support download globbing
2015-05-04 03:56:16 -05:00
43be856b95
keep the glob going into subdirectories
2015-05-04 03:56:16 -05:00
8617115483
simplify arg parsing, compute initial stat path correctly
2015-05-04 03:56:15 -05:00
d934027b3b
expand glob match
2015-05-04 03:56:15 -05:00
866955b6fd
added -R recursive, glob filtering and a dummy '-l' option
2015-05-04 03:56:14 -05:00
a577bef9c3
Rework dirty cleanup to use skip_cleanup instead
2015-05-04 03:52:55 -05:00
e7ba6e8a9a
Speed up dead session cleanup by skipping shutdown/cleanup
2015-05-04 03:40:48 -05:00
3080feb188
Track the machine_id and drop non-responsive sessions automatically
2015-05-04 03:22:29 -05:00
d00f6a8fdf
Rework verbose sessions listing to work around table limits
2015-05-04 02:55:31 -05:00
b47305ba4a
Merge branch 'sqlmap_plugin_json_parse_issue' of https://github.com/void-in/metasploit-framework into sqlmap_plugin_json_parse_issue
2015-05-04 10:01:44 +05:00
02db66e2f6
Rescue connection refused backtrace
2015-05-04 09:57:53 +05:00
451484cb0d
Add support for transport listing
...
Includes a verbose flag for the extra HTTP/S properties
2015-05-04 11:19:53 +10:00
c0adf7f113
Land #5291 , HTTPS reference links
2015-05-03 14:33:20 -05:00
8ca66e03aa
Track and display the last checkin time for Meterpreter sessions
2015-05-03 10:52:54 -05:00
55967172be
allow custom regex
2015-05-02 21:06:15 +02:00
9678479abb
check version from custom file
2015-05-02 18:34:10 +02:00
480a176415
Initial commit
2015-05-02 10:11:17 -05:00
e5847f0ddc
Return only json type from lib as per wchen-7 suggestion
2015-05-02 15:11:59 +05:00
2189c6d868
Pass timeouts to clients and correctly patch timeouts
...
Timeouts are correctly passed through to the client instances from the
handlers. The cilent also passes those values through to the RDI code so
that the binaries are correctly patched.
2015-05-02 10:01:32 +10:00
c441ff81a1
Update comment in wordpress/version.rb
...
The comment 'All versions are vulnerable' makes sense on line 163 where there is no introduced or fixed version. On line 175 though there is a fixed version, just no introduced version. Adjusting comment text.
2015-05-01 17:05:31 -05:00
8bd2a69112
simplify and fix rpc_get_note
2015-05-01 16:01:07 -05:00
52b9fc8fca
handle unknown host when generating a new note
2015-05-01 15:47:05 -05:00
8d78135321
pass down the workspace for the other opt_to_* methods
2015-05-01 15:42:04 -05:00
f2504b84be
use the same logic with 'get_note' and 'del_note' for selecting notes
...
factor out the selector from 'get_note' and use it in both places
2015-05-01 15:41:25 -05:00
29b97f4695
remove superfluous parens on ifs
2015-05-01 15:40:45 -05:00
c6806b4e5f
Land #5102 , @wchen-r7's ManageEngine Desktop Central Login Utility
2015-05-01 15:20:21 -05:00
3e7c790db8
Use constants
2015-05-01 15:15:18 -05:00
c3438955d4
Land #5169 , stop reading when the HTTP socket is closed
2015-05-01 11:40:49 -05:00
0b608e139a
Merge branch 'upstream' into staging/rails-4.0
2015-05-01 11:26:24 -05:00
81744384c2
Actually fix del_note
2015-04-30 17:02:06 -05:00
11f9c010ce
Change documentation
2015-04-30 16:46:01 -05:00
18874fe384
fixes Issue #5272 on report_vuln
...
use includes instead of joins so that refs on
the vuln are not marked as readonly
2015-04-30 15:21:56 -05:00
e79780d885
Fix #5240
2015-04-30 15:20:29 -05:00
3b42265c98
Fix #5239
2015-04-30 15:20:04 -05:00
440005d302
Fix #5237
2015-04-30 15:10:13 -05:00
f315eb4afd
Fix #5236
2015-04-30 15:07:11 -05:00
70ab938951
Fix #5229
2015-04-30 14:56:30 -05:00
f43e4f9447
Fix #5238
2015-04-30 13:49:13 -05:00
89d026c900
Fix merge conflict
2015-04-30 12:33:45 -05:00
912f41292a
Drop some unused code
2015-04-30 11:25:57 -05:00
2d2c946044
Land #5279 , fix for msfconsole -o
2015-04-30 11:23:44 -05:00
3f797e4393
Reinstate some to_s coercions that were mistakenly dropped
2015-04-30 11:13:48 -05:00
3e40433f00
Add an alias for write
...
Fixes #4971
2015-04-30 08:56:16 -05:00
8ddd7a4891
Fix session removal code, prevent missing transport param fail
2015-04-30 22:39:48 +10:00
4c9f44b00c
Revert "Land #4888 , @h00die's brocade credential bruteforcer"
...
There were some issues with this module that caused backtraces when run outside
of msfconsole. Reverting it for now so we can add some specs and ensure that it
works like the other login scanners.
2015-04-29 15:36:03 -05:00
b41aa0e617
Fix NoMethodError for rhost
...
Can't rely on it to be defined (kinda like peer).
2015-04-29 15:14:41 -05:00
9386d1ca6d
remove unused mod_ranked attribute
2015-04-28 22:27:09 -05:00
7b7f40baa4
remove modules that cannot be instantiated
2015-04-28 22:21:31 -05:00
0caeee32fe
replace sort with sort_by
2015-04-28 21:39:37 -05:00
8163c3cdda
Merge branch 'master' into staging/rails-4.0
...
Conflicts:
Gemfile.lock
plugins/nessus.rb
2015-04-28 15:33:46 -05:00
919b96e4cf
Fix up UUID handling
2015-04-28 21:59:19 +10:00
4f9c8d04a2
Add support for moving transports and uuid fetching
...
The 'next' and 'prev' commands were added so that the session can jump
transports without having to add new ones at the same time.
There's also a command which gives the UUID now so that this can be
reused across sessions.
2015-04-28 20:24:44 +10:00
f711e5dee7
Update migration support
...
Migration now uses the new meterpreter loader. Migration configuration
is loaded and created by meterpreter on the fly, and supports the
multiple transport stuff that's just been wired in.
2015-04-28 17:41:43 +10:00
fca4d852a1
Remove the passing on off listen socket values
2015-04-28 13:51:48 +10:00
d82bfb0692
Reorder params, fix up the transport termination
2015-04-28 13:03:40 +10:00
c41f4bd59f
Fix up http/s a little
...
Correctly check the URL against the non-widechar version. Get the SSL
verification stuff working again.
2015-04-28 09:44:48 +10:00
1ca5188c5e
Change the payload to use IPv6 formats if required
2015-04-28 07:44:21 +10:00
f3e547ca92
Remvoe the exitfunk from the loader
...
Meterpreter handles the exitfunk internally as part of the config now
2015-04-28 07:43:26 +10:00
c3f18aa899
Complete the #4989 revert
2015-04-27 16:26:34 -05:00
36daee08c9
Reverts #4989 , support for file: is handled in the options again
2015-04-27 16:07:43 -05:00
7443af64a6
Land #5247 , add RPC API call documentation
2015-04-27 11:13:02 -05:00
a0eb7d0ad3
minor RPC documentation tweaks
2015-04-27 11:11:08 -05:00
6a4d63ca4f
Drop explicit IPAddr to String coercion
...
MSP-12611
2015-04-27 10:48:13 -05:00
1fd601510c
Lands #5194 , merges in PowerShell session support & initial payloads
2015-04-26 16:01:51 -05:00
1cebc9f3cb
Fallback if the regex fails for some reason
2015-04-26 15:59:36 -05:00
82fe480c2e
Update session to display username and hostname
2015-04-26 21:47:49 +01:00
ea0204b7e5
updates to remove powershell from core
2015-04-26 21:25:30 +01:00
76e68fcf4c
session info
2015-04-26 20:13:18 +01:00
1cc167a7fb
Inserted ARCH_X86 payloads, removed interactive_powershell and updated base powershell session
2015-04-26 18:50:42 +01:00
0d2f97ed2d
Add support for config in the x64 bind stager
2015-04-26 14:19:36 +10:00
6da8a14f62
Initial work on x64 payloads for new config
2015-04-26 13:41:31 +10:00
6ac3ecfa7c
Refactor, add reverse_winhttps support
...
Getting closer to a normalised view of what this stuff will look like.
There URL patching is slowly being removed. Reverse HTTPS works fine,
and by default HTTP should too.
Next up, x64 for the same main ones.
2015-04-26 12:11:14 +10:00
2455163d24
Refactor configuration for meterpreter payloads (x86)
...
RDI is now back to what it was before, as this leaves all the other RDI
style payloads alone. Instead we have a new Meterpreter loader which
does the stuff that is required to make meterpreter work well with the
new configuration options.
This is just the case for reverse_tcp and bind_tcp so far, need to do
the other payloads too, along with all the x64 versions.
2015-04-26 09:57:30 +10:00
3a24923361
Force bind to hand over the listen socket
2015-04-25 22:04:58 +10:00
4ec4868bcf
Make bind hand over the listen socket as well
2015-04-25 21:37:32 +10:00
bb77a3a0e6
First pass of refactoring to support new config block
...
This is pretty basic stuff, but at least it's reusable.
2015-04-25 21:36:28 +10:00
9f1e035c53
Changed required_space check in bind payloads
2015-04-25 21:30:54 +10:00
ff96101dba
Land #5218 , fix #3816 , remove print_debug / DEBUG
2015-04-24 13:41:07 -05:00
benpturner
OJ
Brent Cook
jvazquez-r7
HD Moore
root
William Vu
Christian Mehlmauer
Tom Sellers
void_in
darkbushido
wchen-r7
David Maloney
Matt Buck
James Lee
Ben Turner