update mettle->meterpreter references in modules

Author: Brent Cook

modules/exploits/android/browser/stagefright_mp4_tx3g_64bit.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/core'
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = NormalRanking
 
@@ -67,7 +65,7 @@ def initialize(info={})
           'Space'    => 2048,
           'DisableNops' => true,
         },
-      #'DefaultOptions' => { 'PAYLOAD' => 'linux/armle/mettle/reverse_tcp' },
+      #'DefaultOptions' => { 'PAYLOAD' => 'linux/armle/meterpreter/reverse_tcp' },
       'Platform'       => 'linux',
       'Arch'           => [ARCH_ARMLE], # TODO: , ARCH_X86, ARCH_X64, ARCH_MIPSLE],
       'Targets'        =>
@@ -354,7 +352,7 @@ def initialize(info={})
     register_options(
       [
         OptBool.new('OBFUSCATE', [false, 'Enable JavaScript obfuscation', false])
-      ], self.class)
+      ])
 =end
   end
 

modules/exploits/android/local/futex_requeue.rb

@@ -3,9 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/core'
-require 'rex'
-
 class MetasploitModule < Msf::Exploit::Local
   Rank = ExcellentRanking
 
@@ -39,7 +36,7 @@ def initialize(info={})
         'DefaultOptions' =>
         {
           'WfsDelay'     => 300,
-          'PAYLOAD'      => 'linux/armle/mettle/reverse_tcp',
+          'PAYLOAD'      => 'linux/armle/meterpreter/reverse_tcp',
         },
         'DefaultTarget' => 0,
         'Targets'       => [

modules/exploits/android/local/put_user_vroot.rb

@@ -3,9 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/core'
-require 'rex'
-
 class MetasploitModule < Msf::Exploit::Local
   Rank = ExcellentRanking
 
@@ -44,7 +41,7 @@ def initialize(info={})
         'DefaultOptions' =>
         {
           'WfsDelay'     => 120,
-          'PAYLOAD'      => 'linux/armle/mettle/reverse_tcp',
+          'PAYLOAD'      => 'linux/armle/meterpreter/reverse_tcp',
         },
         'DefaultTarget' => 0,
       }

modules/exploits/linux/http/dlink_hnap_login_bof.rb

@@ -3,15 +3,13 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/core'
-
 # Payload working status:
 # MIPS:
 #   - all valid payloads working (the ones that we are able to send without null bytes)
 # ARM:
 #  - inline rev/bind shell works (bind... meh sometimes)
 #  - stager rev/bind shell FAIL
-#  - mettle rev/bind fails with sigsegv standalone, but works under strace or gdb...
+#  - meterpreter rev/bind fails with sigsegv standalone, but works under strace or gdb...
 
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
@@ -95,7 +93,7 @@ def initialize(info = {})
         OptString.new('SRVPORT', [true, 'Port for the HTTP server (ARM only)', '3333']),
         OptString.new('SHELL', [true, 'Don\'t change this', '/bin/sh']),
         OptString.new('SHELLARG', [true, 'Don\'t change this', 'sh']),
-      ], self.class)
+      ])
   end
 
   def check

modules/exploits/linux/http/huawei_hg532n_cmdinject.rb

@@ -3,7 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/core'
 require 'base64'
 
 class MetasploitModule < Msf::Exploit::Remote
@@ -40,7 +39,7 @@ def initialize(info = {})
       'Privileged'     => true,
       'DefaultOptions' =>
         {
-          'PAYLOAD' => 'linux/mipsbe/mettle_reverse_tcp'
+          'PAYLOAD' => 'linux/mipsbe/meterpreter_reverse_tcp'
         },
       'Targets'        =>
         [

modules/exploits/linux/http/mvpower_dvr_shell_exec.rb

@@ -45,7 +45,7 @@ def initialize(info = {})
       'Arch'           => ARCH_ARMLE,
       'DefaultOptions' =>
         {
-          'PAYLOAD' => 'linux/armle/mettle_reverse_tcp',
+          'PAYLOAD' => 'linux/armle/meterpreter_reverse_tcp',
           'CMDSTAGER::FLAVOR' => 'wget'
         },
       'Targets'        =>

modules/exploits/linux/http/netgear_r7000_cgibin_exec.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/core'
-
 class MetasploitModule < Msf::Exploit::Remote
 
   Rank = ExcellentRanking
@@ -39,14 +37,14 @@ def initialize(info = {})
       'DisclosureDate' => 'Dec 06 2016',
       'DefaultOptions'  =>
         {
-          'PAYLOAD' => 'linux/armle/mettle_reverse_tcp'
+          'PAYLOAD' => 'linux/armle/meterpreter_reverse_tcp'
         }
     ))
 
     register_options(
       [
         Opt::RPORT(80)
-      ], self.class)
+      ])
 
     deregister_options('URIPATH')
   end

modules/exploits/linux/local/bpf_priv_esc.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/core'
-
 class MetasploitModule < Msf::Exploit::Local
   Rank = GoodRanking
 
@@ -43,7 +41,7 @@ def initialize(info={})
           ],
         'DefaultOptions' =>
           {
-            'payload' => 'linux/x64/mettle/reverse_tcp',
+            'payload' => 'linux/x64/meterpreter/reverse_tcp',
             'PrependFork' => true,
             'WfsDelay' => 60 # we can chew up a lot of CPU for this, so we want to give time for payload to come through
             },
@@ -56,7 +54,7 @@ def initialize(info={})
         OptString.new('WritableDir', [ true, 'A directory where we can write files', '/tmp' ]),
         OptEnum.new('COMPILE', [ true, 'Compile on target', 'Auto', ['Auto', 'True', 'False']]),
         OptInt.new('MAXWAIT', [ true, 'Max seconds to wait for decrementation in seconds', 120 ])
-      ], self.class)
+      ])
   end
 
   def check

modules/exploits/linux/local/ntfs3g_priv_esc.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/core'
-
 class MetasploitModule < Msf::Exploit::Local
   Rank = GoodRanking
 
@@ -41,7 +39,7 @@ def initialize(info={})
           ],
         'DefaultOptions' =>
           {
-            'payload' => 'linux/x64/mettle/reverse_tcp',
+            'payload' => 'linux/x64/meterpreter/reverse_tcp',
             'PrependFork' => true,
             },
         'DefaultTarget' => 1,
@@ -51,7 +49,7 @@ def initialize(info={})
       ))
     register_options([
         OptString.new('WritableDir', [ true, 'A directory where we can write files', '/tmp' ])
-      ], self.class)
+      ])
   end
 
   def check

modules/exploits/multi/local/allwinner_backdoor.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require "msf/core"
-
 class MetasploitModule < Msf::Exploit::Local
   Rank = ExcellentRanking
 
@@ -35,7 +33,7 @@ def initialize(info = {})
         "Platform"       => [ "android", "linux" ],
         "DisclosureDate" => "Apr 30 2016",
         "DefaultOptions" => {
-          "payload" => "linux/armle/mettle/reverse_tcp"
+          "payload" => "linux/armle/meterpreter/reverse_tcp"
         },
         "Privileged"     => true,
         "Arch"           => ARCH_ARMLE,