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

622 Commits

Author SHA1 Message Date
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
e12b0e2dce Add a bit of debug info 2014-01-22 10:31:16 +10:00
OJ
3cde9b69c2 Update ADSI code to support more types
When non-supported types were returned in queries, ADSI just pooped
itself and tore down the Meterpreter session. This a happy tester
Meterpreter does not make!

This code includes more support for ADSI types with attempts to be
semi-sane in stringifying them.

Plus, Meterpreter no longer crashes.
2014-01-22 10:09:42 +10:00
Tod Beardsley
5b35852e32 Land #68 to resolve the Redmine issue.
FixRM #8747
2014-01-16 13:34:21 -06:00
Tod Beardsley
ffa8a9a04c Update GitHub status.
SeeRM #8747
2014-01-16 13:32:46 -06:00
James Lee
5db4f962b9 Land #66, fix incognito ptr truncation 2014-01-15 13:03:30 -06:00
OJ
6bb128dcbf Merge branch 'upstream/master' into incognito_pointer_truncation_fix 2014-01-15 17:13:26 +10:00
William Vu
7f3bbe6911 Land #67, command impersonation fix 2014-01-15 01:02:37 -06:00
OJ
07f2c00559 Fix command impersonation
In a previous commit, I rejigged the way commands were overloaded,
and added what appeared to be a micro-optimisation to prevent
the thread from being imperonsated twice. Ultimately it wouldn't
make any differnce, so why I put it in there I really don't know.

The optimisation actually resulted in a breakage in the case where
base commands weren't present but extension commands were. As a
result all extended commands didn't get impersonated unless they
were overloading. This is not a good thing at all.

This fix removed that total stupidity and restores some level of
sanity.

Apologies for my idiocy.
2014-01-15 16:35:17 +10:00
OJ
1b0be5f3c5 Remove unused param, force 'treat warnings as error'
For some reason this project setting wasn't present in incognito.
2014-01-15 15:53:02 +10:00
OJ
2c300df811 Fix pointer truncation during process iteration
In similar vein to the migration issue, incognito was crashing when
running under SYSTEM processes (such as lsass.exe). This was because
of a pointer truncation problem when processes were being enumerated.

There was also some other quirky logic going on, but nothing too
damaging. I added some other simple code tidies while I was in there.
2014-01-13 20:56:13 +10:00
OJ
518611b2f6 Land #65 2014-01-08 08:17:55 +10:00
Tod Beardsley
4588057616 Land #64, check and exit w/o submodule 2014-01-07 16:18:43 -06:00
Tod Beardsley
3114ebe8e9 More README lies about build targets 2014-01-07 16:14:44 -06:00
OJ
140c3bde5a Land #3
Thanks Tod for fixing my stupidity.
2014-01-08 08:07:10 +10:00
Tod Beardsley
044c262134 Land #63, update openssl sources. 2014-01-07 16:05:49 -06:00
Tod Beardsley
6a6e82f611 Actually check if the submodule is there 2014-01-07 15:56:15 -06:00
OJ
bdea197999 Update documentation and makefile for submodules
* We now check to make sure that the required files are on disk and
  show an error message if not found.
* README updated to indicate that submodule initialisation is needed.
2014-01-08 07:37:01 +10:00
Meatballs1
10adb2c03f Merge pull request #2 from todb-r7/update-readme-for-https
make README.md consistent w https
2014-01-07 13:12:47 -08:00
Tod Beardsley
734b1f03da Derp add www. too 2014-01-07 14:50:22 -06:00
Tod Beardsley
19e06ff406 make README.md consistent w https 2014-01-07 14:48:18 -06:00
Meatballs
5db286bc4b Dont trust http... 2014-01-07 12:48:39 +00:00
Meatballs
c5bcc09f81 No line wrap 2014-01-07 12:46:52 +00:00
Meatballs
2e54b4733e Use full dns name 2014-01-07 12:45:09 +00:00
Meatballs
880c247554 Land #60, Add ADSI support to ExtAPI 2014-01-07 11:23:07 +00:00
OJ
d7b0e6d3fd Default to a sensible page size if not given 2014-01-07 17:19:53 +10:00
OJ
fda91a3f1d Last debug code, force valid result
Sometimes results can be success values but not S_OK, so this change
contains code which will force the result to S_OK in those cases so that
the caller doesn't get an indication which makes it believe that there is
an error.
2014-01-05 19:59:43 +10:00
OJ
e0da82d12b Extra debug info, force adsi limit
The ADSI API is supposed to support the notion of only returning
a fixed number of results from AD when we specify the
ADS_SEARCHPREF_SIZE_LIMIT value in the search parameters, but it
doesn't appear to do that (at least not my Win2k setup).

This change includes a bit more debugging output and keeps track of
the number of rows processed so that the maximum site is actually
honoured.
2014-01-05 19:46:52 +10:00
OJ
243d3da596 Merge branch 'upstream/master' into basic_asdi_support 2014-01-05 18:46:40 +10:00
OJ
fa685928ed Fix incorrect comment 2014-01-03 13:39:28 +10:00
James Lee
7260569bd1 Land #56, command overloads 2014-01-02 16:57:59 -06:00
OJ
9ac338c3dc Land #62 2013-12-31 12:51:32 +10:00
James Lee
842cd54d30 Remove the lie introduced by #38 2013-12-30 20:37:38 -06:00
OJ
445df8ad36 Merge branch 'upstream/master' into command_req_update
Conflicts:
	source/ReflectiveDLLInjection
2013-12-21 13:31:28 +10:00
OJ
015c92ddf6 Merge branch 'master' into basic_asdi_support
Conflicts:
	source/ReflectiveDLLInjection
2013-12-20 10:36:48 +10:00
OJ
22ae01fb50 Fix indenting problem 2013-12-20 08:18:56 +10:00
Meatballs
0f4f470761 Land #59 Reflective DLL Submodule
Conflicts:
	source/ReflectiveDLLInjection
2013-12-19 21:00:20 +00:00
OJ
dffcb3ab4f Fix page size and max results 2013-12-11 01:02:06 +11:00
OJ
b7f1c2c538 Add support for page size 2013-12-09 00:30:08 +11:00
OJ
ad86ac5b5c Fix handling of numerics 2013-12-08 20:58:25 +10:00
OJ
4e01c9ef98 Refactor into generic query
Querying is now generic so that more flexibility is made available to
the attacker.
2013-12-08 20:30:51 +10:00
OJ
3ba9b0549b Small code refactor 2013-12-08 14:47:52 +10:00
OJ
7b19766f3c Add support for computer and user enum via ADSI 2013-12-07 00:15:19 +10:00
James Lee
7c69813215 Land #57, bad conditional 2013-12-02 10:02:49 -06:00
OJ
1a3368035f Merge branch 'master' into command_req_update
Conflicts:
	source/extensions/stdapi/server/stdapi.c
2013-11-28 21:26:21 +10:00
James Lee
911aa47275 Land #58, getenv 2013-11-26 23:28:23 -06:00
OJ
71c864cc11 Update bare extension template to use RDI submodule 2013-11-27 14:15:48 +10:00
OJ
c6bdc26a55 Update Meterpreter to use the RDI submodule 2013-11-27 14:01:45 +10:00
OJ
5280bb7b06 Remove RDI from the source
Also move the delay loading code to another location as this isn't part of
the RDI source, but was included there beforehand.
2013-11-27 12:52:17 +10:00
OJ
550da5946e Merge branch 'upstream/master' into command_req_update
A few minor issues around formatting collisions, nothing huge.
.gitignore fixes too

Conflicts:
	source/common/base_dispatch_common.c
	source/extensions/stdapi/server/stdapi.c
2013-11-27 06:51:12 +10:00