Rework dirty cleanup to use skip_cleanup instead

Author: HD Moore

lib/msf/base/sessions/meterpreter.rb

@@ -252,12 +252,13 @@ def reset_ui
   #
   # Terminates the session
   #
-  def kill(dirty=false)
+  def kill
     begin
-      cleanup_meterpreter(dirty)
+      cleanup_meterpreter
       self.sock.close if self.sock
     rescue ::Exception
     end
+    # deregister will actually trigger another cleanup
     framework.sessions.deregister(self)
   end
 
@@ -466,6 +467,7 @@ def create(param)
   attr_accessor :binary_suffix
   attr_accessor :console # :nodoc:
   attr_accessor :skip_ssl
+  attr_accessor :skip_cleanup
   attr_accessor :target_id
 
 protected

lib/msf/base/sessions/meterpreter_options.rb

@@ -76,7 +76,10 @@ def on_session(session)
     end
 
     # Terminate the session without cleanup if it did not validate
-    session.kill(true) if not valid
+    if not valid
+      session.skip_cleanup = true
+      session.kill
+    end
 
     }
 

lib/rex/post/meterpreter/client.rb

@@ -84,16 +84,16 @@ def initialize(sock,opts={})
   #
   # Cleans up the meterpreter instance, terminating the dispatcher thread.
   #
-  def cleanup_meterpreter(dirty)
-    if not dirty
+  def cleanup_meterpreter
+    if not self.skip_cleanup
       ext.aliases.each_value do | extension |
         extension.cleanup if extension.respond_to?( 'cleanup' )
       end
     end
 
     dispatcher_thread.kill if dispatcher_thread
 
-    if not dirty
+    if not self.skip_cleanup
       core.shutdown rescue nil
     end