1
mirror of https://github.com/rapid7/metasploit-payloads synced 2024-12-21 05:35:54 +01:00
Commit Graph

846 Commits

Author SHA1 Message Date
OJ
8bf94a4a40 Missed small case when merging r109 (the important one!) 2014-04-02 12:44:36 +10:00
OJ
7828cb9ba2 Merged r111 from Mimikatz source 2014-04-02 12:40:39 +10:00
OJ
6ef340c46d Merged r110 from Mimikatz source 2014-04-02 12:39:44 +10:00
OJ
51d831ac20 Merge r109 from the Mimikatz source 2014-04-02 12:32:59 +10:00
OJ
7c8d38efd2 Merge r108 from Mimikatz source 2014-04-02 08:26:11 +10:00
OJ
0a8e022f41 Added a stack of debug output 2014-03-28 16:12:29 +10:00
OJ
5988a9dbad Moved the last of the bits over to group packets for kiwi 2014-03-28 14:24:27 +10:00
OJ
02312e1972 Debugging output, crash fix
In some cases this extension would crash. This was due to the code using the
incorrect "length" variable when dumping LSA data. This commit includes addition
of some debug output, removal of other debug output, and changing of the
kiwi-specific debug definition.

Another packet function was added to aid in construction of this fix, and the
group packet function was added to one of the calls.
2014-03-28 13:40:02 +10:00
OJ
e40f1a0eaf Fix missing field on x64, use packet groups
Despite rigorous testing, the x64 version seemed to be dropping a column
from the result set. This would appear to be due to the differences in
the way the x86 version of the API handles the ubound parameter of the
enumeration.

x86 ubounds are inclusive, where as x64 are exclusive. Hence in the case
of x86 we need to subtract one from the field set, but not in x64.
2014-03-21 17:22:46 +10:00
OJ
637e839de2 Merge branch 'upstream/master' into ext_server_kiwi 2014-03-20 09:17:18 +10:00
Tod Beardsley
369e83318e Land #80, lots of @OJ PRs
This lands:

rapid7/meterpreter#69
rapid7/meterpreter#70
rapid7/meterpreter#75
rapid7/meterpreter#77
rapid7/meterpreter#78

All have been tested sufficiently, and once this lands, the binaries as
well as the library and module updates represented by
rapid7/metasploit-framework#3122 will also land.
2014-03-19 15:33:25 -05:00
Tod Beardsley
55aec0fbf0 Update README.md to mention flex
Or else you get the problem I saw in validating rapid7/meterpreter#78
2014-03-19 11:34:42 -05:00
Tod Beardsley
3d818f9be4 Land #78, fix to the make script path 2014-03-19 08:40:30 -05:00
Tod Beardsley
fae26b4b3d Land #77, Service control support
This also wants rapid7/metasploit-framework#3085
2014-03-19 08:39:45 -05:00
Tod Beardsley
ef6411271b Land #75, adds Group Packets to Meterpreter 2014-03-19 08:39:24 -05:00
Tod Beardsley
bea18dd6f0 Land #70, Expand ADSI types 2014-03-19 08:39:04 -05:00
Tod Beardsley
38bf1d360c Land #69, WMI support
This also wants rapid7/metasploit-framework#2889
2014-03-19 08:38:39 -05:00
OJ
1a2023ee53 Force-add libs that were missing 2014-03-19 19:32:51 +10:00
OJ
32c7126793 Fixes, documentation and tidying of kiwi code 2014-03-19 17:48:44 +10:00
OJ
83d4d2b0b7 Fix leaking memory 2014-03-19 15:01:02 +10:00
OJ
1791ab8a3a Add kerberos ticket dump support
Also fix up a few other niggles.
2014-03-19 14:26:55 +10:00
OJ
b59676d28e Add SAM key output to the LSA secret dump 2014-03-18 09:50:48 +10:00
OJ
43d362fb1e Enable LSA secret dumping 2014-03-14 19:51:35 +10:00
OJ
e3628d0662 Change make script to work from correct folder
The existing make file would use `pwd` to figure out the current
folder instead of using the base directory of the script. This
causes issues when running commands from different locations (such
as in the case of from the meterpreter_binds folder).

This commit fixes this problem.
2014-03-12 17:25:22 +10:00
OJ
a54e37f301 Remove unused defintion 2014-03-12 06:58:47 +10:00
OJ
f7468732ec Fix incorrect comment for the WMI query function 2014-03-12 06:58:19 +10:00
OJ
49877fda24 Fix comment type and reverse ternary condition 2014-03-12 06:53:05 +10:00
OJ
f1fbf2064f Enable service control and status in queries.
This commit adds service status to the query functionality for a single
service so that it doesn't have to be found in the full list of services.

It also adds the ability for the caller to control services using the
typical start/stop/pause/resume/restart style functions. To use these
functions the caller has to have appropriate rights.
2014-03-11 14:49:19 +10:00
OJ
a4beeba7bc Rejig service initialisation
Gathering of function pointers is now done during initialisation. This
means that it doesn't have to be done each time a function is called
and allows for reuse across other functions.
2014-03-11 09:37:36 +10:00
OJ
063d370e86 Change thread creation to support x86->x64
The create thread functionality would work in all cases except where
the thread was being created in an x64 process from an x86 process.

This commit adds support for this by reusing the wow64 injection code
in this case.
2014-03-10 11:37:43 +10:00
OJ
d8f86c1806 Merge branch 'upstream/master' into wmi_query_support
Conflicts:
	make.bat
	workspace/ext_server_extapi/ext_server_extapi.vcxproj
2014-03-07 08:11:35 +10:00
OJ
a7927a4105 Added the notion of "group packets"
A group packet is a special packet that is to be used as a group of TLVs that
will live under another packet. Using this functionality means that we can
easily nest groupings of data to arbitrary depths, which wasn't something we
were able to do before easily.

The MSF side is easily capable of handling this scenario, but this side had
always been lacking.

The clipboard dump code has been updated to show how this can be used.
2014-03-04 19:38:15 +10:00
OJ
e202ce3959 Merge from source r107 2014-03-04 12:29:06 +10:00
OJ
c4d9ba567f Merge from source r106 2014-03-04 12:15:30 +10:00
OJ
386df98a08 Merge from source r105 2014-03-04 11:30:59 +10:00
OJ
2b2508b8c9 Merge from source r104, fix silly typo in file name 2014-03-04 11:07:58 +10:00
OJ
c3e57bb6c1 Merge changes from source r103 2014-03-04 10:45:15 +10:00
OJ
9622deaddf Merge changes from source r102 2014-03-04 10:41:31 +10:00
OJ
d8760fdf9a Merge branch 'upstream/master' into ext_server_kiwi 2014-03-03 17:30:37 +10:00
OJ
62140f8fa1 Pulled in master and added a fallback for the SID stuff
I just realised I shouldn't have done that in a merge commit.

Conflicts:
	workspace/ext_server_extapi/ext_server_extapi.vcxproj
2014-02-28 13:32:37 +10:00
OJ
256e43cde3 Change the binary->string converter, add SID, warnings as errors
The existing implementation wasn't really solid and I never liked it
anyway. Egypt rightfully pointed out flaws in the code, so it has
been changed so that it allocates the required memory up front
and returns that string to the caller, who then has to free it up.

Added a function to render SIDS.

Made the build set warnings as errors. Still no idea why this wasn't
the case already.
2014-02-28 13:21:33 +10:00
OJ
ce9cfa6c2e Fix silly typo in header comment 2014-02-21 13:01:59 +10:00
James Lee
7ea5d4d35a Land #72, create_remote_thread fixes 2014-02-19 16:14:09 -06:00
OJ
f74962cf2f Reinstate stack size parameter
Previous commits removed the stack size parameter from the remote thread
creation function call. This caused issues in systems prior to Vista/2k8.

This fix puts that value back in and now everything is honky dory.

Tested on 2k/XP/2k3/Vista/7/2k8
2014-02-12 13:27:41 +10:00
James Lee
2c9a8cf9ab Whitespace 2014-02-10 16:45:58 -06:00
James Lee
7d823d1634 Land #71, hashdump fixes 2014-02-10 15:26:54 -06:00
sinn3r
63d516750f Land #74 - clipboard monitor 2014-02-05 19:45:07 -06:00
sinn3r
f0be562baf Merge branch 'clipboard_monitor' of github.com:OJ/meterpreter into OJ-clipboard_monitor 2014-02-05 19:44:28 -06:00
OJ
94468e1313 One last tweak to remove all evidence of stupidity 2014-02-05 23:06:10 +10:00
OJ
cca2f14835 Fix number of issues revealed in x64 testing
Thanks to sinner being on the ball, x64 was broken and causing some
crazy things to happen. The CPU would peg at 100% despite x86 being
quite happy. It turns out, I suck at C, so I had to fix that up.

This commit includes the following changes:

* Fix up the WNDPROC callback so that the parameters are in the right
  order.
* Specify the correct array size for wait handles in the monitor thread.
* Add extra debugging.
* Handle WM_* messages correctly and add WM_NCCREATE.
* Correctly use the CREATESTRUCT to pass in the state.

"How on earth did this ever work?"

Fixed now, thanks again sinner!
2014-02-05 22:37:55 +10:00