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

606 Commits

Author SHA1 Message Date
Tod Beardsley
3114ebe8e9 More README lies about build targets 2014-01-07 16:14:44 -06:00
Tod Beardsley
044c262134 Land #63, update openssl sources. 2014-01-07 16:05:49 -06: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
OJ
7f2bdf0215 Add a couple more VS things to .gitignore 2013-11-27 06:37:38 +10:00
OJ
df82feedac Add support for getting environment variable values
This is a new command in the stdapi which allows the caller to pass in a set of
environment variable names and retrieve a hash of the names and values.
2013-11-26 09:37:56 +10:00
James Lee
970713114d Land #55, check_key_exists 2013-11-25 16:07:51 -06:00
OJ
8090a6393e Fix migrate exit condition
I felt into the C progrmmer's trap of accidentally using `=` instead of `==`. This is
not good. Good catch @jlee-r7.

This commit fixes this, swaps the values around and tidies up code a bit.
2013-11-26 07:07:26 +10:00
OJ
31fdf23f7b Comment fixes 2013-11-26 06:56:34 +10:00
OJ
9f4a66ba8a Fix small issue with return results 2013-11-25 16:28:47 +10:00
OJ
db764771a2 Add check_key_exists registry function
MSF side has been attempting to open keys to see if they exist, which isn't
fantastic as it results in an error. This change adds a function which indicates
to the caller if the given reg key exists.
2013-11-25 16:17:32 +10:00
Tod Beardsley
3cf63909a7 Land #54 to fix RM8696
[FixRM #8696]
2013-11-22 09:56:17 -06:00
OJ
5812d59059 Fix meterpreter not shutting down properly
The work that was done a while back to fix up command dispatching allowed
inline commands to run so that the server could be told to shutdown. Those
commands that want the server to terminate (such as migrate and shutdown)
should have returned `FALSE` instead of `TRUE` to tell the server thread to
stop.

I have no idea why those values were incorrect, but it's my work so it's
definitely my fault. I will have to sick back and lick my wounds for a while.
I hate it when I'm stupid.

Thanks to Kevin Mitnick for the bug, and @todb-r7 for the investigating the
history.

Redmine: [FixRM #8696]
2013-11-22 12:38:50 +10:00
OJ
c947f9d1f6 Add more documnetation, tidying
More of the usual, added during investigations.
2013-11-22 12:22:48 +10:00
OJ
f3eaadd184 Change POSIX macros to avoid exit and abort
I found that the BREAK_* macros behaved differently on POSIX and in
some cases this was causing a brutal exit of POSIX meterpteter in
cases where it should just gracefully fail.

After talking to egypt, we decided to use `break` statements instead
given that's how it should function.
2013-11-22 09:07:05 +10:00
OJ
0864ef2e34 Fix incorrect error usage and bind issue
During the call which establishes a TCP client channel, the call
to `connect` can sometimes fail if the settings that are used are
incorrect (such as an invalid port number). When this call fails
the result was being set to `GetLastError()`, which isn't correct.

On Windows it should be `WSAGetLastError()` and on POSIX the `errno`
value should be used instead. This wasnt causing issues on Windows
but on POSIX it was causing problems because the `GetLastError()`
call was returning zero, which was returned to the function that
invokes `create_tcp_client_channel()`.

Given that `ERROR_SUCCESS` == 0, the caller believed the function
had completed successfully and hence relied on context being set up
correctly. This was resulting crashes because this obviously wasn't
the case.

I also added a code chance which makes meterpreter attempt to bind
to `0.0.0.0` if binding to the specified address fails.
2013-11-22 09:02:06 +10:00
James Lee
3fd2153027 Land #45, extapi 2013-11-21 11:35:26 -06:00
James Lee
46126ac21f Land #53, warnings as errors 2013-11-21 11:12:55 -06:00
OJ
48f9ae5116 Fix commands to properly invoke base and extensions
In previous work done during the command refactor the mechanism for overriding
commands changed such that it wasn't invoking commands if they were overriden
by an extension. This, it would appear, broke some stuff. Badly.

This commit fixes this issue by reinstating the way things were done before.
If a base command exists, it is always executed. If an extension also exists
which overrides this command then the base command result is ignored, the
extension command is executed, and the result of that command is returned.
2013-11-21 13:40:54 +10:00
OJ
5a1d5bbbe9 Set "warnings as errors"
Now that the build is clean, warnings are now errors to keep it clean.
2013-11-20 11:35:43 +10:00