Fix first time startup timing bug

Author: clee-r7

lib/msf/core/modules/metadata/obj.rb

@@ -54,6 +54,10 @@ def initialize(module_instance)
     end
   end
 
+  def update_mod_time(mod_time)
+    @mod_time = mod_time
+  end
+
   def path
     if @is_install_path
       return ::File.join(Msf::Config.install_root, @path)

lib/msf/core/modules/metadata/store.rb

@@ -35,11 +35,12 @@ def update_store
   def load_metadata
     begin
       retries ||= 0
-      configure_user_store
-      @store = PStore.new(@path_to_user_metadata)
+      copied = configure_user_store
+      @store = PStore.new(@path_to_user_metadata, true)
       @module_metadata_cache = @store.transaction(true) { @store[:module_metadata]}
-      validate_data if (!@module_metadata_cache.nil? && @module_metadata_cache.size > 0)
+      validate_data(copied) if (!@module_metadata_cache.nil? && @module_metadata_cache.size > 0)
       @module_metadata_cache = {} if @module_metadata_cache.nil?
+      puts "module size #{@module_metadata_cache.size}"
     rescue
       retries +=1
 
@@ -54,30 +55,42 @@ def load_metadata
 
   end
 
-  def validate_data
+  def validate_data(copied)
     size_prior = @module_metadata_cache.size
-    @module_metadata_cache.delete_if {|path, module_metadata| !::File.exist?(module_metadata.path)}
-    update_store if (size_prior != @module_metadata_cache.size)
+    @module_metadata_cache.delete_if {|key, module_metadata| !::File.exist?(module_metadata.path)}
+
+    if (copied)
+      @module_metadata_cache.each_value {|module_metadata|
+        module_metadata.update_mod_time(::File.mtime(module_metadata.path))
+      }
+    end
+
+    update_store if (size_prior != @module_metadata_cache.size || copied)
   end
 
   def configure_user_store
+    copied = false
     @path_to_user_metadata =  ::File.join(Msf::Config.config_directory, UserMetaDataFile)
-    path_to_base_metadata = ::File.join(Msf::Config.install_root, "db", BaseMetaDataFile)
+    @path_to_base_metadata = ::File.join(Msf::Config.install_root, "db", BaseMetaDataFile)
 
     if (!::File.exist?(path_to_base_metadata))
       wlog("Missing base module metadata file: #{path_to_base_metadata}")
     else
       if (!::File.exist?(@path_to_user_metadata))
-        FileUtils.cp(path_to_base_metadata, @path_to_user_metadata)
+        FileUtils.cp(@path_to_base_metadata, @path_to_user_metadata)
+        copied = true
         dlog('Created user based module store')
 
        # Update the user based module store if an updated base file is created/pushed
       elsif (::File.mtime(path_to_base_metadata).to_i > ::File.mtime(@path_to_user_metadata).to_i)
         FileUtils.remove(@path_to_user_metadata, true)
-        FileUtils.cp(path_to_base_metadata, @path_to_user_metadata)
+        FileUtils.cp(@path_to_base_metadata, @path_to_user_metadata)
+        copied = true
         dlog('Updated user based module store')
       end
     end
+
+    return copied
   end
 
 end