Move deletion into #remove_resource

Doing it here means that modules manually calling remove_resource won't
screw up the cleanup

Author: egypt

lib/msf/core/exploit/http/server.rb

@@ -36,6 +36,8 @@ def initialize(info = {})
 			], Exploit::Remote::HttpServer
 		)
 
+		# Used to keep track of resources added to the service manager by
+		# this module. see #add_resource and #cleanup
 		@my_resources = []
 		@service_path = nil
 	end
@@ -205,9 +207,8 @@ def start_service(opts = {})
 
 	# Take care of removing any resources that we created
 	def cleanup
-		@my_resources.delete_if do |resource|
+		@my_resources.each do |resource|
 			remove_resource(resource)
-			true
 		end
 
 		super
@@ -374,7 +375,8 @@ def add_resource(opts)
 		@service_path = opts['Path']
 		res = service.add_resource(opts['Path'], opts)
 
-		# This has to go *after* the call to add_resource in case it raises
+		# This has to go *after* the call to service.add_resource in case
+		# the service manager doesn't like it for some reason and raises.
 		@my_resources.push(opts['Path'])
 
 		res
@@ -472,7 +474,11 @@ def srvhost_addr
 	# Removes a URI resource.
 	#
 	def remove_resource(name)
-		service.remove_resource(name)
+		# Guard against removing resources added by other modules
+		if @my_resources.include?(name)
+			@my_resources.delete(name)
+			service.remove_resource(name)
+		end
 	end
 
 	#