1
mirror of https://github.com/rapid7/metasploit-payloads synced 2025-03-24 18:16:24 +01:00

187 Commits

Author SHA1 Message Date
OJ
801b48aa1e Merge branch 'upstream/master' into transport-refactor 2015-06-26 15:23:58 +10:00
OJ
d107004a88 Add the uuid command support 2015-06-26 14:48:40 +10:00
OJ
b6a3c41e40 Last print statements removed 2015-06-26 14:27:45 +10:00
OJ
3afca8dc40 Remove log statements 2015-06-26 14:24:38 +10:00
OJ
e69933b540 Remove lots of debug output 2015-06-26 14:08:31 +10:00
OJ
c8aeb38847 Small tweaks to support both java and android 2015-06-26 13:58:20 +10:00
OJ
2fcfa92387 Add support for transport remove 2015-06-25 21:59:31 +10:00
OJ
c96724fab5 Better edgecase handling, process termination on exit 2015-06-25 21:38:01 +10:00
OJ
0455f5271d Add transport change, next, prev, sleep
Along with a few other tweaks to make things clean up properly and keep
the MSF side happy.
2015-06-25 21:17:45 +10:00
OJ
1d67e972f6 Add transport adding functionality 2015-06-25 15:17:23 +10:00
OJ
986b99abac Add the rest of the code that supports transport list 2015-06-25 14:54:38 +10:00
OJ
c0a72715cd Add transport list support 2015-06-25 14:09:03 +10:00
OJ
b62971d265 Implemented proper timeout modification
Also added the socket poll timeout to the stager
2015-06-25 13:29:13 +10:00
OJ
691559e641 Initial wiring for stageless URL switching
This actually started because of something else, and I realised that
I didn't need to do it. But this will be useful for stageless stuff, so
it's staying in there for now until the commands and other wiring are in
place to make the magic happen.
2015-06-24 22:36:33 +10:00
OJ
85f2e12165 Reconnect vs connet handling for HTTP/S 2015-06-24 21:57:08 +10:00
OJ
fbbff1e7b4 Add support for HTTP/S transports
Still need to add certificate hash validation, proxy support, and
modifiable user agent.
2015-06-24 21:25:23 +10:00
OJ
f03ad14292 Move new classes into the proper locations 2015-06-24 20:22:09 +10:00
OJ
bbe1ab529b Transport refactoring, dispatch functionality, and more
This commit adds a new idea to the dispatch loop that allows commands to
exit. It also adds the core_shutdown command so that it functions
correct. There are a bunch of other changes around transports as well,
and this commit adds a "resilient" TCP transport.

HTTP/S to come. progress being made. This commit is messy with debug
statements all through it, and they'll get removed down the track.
2015-06-24 19:57:09 +10:00
OJ
4ed2b484f0 Modify the staging process 2015-06-24 13:20:25 +10:00
Joao Pena Gil
b47ed549c8 Added SuperSU.apk to check_root 2015-06-23 15:25:08 +01:00
Tim
ac3d244538 add machine_id and fix sysinfo as root 2015-06-03 08:12:38 +01:00
Brent Cook
e4af7abf22 Land , fix thread race condition 2015-06-01 08:00:26 -05:00
Tim
cd0d091eb0 fix race condition 2015-06-01 07:15:19 +01:00
Tim
4cef8cfbb1 fix http sluggishness 2015-05-27 13:13:33 +01:00
Tim
509e67b27a add ssl cert validation 2015-05-20 07:28:20 +01:00
Tim
d02a5e41e4 add ability to change retry_wait/retry_total at runtime 2015-05-19 20:03:58 +01:00
Tim
7bbe4f5794 Merge branch 'master' into retry_options
Conflicts:
	androidpayload/app/src/com/metasploit/stage/Payload.java
2015-05-19 17:31:44 +01:00
Tim
5c362ad256 cleaner contextless meterpreter 2015-05-19 17:19:38 +01:00
Tim
ba2433a16f fix termination 2015-05-19 17:19:11 +01:00
Brent Cook
8a6e26af80 fix a little more whitespace, remove superfluous ; 2015-05-19 10:33:34 -05:00
Tim
57adddb803 fix http 2015-05-19 16:14:37 +01:00
Tim
6101c78a5b code formatting 2015-05-18 07:03:15 +01:00
Tim
a66ec09285 wait for the context object 2015-05-18 06:55:31 +01:00
Tim
d1e69b2d43 format all code with the default intellij java formatter 2015-05-17 19:05:21 +01:00
Tim
5fce838afc add support for configurable retry options 2015-05-17 18:56:30 +01:00
Brent Cook
3ba13e719a Land , switch FILE_HASH to use RAW, strings to use UTF-8 2015-05-15 09:58:38 -05:00
Tim
98aa4babbf fix Payload.start 2015-05-12 04:25:33 +01:00
Tim
6586bd0df8 add TLV_TYPE_FILE_HASH 2015-05-10 15:05:45 +01:00
Brent Cook
5998658155 wait up to 5 seconds for shell output before checking the result.
otherwise, we can jumpt the gun and fail the test randomly
2015-03-26 01:14:38 -05:00
Brent Cook
fdebac9f9d Land , @timwr switch back to background thread after finding Context 2015-03-22 21:48:20 -05:00
Brent Cook
d0ef907199 Land @jlee-r7 handle broken isHidden with GCJ 2015-03-22 17:34:47 -05:00
Brent Cook
e891c7fcd0 treat strings in TLV packets as UTF-8 2015-03-19 15:21:08 -05:00
Tim Wright
3b59d513b5 Fix AndroidMeterpreter when running on Main thread 2015-03-13 23:29:42 +00:00
James Lee
78084a2d20 Fix stat when isHidden() is broken
Works around a bug in GCJ
2015-03-09 01:39:00 -05:00
Brent Cook
bab206fd92 Land , @jvazquez-r7's MBean loading support 2015-02-02 13:08:03 -06:00
Brent Cook
a0388b42d1 don't everybody get the same IDEA 2015-02-02 13:06:29 -06:00
Brent Cook
379b455a10 Land , @schierlm's meterpreter plugin maven archetype 2015-02-02 09:55:00 -06:00
Brent Cook
b7c0e49907 s/module/class/ 2015-02-02 09:52:29 -06:00
Brent Cook
65058c6dba update sample module code and provide property defaults 2015-01-30 18:50:59 -06:00
jvazquez-r7
ca95627f3c Add interface and class to support MBean loading 2015-01-14 18:09:06 -06:00