Land rapid7#5218, fix rapid7#3816, remove print_debug / DEBUG

Author: Brent Cook

lib/msf/core/exploit/http/server.rb

@@ -92,11 +92,7 @@ def print_good(msg='')
   def print_error(msg='')
     (cli) ? super("#{cli.peerhost.ljust(16)} #{self.shortname} - #{msg}") : super
   end
-  # :category: print_* overrides
-  # Prepends client and module name if inside a thread with a #cli
-  def print_debug(msg='')
-    (cli) ? super("#{cli.peerhost.ljust(16)} #{self.shortname} - #{msg}") : super
-  end
+
   #
   # :category: print_* overrides
   # Prepends client and module name if inside a thread with a #cli
@@ -126,11 +122,6 @@ def vprint_error(msg='')
   end
   # :category: print_* overrides
   # Prepends client and module name if inside a thread with a #cli
-  def vprint_debug(msg='')
-    (cli) ? super("#{cli.peerhost.ljust(16)} #{self.shortname} - #{msg}") : super
-  end
-  # :category: print_* overrides
-  # Prepends client and module name if inside a thread with a #cli
   def vprint_warning(msg='')
     (cli) ? super("#{cli.peerhost.ljust(16)} #{self.shortname} - #{msg}") : super
   end

lib/msf/core/exploit/remote/browser_exploit_server.rb

@@ -219,7 +219,7 @@ def get_bad_requirements(profile)
 
       @requirements.each do |k, v|
         expected = k != :vuln_test ? v : 'true'
-        vprint_debug("Comparing requirement: #{k}=#{expected} vs #{k}=#{profile[k.to_sym]}")
+        vprint_status("Comparing requirement: #{k}=#{expected} vs #{k}=#{profile[k.to_sym]}")
 
         if k == :activex
           bad_reqs << k if has_bad_activex?(profile[k.to_sym])
@@ -334,7 +334,7 @@ def process_browser_info(source, cli, request)
       when :script
         # Gathers target data from a POST request
         parsed_body = CGI::parse(Rex::Text.decode_base64(request.body) || '')
-        vprint_debug("Received sniffed browser data over POST: \n#{parsed_body}.")
+        vprint_status("Received sniffed browser data over POST: \n#{parsed_body}.")
         parsed_body.each { |k, v| update_profile(target_info, k.to_sym, v.first) }
       when :headers
         # Gathers target data from headers

lib/msf/core/module/ui/message/verbose.rb

@@ -1,9 +1,4 @@
 module Msf::Module::UI::Message::Verbose
-  # Verbose version of #print_debug
-  def vprint_debug(msg)
-    print_debug(msg) if datastore['VERBOSE'] || framework.datastore['VERBOSE']
-  end
-
   # Verbose version of #print_error
   def vprint_error(msg)
     print_error(msg) if datastore['VERBOSE'] || framework.datastore['VERBOSE']

lib/msf/core/plugin.rb

@@ -119,13 +119,6 @@ def print_good(msg='')
     output.print_good(msg) if (output)
   end
 
-  #
-  # Prints a 'debug' message.
-  #
-  def print_debug(msg='')
-    output.print_debug(msg) if (output)
-  end
-
   #
   # Prints a status line.
   #

lib/msf/core/post/windows/registry.rb

@@ -331,7 +331,6 @@ def meterpreter_registry_loadkey(key, file)
     begin
       client.sys.config.getprivs()
       root_key, base_key = session.sys.registry.splitkey(key)
-      #print_debug("Loading file #{file}")
       begin
         loadres = session.sys.registry.load_key(root_key, base_key, file)
       rescue Rex::Post::Meterpreter::RequestError => e
@@ -349,7 +348,6 @@ def meterpreter_registry_loadkey(key, file)
           #print_error("An unknown error has occurred: #{loadres.to_s}")
           return false
         else
-          #print_debug("Registry Hive Loaded Successfully: #{key}")
           return true
         end
       end
@@ -377,7 +375,6 @@ def meterpreter_registry_unloadkey(key)
           #print_error("An unknown error has occurred: #{unloadres.to_s}")
           return false
         else
-          #print_debug("Registry Hive Unloaded Successfully: #{key}")
           return true
         end
       end

lib/msf/http/typo3/login.rb

@@ -32,10 +32,10 @@ def typo3_backend_login(user, pass)
     end
     n = n_match[1]
 
-    vprint_debug("e: #{e}")
-    vprint_debug("n: #{n}")
+    vprint_status("e: #{e}")
+    vprint_status("n: #{n}")
     rsa_enc = typo3_helper_login_rsa(e, n, pass)
-    vprint_debug("RSA Hash: #{rsa_enc}")
+    vprint_status("RSA Hash: #{rsa_enc}")
     # make login request
     vars_post = {
       'n' => '',
@@ -58,10 +58,10 @@ def typo3_backend_login(user, pass)
     })
     if res_login
       if res_login.body =~ /<!-- ###LOGIN_ERROR### begin -->(.*)<!-- ###LOGIN_ERROR### end -->/im
-        vprint_debug(strip_tags($1))
+        vprint_status(strip_tags($1))
         return nil
       elsif res_login.body =~ /<p class="t3-error-text">(.*?)<\/p>/im
-        vprint_debug(strip_tags($1))
+        vprint_status(strip_tags($1))
         return nil
       else
         cookies = res_login.get_cookies

lib/rex/io/bidirectional_pipe.rb

@@ -87,10 +87,6 @@ def print_good(msg='')
     print_line('[+] ' + msg)
   end
 
-  def print_debug(msg='')
-    print_line('[!] ' + msg)
-  end
-
   def flush
   end
 

lib/rex/ui/output.rb

@@ -30,9 +30,6 @@ def print_error(msg='')
   def print_good(msg='')
   end
 
-  def print_debug(msg='')
-  end
-
   #
   # Prints a status line.
   #

lib/rex/ui/subscriber.rb

@@ -56,16 +56,6 @@ def print_good(msg='')
       end
     end
 
-    #
-    # Wraps user_output.print_debug
-    #
-    def print_debug(msg='')
-      if (user_output)
-        print_blank_line if user_output.prompting?
-        user_output.print_debug(msg)
-      end
-    end
-
     #
     # Wraps user_output.print_warning
     #

lib/rex/ui/text/output.rb

@@ -55,10 +55,6 @@ def print_good(msg = '')
     print_line("%bld%grn[+]%clr #{msg}")
   end
 
-  def print_debug(msg = '')
-    print_line("%bld%cya[!]%clr #{msg}")
-  end
-
   def print_status(msg = '')
     print_line("%bld%blu[*]%clr #{msg}")
   end