Land #18720, Mark unix encoders as compatible with linux

Merge branch 'land-18720' into upstream-master
rapid7 · Jan 23, 2024 · 583d39b · 583d39b
2 parents 2b938d1 + b31abcc
commit 583d39b
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/lib/msf/core/encoder.rb b/lib/msf/core/encoder.rb
@@ -129,19 +129,19 @@ module Type
     #
     # perl encoding.
     #
-    CmdUnixPerl = 'perl'
+    CmdPosixPerl = 'perl'
     #
     # Bourne shell echo encoding.
     #
-    CmdUnixEcho = 'echo'
+    CmdPosixEcho = 'echo'
     #
     # Bourne shell ${IFS} encoding.
     #
-    CmdUnixIFS = 'ifs'
+    CmdPosixIFS = 'ifs'
     #
     # Bash brace expansion encoding.
     #
-    CmdUnixBrace = 'brace'
+    CmdPosixBrace = 'brace'
   end
 
   #

diff --git a/modules/encoders/cmd/brace.rb b/modules/encoders/cmd/brace.rb
@@ -16,9 +16,9 @@ def initialize
         to avoid whitespace without being overly fancy.
       },
       'Author'      => ['wvu', 'egypt'],
-      'Platform'    => 'unix',
+      'Platform'    => %w[ linux unix ],
       'Arch'        => ARCH_CMD,
-      'EncoderType' => Msf::Encoder::Type::CmdUnixBrace
+      'EncoderType' => Msf::Encoder::Type::CmdPosixBrace
     )
   end
 

diff --git a/modules/encoders/cmd/echo.rb b/modules/encoders/cmd/echo.rb
@@ -14,8 +14,8 @@ def initialize
       },
       'Author'           => 'hdm',
       'Arch'             => ARCH_CMD,
-      'Platform'         => 'unix',
-      'EncoderType'      => Msf::Encoder::Type::CmdUnixEcho)
+      'Platform'         => %w[ linux unix ],
+      'EncoderType'      => Msf::Encoder::Type::CmdPosixEcho)
   end
 
 

diff --git a/modules/encoders/cmd/ifs.rb b/modules/encoders/cmd/ifs.rb
@@ -16,9 +16,9 @@ def initialize
         without being overly fancy.
       },
       'Author'      => ['egypt', 'wvu'],
-      'Platform'    => 'unix',
+      'Platform'    => %w[ linux unix ],
       'Arch'        => ARCH_CMD,
-      'EncoderType' => Msf::Encoder::Type::CmdUnixIFS
+      'EncoderType' => Msf::Encoder::Type::CmdPosixIFS
     )
   end
 

diff --git a/modules/encoders/cmd/perl.rb b/modules/encoders/cmd/perl.rb
@@ -14,8 +14,8 @@ def initialize
       },
       'Author'           => 'hdm',
       'Arch'             => ARCH_CMD,
-      'Platform'         => 'unix',
-      'EncoderType'      => Msf::Encoder::Type::CmdUnixPerl)
+      'Platform'         => %w[ linux unix ],
+      'EncoderType'      => Msf::Encoder::Type::CmdPosixPerl)
   end
 
 

diff --git a/modules/exploits/multi/misc/persistent_hpca_radexec_exec.rb b/modules/exploits/multi/misc/persistent_hpca_radexec_exec.rb
@@ -47,7 +47,7 @@ def initialize(info = {})
               'Payload'  =>
                 {
                   'Space'       => 466,
-                  'EncoderType' => Msf::Encoder::Type::CmdUnixPerl,
+                  'EncoderType' => Msf::Encoder::Type::CmdPosixPerl,
                   'Compat'      =>
                     {
                       'PayloadType' => 'cmd',

diff --git a/modules/exploits/solaris/sunrpc/sadmind_exec.rb b/modules/exploits/solaris/sunrpc/sadmind_exec.rb
@@ -35,7 +35,7 @@ def initialize(info = {})
           'Space'       => 2000,
           'BadChars'    => "\x00",
           'DisableNops' => true,
-          'EncoderType' => Msf::Encoder::Type::CmdUnixPerl,
+          'EncoderType' => Msf::Encoder::Type::CmdPosixPerl,
           'Compat'      =>
             {
               'PayloadType' => 'cmd',