Land rapid7#7825, don't double-load plugins

Author: egypt

lib/msf/core/plugin_manager.rb

@@ -68,6 +68,10 @@ def load(path, opts = {})
       Kernel.load(path + ".rb")
     end
 
+    # Force unloading if already loaded
+    plugin = self.find { |p| p.class == klass }
+    unload(plugin) if plugin
+
     # Create an instance of the plugin and let it initialize
     instance = klass.create(framework, opts)
 

lib/msf/core/rpc/v10/rpc_plugin.rb

@@ -57,15 +57,16 @@ def rpc_load(path, xopts = {})
   # @example Here's how you would use this from the client:
   #  rpc.call('plugin.unload', 'nexpose')
   def rpc_unload(name)
-    self.framework.plugins.each { |plugin|
-      # Unload the plugin if it matches the name we're searching for
-      if (plugin.name == name)
-        self.framework.plugins.unload(plugin)
-        return 	{ "result" => "success" }
-      end
-    }
-    return 	{ "result" => "failure" }
+    # Find a plugin within the plugins array
+    plugin = self.framework.plugins.find { |p| p.name == name }
 
+    # Unload the plugin if it matches the name we're searching for
+    if plugin
+      self.framework.plugins.unload(plugin)
+      return 	{ "result" => "success" }
+    end
+
+    return 	{ "result" => "failure" }
   end
 
 

lib/msf/ui/console/command_dispatcher/core.rb

@@ -1653,16 +1653,15 @@ def cmd_unload(*args)
       return false
     end
 
-    # Walk the plugins array
-    framework.plugins.each { |plugin|
-      # Unload the plugin if it matches the name we're searching for
-      if (plugin.name.downcase == args[0].downcase)
-        print("Unloading plugin #{args[0]}...")
-        framework.plugins.unload(plugin)
-        print_line("unloaded.")
-        break
-      end
-    }
+    # Find a plugin within the plugins array
+    plugin = framework.plugins.find { |p| p.name.downcase == args[0].downcase }
+
+    # Unload the plugin if it matches the name we're searching for
+    if plugin
+      print("Unloading plugin #{args[0]}...")
+      framework.plugins.unload(plugin)
+      print_line("unloaded.")
+    end
   end
 
   #