Land rapid7#9150, fix broken and simplify unusual RuntimeError exceptions

Author: busterb

lib/msf/core/exploit/smtp_deliver.rb

@@ -111,7 +111,7 @@ def connect_login(global = true)
           unless res[0..2] == '235'
             print_error("Authentication failed, quitting")
             disconnect(nsock)
-            raise RuntimeError.new 'Could not authenticate to SMTP server'
+            raise 'Could not authenticate to SMTP server'
           end
         else
           print_status("Server requested auth and no creds given, trying to continue anyway")
@@ -126,7 +126,7 @@ def connect_login(global = true)
           unless res[0..2] == '235'
             print_error("Authentication failed, quitting")
             disconnect(nsock)
-            raise RuntimeError.new 'Could not authenticate to SMTP server'
+            raise 'Could not authenticate to SMTP server'
           end
         else
           print_status("Server requested auth and no creds given, trying to continue anyway")

lib/msf/core/module/platform.rb

@@ -143,8 +143,7 @@ def self.find_portion(mod, str)
 
     if (not mod.const_defined?('Names'))
       elog("Failed to instantiate the platform list for module #{mod}")
-      raise RuntimeError.new("Failed to instantiate the platform list for module #{mod}")
-      return nil
+      raise "Failed to instantiate the platform list for module #{mod}"
     end
 
     abbrev   = mod.const_get('Abbrev')

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

@@ -119,7 +119,7 @@ def query(filter, max_results, fields, domain=nil)
     domain ||= get_domain
 
     if domain.blank?
-      raise RuntimeError, "Unable to find the domain to query."
+      raise "Unable to find the domain to query."
     end
 
     if load_extapi
@@ -338,7 +338,7 @@ def bind_default_ldap_server(size_limit, domain=nil)
     init_result = wldap32.ldap_sslinitA(domain, 389, 0)
     session_handle = init_result['return']
     if session_handle == 0
-      raise RuntimeError.new("Unable to initialize ldap server: #{init_result["ErrorMessage"]}")
+      raise "Unable to initialize ldap server: #{init_result["ErrorMessage"]}"
     end
 
     vprint_status("LDAP Handle: #{session_handle}")
@@ -352,7 +352,7 @@ def bind_default_ldap_server(size_limit, domain=nil)
     bind = bind_result['return']
     unless bind == 0
       wldap32.ldap_unbind(session_handle)
-      raise RuntimeError.new("Unable to bind to ldap server: #{ERROR_CODE_TO_CONSTANT[bind]}")
+      raise "Unable to bind to ldap server: #{ERROR_CODE_TO_CONSTANT[bind]}"
     end
 
     if (block_given?)

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

@@ -78,7 +78,7 @@ def open_sc_manager(opts={})
     # );
     manag = advapi32.OpenSCManagerA(machine_str,nil,access)
     if (manag["return"] == 0)
-      raise RuntimeError.new("Unable to open service manager: #{manag["ErrorMessage"]}")
+      raise "Unable to open service manager: #{manag["ErrorMessage"]}"
     end
 
     if (block_given?)
@@ -115,7 +115,7 @@ def close_service_handle(handle)
   def open_service_handle(manager, name, access)
     handle = advapi32.OpenServiceA(manager, name, access)
     if (handle["return"] == 0)
-      raise RuntimeError.new("Could not open service. OpenServiceA error: #{handle["ErrorMessage"]}")
+      raise "Could not open service. OpenServiceA error: #{handle["ErrorMessage"]}"
     end
 
     if (block_given?)
@@ -267,7 +267,7 @@ def service_change_startup(name, mode, server=nil)
         when "manual" then startup_number   = START_TYPE_MANUAL
         when "disable" then startup_number  = START_TYPE_DISABLED
         else
-          raise RuntimeError, "Invalid Startup Mode: #{mode}"
+          raise "Invalid Startup Mode: #{mode}"
       end
     end
 
@@ -453,7 +453,7 @@ def service_status(name, server=nil)
         status = advapi32.QueryServiceStatus(service_handle,28)
 
         if (status["return"] == 0)
-          raise RuntimeError.new("Could not query service. QueryServiceStatus error: #{status["ErrorMessage"]}")
+          raise "Could not query service. QueryServiceStatus error: #{status["ErrorMessage"]}"
         else
           ret = parse_service_status_struct(status['lpServiceStatus'])
         end
@@ -485,7 +485,7 @@ def service_restart(name, start_type=START_TYPE_AUTO, server=nil)
         vprint_good("[#{name}] Service started")
         return true
       else
-        raise RuntimeError, status
+        raise status
       end
     rescue RuntimeError => s
       if tried

lib/rex/ui/text/dispatcher_shell.rb

@@ -464,7 +464,7 @@ def append_dispatcher(dispatcher)
     inst = dispatcher.new(self)
     self.dispatcher_stack.each { |disp|
       if (disp.name == inst.name)
-        raise RuntimeError.new("Attempting to load already loaded dispatcher #{disp.name}")
+        raise "Attempting to load already loaded dispatcher #{disp.name}"
       end
     }
     self.dispatcher_stack.push(inst)

scripts/meterpreter/search_dwld.rb

@@ -91,15 +91,15 @@ def unsupported
 # Set the regexp
 if filter == 'free'
   if args[2].nil?
-    raise RuntimeError.new("free filter requires pattern argument")
+    raise "free filter requires pattern argument"
   end
   $motif = args[2]
 else
   $motif = $filters[filter]
 end
 
 if $motif.nil?
-  raise RuntimeError.new("Unrecognized filter")
+  raise "Unrecognized filter"
 end
 
 # Search and download