1
mirror of https://github.com/rapid7/metasploit-payloads synced 2024-11-20 14:39:22 +01:00
Commit Graph

2839 Commits

Author SHA1 Message Date
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
OJ
8565f9967e
Update lanattacks to not use delay loading of metsrv 2020-04-22 13:06:47 +10:00
OJ
f7b50df020
Update peinjectory to avoid delay loading
Also added the GetExtensionName function.
2020-04-22 13:06:47 +10:00
OJ
136a58a194
Clean comments & update winpmem to avoid delay loading
Also, added the "GetExtensionName" functions to winpmum and unhook
2020-04-22 13:06:46 +10:00
OJ
9ca881235e
Change unhook extension to remove delay loading of metsrv 2020-04-22 13:06:46 +10:00
OJ
cd18f98caf
Make espia work without delay loading metsrv 2020-04-22 13:06:46 +10:00
OJ
4ffe127f04
Begin removing the delay-load dependency
The 'common' library has been removed. The only project that actually
used it was metsrv, so the code that metsrv required from common is now
directly compiled in as part of that project.

The common folder now contains files that are importanta cross all of
the projects, with a primary focus on the new "API" style function. What
this means is that MetSrv has an API that it exposes through a function
pointer that is passed to the extension when it's initialised. This
pointer references a structure with all the API functions wired in. This
means that:

* Extensions don't need to know anything about metsrv at compile time.
* The delay loading code can be removed, which was one of the last
  instances of "metsrv.dll" as a string.
* Metsrv.dll no longer exports any functions.

More to come.
2020-04-22 13:06:40 +10:00
OJ
1fb386c93b
Remove metcli and bare extension projects 2020-04-22 13:01:26 +10:00
Metasploit
4384ceffde Bump metasploit-payloads to 1.3.93 2020-04-21 20:21:00 -05:00
Jeffrey Martin
5b5c9c637d
Land #388, Toolset update to 141_xp with VS2019 2020-04-21 20:12:40 -05:00
OJ
084eccdef1
Fix Rakefile to point to new output location
This PR contains changes that will force Meterpreter binaries to be
outputted to "output" instead of the "output/<arch>" folders. So the gem
generation needs to be updated as well so that this new location is used
when generating the gem.
2020-04-22 07:41:59 +10:00
OJ
fef2c54b91
Change README to point to existing Choco package for VS2013 2020-04-22 07:17:10 +10:00
OJ
fda53ff14b
Update readme to reference vsconfig files 2020-04-21 20:18:04 +10:00
OJ
429c5f4bd8
Add VS configurations to the source to make it easy to install tools 2020-04-21 19:57:57 +10:00
OJ
42e833c8fa
Update readme slightly 2020-04-21 19:24:23 +10:00
OJ
6df6bc9c56
Update install and build instructions in the README
This now shows how to install various VS versions correctly from
scratch.
2020-04-21 18:14:18 +10:00
OJ
5ab1d39776
Slight makefile tweak 2020-04-21 10:21:51 +10:00
OJ
23b7a7b9ad
Finalise support for building on all the toolsets. 2020-04-21 09:37:11 +10:00
OJ
f8154f8e04
Finalise support for VS2013/VS2017/VS2019 & v120_xp/v141_xp
These changes allow us to build across multiple toolsets and VS
versions.
2020-04-21 08:10:42 +10:00
Metasploit
107f532d8a Bump metasploit-payloads to 1.3.92 2020-04-17 13:13:40 -05:00
bwatters
a92c036011
Land #387, fix rapid7/metasploit-framework#12580
Merge branch 'land-387' into upstream-master
2020-04-17 12:50:02 -05:00
OJ
74c9c79892
Enable multie-CPU builds
Added /MP for parallel builds, and removed precompiled headers as /Yc
isn't compat with /MP.

Not enabled for the Powershell extension because of it's .NET-ness.
2020-04-16 15:30:17 +10:00
OJ
dbe13941c3
Update mimikatz code to avoid warnings 2020-04-16 11:06:59 +10:00
OJ
124a3a7c0c
Updated deps to include new LibreSSL stuff 2020-04-16 10:59:21 +10:00
OJ
f27e09e85f
Update deps, remove unused folder 2020-04-15 14:32:01 +10:00
OJ
8f5d4bef01
Replace OpenSSL with LibreSSL in the Python extension
This was a bit of a pain, but was well worth it. Had to add a couple of
hacks to make it all work, but this is a nicer solution than having to
depend on OpenSSL and its horrendous build experience.
2020-04-15 13:43:50 +10:00
OJ
306e2f9399
Update the bare template 2020-04-14 20:13:02 +10:00
OJ
3809651b79
Fix a slight issue with the old Mimikatz extension 2020-04-14 14:42:10 +10:00
OJ
ef721b1f3c
Update make file and dependencies 2020-04-14 14:24:30 +10:00
OJ
1aea69806a
Update sniffer SDK libs 2020-04-14 14:09:12 +10:00
OJ
078a3e960f
Finalise 'Release' build for both x86 and x64 _clean_
Still need to fix dependencies and whatnot as well.
2020-04-14 13:18:25 +10:00
OJ
1a6bb89845
Update to build against new libs, remove hacks to make things work 2020-04-14 12:40:02 +10:00
OJ
443bfca952
Update JPEG lib to build with VS2019 toolset 141_xp 2020-04-14 12:29:59 +10:00