Land rapid7#5138 : Cleanup http(s) sessions when all closed

Author: OJ

lib/msf/core/handler/reverse_http.rb

@@ -165,7 +165,9 @@ def setup_handler
   def stop_handler
     if self.service
       self.service.remove_resource("/")
-      Rex::ServiceManager.stop_service(self.service) if self.sessions == 0
+      if self.service.resources.empty? && self.sessions == 0
+        Rex::ServiceManager.stop_service(self.service)
+      end
     end
   end
 

lib/rex/post/meterpreter/packet_dispatcher.rb

@@ -79,7 +79,12 @@ def initialize_passive_dispatcher
 
   def shutdown_passive_dispatcher
     return if not self.passive_service
-    self.passive_service.remove_resource("/" + self.conn_id  + "/")
+    self.passive_service.remove_resource(self.conn_id  + "/")
+
+    # If there are no more resources registered on the service, stop it entirely
+    if self.passive_service.resources.empty?
+      Rex::ServiceManager.stop_service(self.passive_service)
+    end
 
     self.alive      = false
     self.send_queue = []