James Lee
83cb65d3a2
Don't spin CPU if an fopen fails
...
Because PHP is happy to continue on just fine in that case and the loop
below will run unbounded spewing warnings about reading from `false`.
2017-02-02 19:07:58 -06:00
James Lee
3c7f78167a
Push up the preamble and modernize style
2017-02-02 17:57:03 -06:00
James Lee
ff20cf911c
Move the preamble above all other code
2017-02-02 14:53:53 -06:00
bwatters-r7
2f5845bdd7
Update cached size for payloads
2017-01-25 10:26:46 -06:00
Brent Cook
43493e310e
update payload sizes
2017-01-10 16:54:31 -06:00
William Vu
29d6cf4480
Fix nil bug in generic/custom and change opt order
...
I think PAYLOADSTR should take precedence over PAYLOADFILE. Usually,
you'll use PAYLOADFILE but might want to override with PAYLOADSTR. I
doubt this change will hurt anyone, since few people set both at once.
The payload description even says "either," so there's that.
2016-12-28 05:15:25 -06:00
William Webb
5702bd6745
Land #7674 , Move migration stub generation code into msf
2016-12-22 17:53:00 -06:00
William Webb
ea704211ca
incorporate payload stub generation changes
2016-12-22 17:50:43 -06:00
Brent Cook
fa016de78a
Land #7634 , Implement universal HTTP/S handlers for Meterpreter payloads
2016-12-13 18:13:22 -06:00
Adam Cammack
ccba73b324
Add stageless mettle for Linux/zarch
2016-12-09 18:30:52 -06:00
Adam Cammack
24cf756f5b
Add stageless mettle for Linux/x86
2016-12-09 18:29:34 -06:00
Adam Cammack
62a9a31222
Add stageless mettle for Linux/x64
2016-12-09 18:28:29 -06:00
Adam Cammack
7d36d41b20
Add stageless mettle for Linux/ppc64le
2016-12-09 18:27:22 -06:00
Adam Cammack
ee7d5fc0c9
Add stageless mettle for Linux/ppc
2016-12-09 18:25:57 -06:00
Adam Cammack
4570a7198c
Add stageless mettle for Linux/mipsle
2016-12-09 18:24:12 -06:00
Adam Cammack
25b069f6b4
Add stageless mettle for Linux/mipsbe
2016-12-09 18:23:03 -06:00
Adam Cammack
7aec68c1fe
Add stageless mettle for Linux/mips64
2016-12-09 18:21:52 -06:00
Adam Cammack
7a654ca76c
Add stageless mettle for Linux/armle
2016-12-09 18:19:58 -06:00
Adam Cammack
b74482aa6e
Add stageless mettle for Linux/armbe
2016-12-09 18:18:22 -06:00
Adam Cammack
12b296ab1a
Add stageless mettle for Linux/aarch64
2016-12-09 18:05:34 -06:00
Brent Cook
50f95f9940
Land #7681 , Get ready for stageless mettle
2016-12-09 09:31:47 -06:00
OJ
b902b4c28a
Update payload sizes
2016-12-07 15:08:45 +10:00
Adam Cammack
c5641c9681
Factor out mettle configuration
...
Also cleans up some stuff: s/url/uri/ and base-64 encodes UUIDs
2016-12-06 18:28:48 -06:00
Brent Cook
7346223a65
update payloads
2016-12-06 07:16:44 -06:00
OJ
ffee0ff1b6
Fix payload cache size issue, fix shell/bind payloads
2016-12-06 11:12:02 +10:00
OJ
72a20ce464
Merge timwr's changes that fix android/reverse_http
2016-12-01 09:59:41 +10:00
Tim
78480e31e7
remove AutoLoadAndroid
2016-11-30 21:23:14 +08:00
Tim
92751714c1
fix android/meterpreter/reverse_http
2016-11-30 20:12:00 +08:00
OJ
bdc2e7c3cd
Fix missing stager_config functions, payload sizes
2016-11-30 16:11:51 +10:00
OJ
3fad75641d
Final touches to make MSF happy with all refactorings
2016-11-30 11:30:59 +10:00
Adam Cammack
878779e14c
Fix typo in payloads/linux/armle/mettle
2016-11-29 10:12:17 -06:00
OJ
834756c337
Rework android structure to function with the multi arch payload
2016-11-29 17:55:31 +10:00
OJ
bdfaaf01b2
Make multi work with https
2016-11-29 15:51:38 +10:00
OJ
bd8f8fd6cb
More rework of payload structure to handle multi arch handlers
2016-11-29 15:21:13 +10:00
OJ
beca63645e
Revamp of java payload structure
2016-11-29 11:54:30 +10:00
OJ
e8158bd200
Add multi platform type, wire into the multi stage
2016-11-28 09:34:09 +10:00
OJ
5fdd5a7326
More progress on http universal staged handler
2016-11-25 13:00:35 +10:00
OJ
c606eabbb9
Merge 'upstream/master' into universal-handlers
2016-11-22 14:06:46 +10:00
Brent Cook
0a3acf57d1
update payload sizes
2016-11-20 19:47:17 -06:00
Brent Cook
f313389be4
Merge remote-tracking branch 'upstream/master' into land-7507-uuid-arch
2016-11-20 19:08:56 -06:00
OJ
b0970783ff
Another interim commit moving towards universal handlers
2016-11-04 13:25:02 +10:00
OJ
7895ba810d
Update payload cached size for the powershell payload
2016-11-03 02:50:13 +10:00
OJ
cc8c1adc00
Add first pass of multi x86 http/s payload (not working yet)
2016-11-03 02:44:53 +10:00
OJ
494b4e67bd
Refactor http/s handler & payloads
...
This commit moves much of the platform-specific logic from the
reverse_http handler down into the payloads. This makes the handler
a bit more agnostic of what the payload is (which is a good thing).
There is more to do here though, and things can be improved.
Handling of datastore settings has been changed to make room for the
ability to override the datastore completely when generating the
payloads. If a datastore is given via the `opts` then this is used
instead otherwise it falls back to the settings specified in the usual
datatstore location.
Down the track, we'll have a payload that supports multiple stages, and
the datastore will be generated on the fly, along with the stage itself.
Without this work, there's no other nice way of getting datastore
settings to be contained per-stager.
2016-11-02 11:33:59 +10:00
Adam Cammack
a79f860cb7
Add UUIDs to mettle stages
2016-11-01 16:58:21 -05:00
OJ
e4b4264d79
Fix psh template to avoid 100% cpu spike on CTRL+C
...
Fixes #7293
2016-11-02 05:19:52 +10:00
OJ
57eabda5dc
Merge upstream/master
2016-10-29 13:54:31 +10:00
OJ
1d617ae389
Implement first pass of architecture/platform refactor
2016-10-28 07:16:05 +10:00
Brent Cook
1a1841d441
rebuilt metasploit-payloads without debug info
2016-10-26 05:43:36 -05:00
Brent Cook
4c248ebe9e
Merge branch 'master' into land-7430-
2016-10-14 09:48:33 -05:00