OJ
849f904711
Finalise style changes as per suggestions in PR
2015-05-12 09:48:50 +10:00
OJ
474461d2a4
Merge format and structure changes from multi transport
2015-05-12 09:46:02 +10:00
OJ
69d2b8ffb1
Various code format, style changes, file moves
...
As per Egypt's suggestions.
2015-05-12 09:43:41 +10:00
OJ
42f94e70c7
Add `nil` default to exit_types, transport param order swap
...
This allows for checking against exit types to be super easy instead of
having to have extra checks in place. Also changed the order of scope_id
and uri in the transport URI generation. The net effect of this is NOP
because these things only appear separately.
2015-05-12 09:05:58 +10:00
OJ
0dbfc1e02b
Merge the stager size work from mult-transport-support
2015-05-12 07:50:56 +10:00
OJ
fe51f552b8
Make stageless, and reverse_tcp x64 non-dynamic
2015-05-12 07:37:12 +10:00
OJ
6fdf23ad98
Update payload sizes again
2015-05-11 22:33:45 +10:00
OJ
e99d885b6b
Final work on reverse_winhttps
2015-05-11 22:21:22 +10:00
OJ
68eadd9f51
More work on reverse_winhttps
2015-05-11 21:38:26 +10:00
OJ
d9068b7719
Fix up payload cache sizes, and powershell include
2015-05-11 17:43:51 +10:00
OJ
e69e6c4a73
Implement winhttp for x64
...
Still has some quirks to fix up, but we're getting there. Everything
seems to work except for reverse_winhttps. I can't see why at this
point.
2015-05-11 17:27:47 +10:00
OJ
800ab11abd
Payload size adjustment, typo fix
...
Woot, this somehow reduces the payload sizes by 2 bytes... woot.. or
something.
2015-05-11 17:24:32 +10:00
OJ
cbf06fcb02
Tweak reverse_winhttp to fix small issues
...
Now working fine with proxy settings.
2015-05-11 17:24:32 +10:00
OJ
679bb46f86
Refactoring, exitfunk fix, block_api_hash func
2015-05-11 17:24:32 +10:00
OJ
99fdfe31f1
More tidying/refactoring of the stagers
2015-05-11 17:24:31 +10:00
OJ
4686691753
Interim commit while juggling some other code
2015-05-11 17:24:31 +10:00
OJ
0820bc5dd5
Small bits of tidying up for reverse_winhttp/s
...
Refactoring, ready to get the proxy stuff going.
2015-05-11 17:24:31 +10:00
OJ
21397b46aa
Add proxy user/pass to x64 reverse_http/s
2015-05-11 17:24:31 +10:00
OJ
9312c0ea46
Add proxy host support to x64 reverse_http/s
...
Proxy user/pass coming shortly.
2015-05-11 17:24:31 +10:00
OJ
b922da8f80
Add support for x64 reverse_http
...
Still need to bake in support for proxies in the stagers, but wer'e
getting there.
2015-05-11 17:24:31 +10:00
OJ
15e9fb7e40
Port reverse_https (wininet) x64 to metasm
...
This laid the groundwork for implementation of reverse_http as well.
2015-05-11 17:24:31 +10:00
OJ
29649ff881
Fix proxy config not making it through
2015-05-11 17:24:02 +10:00
OJ
79753f719f
Slight fix to the transport config
2015-05-08 18:36:30 +10:00
OJ
ba3266803a
Add transport configuration to reverse_http/s
2015-05-08 18:32:48 +10:00
OJ
5111abdd09
Add transport config entry to reverse_winhttp
2015-05-08 18:15:24 +10:00
OJ
fd827db6dd
Fix up bind stager payload sizes
2015-05-07 10:13:27 +10:00
OJ
9d7a7cb68d
Merge branch 'upstream/master' into multi-transport-support
...
Conflicts:
lib/msf/core/payload/linux/bind_tcp.rb
2015-05-07 07:24:22 +10:00
OJ
60e25170fa
Land #5313 : fixup bind_tcp stager
2015-05-07 07:09:19 +10:00
Brent Cook
73735760ce
Land #5311 , fix more payload_exe->generate_payload_exe calls
2015-05-06 13:38:35 -05:00
Brent Cook
5a8b6e90f2
restore ecx after setting the socket options, set default size
2015-05-06 11:56:07 -05:00
William Vu
b8c7161819
Fix up NameError'd payload_exe
2015-05-06 11:34:05 -05:00
William Vu
59ffe5d98f
Land #5306 , payload_exe NameError fix
2015-05-06 11:29:29 -05:00
wchen-r7
4b0f54f0aa
Land #5305 , CVE-2015-0336 Flash NetConnection Type Confusion
2015-05-06 11:26:22 -05:00
wchen-r7
97807e09ca
Lad #5125 , Group Policy startup exploit
2015-05-06 11:17:01 -05:00
wchen-r7
5b57e4e9ca
Add info about the waiting time
2015-05-06 11:15:11 -05:00
William Vu
0c18775562
Land #5309 , Linux bind_tcp rollback
2015-05-06 10:20:06 -05:00
Brent Cook
0493f58834
Reenable metasm bind_tcp stager
2015-05-06 09:34:35 -05:00
Brent Cook
3c2e6bb698
rollback linux bind_tcp stager metasm port
...
The new metasm port of the linux bind_tcp stager doesn't yet generate valid
executables. While we're debugging the problem, this reverts the bind_tcp.rb
stager to use the static ASM again.
2015-05-06 09:26:04 -05:00
Sam Roth
5cb8b9a20a
Fix #5304
2015-05-05 22:25:06 -04:00
jvazquez-r7
582919acac
Add module for CVE-2015-0336
2015-05-05 17:25:19 -05:00
OJ
95e9057854
Remove typo'd stuff that shouldn't have made it past merge
2015-05-06 08:07:07 +10:00
William Vu
b862d24f0a
Land #5302 , module title/ref updates
2015-05-05 15:21:34 -05:00
Darius Freamon
c988447c18
title enhancement, OSVDB ref
...
touch up title and add OSVDB reference
2015-05-05 13:21:36 -06:00
William Vu
013781fb9c
Land #5292 , WordPress custom file version check
2015-05-05 11:21:18 -05:00
William Vu
18791ce933
Clean up code
2015-05-05 11:19:40 -05:00
OJ
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
OJ
c540ba4b98
Land #5297 : Track machine_id and dead sessions
2015-05-05 17:08:39 +10:00
OJ
232117117b
Fix missing includes
...
The powershell one broke thanks to include hierarchy changes. The others
failed in the specs only for some reason.
2015-05-05 14:24:21 +10:00
OJ
146f41992f
Fix up payload sizes
2015-05-05 13:52:20 +10:00
OJ
2949bf053a
Remove old comment from ASM
2015-05-05 13:09:13 +10:00