fix(payloads): updating prepend mixin in payloads

dledda-r7 · dledda-r7 · commit 4565a04510bf · 2025-01-14T09:31:03.000-05:00
diff --git a/lib/msf/core/payload/linux/bind_tcp.rb b/lib/msf/core/payload/linux/bind_tcp.rb
@@ -13,7 +13,7 @@ module Msf
 module Payload::Linux::BindTcp
 
   include Msf::Payload::TransportConfig
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::X86::Prepends
   include Msf::Payload::Linux::SendUUID
 
   #
diff --git a/lib/msf/core/payload/linux/reverse_tcp_x86.rb b/lib/msf/core/payload/linux/reverse_tcp_x86.rb
@@ -12,7 +12,7 @@ module Msf
 module Payload::Linux::ReverseTcp_x86
 
   include Msf::Payload::TransportConfig
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::X86::Prepends
   include Msf::Payload::Linux::SendUUID
 
   #
diff --git a/lib/msf/core/payload/linux/x64/reverse_sctp.rb b/lib/msf/core/payload/linux/x64/reverse_sctp.rb
@@ -12,7 +12,7 @@ module Msf
 module Payload::Linux::X64::ReverseSctp
 
   include Msf::Payload::TransportConfig
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::X64::Prepends
 
   #
   # Generate the first stage
diff --git a/lib/msf/core/payload/linux/x64/reverse_tcp.rb b/lib/msf/core/payload/linux/x64/reverse_tcp.rb
@@ -12,7 +12,7 @@ module Msf
 module Payload::Linux::X64::ReverseTcp
 
   include Msf::Payload::TransportConfig
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::X64::Prepends
 
   #
   # Generate the first stage
diff --git a/modules/payloads/singles/apple_ios/aarch64/shell_reverse_tcp.rb b/modules/payloads/singles/apple_ios/aarch64/shell_reverse_tcp.rb
@@ -9,7 +9,6 @@ module MetasploitModule
   CachedSize = 152
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
   include Msf::Sessions::CommandShellOptions
 
   def initialize(info = {})
diff --git a/modules/payloads/singles/linux/armbe/shell_bind_tcp.rb b/modules/payloads/singles/linux/armbe/shell_bind_tcp.rb
@@ -9,7 +9,6 @@ module MetasploitModule
   CachedSize = 118
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
   include Msf::Sessions::CommandShellOptions
 
   def initialize(info = {})
diff --git a/modules/payloads/singles/linux/armle/adduser.rb b/modules/payloads/singles/linux/armle/adduser.rb
@@ -16,7 +16,7 @@ module MetasploitModule
   CachedSize = 119
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::Armle::Prepends
 
   def initialize(info = {})
     super(merge_info(info,
diff --git a/modules/payloads/singles/linux/armle/exec.rb b/modules/payloads/singles/linux/armle/exec.rb
@@ -16,7 +16,7 @@ module MetasploitModule
   CachedSize = 29
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::Armle::Prepends
 
   def initialize(info = {})
     super(merge_info(info,
diff --git a/modules/payloads/singles/linux/armle/shell_bind_tcp.rb b/modules/payloads/singles/linux/armle/shell_bind_tcp.rb
@@ -9,7 +9,7 @@ module MetasploitModule
   CachedSize = 208
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::Armle::Prepends
   include Msf::Sessions::CommandShellOptions
 
   def initialize(info = {})
diff --git a/modules/payloads/singles/linux/armle/shell_reverse_tcp.rb b/modules/payloads/singles/linux/armle/shell_reverse_tcp.rb
@@ -9,7 +9,7 @@ module MetasploitModule
   CachedSize = 172
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::Armle::Prepends
   include Msf::Sessions::CommandShellOptions
 
   def initialize(info = {})
diff --git a/modules/payloads/singles/linux/mipsbe/exec.rb b/modules/payloads/singles/linux/mipsbe/exec.rb
@@ -10,7 +10,6 @@ module MetasploitModule
   CachedSize = 52
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
 
   def initialize(info = {})
     super(merge_info(info,
diff --git a/modules/payloads/singles/linux/mipsbe/reboot.rb b/modules/payloads/singles/linux/mipsbe/reboot.rb
@@ -8,7 +8,6 @@ module MetasploitModule
   CachedSize = 32
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
 
   def initialize(info = {})
     super(merge_info(info,
diff --git a/modules/payloads/singles/linux/mipsbe/shell_bind_tcp.rb b/modules/payloads/singles/linux/mipsbe/shell_bind_tcp.rb
@@ -9,7 +9,6 @@ module MetasploitModule
   CachedSize = 232
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
   include Msf::Sessions::CommandShellOptions
 
   def initialize(info = {})
diff --git a/modules/payloads/singles/linux/mipsbe/shell_reverse_tcp.rb b/modules/payloads/singles/linux/mipsbe/shell_reverse_tcp.rb
@@ -9,7 +9,6 @@ module MetasploitModule
   CachedSize = 184
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
   include Msf::Sessions::CommandShellOptions
 
   def initialize(info = {})
diff --git a/modules/payloads/singles/linux/mipsle/exec.rb b/modules/payloads/singles/linux/mipsle/exec.rb
@@ -10,7 +10,6 @@ module MetasploitModule
   CachedSize = 52
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
 
   def initialize(info = {})
     super(merge_info(info,
diff --git a/modules/payloads/singles/linux/mipsle/reboot.rb b/modules/payloads/singles/linux/mipsle/reboot.rb
@@ -8,7 +8,6 @@ module MetasploitModule
   CachedSize = 32
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
 
   def initialize(info = {})
     super(merge_info(info,
diff --git a/modules/payloads/singles/linux/mipsle/shell_bind_tcp.rb b/modules/payloads/singles/linux/mipsle/shell_bind_tcp.rb
@@ -9,7 +9,6 @@ module MetasploitModule
   CachedSize = 232
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
   include Msf::Sessions::CommandShellOptions
 
   def initialize(info = {})
diff --git a/modules/payloads/singles/linux/mipsle/shell_reverse_tcp.rb b/modules/payloads/singles/linux/mipsle/shell_reverse_tcp.rb
@@ -9,7 +9,6 @@ module MetasploitModule
   CachedSize = 184
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
   include Msf::Sessions::CommandShellOptions
 
   def initialize(info = {})
diff --git a/modules/payloads/singles/linux/ppc64/shell_bind_tcp.rb b/modules/payloads/singles/linux/ppc64/shell_bind_tcp.rb
@@ -9,7 +9,7 @@ module MetasploitModule
   CachedSize = 223
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::Ppc::Prepends
   include Msf::Sessions::CommandShellOptions
 
   def initialize(info = {})
diff --git a/modules/payloads/singles/linux/ppc64/shell_find_port.rb b/modules/payloads/singles/linux/ppc64/shell_find_port.rb
@@ -9,7 +9,7 @@ module MetasploitModule
   CachedSize = 171
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::Ppc::Prepends
   include Msf::Sessions::CommandShellOptions
 
   def initialize(info = {})
diff --git a/modules/payloads/singles/linux/ppc64/shell_reverse_tcp.rb b/modules/payloads/singles/linux/ppc64/shell_reverse_tcp.rb
@@ -9,7 +9,7 @@ module MetasploitModule
   CachedSize = 183
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::Ppc::Prepends
   include Msf::Sessions::CommandShellOptions
 
   def initialize(info = {})
diff --git a/modules/payloads/singles/linux/riscv32le/exec.rb b/modules/payloads/singles/linux/riscv32le/exec.rb
@@ -7,7 +7,6 @@ module MetasploitModule
   CachedSize = 96
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
 
   def initialize(info = {})
     super(
diff --git a/modules/payloads/singles/linux/riscv32le/reboot.rb b/modules/payloads/singles/linux/riscv32le/reboot.rb
@@ -7,7 +7,6 @@ module MetasploitModule
   CachedSize = 32
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
 
   def initialize(info = {})
     super(
diff --git a/modules/payloads/singles/linux/riscv64le/exec.rb b/modules/payloads/singles/linux/riscv64le/exec.rb
@@ -7,7 +7,6 @@ module MetasploitModule
   CachedSize = 100
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
 
   def initialize(info = {})
     super(
diff --git a/modules/payloads/singles/linux/riscv64le/reboot.rb b/modules/payloads/singles/linux/riscv64le/reboot.rb
@@ -7,7 +7,6 @@ module MetasploitModule
   CachedSize = 40
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
 
   def initialize(info = {})
     super(
diff --git a/modules/payloads/singles/linux/x64/exec.rb b/modules/payloads/singles/linux/x64/exec.rb
@@ -8,7 +8,7 @@ module MetasploitModule
   CachedSize = 44
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::X64::Prepends
 
   def initialize(info = {})
     super(merge_info(info,
diff --git a/modules/payloads/singles/linux/x64/pingback_bind_tcp.rb b/modules/payloads/singles/linux/x64/pingback_bind_tcp.rb
@@ -9,7 +9,7 @@ module MetasploitModule
 
   CachedSize = 109
 
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::X64::Prepends
   include Msf::Payload::Single
   include Msf::Payload::Pingback
   include Msf::Payload::Pingback::Options
diff --git a/modules/payloads/singles/linux/x64/pingback_reverse_tcp.rb b/modules/payloads/singles/linux/x64/pingback_reverse_tcp.rb
@@ -9,7 +9,7 @@ module MetasploitModule
 
   CachedSize = 125
 
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::X64::Prepends
   include Msf::Payload::Single
   include Msf::Payload::Pingback
   include Msf::Payload::Pingback::Options
diff --git a/modules/payloads/singles/linux/x64/shell_bind_ipv6_tcp.rb b/modules/payloads/singles/linux/x64/shell_bind_ipv6_tcp.rb
@@ -9,7 +9,7 @@ module MetasploitModule
   CachedSize = 94
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::X64::Prepends
   include Msf::Sessions::CommandShellOptions
 
   def initialize(info = {})
diff --git a/modules/payloads/singles/linux/x64/shell_bind_tcp.rb b/modules/payloads/singles/linux/x64/shell_bind_tcp.rb
@@ -9,7 +9,7 @@ module MetasploitModule
   CachedSize = 86
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::X64::Prepends
   include Msf::Sessions::CommandShellOptions
 
   def initialize(info = {})
diff --git a/modules/payloads/singles/linux/x64/shell_bind_tcp_random_port.rb b/modules/payloads/singles/linux/x64/shell_bind_tcp_random_port.rb
@@ -8,7 +8,7 @@ module MetasploitModule
   CachedSize = 51
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::X64::Prepends
 
   def initialize(info = {})
     super(merge_info(info,
diff --git a/modules/payloads/singles/linux/x64/shell_find_port.rb b/modules/payloads/singles/linux/x64/shell_find_port.rb
@@ -9,7 +9,7 @@ module MetasploitModule
   CachedSize = 98
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::X64::Prepends
   include Msf::Sessions::CommandShellOptions
 
   def initialize(info = {})
diff --git a/modules/payloads/singles/linux/x64/shell_reverse_ipv6_tcp.rb b/modules/payloads/singles/linux/x64/shell_reverse_ipv6_tcp.rb
@@ -9,7 +9,7 @@ module MetasploitModule
   CachedSize = 90
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::X64::Prepends
   include Msf::Sessions::CommandShellOptions
 
   def initialize(info = {})
diff --git a/modules/payloads/singles/linux/x64/shell_reverse_tcp.rb b/modules/payloads/singles/linux/x64/shell_reverse_tcp.rb
@@ -9,7 +9,7 @@ module MetasploitModule
   CachedSize = 74
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::X64::Prepends
   include Msf::Sessions::CommandShellOptions
 
   def initialize(info = {})
diff --git a/modules/payloads/singles/linux/x86/adduser.rb b/modules/payloads/singles/linux/x86/adduser.rb
@@ -16,7 +16,7 @@ module MetasploitModule
   CachedSize = 97
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::X86::Prepends
 
   def initialize(info = {})
     super(merge_info(info,
diff --git a/modules/payloads/singles/linux/x86/chmod.rb b/modules/payloads/singles/linux/x86/chmod.rb
@@ -13,7 +13,7 @@ module MetasploitModule
   CachedSize = 36
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::X86::Prepends
 
   def initialize(info = {})
     super(merge_info(info,
diff --git a/modules/payloads/singles/linux/x86/exec.rb b/modules/payloads/singles/linux/x86/exec.rb
@@ -16,7 +16,7 @@ module MetasploitModule
   CachedSize = 43
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::X86::Prepends
 
   def initialize(info = {})
     super(merge_info(info,
diff --git a/modules/payloads/singles/linux/x86/metsvc_bind_tcp.rb b/modules/payloads/singles/linux/x86/metsvc_bind_tcp.rb
@@ -8,7 +8,7 @@ module MetasploitModule
 
   CachedSize = 0
 
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::X86::Prepends
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
 
diff --git a/modules/payloads/singles/linux/x86/metsvc_reverse_tcp.rb b/modules/payloads/singles/linux/x86/metsvc_reverse_tcp.rb
@@ -8,7 +8,7 @@ module MetasploitModule
 
   CachedSize = 0
 
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::X86::Prepends
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
 
diff --git a/modules/payloads/singles/linux/x86/read_file.rb b/modules/payloads/singles/linux/x86/read_file.rb
@@ -8,7 +8,7 @@ module MetasploitModule
   CachedSize = 63
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::X86::Prepends
 
   def initialize(info = {})
     super(merge_info(info,
diff --git a/modules/payloads/singles/linux/x86/shell_bind_ipv6_tcp.rb b/modules/payloads/singles/linux/x86/shell_bind_ipv6_tcp.rb
@@ -9,7 +9,7 @@ module MetasploitModule
   CachedSize = 90
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::X86::Prepends
   include Msf::Sessions::CommandShellOptions
 
   def initialize(info = {})
diff --git a/modules/payloads/singles/linux/x86/shell_bind_tcp.rb b/modules/payloads/singles/linux/x86/shell_bind_tcp.rb
@@ -9,7 +9,7 @@ module MetasploitModule
   CachedSize = 78
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::X86::Prepends
   include Msf::Sessions::CommandShellOptions
 
   def initialize(info = {})
diff --git a/modules/payloads/singles/linux/x86/shell_bind_tcp_random_port.rb b/modules/payloads/singles/linux/x86/shell_bind_tcp_random_port.rb
@@ -8,7 +8,7 @@ module MetasploitModule
   CachedSize = 57
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::X86::Prepends
 
   def initialize(info = {})
     super(merge_info(info,
diff --git a/modules/payloads/singles/linux/x86/shell_find_port.rb b/modules/payloads/singles/linux/x86/shell_find_port.rb
@@ -9,7 +9,7 @@ module MetasploitModule
   CachedSize = 62
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::X86::Prepends
   include Msf::Sessions::CommandShellOptions
 
   def initialize(info = {})
diff --git a/modules/payloads/singles/linux/x86/shell_find_tag.rb b/modules/payloads/singles/linux/x86/shell_find_tag.rb
@@ -9,7 +9,7 @@ module MetasploitModule
   CachedSize = 69
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::X86::Prepends
   include Msf::Sessions::CommandShellOptions
 
   def initialize(info = {})
diff --git a/modules/payloads/singles/linux/x86/shell_reverse_tcp.rb b/modules/payloads/singles/linux/x86/shell_reverse_tcp.rb
@@ -9,7 +9,7 @@ module MetasploitModule
   CachedSize = 68
 
   include Msf::Payload::Single
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::X86::Prepends
   include Msf::Sessions::CommandShellOptions
 
   def initialize(info = {})
diff --git a/modules/payloads/singles/linux/x86/shell_reverse_tcp_ipv6.rb b/modules/payloads/singles/linux/x86/shell_reverse_tcp_ipv6.rb
diff --git a/modules/payloads/stagers/linux/aarch64/reverse_tcp.rb b/modules/payloads/stagers/linux/aarch64/reverse_tcp.rb
diff --git a/modules/payloads/stagers/linux/armle/bind_tcp.rb b/modules/payloads/stagers/linux/armle/bind_tcp.rb
diff --git a/modules/payloads/stagers/linux/armle/reverse_tcp.rb b/modules/payloads/stagers/linux/armle/reverse_tcp.rb
diff --git a/modules/payloads/stagers/linux/x64/bind_tcp.rb b/modules/payloads/stagers/linux/x64/bind_tcp.rb
diff --git a/modules/payloads/stagers/linux/x86/bind_nonx_tcp.rb b/modules/payloads/stagers/linux/x86/bind_nonx_tcp.rb
diff --git a/modules/payloads/stagers/linux/x86/find_tag.rb b/modules/payloads/stagers/linux/x86/find_tag.rb
diff --git a/modules/payloads/stagers/linux/x86/reverse_ipv6_tcp.rb b/modules/payloads/stagers/linux/x86/reverse_ipv6_tcp.rb
diff --git a/modules/payloads/stagers/linux/x86/reverse_nonx_tcp.rb b/modules/payloads/stagers/linux/x86/reverse_nonx_tcp.rb
diff --git a/modules/payloads/stages/linux/x64/shell.rb b/modules/payloads/stages/linux/x64/shell.rb
diff --git a/modules/payloads/stages/linux/x86/shell.rb b/modules/payloads/stages/linux/x86/shell.rb

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ module Msf`
`13`	`13`	`module Payload::Linux::BindTcp`
`14`	`14`
`15`	`15`	`include Msf::Payload::TransportConfig`
`16`		`- include Msf::Payload::Linux`
	`16`	`+ include Msf::Payload::Linux::X86::Prepends`
`17`	`17`	`include Msf::Payload::Linux::SendUUID`
`18`	`18`
`19`	`19`	`#`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ module Msf`
`12`	`12`	`module Payload::Linux::ReverseTcp_x86`
`13`	`13`
`14`	`14`	`include Msf::Payload::TransportConfig`
`15`		`- include Msf::Payload::Linux`
	`15`	`+ include Msf::Payload::Linux::X86::Prepends`
`16`	`16`	`include Msf::Payload::Linux::SendUUID`
`17`	`17`
`18`	`18`	`#`