OJ
0d56b3ee66
Stage UUIDs, generation options, php and python meterp uuid
2015-05-18 13:29:46 +10:00
OJ
bf2b113abb
Merge branch 'upstream/master' into update-x64-stagers
2015-05-18 13:28:36 +10:00
OJ
8bd41a3834
Land #5354 - transport config fallback in stager
2015-05-18 10:16:44 +10:00
OJ
8b2e5c88d9
Adjust transport config fallback to include https
2015-05-18 10:16:09 +10:00
OJ
dbe4f3f1c8
Adjust single pack statement, fix up some quotes
...
* Moved over to using single quotes for strings that don't need
escaping or interpolation.
* Changed one pack spec to be "more correct". Thankfully, we were only
packing 0 so the endianness isn't a problem, however it should be
correct, hence the fix.
2015-05-18 09:29:48 +10:00
Hans-Martin Münch (h0ng10)
d99eedb1e4
Adding begin...ensure block
2015-05-17 20:48:11 +02:00
Hans-Martin Münch (h0ng10)
acb053a2a7
CloseHandle cleanup
2015-05-17 20:39:10 +02:00
Brent Cook
20ad2a80f3
Land #5357 , switch UUID to be binary rather than string
2015-05-17 11:09:12 -05:00
Brent Cook
d804f5fe49
update to metasploit-payloads 0.0.7
2015-05-17 10:06:38 -05:00
Stuart Morgan
b4e20c393d
Merge branch 'master' into http-title-grabber
2015-05-17 14:00:01 +01:00
Stuart Morgan
79b9ef008a
Bugfix
2015-05-17 13:55:56 +01:00
OJ
178ba50b98
Merge branch 'upstream/master' into rage-stager-transport
2015-05-17 20:09:50 +10:00
OJ
d725554a87
Fix UUID code so that it always deals with 16 bytes
...
Also re-add the payload ID to session validation now that the UUID stuff
is reliable.
2015-05-17 17:49:21 +10:00
William Vu
636d8151d0
Land #5355 , emergency fix for Meterpreter UUIDs
2015-05-17 02:21:32 -05:00
OJ
37e4d71a6a
Remove check for UUID in the valid session check
...
This is causing sessions to fail because meterpreter isn't doing the
right thing. I have another fix in the works which will properly solve
this, but in the short term the best way of solving the problem is to
remove this line.
2015-05-17 17:13:54 +10:00
RageLtMan
11e715ae46
Configure transport from stager mixin
...
Transport configuration for basic session types can be performed
by the stager mixin.
Add a default transport_config method to Msf::Payload::Stager by
mixing in Msf::Payload::TransportConfig and attempting to guess
the default tranport and direction types from the currently loaded
module's (MSF module) refname.
Users with custom payloads will no longer need to update them with
transport_config methods unless they use a non standard transport,
direction, or other innovation which affects the default approach.
Testing:
Tested with payloads lacking transport_config methods or access
to the TransportConfig module (Ruby) namespace. This also resolves
problems with the RC4 payloads in upstream as they can't currently
generate stagers for meterpreter.
2015-05-17 03:03:17 -04:00
Brent Cook
829f8420e2
Update static payload sizes for metasploit-payloads-0.0.6
2015-05-15 18:43:47 -05:00
Brent Cook
b1507f6d2a
Land #5339 , support for 'sleep' with meterpreter sessions
2015-05-15 18:14:37 -05:00
Brent Cook
f3c22e4168
update metasploit-payloads to 0.0.6
...
This includes:
- support for the 'sleep' command (metasploit-framework #5339 )
- support for Unicode file names with Java (metasploit-javapayloads #29 )
- proxy support with winhttp (meterpreter #159 )
- support for showing domain and logged in users (meterpreter #161 )
2015-05-15 18:04:04 -05:00
Brent Cook
fb3a2079f2
Merge branch 'master' into land-5339-sleep
2015-05-15 18:00:52 -05:00
Brent Cook
02994bc83b
Land #5352 , display domain and user info in sysinfo if available
2015-05-15 16:37:00 -05:00
David Maloney
7d44d6d67a
client side for new sysinfo fields
...
added Domain and Logged On Users fields to
the meterpreter sysinfo command
MSP-12715
2015-05-15 15:09:33 -05:00
jvazquez-r7
dd5060e08c
Land #5340 , @wchen-r7's change to the symantec_web_gateway_login writing style
2015-05-15 13:18:35 -05:00
jvazquez-r7
cf5fa6752e
Use parenthesis
2015-05-15 13:17:54 -05:00
Brent Cook
5cf6d28c34
Land #5426 , use RAW for TLV hash binary data
2015-05-15 11:54:45 -05:00
Brent Cook
93ba08738c
add backward compatibility for hash responses
2015-05-15 11:53:12 -05:00
jvazquez-r7
3c92d5365e
Lnad #5334 , @wchen-r7's deletes unnecessary check on mysql_drop_and_create_sys_exec
2015-05-15 11:51:21 -05:00
wchen-r7
25099dd877
Land #5212 , HTA Powershell template
2015-05-15 11:49:07 -05:00
wchen-r7
3bc3614be6
Do a check for powershell.exe before running it.
2015-05-15 11:48:21 -05:00
jvazquez-r7
4c1558b398
Land #5331 , @wchen-r7's fixes #5330 by using print_warning
2015-05-15 11:42:57 -05:00
jvazquez-r7
b7b00666fa
Use parenthesis
2015-05-15 11:41:14 -05:00
jvazquez-r7
d05cae5faf
Land #5329 , @wchen-r7's add configurable options to jenkins_login
2015-05-15 11:38:21 -05:00
Brent Cook
c614f6059d
Merge branch 'master' into land-5326-
2015-05-15 11:29:54 -05:00
jvazquez-r7
2882374582
Land #5276 , @lanjelot fixes #4243 and improves java_jdwp_debugger
2015-05-15 11:12:10 -05:00
jvazquez-r7
a46975f1f0
Fix read_reply to use get_once correctly
2015-05-15 11:11:25 -05:00
Brent Cook
1653acd527
Land #5344 , print payload size from msfvenom
2015-05-15 09:49:05 -05:00
Donny Maasland (Fox-IT)
2721be946a
also check Wow6432Node keys
2015-05-15 14:28:12 +02:00
Samuel Huckins
3d905418f4
Merge branch 'master' of github.com:rapid7/metasploit-framework
2015-05-15 00:20:59 -05:00
Hans-Martin Münch (h0ng10)
e075495a5b
string concatenation, clear \ handling
2015-05-15 06:51:42 +02:00
Hans-Martin Münch (h0ng10)
94d39c5c75
remove hard coded pipe name
2015-05-15 06:35:55 +02:00
Hans-Martin Münch (h0ng10)
bb4f5da6d9
replace client.sys.config.getenv with get_env
2015-05-15 06:33:57 +02:00
Joshua Smith
c62cbe6555
Land #5342 , import dev keys script
2015-05-14 21:43:04 -05:00
Joshua Smith
661a1fef3e
Land #5350 , Remove stray comma meterp help
2015-05-14 21:31:31 -05:00
OJ
7b2aee2a60
Merge branch 'upstream/master' into update-x64-stagers
2015-05-15 12:27:40 +10:00
OJ
1ff6d6298e
Remove stray comma causing help to be incorrect
2015-05-15 09:23:55 +10:00
Hans-Martin Münch (h0ng10)
bba261a1cf
Initial version
2015-05-15 00:36:03 +02:00
OJ
7c013c0486
Merge branch 'upstream/master' into add-transport-sleep
2015-05-15 08:00:04 +10:00
Samuel Huckins
9a7c58ed82
Merge branch 'master' of github.com:rapid7/metasploit-framework
2015-05-14 16:31:33 -05:00
wchen-r7
24a989b8a3
Land #5249 , Add Module for Enum on InfluxDB database
2015-05-14 11:22:54 -05:00
wchen-r7
005c36b2a6
If data is empty, don't save (or even continue)
2015-05-14 11:22:10 -05:00