From c9bd0ca9950f3775cefa9ef5a2ea2e4eed6cab06 Mon Sep 17 00:00:00 2001
From: jvazquez-r7 <juan_vazquez@rapid7.com>
Date: Wed, 4 Jun 2014 15:56:14 -0500
Subject: [PATCH] Add minor changes

---
 modules/exploits/multi/misc/java_jdwp_debugger.rb | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/modules/exploits/multi/misc/java_jdwp_debugger.rb b/modules/exploits/multi/misc/java_jdwp_debugger.rb
index e1b12bbf70..4d5d43dc96 100644
--- a/modules/exploits/multi/misc/java_jdwp_debugger.rb
+++ b/modules/exploits/multi/misc/java_jdwp_debugger.rb
@@ -116,13 +116,13 @@ class Metasploit3 < Msf::Exploit::Remote
         OptInt.new('RESPONSE_TIMEOUT', [true, 'Number of seconds to wait for a server response', 10]),
         OptString.new('TMP_PATH', [ false, 'A directory where we can write files. Ensure there is a trailing slash']),
         OptString.new('BREAKPOINT', [ true, 'Frequently called method for setting breakpoint', 'java.net.ServerSocket.accept' ]),
-        OptPort.new('BREAKPOINT_PORT', [ false, 'If debugging an application accessible from network and breakpoint is on socket accept, set the port of the app to force a socket connection' ])
+        OptPort.new('BREAKPOINT_PORT', [ false, 'HTTP port to trigger breakpoint automatically (Ex. 8080 on tomcat)' ])
       ], self.class)
 
     register_advanced_options(
       [
-        OptInt.new('BREAK_TIMEOUT', [true, 'Number of seconds to wait for a breakpoint hit', 30]),
-        OptInt.new('NUM_RETRIES', [true, 'Number of retries when waiting for event', 10])
+        OptInt.new('NUM_RETRIES', [true, 'Number of retries when waiting for event', 10]),
+        OptInt.new('BREAK_TIMEOUT', [true, 'Number of seconds to wait for a breakpoint hit', 30])
       ], self.class)
   end
 
@@ -210,7 +210,6 @@ class Metasploit3 < Msf::Exploit::Remote
     ret
   end
 
-
   # Pack Fixnum for JDWP protocol
   def format(fmt, value)
     if fmt == "L" || fmt == 8
@@ -285,7 +284,6 @@ class Metasploit3 < Msf::Exploit::Remote
     entries
   end
 
-
   # Gets the sizes of variably-sized data types in the target VM
   def get_sizes
     formats = [
@@ -301,7 +299,6 @@ class Metasploit3 < Msf::Exploit::Remote
     entries.each { |e| @vars.merge!(e) }
   end
 
-
   # Gets the JDWP version implemented by the target VM
   def get_version
     formats = [
@@ -317,12 +314,10 @@ class Metasploit3 < Msf::Exploit::Remote
     entries.each { |e| @vars.merge!(e) }
   end
 
-
   def version
     "#{@vars["vm_name"]} - #{@vars["vm_version"]}"
   end
 
-
   # Returns reference types for all classes currently loaded by the target VM
   def get_all_classes
     return unless @classes.empty?