rework logical fix for rapid7#8884 to function with bootstrap code

Author: Brent Cook

lib/msf/base/sessions/meterpreter.rb

@@ -120,7 +120,7 @@ def shell_init
 
   end
 
-  def bootstrap(datastore={})
+  def bootstrap(datastore = {}, handler = nil)
     session = self
 
     init_session = Proc.new do
@@ -182,9 +182,12 @@ def bootstrap(datastore={})
       end
 
       # Process the auto-run scripts for this session
-      if self.respond_to?('process_autoruns')
+      if self.respond_to?(:process_autoruns)
         self.process_autoruns(datastore)
       end
+
+      # Tell the handler that we have a session
+      handler.on_session(self) if handler
     end
 
     # Defer the session initialization to the Session Manager scheduler

lib/msf/core/handler.rb

@@ -244,8 +244,11 @@ def register_session(session)
     framework.sessions.register(session)
 
     # Call the handler's on_session() method
-    on_session(session)
-    session.bootstrap(datastore)
+    if session.respond_to?(:bootstrap)
+      session.bootstrap(datastore, self)
+    else
+      on_session(session)
+    end
 
     # If there is an exploit associated with this payload, then let's notify
     # anyone who is interested that this exploit succeeded