Fix NFS exports pruning of other users. Issue 9070.

hashicorp · Nov 17, 2024 · a243fd8 · a243fd8
1 parent 216835c
commit a243fd8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/lib/vagrant/util/string_block_editor.rb b/lib/vagrant/util/string_block_editor.rb
@@ -45,6 +45,16 @@ def keys
         end
       end
 
+      # This returns the keys (or ids) that are in the string regarding current user only (fix for issue 9070).
+      #
+      # @return [<Array<String>]
+      def cur_user_keys
+        regexp = /^#\s*VAGRANT-BEGIN:\s*(#{Process.uid}\s.+?)$\r?\n?(.*)$\r?\n?^#\s*VAGRANT-END:\s(\1)$/m
+        @value.scan(regexp).map do |match|
+          match[0]
+        end
+      end
+
       # This deletes the block with the given key if it exists.
       def delete(key)
         key    = Regexp.quote(key)

diff --git a/plugins/hosts/linux/cap/nfs.rb b/plugins/hosts/linux/cap/nfs.rb
@@ -117,7 +117,10 @@ def self.nfs_prune(environment, ui, valid_ids)
           composite_ids = valid_ids.map do |v_id|
             "#{user} #{v_id}"
           end
-          remove_ids = editor.keys - composite_ids
+
+          #Fix for issue 9070, pruning other users' NFS exports
+          #remove_ids = editor.keys - composite_ids
+          remove_ids = editor.cur_user_keys - composite_ids
 
           logger.debug("Known valid NFS export IDs: #{valid_ids}")
           logger.debug("Composite valid NFS export IDs with user: #{composite_ids}")