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

459 Commits

Author SHA1 Message Date
OJ
984880d8b2 Add service_query to ext_server_extapi
Once the user has queried the list of services they can now use the
`service_query` function to get more detail about a specific service.
2013-10-11 01:01:47 +10:00
OJ
f720ca7bdb Add service_enum to the ext_server_extapi extension
This commit adds the ability to enumerate services on the target machine,
showing the PID, the service name, the display name and an indication of
the service's ability to interact with the desktop.

Some other small code tidies were done too.
2013-10-10 21:20:23 +10:00
OJ
2902bf3406 Free up user32 when we're done with it 2013-10-10 18:31:22 +10:00
OJ
52e13ad2d3 New extended API extension with window enum
Decided to kick off a new extended API extension with mubix and
kernelsmith to include some more advanced enumeration stuff. The goal of
this extension is to take stuff that wouldn't be part of the std api but
is rather useful for enumeration of a target once meterpreter has been
established.

This commit kicks things off with enumeration of top level windows on the
current desktop.
2013-10-09 22:16:47 +10:00
OJ
35aada915f Fix debug build of various components
No idea why they were broken, but they shouldn't have been. This fixes
them up and tidies a few other things up, especially the guts of the
stdapi project.
2013-10-09 17:20:58 +10:00
OJ
bab7340a3f Doc changes, project fixes 2013-10-09 15:54:39 +10:00
OJ
7f2fc483dc New ext docs, remove boiler from solution
Documentation now includes how to create a new extension using the bare
extension as a sample.
2013-10-09 15:26:19 +10:00
OJ
a10ee71e1c Remove boiler extension and create 'bare' extension
The boiler extension wasn't used and was old so it was removed. I've added
a new "bare" extension which is, as it says, just bare and doesn't do
anything. This can be used to create new extension projets just by copying
and pasting, then editing a couple of small things.

This will be added to the documentation.
2013-10-09 15:08:09 +10:00
James Lee
50b7557290 Land #26, Railgun error messages
See rapid7/metasploit-framework#2443 and rapid7/metasploit-framework#740
2013-10-01 16:39:01 -05:00
Tod Beardsley
adbb8ad2ce Don't lie in the README.md 2013-09-30 16:18:57 -05:00
Tod Beardsley
f629cc4b89 Land #22, more doc and proj updates
Again, tested with a successful run of the build.
2013-09-30 16:16:39 -05:00
Tod Beardsley
0406a2f336 Land #20, update docs and project files.
Tested by merging and running a build, as proscribed by the README.md.
12 succeeded, 0 dailed, 2 skipped.
2013-09-30 16:15:31 -05:00
jvazquez-r7
864917b32d Land #24, @OJ's patch to add posix depends .gitignore 2013-09-26 18:22:40 -05:00
jvazquez-r7
07a45634bb Land #21, @OJ's fix for PIP_ADAPTER_PREFIX Length check 2013-09-26 17:46:32 -05:00
OJ
60b4a5778d Better fix for the XP SP0 problem
Thanks to @jvazquez-r7 doing some investigation we have a better solution
to this crash. This commit implements this fix and removes the need to
check the status of the memory that's being read.
2013-09-27 08:32:31 +10:00
OJ
78d4dc0c7b Add posix temp folder to gitignore 2013-09-26 15:29:33 +10:00
jvazquez-r7
edd2cc57af Land #23, @OJ's fix for kitrap0d 2013-09-25 20:52:55 -05:00
OJ
895a580cb5 Last code tidy for the kitrap0d fix
Tidies up the API to be more intuitive, including conversion of the
first parameter to a char pointer (removing MAX_PATH) and renaming
the second parameter to be more indicative of what it means.

Thanks to @jvazquez-r7 for the great discussion!
2013-09-26 11:35:05 +10:00
OJ
54cf92ff6d Updated fix to work properly with _snprintf_s
* Modified first and second parameters to use `dwOutputLength` which
  is given to the function as an indicator of buffer size in bytes
  anyway.
* Check the return value of the function call to see if the result
  was a truncation, and if so, break from the current loop.

Realistically, truncation will not happen because the default windows
installation location folder name is very short.

Thanks @jvazquez-r7 for prodding me to validate this.
2013-09-26 09:07:15 +10:00
OJ
05388502cc Fix issue with kitrap0d crashing meterpreter
Calling getsystem or getsystem -t 4 was resulting in crashes due to
an incorrect usage of sizes in a call to _sprintf_s in the kitrap0d
code. This might have come about as a result of a move to the new
compiler which is C++11.

This code forces the size check to be correct and results in the
exploit functioning correctly on all platforms.
2013-09-24 20:00:26 +10:00
OJ
ef4175156f Build status and documnetation update
* Added the build status notification to the top of the README.
* Updated the order of details in the docs (put Linux build after Windows).
* Updated the details about where this repo came from.

Note: this PR should be merged AFTER #20 for ease of merging.
2013-09-24 10:49:29 +10:00
OJ
2d96468969 Landing #8 2013-09-20 08:02:25 +10:00
Meatballs
1ed1fa6e94 Fix indent and nitpick 2013-09-19 20:22:45 +01:00
OJ
361aba7f4c Updated build documentation
Added more detail around using the appropriate configurations depending on
whether you have access to the appropriate SDKs.
2013-09-18 18:14:36 +10:00
OJ
1c07b8650b Remove unused sniffer config, add PssdkVersion setting
* Rather than having various places where the PSSDK path is set scattered
  through the solution I created a property which contains the version.
  This means we can update that version property in the project and it'll
  take effect everywhere it's required.
* Removed debug and release configurations from ext_server_sniffer.
2013-09-18 18:09:32 +10:00
Meatballs
2182a891b6 Correct indent 2013-09-17 19:24:39 +01:00
Meatballs
4090e197aa Merge branch 'master' of github.com:rapid7/meterpreter into ip_resolv 2013-09-17 19:19:51 +01:00
Meatballs
4f1c2fe1ed Dont build in nix 2013-09-17 19:18:44 +01:00
James Lee
e031cc37f1 Land #19, add 'x86' to output filenames
Conflicts:
	workspace/ext_server_mimikatz/ext_server_mimikatz.vcxproj
	workspace/ext_server_sniffer/ext_server_sniffer.vcxproj
2013-09-16 23:56:52 -05:00
James Lee
51fa8f3b7d Land #18, sniffer fixes 2013-09-16 23:46:44 -05:00
James Lee
dacc03bd10 Land #15, add a LICENSE file 2013-09-16 23:36:48 -05:00
James Lee
a463f44e5b Land #17, doc updates 2013-09-16 22:02:03 -05:00
OJ
7b3d45f1fd Remove redundant entries in makefile 2013-09-17 09:29:10 +10:00
OJ
b442d17082 Change output file names
As per @jlee-r7's request I've changed the output of both 32 and 64 bit
components so that the platform is included in the file name.

I also added "make clean" to the make script.
2013-09-17 07:24:27 +10:00
OJ
8070ff7771 Possible fix for XP SP0 System process exploit crash
Exploitation of the System process on Windows XP SP0 resulted in crashes
when metepreter was enumerating network interfaces. It appears that the
System process isn't able to read from the address that contains prefixes
(stored in pPrefix in interfaces.c). In other cases, such as exploitation
of svchost.exe or via an msfpayload-generated exe, there was no such
crash. This is not an issue on later versions of Windows.

This crash happens in the current "production" version of Meterpreter that
was deployed with MSF v4.7.

The MS08-067 exploit targets the System process, and hence crashes.
The MS03-26 exploit targets svchost, and hence does not crash.

Checking the protection of the memory in each of those cases showed that
the MEM_COMMIT was set when not the System process, and was MEM_RESERVED
when it was. Sample runs can be seen here: http://pastebin.com/2WHqJ90A

This commit is an attempt to avoid this crash down the track, and it just
does a simple check to see if querying the area of memory for the current
process shows a state of MEM_COMMIT. If so, it carries on as per normal,
if not it uses the other legacy code path to traverse the network
interfaces.

With this "fix" in place I have not seen a crash at all on Windows XP,
Windows 7, Windows 8 and Windows 2012.
2013-09-16 23:14:10 +10:00
OJ
b9e58daa96 Remove unused project
* Accidentally added a project to the FS, this commit removes it.
2013-09-16 16:05:33 +10:00
OJ
99771d367e Removal of more warnings in compilation 2013-09-15 00:06:49 +10:00
OJ
73c3a2cfcd Support Rapid7 internal builds, fix sniffer ext
* r7_debug and r7_release configurations added.
* Make now detects if the appropriate libraries are on disk and will build
  whatever it can. If PSSDK is present in the appropriate location then it
  will attempt to build ext_server_sniffer.
* ext_server_sniffer is now buildable with VS 2012 with all the settings
  correct.
* ext_server_sniffer was failing to load once built. The cause of this was
  that the hMetSrv handle wasn't being set to a valid value prior to the
  command_register calls happening, it was being set too late. I'm not
  sure why this results in a crash, but moving this one call to a location
  prior to the command_register calls does resolve that problem.
2013-09-15 00:00:20 +10:00
OJ
101788efa0 VS 2012 doc improvements
* Removed the old README.md from the `workspace` folder.
* Adjusted the build documentation in the main README.md.
* Added details of how to make sure VS2012 has beeen updated so that
  things are able to be build.
2013-09-14 16:21:10 +10:00
James Lee
59fb63c3e2 Land #16, VS2012 upgrade 2013-09-14 00:12:44 -05:00
OJ
f0e7e0ec3c Add error message support to the railgun code
This code was lost in the transition when the meterpreter source was
removed from the metasploit-framework source. I'm pulling this in by
request of @dmaloney-r7 who originally requested this code be inculded
as part of https://github.com/rapid7/metasploit-framework/pull/740

I added an extra bit of code to free up memory that is allocated by the
call to FormatMessage and forced the ASCII-version (FormatMessageA) of
the call.
2013-09-13 06:15:48 +10:00
OJ
7c5e7e930c Fix typo in ReflectiveLoader comment 2013-09-12 07:25:18 +10:00
OJ
68c7202015 Specify Rapid7 in appropriate location in LICENSE 2013-09-12 06:41:33 +10:00
OJ
03706b842f Reflective DLL Injection update, bugfix and tidy
* Pulled source from Stephen Fewer which contains a few updates including
  support for Windows RT.
* Added Stephen Fewer's fix which includes a correct pointer size for the
  reflective DLL loader function.
* Added ENABLE_STOPAGING to allow toggling of VirtualLock() call (defined
  by default).
* Added ENABLE_OUTPUTDEBUG to allow toggling of calls to pOutputDebug
  (undefined by default).
* Remove more warnings in some areas of the code.
2013-09-10 17:36:49 +10:00
OJ
65caf757da Add 3-clause BSD license, plus dependency sub-licenses
* Include the 3-clause BSD license for Metepreter.
* Include licenses for dependencies as specified in the original Metasploit license file.
2013-09-10 16:15:19 +10:00
Stephen Fewer
cf66b0213b bugfix for the x64 pointer truncation issue. 2013-09-05 09:17:45 +01:00
OJ
7ce3766b11 Updated readme, fix make
* Tweak to the make.bat file.
* Updated README to indicate how to build with VS express.
2013-09-04 00:05:08 +10:00
OJ
fbb84f4718 Basic command line builds 2013-09-03 22:31:38 +10:00
OJ
23c9f86241 Rebuild jpeg lib, bit of cleanup 2013-09-03 20:09:52 +10:00
OJ
35bef0be11 Post-build event changes
* Copy output to different locations for different builds
2013-09-03 17:22:18 +10:00