Land #4632, reverting #4473, too noisy errors

Fixes #4630 as well.

See also #4122 and #4552.

lib/msf/base/simple/auxiliary.rb

@@ -151,19 +151,17 @@ protected
     rescue ::Exception => e
       mod.error = e
       mod.print_error("Auxiliary failed: #{e.class} #{e}")
-      elog("Auxiliary failed: #{e.class} #{e}", 'core', LEV_0)
+      if(e.class.to_s != 'Msf::OptionValidateError')
-
-      if e.kind_of?(Msf::OptionValidateError)
-        dlog("Call stack:\n#{$@.join("\n")}", 'core', LEV_3)
-      else
         mod.print_error("Call stack:")
         e.backtrace.each do |line|
           break if line =~ /lib.msf.base.simple.auxiliary.rb/
           mod.print_error("  #{line}")
         end
-        elog("Call stack:\n#{$@.join("\n")}", 'core', LEV_0)
       end
 
+      elog("Auxiliary failed: #{e.class} #{e}", 'core', LEV_0)
+      dlog("Call stack:\n#{$@.join("\n")}", 'core', LEV_3)
+
       mod.cleanup
 
       return
@@ -184,3 +182,4 @@ end
 
 end
 end
+

lib/msf/base/simple/exploit.rb

@@ -147,17 +147,7 @@ module Exploit
       exploit.error = e
       exploit.print_error("Exploit failed: #{e}")
       elog("Exploit failed (#{exploit.refname}): #{e}", 'core', LEV_0)
-
+      dlog("Call stack:\n#{e.backtrace.join("\n")}", 'core', LEV_3)
-      if e.kind_of?(Msf::OptionValidateError)
-        dlog("Call stack:\n#{e.backtrace.join("\n")}", 'core', LEV_3)
-      else
-        exploit.print_error("Call stack:")
-        e.backtrace.each do |line|
-          break if line =~ /lib.msf.base.simple.exploit.rb/
-          exploit.print_error("  #{line}")
-        end
-        elog("Call stack:\n#{e.backtrace.join("\n")}", 'core', LEV_0)
-      end
     end
 
     return driver.session if driver
@@ -209,3 +199,4 @@ end
 
 end
 end
+

lib/msf/base/simple/post.rb

@@ -121,19 +121,17 @@ protected
     rescue ::Exception => e
       mod.error = e
       mod.print_error("Post failed: #{e.class} #{e}")
-      elog("Post failed: #{e.class} #{e}", 'core', LEV_0)
+      if(e.class.to_s != 'Msf::OptionValidateError')
-
-      if e.kind_of?(Msf::OptionValidateError)
-        dlog("Call stack:\n#{$@.join("\n")}", 'core', LEV_3)
-      else
         mod.print_error("Call stack:")
         e.backtrace.each do |line|
           break if line =~ /lib.msf.base.simple.post.rb/
           mod.print_error("  #{line}")
         end
-        elog("Call stack:\n#{$@.join("\n")}", 'core', LEV_0)
       end
 
+      elog("Post failed: #{e.class} #{e}", 'core', LEV_0)
+      dlog("Call stack:\n#{$@.join("\n")}", 'core', LEV_3)
+
       mod.cleanup
 
       return
@@ -156,3 +154,4 @@ end
 
 end
 end
+

lib/msf/core/exploit_driver.rb

@@ -271,20 +271,14 @@ protected
           exploit.fail_reason = Msf::Exploit::Failure::Unknown
         end
 
-        elog("Exploit failed (#{exploit.refname}): #{msg}", 'core', LEV_0)
-
         if exploit.fail_reason == Msf::Exploit::Failure::Unknown
           exploit.print_error("Exploit failed: #{msg}")
-          exploit.print_error("Call stack:")
-          e.backtrace.each do |line|
-            break if line =~ /lib.msf.base.core.exploit_driver.rb/
-            exploit.print_error("  #{line}")
-          end
-          elog("Call stack:\n#{e.backtrace.join("\n")}", 'core', LEV_0)
         else
           exploit.print_error("Exploit failed [#{exploit.fail_reason}]: #{msg}")
-          dlog("Call stack:\n#{e.backtrace.join("\n")}", 'core', LEV_3)
         end
+
+        elog("Exploit failed (#{exploit.refname}): #{msg}", 'core', LEV_0)
+        dlog("Call stack:\n#{e.backtrace.join("\n")}", 'core', LEV_3)
       end
 
       # Record the error to various places
@@ -335,3 +329,4 @@ protected
 end
 
 end
+

lib/msf/ui/console/command_dispatcher/auxiliary.rb

@@ -120,17 +120,12 @@ class Auxiliary
       print_error("Auxiliary interrupted by the console user")
     rescue ::Exception => e
       print_error("Auxiliary failed: #{e.class} #{e}")
-      elog("Auxiliary failed: #{e.class} #{e}", 'core', LEV_0)
+      if(e.class.to_s != 'Msf::OptionValidateError')
-
-      if e.kind_of?(Msf::OptionValidateError)
-        dlog("Call stack:\n#{e.backtrace.join("\n")}", 'core', LEV_3)
-      else
         print_error("Call stack:")
         e.backtrace.each do |line|
           break if line =~ /lib.msf.base.simple/
           print_error("  #{line}")
         end
-        elog("Call stack:\n#{e.backtrace.join("\n")}", 'core', LEV_0)
       end
 
       return false
@@ -157,3 +152,4 @@ class Auxiliary
 end
 
 end end end end
+

lib/msf/ui/console/command_dispatcher/exploit.rb

@@ -121,18 +121,12 @@ class Exploit
       raise $!
     rescue ::Exception => e
       print_error("Exploit exception (#{mod.refname}): #{e.class} #{e}")
-
+      if(e.class.to_s != 'Msf::OptionValidateError')
-      elog("Exploit exception (#{mod.refname}): #{e.class} #{e}", 'core', LEV_0)
-
-      if e.kind_of?(Msf::OptionValidateError)
-        dlog("Call stack:\n#{e.backtrace.join("\n")}", 'core', LEV_3)
-      else
         print_error("Call stack:")
         e.backtrace.each do |line|
           break if line =~ /lib.msf.base.simple/
           print_error("  #{line}")
         end
-        elog("Call stack:\n#{e.backtrace.join("\n")}", 'core', LEV_0)
       end
     end
 

lib/msf/ui/console/command_dispatcher/post.rb

@@ -122,18 +122,12 @@ class Post
       print_error("Post interrupted by the console user")
     rescue ::Exception => e
       print_error("Post failed: #{e.class} #{e}")
-
+      if (e.class.to_s != 'Msf::OptionValidateError')
-      elog("Post failed: #{e.class} #{e}", 'core', LEV_0)
-
-      if e.kind_of?(Msf::OptionValidateError)
-        dlog("Call stack:\n#{e.backtrace.join("\n")}", 'core', LEV_3)
-      else
         print_error("Call stack:")
         e.backtrace.each do |line|
           break if line =~ /lib.msf.base.simple/
           print_error("  #{line}")
         end
-        elog("Call stack:\n#{e.backtrace.join("\n")}", 'core', LEV_0)
       end
 
       return false
@@ -160,3 +154,4 @@ class Post
 end
 
 end end end end
+