Take care of modules using the 'DEBUG' option

Author: jvazquez-r7

modules/auxiliary/scanner/http/open_proxy.rb

@@ -31,7 +31,6 @@ def initialize(info = {})
     register_options(
       [
         Opt::RPORT(8080),
-        OptBool.new('DEBUG', [ false, 'Enable requests debugging output', false ]),
         OptBool.new('MULTIPORTS', [ false, 'Multiple ports will be used : 80, 1080, 3128, 8080, 8123', false ]),
         OptBool.new('RANDOMIZE_PORTS', [ false, 'Randomize the order the ports are probed', false ]),
         OptBool.new('VERIFY_CONNECT', [ false, 'Enable test for CONNECT method', false ]),
@@ -193,10 +192,7 @@ def send_request_ripe(user_agent)
   end
 
   def check_host(target_host,target_port,site,user_agent)
-
-    if datastore['DEBUG']
-      print_status("Checking #{target_host}:#{target_port} [#{site}]")
-    end
+    vprint_status("Checking #{target_host}:#{target_port} [#{site}]")
 
     is_valid,retcode,retvia,retsrv = send_request(site,user_agent)
 

modules/auxiliary/scanner/http/robots_txt.rb

@@ -56,7 +56,6 @@ def run_host(target_host)
 
       if not res.body.include?("llow:")
         vprint_status("[#{target_host}] #{tpath}robots.txt - Doesn't contain \"llow:\"")
-        print_status(res.body.inspect) if datastore['DEBUG']
         return
       end
 

modules/auxiliary/scanner/natpmp/natpmp_portscan.rb

@@ -93,11 +93,11 @@ def handle_reply(host, external_addr, pkt)
         end
       else
         state = Msf::ServiceState::Closed
-        print_status("#{peer} #{external_addr} - #{int}/#{protocol} #{state} because of successful mapping with matched ports") if (datastore['DEBUG'])
+        vprint_status("#{peer} #{external_addr} - #{int}/#{protocol} #{state} because of successful mapping with matched ports")
       end
     else
       state = Msf::ServiceState::Closed
-      print_status("#{peer} #{external_addr} - #{int}/#{protocol} #{state} because of code #{result} response") if (datastore['DEBUG'])
+      vprint_status("#{peer} #{external_addr} - #{int}/#{protocol} #{state} because of code #{result} response")
     end
 
     report_service(

modules/auxiliary/server/browser_autopwn.rb

@@ -75,7 +75,7 @@ def initialize(info = {})
       OptRegexp.new('EXCLUDE', [false,
         'Only attempt to use exploits whose name DOES NOT match this regex'
       ]),
-      OptBool.new('DEBUG', [false,
+      OptBool.new('DEBUG_AUTOPWN', [false,
         'Do not obfuscate the javascript and print various bits of useful info to the browser',
         false
       ]),
@@ -232,7 +232,7 @@ def setup
     ENDJS
     )
 
-    if (datastore['DEBUG'])
+    if (datastore['DEBUG_AUTOPWN'])
       print_status("NOTE: Debug Mode; javascript will not be obfuscated")
     else
       pre = Time.now
@@ -349,7 +349,7 @@ def init_exploit(name, mod = nil, targ = 0)
 
     # For testing, set the exploit uri to the name of the exploit so it's
     # easy to tell what is happening from the browser.
-    if (datastore['DEBUG'])
+    if (datastore['DEBUG_AUTOPWN'])
       @exploits[name].datastore['URIPATH'] = name
     else
       # randomize it manually since if a saved value exists in the user's
@@ -1056,7 +1056,7 @@ def exploit_resource(name)
   end
 
   def js_debug(msg)
-    if datastore['DEBUG']
+    if datastore['DEBUG_AUTOPWN']
       return "document.body.innerHTML += #{msg};"
     end
     return ""

modules/auxiliary/spoof/llmnr/llmnr_response.rb

@@ -47,10 +47,6 @@ def initialize
       OptInt.new('TTL', [ false, "Time To Live for the spoofed response", 300]),
     ])
 
-    register_advanced_options([
-      OptBool.new('Debug', [ false, "Determines whether incoming packet parsing is displayed", false])
-    ])
-
     deregister_options('RHOST', 'PCAPFILE', 'SNAPLEN', 'FILTER')
     self.thread = nil
     self.sock = nil

modules/auxiliary/spoof/nbns/nbns_response.rb

@@ -46,10 +46,6 @@ def initialize
       OptRegexp.new('REGEX', [ true, "Regex applied to the NB Name to determine if spoofed reply is sent", '.*']),
     ])
 
-    register_advanced_options([
-      OptBool.new('DEBUG', [ false, "Determines whether incoming packet parsing is displayed", false])
-    ])
-
     deregister_options('RHOST', 'PCAPFILE', 'SNAPLEN', 'FILTER')
     self.thread = nil
     self.sock = nil
@@ -90,20 +86,18 @@ def dispatch_request(packet, rhost, src_port)
 
     vprint_good("#{rhost.ljust 16} nbns - #{nbnsq_decodedname} matches regex, responding with #{spoof}")
 
-    if datastore['DEBUG']
-      print_status("transid:        #{nbnsq_transid.unpack('H4')}")
-      print_status("tlags:          #{nbnsq_flags.unpack('B16')}")
-      print_status("questions:      #{nbnsq_questions.unpack('n')}")
-      print_status("answerrr:       #{nbnsq_answerrr.unpack('n')}")
-      print_status("authorityrr:    #{nbnsq_authorityrr.unpack('n')}")
-      print_status("additionalrr:   #{nbnsq_additionalrr.unpack('n')}")
-      print_status("name:           #{nbnsq_name} #{nbnsq_name.unpack('H34')}")
-      print_status("full name:      #{nbnsq_name.slice(1..-2)}")
-      print_status("decoded:        #{decoded}")
-      print_status("decoded name:   #{nbnsq_decodedname}")
-      print_status("type:           #{nbnsq_type.unpack('n')}")
-      print_status("class:          #{nbnsq_class.unpack('n')}")
-    end
+    vprint_status("transid:        #{nbnsq_transid.unpack('H4')}")
+    vprint_status("tlags:          #{nbnsq_flags.unpack('B16')}")
+    vprint_status("questions:      #{nbnsq_questions.unpack('n')}")
+    vprint_status("answerrr:       #{nbnsq_answerrr.unpack('n')}")
+    vprint_status("authorityrr:    #{nbnsq_authorityrr.unpack('n')}")
+    vprint_status("additionalrr:   #{nbnsq_additionalrr.unpack('n')}")
+    vprint_status("name:           #{nbnsq_name} #{nbnsq_name.unpack('H34')}")
+    vprint_status("full name:      #{nbnsq_name.slice(1..-2)}")
+    vprint_status("decoded:        #{decoded}")
+    vprint_status("decoded name:   #{nbnsq_decodedname}")
+    vprint_status("type:           #{nbnsq_type.unpack('n')}")
+    vprint_status("class:          #{nbnsq_class.unpack('n')}")
 
     # time to build a response packet - Oh YEAH!
     response = nbnsq_transid +

modules/exploits/linux/local/pkexec.rb

@@ -57,7 +57,7 @@ def initialize(info = {})
       OptString.new("WritableDir", [ true, "A directory where we can write files (must not be mounted noexec)", "/tmp" ]),
       OptInt.new("Count", [true, "Number of attempts to win the race condition", 500 ]),
       OptInt.new("ListenerTimeout", [true, "Number of seconds to wait for the exploit", 60]),
-      OptBool.new("DEBUG", [ true, "Make the exploit executable be verbose about what it's doing", false ])
+      OptBool.new("DEBUG_EXPLOIT", [ true, "Make the exploit executable be verbose about what it's doing", false ])
     ])
   end
 
@@ -327,7 +327,7 @@ def exploit
     main.gsub!(/shellcode_size = 0/, "shellcode_size = #{payload.encoded.length}")
     main.gsub!(/cmd_path = ""/, "cmd_path = \"#{executable_path}\"")
     main.gsub!(/COUNT/, datastore["Count"].to_s)
-    main.gsub!(/#define dprintf/, "#define dprintf printf") if datastore['DEBUG']
+    main.gsub!(/#define dprintf/, "#define dprintf printf") if datastore['DEBUG_EXPLOIT']
 
     cpu = nil
     if target['Arch'] == ARCH_X86

modules/exploits/multi/browser/firefox_svg_plugin.rb

@@ -83,7 +83,7 @@ def initialize(info = {})
     register_options(
       [
         OptString.new('CONTENT', [ false, "Content to display inside the HTML <body>.", '' ] ),
-        OptBool.new('DEBUG', [false, "Display some alert()'s for debugging the payload.", false])
+        OptBool.new('DEBUG_JS', [false, "Display some alert()'s for debugging the payload.", false])
       ], Auxiliary::Timed)
 
   end
@@ -110,7 +110,7 @@ def flash_trigger
   # @return [String] containing javascript that will alert a debug string
   #   if the DEBUG is set to true
   def js_debug(str, quote="'")
-    if datastore['DEBUG'] then "alert(#{quote}#{str}#{quote})" else '' end
+    if datastore['DEBUG_JS'] then "alert(#{quote}#{str}#{quote})" else '' end
   end
 
   # @return [String] HTML that is sent in the first response to the client

modules/exploits/windows/http/hp_nnm_ovbuildpath_textfile.rb

@@ -235,10 +235,6 @@ def exploit
 
     if res and res.code != 502
       print_error("Eek! We weren't expecting a response, but we got one")
-      if datastore['DEBUG']
-        print_line()
-        print_error(res.to_s)
-      end
     end
 
     handler

modules/exploits/windows/http/hp_nnm_webappmon_execvp.rb

@@ -157,10 +157,6 @@ def exploit
 
     if res and res.code != 502
       print_error("Eek! We weren't expecting a response, but we got one")
-      if datastore['DEBUG']
-        print_error('')
-        print_error(res.to_s)
-      end
     end
 
     handler