Commit Graph

267 Commits

Author SHA1 Message Date
adfoster-r7 9a40e2612b Land #17129, Add OSX Aarch64 Payload support 2023-08-02 18:37:56 +01:00
adfoster-r7 f3adc3f79f Fix invalid references in modules 2023-07-27 16:02:37 +01:00
usiegl00 1c5b88c59f Update CachedSize for Mettle 2023-06-19 12:23:40 +02:00
adfoster-r7 0d9cca79b4 Fix crash when generating payload sizes 2022-11-04 02:10:58 +00:00
Spencer McIntyre 83de0924f0 Move #generate_stage to #generate for singles 2022-09-22 12:55:41 -04:00
space-r7 664a3eb89c bump mettle to 1.0.20 2022-09-16 18:20:06 -05:00
space-r7 1e18013a9b update payload cached sizes 2022-08-30 10:15:36 -05:00
dwelch-r7 1f4ee19c05 Expose options for logging to a file in mettle 2022-05-06 14:36:55 +01:00
bwatters f3f3f8726c update payload cache sizes 2022-01-27 09:18:08 -06:00
Tim W d7ba48426d update payload cached sizes 2021-12-10 06:15:28 +00:00
dwelch-r7 f2292c4b5c update payload cache sizes 2021-10-18 17:33:32 +01:00
Tim W dd76fe4d07 update payload cached sizes 2021-09-28 15:30:17 +01:00
Grant Willcox fb9aa68b7a Comment out several additional parts of the shellcode for better clarity 2021-04-12 17:26:46 -05:00
Geyslan G. Bem 6f5c82c388 payloads/x64: exec.rb new behaviour
This patch adds new behaviour to CMD option.

Now if CMD is empty or unset, a 21 byte not null-free execve payload is built.
The arbitrary command option continues the same when CMD is set.

It also adds the OptBool NullFreeVersion advanced option.

Its default value is false. When set as true, generate will output a
self included null-free version of the payload without need of encoding.

Signed-off-by: Geyslan G. Bem <geyslan@gmail.com>
2021-04-10 00:55:44 -03:00
Geyslan G. Bem 8e0d6d2675 payloads/x64: exec.rb metasm, refactoring
This patch converts shellcode to metasm and make it more efficient, resulting
in its size being reduced to 37 bytes + CMD length.

Signed-off-by: Geyslan G. Bem <geyslan@gmail.com>
2021-04-09 21:50:18 -03:00
Grant Willcox 0588672415 Land #15020, Update mettle payloads to 1.0.9 2021-04-09 12:33:32 -05:00
Alan Foster c7635296a1 Update mettle payloads to 1.0.9 2021-04-09 12:09:47 +01:00
Geyslan G. Bem 74a77fb66e x64/shell_bind_tcp_random_port: rip one byte off
Gets rid of one more byte and adjusts mentions to //bin/sh string.

Signed-off-by: Geyslan G. Bem <geyslan@gmail.com>
2021-04-03 12:04:32 -03:00
Tim W c05ed60dd8 update payloads cached size 2021-03-26 15:25:35 +00:00
Tim W ae322abbdf update payloads cached size 2021-03-22 21:49:50 +00:00
Spencer McIntyre 3684bc6f30 Land #14661, payload/x86/exec with metasm conversoin and NULL free variant 2021-03-12 12:02:44 -05:00
Geyslan G. Bem dc6dac3af1 payload/x86/exec.rb - logic inverted for readability
Signed-off-by: Geyslan G. Bem <geyslan@gmail.com>
2021-03-11 19:11:34 -03:00
Geyslan G. Bem 1da8c111b7 payloads/x86/exec.rb - set NullFreeVersion as required
Set NullFreeVersion as a required option.
Remove nullfreeversion redundant assignment.

Signed-off-by: Geyslan G. Bem <geyslan@gmail.com>
2021-03-11 18:31:35 -03:00
Tim W f3eafc22a2 Land #14685, linux/x64/shell_bind_tcp_random_port improvements 2021-02-05 17:14:50 +00:00
Tim W 4a68ef17fd update mettle payload cached sizes 2021-02-01 11:50:35 -05:00
Geyslan G. Bem ab307fbd87 payload/x64: shell_bind_tcp_random_port improvement
This patch reduces the payload to 52 bytes while preserving its functionality
using coordinated xchg instructions.
It also guarantees dup2 call without garbage in rax.

Signed-off-by: Geyslan G. Bem <geyslan@gmail.com>
2021-01-29 16:58:14 -03:00
Geyslan G. Bem 4ed8bd8052 payloads/x86/exec.rb - new NullFreeVersion advanced option
This patch adds the OptBool NullFreeVersion advanced option.

Its default value is false. When set as true, generate will output a
self included null-free version of the payload without need of encoding.

Signed-off-by: Geyslan G. Bem <geyslan@gmail.com>
2021-01-26 14:24:03 -03:00
Geyslan G. Bem 34223874b6 payloads/x86/exec.rb - metasm, refactoring
This patch converts shellcode to metasm and adds new behaviour to CMD option.

Now if CMD is empty or unset, a 20 byte not null-free execve payload is build.
The arbitrary command option continues the same when CMD is set.

Signed-off-by: Geyslan G. Bem <geyslan@gmail.com>
2021-01-26 11:09:25 -03:00
bwatters 1ad7ae2707 Land #14621, Refactor (reduce) linux/x64/shell_bind_tcp_random_port
Merge branch 'land-14621' into upstream-master
2021-01-21 12:38:53 -06:00
adfoster-r7 da7a51fbca Land #14584, implement the zeitwerk autoloader within lib/msf/base 2021-01-18 13:11:08 +00:00
Geyslan G. Bem d0cf0ef0e9 get rid of tabs
Signed-off-by: Geyslan G. Bem <geyslan@gmail.com>
2021-01-17 11:18:59 -03:00
Geyslan G. Bem 5edb4cd135 reduce to 53 bytes and refactor to embed nasm
Signed-off-by: Geyslan G. Bem <geyslan@gmail.com>
2021-01-17 11:11:07 -03:00
Spencer McIntyre 65dfaf9453 Update the metasploit-payloads and mettle gems 2021-01-14 10:16:17 -05:00
dwelch-r7 bad5ccbc49 Remove msf/base requires 2021-01-05 14:59:46 +00:00
dwelch-r7 1617b3ec9b Use zeitwerk for lib/msf/core folder 2020-12-07 10:31:45 +00:00
Jeffrey Martin f69dedf40b update payload sizes for mettle 1.0.2 gem 2020-08-03 12:32:33 -05:00
Spencer McIntyre dc9764a6ff Bump metasploit-payloads to 2.0.5 and updates payload sizes 2020-06-19 12:20:01 -04:00
Brent Cook 6ec8e942c2 update sizes 2020-06-09 08:59:51 +10:00
Tim W def95c41ce update payload cached sizes 2020-03-30 16:12:42 +08:00
Brent Cook 4c93933b6e HTTP pivot fixes for Meterpreter 2020-03-24 05:40:02 -05:00
Brent Cook 40cc170578 bump payload sizes 2020-03-05 10:12:14 -06:00
Shelby Pace bcd181c87d require bind tcp 2019-09-03 09:14:34 -05:00
bwatters-r7 6bf10e1f91 Fixups for syntax 2019-07-29 11:55:51 -05:00
bwatters-r7 79b7bbd2cf Update payload cache size and fix import bug 2019-07-26 13:52:36 -05:00
bwatters-r7 2f804faed9 Rubocop and @acammack cleanup suggestions 2019-07-26 12:36:59 -05:00
bwatters-r7 7c2d214af2 Clean up debugging, move options to one place and delete superflous file
change the uuid handing to prevent changes to it when it gets put in payloads
2019-07-25 19:45:05 -05:00
bwatters-r7 6ae3f97c4a Maybe include the super pingback type in the payloads? 2019-07-25 19:44:11 -05:00
bwatters-r7 39f193e649 Stupid last trailing space 2019-07-25 19:43:13 -05:00
bwatters-r7 3e765090e2 Fix some spacing 2019-07-25 19:43:13 -05:00
bwatters-r7 08a765df81 Shut up, nmsftidy.... I hope 2019-07-25 19:42:51 -05:00