Land rapid7#5688, remove msfcli

Author: Brent Cook

lib/msf/core/modules/loader/base.rb

@@ -253,21 +253,13 @@ def load_module(parent_path, type, module_reference_name, options={})
   # @return [Hash{String => Integer}] Maps module type to number of
   #   modules loaded
   def load_modules(path, options={})
-    options.assert_valid_keys(:force, :whitelist)
+    options.assert_valid_keys(:force)
 
     force = options[:force]
     count_by_type = {}
     recalculate_by_type = {}
 
-    # This is used to avoid loading the same thing twice
-    loaded_items = []
-
     each_module_reference_name(path, options) do |parent_path, type, module_reference_name|
-      # In msfcli mode, if a module is already loaded, avoid loading it again
-      next if loaded_items.include?(module_reference_name) and options[:whitelist]
-
-      # Keep track of loaded modules in msfcli mode
-      loaded_items << module_reference_name if options[:whitelist]
       load_module(
           parent_path,
           type,

lib/msf/core/modules/loader/directory.rb

@@ -56,24 +56,7 @@ def each_module_reference_name(path, opts={})
           # The module_reference_name doesn't have a file extension
           module_reference_name = module_reference_name_from_path(relative_entry_descendant_path)
 
-          # If the modules argument is set, this means we only want to load specific ones instead
-          # of loading everything to memory - see msfcli.
-          if whitelist.empty?
-            # Load every module we see, which is the default behavior.
-            yield path, type, module_reference_name
-          else
-              whitelist.each do |pattern|
-              # We have to use entry_descendant_path to see if this is the module we want, because
-              # this is easier to identify the module type just by looking at the file path.
-              # For example, if module_reference_name is used (or a parsed relative path), you can't
-              # really tell if php/generic is a NOP module, a payload, or an encoder.
-              if entry_descendant_path =~ pattern
-                yield path, type, module_reference_name
-              else
-                next
-              end
-            end
-          end
+          yield path, type, module_reference_name
         end
       end
     end

metasploit-framework.gemspec

@@ -30,7 +30,6 @@ Gem::Specification.new do |spec|
   spec.bindir = '.'
   spec.executables   = [
       'msfbinscan',
-      'msfcli',
       'msfconsole',
       'msfd',
       'msfelfscan',

modules/auxiliary/scanner/http/cert.rb

@@ -21,10 +21,6 @@ def initialize
           This module will check the certificate of the specified web servers
         to ensure the subject and issuer match the supplied pattern and that the certificate
         is not expired.
-
-        Note:  Be sure to check your expression if using msfcli, shells tend to not like certain
-        things and will strip/interpret them (= is a perfect example). It is better to use in
-        console.
       }
     )