1
mirror of https://github.com/rapid7/metasploit-payloads synced 2024-12-27 08:33:43 +01:00
Commit Graph

2871 Commits

Author SHA1 Message Date
Brent Cook
3bdd83779f
Land #395, Replace METHOD string with COMMAND_ID integer 2020-05-28 16:22:02 -05:00
Brent Cook
44be44ed89 bump to 2.0.0 2020-05-28 16:21:40 -05:00
Tim W
6c54c2ce76 fix ProcessChannel thread closing 2020-05-27 14:54:58 +08:00
Tim W
91acbc8f2e actually fix java stderr output 2020-05-26 15:53:57 +08:00
Metasploit
873ad69319 Bump metasploit-payloads to 1.4.3 2020-05-20 22:53:06 -05:00
Brent Cook
b70d38ab9f
Land #393, fix java meterpreter shell stderr output 2020-05-20 22:44:00 -05:00
OJ
9019b2fa05
Land Tim's string comparison fix 2020-05-18 19:50:50 +10:00
Tim W
79e2018f0d fix stdapi_channel_open 2020-05-18 17:02:22 +08:00
OJ
42a785b33f
Add RSA encryption support 2020-05-11 19:09:23 +10:00
OJ
e9e5894eca
Updated powershell extension binding IDs 2020-05-08 17:17:25 +10:00
OJ
bfd6e9af0d
Enable encryption of TLV packges with AES
Still need to support RSA encryption of the generated key
2020-05-07 19:37:22 +10:00
OJ
1945275be3
Get the last of the android stuff working 2020-05-04 19:14:14 +10:00
OJ
28d522561b
Finalised android support.. I think.
Still can't get it to build because I'm a java/mvn noob. NO idea what's
going on.
2020-05-04 17:19:56 +10:00
OJ
fad9548108
Adjust the extension and command identifiers (windows) 2020-05-04 14:04:34 +10:00
OJ
fc0079e98a
Update enumeration commands to support the id range 2020-05-01 15:55:43 +10:00
OJ
d3f3a513de
Update command id maps for php, java and python 2020-05-01 15:42:45 +10:00
OJ
6163be1142
Updated powershell extension with appropriate command map 2020-05-01 15:41:31 +10:00
OJ
8669ba8996
Merge branch 'remove-tlv-command-strings' of github.com:OJ/metasploit-payloads into remove-tlv-command-strings 2020-05-01 15:38:21 +10:00
OJ
3f574e3521
Implement extendion IDs and refactor command enum
Enumeration of commands was a bit of a hack, and still resultsed in
strings (like "stdapi") to appear in binaries, and also meant that
extensions needed to identify themselves.

This code changes the way this works. Extensions no longer have a name.
Instead they have an internal ID tha maps to the command sets they
support. To enumerate extension commands, MSF will ask for a range of
commands, and if any command IDs fit within that range, they'll be
returned.

This moves us towards a nicer way of handling things across all the
meterpreters.
2020-05-01 15:36:07 +10:00
Tim W
48a9c6c77e fix java meterpreter > shell stderr 2020-04-30 16:03:36 +08:00
OJ
5e31a39eaa
Finalise changes to Java for Command ID support 2020-04-30 17:44:59 +10:00
OJ
dc40ddc38d
Rename the tcp channel open command in python 2020-04-30 15:57:43 +10:00
OJ
c466527fb6
First pass of java support for UINT comamnd
Also had to fix up some implementation issues (such as riding off the
back of the command functionality to make channels... noooo!
2020-04-30 13:39:58 +10:00
OJ
409e6cce6d
Update python meterpreter to use UINT command ids
This is based heavily off the work that zeroSteiner did last year.
2020-04-29 16:59:51 +10:00
OJ
c9284388d9
Update PHP meterpreter to support UINT command IDs 2020-04-29 15:42:25 +10:00
OJ
c7f7bc2fc0
Remove method strings from TLV packets
We now use ints, and hopefully this means we don't have as much obvious
stuff in the binaries!

```
$ # Before:
$ strings metsrv.x86.dll | grep core_ | wc -l
46
$ # After:
$ strings metsrv.x86.dll | grep core_ | wc -l
0
```
Big win, and it's even bigger for the likes of stdapi.

Had to fix a bunch of other stuff along the way, including a subtle
issue with the Powershell Meterp bindings.
2020-04-28 23:41:06 +10:00
Metasploit
2824292111 Bump metasploit-payloads to 1.4.2 2020-04-24 21:10:32 -05:00
Brent Cook
d672097e99
Land #390, initial CMake support for Visual Studio 2020-04-24 20:51:55 -05:00
OJ
e0645a8d39
Include comsuppw change for mimikatz
This was required to support upstream changes that cause clean builds
for mimikatz now.
2020-04-24 13:40:19 +10:00
OJ
4f8544cfca
Slight make tweak and removal of some verbose debug stuff 2020-04-24 13:31:34 +10:00
OJ
f54c8e2ccb
Make script tweaks, adjustments to doxygen config 2020-04-24 13:31:34 +10:00
OJ
3dbff1e401
Clean and working builds with CMake 2020-04-24 13:31:34 +10:00
OJ
0e9a231e8a
First pass of CMake support (MSVC specific ATM)
This commit includes a bunch of changes that are working towards being
able to build the Meterpreter source from CMake. Changes include:

* Updated `make.bat` which does the stuff that we need.
* Removed a bunch of stuff from the python extension source tree so that
  CMake generator would not include them.
* Moved a few things around in the priv extension.
* Created `CMakeFileLists.txt` for all the projects.

There are a few hacks required in things like stdapi and kiwi to ignore
files that are on disk but shouldn't be included in the build.

Initial testing indicates that sessions run, extensions load, but some
things don't work as intended. It's a start! Still much to do.
2020-04-24 13:31:16 +10:00
Metasploit
bb14a52454 Bump metasploit-payloads to 1.4.1 2020-04-23 22:28:02 -05:00
Brent Cook
e0f9b827a8
Land #389, remove delay loading, common.lib 2020-04-23 22:19:41 -05:00
Brent Cook
934cf1e630
bump to 1.4.0 2020-04-23 22:19:27 -05:00
OJ
57eda40fc7
Fix mimikatz to build clean again
I am sad. Like.. really sad. I'm sad for so many reasons. For nearly
7 years I've worked on this god forsaken source, and for many of those
7 years I have had the ext_server_mimikatz project configured to have
warning level 3, and warnings as errors. While making changes to the
build systems in the last week or so, I've even rebuilt this on updated
toolsets on multiple platforms.

Despite all this, one thing slipped through the cracks. I have NO idea
why this warning wasn't shown in th past. Also.. how did this ever
work!? Why is it that it's only rearing its ugly head now? I honestly
don't know. Based on the code that I've had to fix in this PR, there's
no reason why this should build without warnings on any machine. Yet, it
does. It builds clean on my Windows 10 desktop with VS2013/2017/2019.
Same on most of my other virtual machines. For some reason it only
failed on this one VM after I had to fight to reproduce it when Brent
hand an issue.

The issue here was that a `string` type was being constructed from an
iterator over a `wstring` type, and hence there was an implicit
character conversion from `wchar_t` to `char`. This SHOULD be a warning,
because clearly that's not a good thing. BUT HERE WE ARE.

Anyway, we're proxying via the `_bstr_t` type now to avoid having to do
horrible manual character conversions. Given that we're in C++ land
already there's no point in working any harder. Also, this extension is
probably going to go away soon anyway, so a temporary fix that does the
job is good enough.

RIP my morning. I won't be getting that back.
2020-04-24 12:35:40 +10:00
OJ
f5313a91d0
Remove __declspec(dllexport) from the Init function in metsrv 2020-04-23 01:37:51 +10:00
OJ
f49e7bc7aa
Fix silly mistake with espia reference to backcompat 2020-04-22 13:14:18 +10:00
OJ
24e6067b51
Update RDI, remove metsrv references/libs from extensions 2020-04-22 13:13:56 +10:00
OJ
64f6062d8b
Remove unused crap from espia
The video and audio capture things didn't do anything other than leave
artifacts on disk. So this commit removes the code that does that,
resulting in just one feature being available for this extension. Might
be worth ditching it entirely?
2020-04-22 13:06:49 +10:00
OJ
eb81e43b03
Remove the common vcxproj and all references to it 2020-04-22 13:06:49 +10:00
OJ
3a3e77942b
Fix small issue with calling convensions in x86 2020-04-22 13:06:49 +10:00
OJ
c8aa435b3c
Finally removed delay loading from the last extension: extapi 2020-04-22 13:06:49 +10:00
OJ
4cd3a29319
Remove delay loading from the kiwi extension 2020-04-22 13:06:48 +10:00
OJ
f4f6bb01d8
Remove delay loading from mimikatz 2020-04-22 13:06:48 +10:00
OJ
472a6b1f9e
Move incognito to no more delay loading 2020-04-22 13:06:48 +10:00
OJ
86a4763164
Update powershell extension to avoid delay loading 2020-04-22 13:06:48 +10:00
OJ
05d5a16fe5
Get the python extension working without delay loading 2020-04-22 13:06:47 +10:00
OJ
ce8544bd2d
Move sniffer over to metserv api 2020-04-22 13:06:47 +10:00