Merge branch 'bug/wrong-file_changed-argument' into rapid7

[Closes rapid7#965]

Author: egypt

lib/fastlib.rb

@@ -182,12 +182,14 @@ def self.fastlib_filter_encode(lib, buff)
 	end
 
 
+	# This method provides a way to create a FASTLIB archive programatically.
 	#
-	# This method provides a way to create a FASTLIB archive programatically,
-	# the key arguments are the name of the destination archive, the base
-	# directory that should be excluded from the archived path, and finally
-	# the list of specific files and directories to include in the archive.
-	#
+	# @param [String] lib the output path for the archive
+	# @param [String] flag a string containing the hex values for the flags ({FLAG_COMPRESS} and {FLAG_ENCRYPT}).
+	# @param [String] bdir the path to the base directory which will be stripped from all paths included in the archive
+	# @param [Array<String>] dirs list of directories/files to pack into the archive.  All dirs should be under bdir so
+	#   that the paths are stripped correctly.
+	# @return [void]
 	def self.dump(lib, flag, bdir, *dirs)
 		head = ""
 		data = ""

lib/msf/core/module_manager/loading.rb

@@ -26,11 +26,11 @@ module Msf::ModuleManager::Loading
   def file_changed?(path)
     changed = false
 
-    module_details = self.module_info_by_path[path]
+    module_info = self.module_info_by_path[path]
 
     # if uncached then it counts as changed
     # Payloads can't be cached due to stage/stager matching
-    if module_details.nil? or module_details[:mtype] == Msf::MODULE_PAYLOAD
+    if module_info.nil? or module_info[:type] == Msf::MODULE_PAYLOAD
       changed = true
     else
       begin
@@ -39,7 +39,7 @@ def file_changed?(path)
         # if the file does not exist now, that's a change
         changed = true
       else
-        cached_modification_time = module_details[:mtime].to_i
+        cached_modification_time = module_info[:modification_time].to_i
 
         # if the file's modification time's different from the cache, then it's changed
         if current_modification_time != cached_modification_time

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

@@ -41,7 +41,7 @@ def each_module_reference_name(path)
       type = entry.split('/', 2)[0]
       type = type.singularize
 
-      unless module_manager.enablement_by_type[type]
+      unless module_manager.type_enabled?(type)
         next
       end
 

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

@@ -3,6 +3,7 @@
 #
 require 'msf/core/modules/loader'
 require 'msf/core/modules/namespace'
+require 'msf/core/modules/version_compatibility_error'
 
 # Responsible for loading modules for {Msf::ModuleManager}.
 #
@@ -77,7 +78,6 @@ def loadable?(path)
     raise ::NotImplementedError
   end
 
-
   # Loads a module from the supplied path and module_reference_name.
   #
   # @param [String] parent_path The path under which the module exists.  This is not necessarily the same path as passed
@@ -104,14 +104,18 @@ def load_module(parent_path, type, module_reference_name, options={})
     force = options[:force] || false
     reload = options[:reload] || false
 
-    unless force or module_manager.file_changed?(parent_path)
-      dlog("Cached module from #{parent_path} has not changed.", 'core', LEV_2)
+    module_path = self.module_path(parent_path, type, module_reference_name)
+    file_changed = module_manager.file_changed?(module_path)
+
+    unless force or file_changed
+      dlog("Cached module from #{module_path} has not changed.", 'core', LEV_2)
 
       return false
     end
 
+    reload ||= force || file_changed
+
     metasploit_class = nil
-    module_path = self.module_path(parent_path, type, module_reference_name)
 
     loaded = namespace_module_transaction(type + "/" + module_reference_name, :reload => reload) { |namespace_module|
       # set the parent_path so that the module can be reloaded with #load_module
@@ -121,7 +125,7 @@ def load_module(parent_path, type, module_reference_name, options={})
 
       begin
         namespace_module.module_eval_with_lexical_scope(module_content, module_path)
-          # handle interrupts as pass-throughs unlike other Exceptions
+      # handle interrupts as pass-throughs unlike other Exceptions so users can bail with Ctrl+C
       rescue ::Interrupt
         raise
       rescue ::Exception => error
@@ -191,6 +195,11 @@ def load_module(parent_path, type, module_reference_name, options={})
       # not trigger an ambiguous name warning, which would cause the reloaded module to not be stored in the
       # ModuleManager.
       module_manager.delete(module_reference_name)
+
+	    # Delete the original copy of the module in the type-specific module set stores the reloaded module and doesn't
+	    # trigger an ambiguous name warning
+	    module_set = module_manager.module_set(type)
+	    module_set.delete(module_reference_name)
     end
 
     # Do some processing on the loaded module to get it into the right associations
@@ -290,7 +299,6 @@ def reload_module(original_metasploit_class_or_instance)
 
     dlog("Reloading module #{module_reference_name}...", 'core')
 
-
     if load_module(parent_path, type, module_reference_name, :force => true, :reload => true)
       # Create a new instance of the module
       reloaded_module_instance = module_manager.create(module_reference_name)
@@ -486,20 +494,18 @@ def namespace_module_transaction(uniq_module_reference_name, options={}, &block)
       elog("Reloading namespace_module #{previous_namespace_module} when :reload => false")
     end
 
+    relative_name = namespace_module_names.last
+
     if previous_namespace_module
       parent_module = previous_namespace_module.parent
-      relative_name = namespace_module_names.last
-
-      # remove_const is private, so invoke in instance context
-      parent_module.instance_eval do
-        remove_const relative_name
-      end
-    else
-      parent_module = nil
-      relative_name = namespace_module_names.last
+      # remove_const is private, so use send to bypass
+      parent_module.send(:remove_const, relative_name)
     end
 
     namespace_module = create_namespace_module(namespace_module_names)
+    # Get the parent module from the created module so that restore_namespace_module can remove namespace_module's
+    # constant if needed.
+    parent_module = namespace_module.parent
 
     begin
       loaded = block.call(namespace_module)
@@ -534,19 +540,29 @@ def read_module_content(parent_path, type, module_reference_name)
   #
   # @param [Module] parent_module The .parent of namespace_module before it was removed from the constant tree.
   # @param [String] relative_name The name of the constant under parent_module where namespace_module was attached.
-  # @param [Module] namespace_module The previous namespace module containing the old module content.
+  # @param [Module, nil] namespace_module The previous namespace module containing the old module content.  If `nil`,
+  #   then the relative_name constant is removed from parent_module, but nothing is set as the new constant.
   # @return [void]
   def restore_namespace_module(parent_module, relative_name, namespace_module)
-    if parent_module and namespace_module
-      # the const may have been redefined by {#create_namespace_module}, in which case that new namespace_module needs
-      # to be removed so the original can replace it.
-      if parent_module.const_defined? relative_name
-        parent_module.instance_eval do
-          remove_const relative_name
-        end
+    if parent_module
+      # If there is a current module with relative_name
+      if parent_module.const_defined?(relative_name)
+	      # if the current value isn't the value to be restored.
+	      if parent_module.const_get(relative_name) != namespace_module
+		      # remove_const is private, so use send to bypass
+		      parent_module.send(:remove_const, relative_name)
+
+		      # if there was a previous module, not set it to the name
+		      if namespace_module
+			      parent_module.const_set(relative_name, namespace_module)
+		      end
+	      end
+      else
+	      # if there was a previous module, but there isn't a current module, then restore the previous module
+	      if namespace_module
+		      parent_module.const_set(relative_name, namespace_module)
+	      end
       end
-
-      parent_module.const_set(relative_name, namespace_module)
     end
   end