log errors into framework.log

Author: firefart

lib/msf/base/simple/auxiliary.rb

@@ -151,17 +151,19 @@ def self.job_run_proc(ctx)
     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')
         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)
+      else
+        dlog("Call stack:\n#{$@.join("\n")}", 'core', LEV_3)
       end
 
-      elog("Auxiliary failed: #{e.class} #{e}", 'core', LEV_0)
-      dlog("Call stack:\n#{$@.join("\n")}", 'core', LEV_3)
-
       mod.cleanup
 
       return
@@ -182,4 +184,3 @@ def self.job_cleanup_proc(ctx)
 
 end
 end
-

lib/msf/base/simple/exploit.rb

@@ -147,7 +147,17 @@ def self.exploit_simple(oexploit, opts, &block)
       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.class.to_s != 'Msf::OptionValidateError')
+        mod.print_error("Call stack:")
+        e.backtrace.each do |line|
+          break if line =~ /lib.msf.base.simple.exploit.rb/
+          mod.print_error("  #{line}")
+        end
+        elog("Call stack:\n#{e.backtrace.join("\n")}", 'core', LEV_0)
+      else
+        dlog("Call stack:\n#{e.backtrace.join("\n")}", 'core', LEV_3)
+      end
     end
 
     return driver.session if driver
@@ -199,4 +209,3 @@ def check_simple(opts)
 
 end
 end
-

lib/msf/base/simple/post.rb

@@ -121,17 +121,19 @@ def self.job_run_proc(ctx)
     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')
         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)
+      else
+        dlog("Call stack:\n#{$@.join("\n")}", 'core', LEV_3)
       end
 
-      elog("Post failed: #{e.class} #{e}", 'core', LEV_0)
-      dlog("Call stack:\n#{$@.join("\n")}", 'core', LEV_3)
-
       mod.cleanup
 
       return
@@ -154,4 +156,3 @@ def self.job_cleanup_proc(ctx)
 
 end
 end
-