Manage Exceptions to not wait the full wfs_delay

Author: jvazquez-r7

modules/exploits/multi/misc/java_rmi_server.rb

@@ -93,12 +93,20 @@ def exploit
     begin
       Timeout.timeout(datastore['HTTPDELAY']) { super }
     rescue Timeout::Error
-      # When the server stops due to our timeout, fail and
-      # don't wait WfsDelay
-      fail_with(Failure::Unknown, "The HTTP Server didn't get a payload requests")
+      # When the server stops due to our timeout, re-raise
+      # RuntimeError so it won't wait the full wfs_delay
+      raise ::RuntimeError, "Timeout HTTPDELAY expired and the HTTP Server didn't get a payload request"
+    rescue Msf::Exploit::Failed
+      # When the server stops due primer failing, re-raise
+      # RuntimeError so it won't wait the full wfs_delays
+      raise ::RuntimeError, "Exploit aborted due to failure #{fail_reason} #{(fail_detail || "No reason given")}"
     end
   end
 
+  def peer
+    "#{rhost}:#{rport}"
+  end
+
   def primer
     connect