vagrant-sshfs 1.3.4 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68c00a268dd8b861a0dccc09d8038bade7d6fdda953fa4790fb057ad304c8f5b
-  data.tar.gz: f2e5f1162a74cb9bf5034d243167cca7f69f7e5ecf4bff5d74235c134f232674
+  metadata.gz: 72b97abe094123820d790b417d595675003b24a8a0ba4adbfc943aa8663076f7
+  data.tar.gz: 63fd927bcd56ce74257edff5588d8025057a2746f859c81f1e4c8a311fd635da
 SHA512:
-  metadata.gz: 4afe022b17eff7aa2c4bed784dd05e8e9e4701bd6327b9792ff20c4ea551185037dc75a69100dfde7a06f47db9d06c404efeb532161427236d927eaca6257981
-  data.tar.gz: b9828d27f40ca3318c2877e2a6381f01a7d7594a54f96affbb73b2913843bcf4134f059cc458aaa16b600f395907c900f3767f6ebfaa4d3fa810f6606cbe4ef7
+  metadata.gz: 3e810e679a39964500567be12233816f504301b7e0aa4f222b6ac2c1dfbbc2e5b314fc1b40015a70532eae759d978f5820992b448e944be51467ccb328671282
+  data.tar.gz: 7c0451482703f81bb0a8a740a4a094b51b7d7529d73e302bdf7312e44e1d84e2cf6c002b40858696a84c67b12c4e01f6a935e0e0c482c035d9ee226751e99c2f

data/Gemfile

@@ -6,11 +6,11 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem "vagrant", :git => "https://github.com/mitchellh/vagrant.git", :ref => 'v2.2.7'
+  gem "vagrant", :git => "https://github.com/mitchellh/vagrant.git", :ref => 'v2.2.19'
 end
 
 group :plugins do
   # Add vagrant-libvirt plugin here, otherwise you won't be able to
   # use libvirt as a provider when you execute `bundle exec vagrant up`
-  gem "vagrant-libvirt" , '0.0.45'
+  gem "vagrant-libvirt" , '0.7.0'
 end

data/build.sh

@@ -1,7 +1,7 @@
 #!/bin/bash -x
 set -ex
 
-ctr=$(buildah from registry.fedoraproject.org/fedora:31)
+ctr=$(buildah from registry.fedoraproject.org/fedora:35)
 
 rpms=(
   make gcc ruby ruby-devel redhat-rpm-config # for building gems

data/lib/vagrant-sshfs/cap/guest/alma/sshfs_client.rb

@@ -0,0 +1,39 @@
+module VagrantPlugins
+  module GuestAlma
+    module Cap
+      class SSHFSClient
+        def self.sshfs_install(machine)
+
+          case machine.guest.capability("flavor")
+            when :alma_8
+              # No need to install epel. fuse-sshfs comes from the powertools repo
+              # https://bugzilla.redhat.com/show_bug.cgi?id=1758884
+              # https://github.com/dustymabe/vagrant-sshfs/issues/123
+              machine.communicate.sudo("yum -y install --enablerepo=powertools fuse-sshfs")
+            when :alma_9, :alma # alma9 or unknown
+              # Install fuse-sshfs from epel
+              if !epel_installed(machine)
+                epel_install(machine)
+              end
+              machine.communicate.sudo("yum -y install fuse-sshfs")
+          end
+        end
+
+        def self.sshfs_installed(machine)
+          machine.communicate.test("rpm -q fuse-sshfs")
+        end
+
+        protected
+
+        def self.epel_installed(machine)
+          machine.communicate.test("rpm -q epel-release")
+        end
+
+        def self.epel_install(machine)
+          machine.communicate.sudo("yum -y install epel-release")
+        end
+
+      end
+    end
+  end
+end

data/lib/vagrant-sshfs/cap/guest/centos/sshfs_client.rb

@@ -0,0 +1,52 @@
+module VagrantPlugins
+  module GuestCentOS
+    module Cap
+      class SSHFSClient
+        def self.sshfs_install(machine)
+
+          # Until a newer version of Vagrant ships with https://github.com/hashicorp/vagrant/pull/12785
+          # we need to handle the case where Alma or Rocky end up here
+          if machine.communicate.test("grep 'VERSION_ID=\"8' /etc/os-release")
+              machine.communicate.sudo("yum -y install --enablerepo=powertools fuse-sshfs")
+              return
+          elsif machine.communicate.test("grep 'VERSION_ID=\"9' /etc/os-release")
+              if !epel_installed(machine)
+                epel_install(machine)
+              end
+              machine.communicate.sudo("yum -y install fuse-sshfs")
+              return
+          end
+
+          case machine.guest.capability("flavor")
+            when :centos_8
+              # No need to install epel. fuse-sshfs comes from the powertools repo
+              # https://bugzilla.redhat.com/show_bug.cgi?id=1758884
+              # https://github.com/dustymabe/vagrant-sshfs/issues/123
+              machine.communicate.sudo("yum -y install --enablerepo=powertools fuse-sshfs")
+            when :centos_9, :centos_7, :centos # centos{9,7,6}
+              # Install fuse-sshfs from epel
+              if !epel_installed(machine)
+                epel_install(machine)
+              end
+              machine.communicate.sudo("yum -y install fuse-sshfs")
+          end
+        end
+
+        def self.sshfs_installed(machine)
+          machine.communicate.test("rpm -q fuse-sshfs")
+        end
+
+        protected
+
+        def self.epel_installed(machine)
+          machine.communicate.test("rpm -q epel-release")
+        end
+
+        def self.epel_install(machine)
+          machine.communicate.sudo("yum -y install epel-release")
+        end
+
+      end
+    end
+  end
+end

data/lib/vagrant-sshfs/cap/guest/freebsd/sshfs_client.rb

@@ -4,14 +4,22 @@ module VagrantPlugins
       class SSHFSClient
         def self.sshfs_install(machine)
           machine.communicate.sudo("pkg install -y fusefs-sshfs")
-          machine.communicate.sudo("kldload fuse")
+          # older FreeBSD used fuse, newer uses fusefs
+          # https://github.com/dustymabe/vagrant-sshfs/issues/124
+          machine.communicate.sudo("kldload fuse || kldload fusefs")
         end
 
         def self.sshfs_installed(machine)
           installed = machine.communicate.test("pkg info fusefs-sshfs")
           if installed
-              # fuse may not get loaded at boot, so check if it's loaded otherwise force load it
-              machine.communicate.sudo("kldstat -m fuse || kldload fuse")
+              # fuse may not get loaded at boot, so check if it's loaded
+              # If not loaded then force load it
+              loaded = machine.communicate.test("kldstat -m fuse || kldstat -m fusefs")
+              if not loaded
+                # older FreeBSD used fuse, newer uses fusefs
+                # https://github.com/dustymabe/vagrant-sshfs/issues/124
+                machine.communicate.sudo("kldload fuse || kldload fusefs")
+              end
           end
 
           installed

data/lib/vagrant-sshfs/cap/guest/linux/sshfs_forward_mount.rb

@@ -2,6 +2,7 @@ require "log4r"
 require "vagrant/util/retryable"
 require "vagrant/util/platform"
 require "tempfile"
+require Vagrant.source_root.join("plugins/synced_folders/unix_mount_helpers")
 
 # This is already done for us in lib/vagrant-sshfs.rb. We needed to
 # do it there before Process.uid is called the first time by Vagrant
@@ -15,6 +16,7 @@ module VagrantPlugins
     module Cap
       class MountSSHFS
         extend Vagrant::Util::Retryable
+        extend VagrantPlugins::SyncedFolder::UnixMountHelpers
         @@logger = Log4r::Logger.new("vagrant::synced_folders::sshfs_mount")
 
         def self.list_mounts_command
@@ -80,7 +82,25 @@ module VagrantPlugins
               hostpath = File.expand_path(opts[:hostpath], machine.env.root_path)
               hostpath  = Vagrant::Util::Platform.fs_real_path(hostpath).to_s
           end
-           
+
+          # Support for user provided mount_options, owner, group
+          # https://github.com/hashicorp/vagrant/blob/2c3397c46851ef29a3589bf3214a3eee12da8484/website/content/docs/synced-folders/basic_usage.mdx#options
+          mount_options = opts.fetch(:mount_options, [])
+          # Determine owner/group info to use
+          if (opts.has_key?(:owner) and opts[:owner]) or
+             (opts.has_key?(:group) and opts[:group])
+            detected_ids = detect_owner_group_ids(
+                machine, expanded_guest_path, mount_options, opts)
+            mount_uid = detected_ids[:uid]
+            mount_gid = detected_ids[:gid]
+            mount_options.append("uid=#{mount_uid}")
+            mount_options.append("gid=#{mount_gid}")
+          end
+          # Combine mount_options into sshfs_opts_append (also user provided)
+          if not mount_options.empty?()
+            opts[:sshfs_opts_append] =
+              opts[:sshfs_opts_append].to_s + ' -o ' + mount_options.join(',') + ' '
+          end
 
           # Add in some sshfs/fuse options that are common to both mount methods
           opts[:sshfs_opts] = ' -o allow_other ' # allow non-root users to access
@@ -288,8 +308,8 @@ module VagrantPlugins
                            :thread_inherit => true,
                            :startup_info => {:stdin => w1, :stdout => r2, :stderr => f2})
           else
-            p1 = spawn(sftp_server_cmd, :out => w2, :in => r1, :err => f1, :pgroup => true)
-            p2 = spawn(ssh_cmd,         :out => w1, :in => r2, :err => f2, :pgroup => true)
+            p1 = spawn(sftp_server_cmd, :out => w2, :in => r1, :err => f1, :pgroup => true, :close_others => true)
+            p2 = spawn(ssh_cmd,         :out => w1, :in => r2, :err => f2, :pgroup => true, :close_others => true)
 
             # Detach from the processes so they will keep running
             Process.detach(p1)

data/lib/vagrant-sshfs/cap/guest/redhat/sshfs_client.rb

@@ -4,20 +4,17 @@ module VagrantPlugins
       class SSHFSClient
         def self.sshfs_install(machine)
 
-          rhel_version = machine.guest.capability("flavor")
-
-          # Handle the case where Vagrant doesn't yet know how to
-          # detect and return :rhel_8 https://github.com/hashicorp/vagrant/pull/11453
-          if Gem::Version.new(Vagrant::VERSION) < Gem::Version.new('2.2.8')
-            rhel_version = vagrant_lt_228_flavor_compat(machine)
-          end
-
-          case rhel_version
+          case machine.guest.capability("flavor")
             when :rhel_8
-              # No need to install epel. fuse-sshfs comes from the PowerTools repo
-              # https://bugzilla.redhat.com/show_bug.cgi?id=1758884
-              machine.communicate.sudo("yum -y install --enablerepo=PowerTools fuse-sshfs")
-            when :rhel_7, :rhel # rhel7 and rhel6
+              # fuse-sshfs isn't in EPEL8 and how to get it from RHEL repos
+              # without having to have the system subscribed is unclear:
+              # https://github.com/dustymabe/vagrant-sshfs/issues/108#issuecomment-601061947
+              # Using fuse-sshfs from EPEL7 works for now so let's just go with it.
+              # Do the install in such a way that the epel7 repo doesn't hang around
+              # on the system, which may have unintended consequences on RHEL8.
+              machine.communicate.sudo("rpm --import https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7")
+              machine.communicate.sudo("yum -y install fuse-sshfs --repofrompath=epel7,'http://download.fedoraproject.org/pub/epel/7/$basearch'")
+            when :rhel_9, :rhel_7, :rhel # rhel{9,7,6}
               # Install fuse-sshfs from epel
               if !epel_installed(machine)
                 epel_install(machine)
@@ -37,23 +34,19 @@ module VagrantPlugins
         end
 
         def self.epel_install(machine)
-          machine.communicate.sudo("yum -y install epel-release")
-        end
-
-        def self.vagrant_lt_228_flavor_compat(machine)
-          # This is a compatibility function to handle RHEL8 for
-          # vagrant versions that didn't include:
-          # https://github.com/hashicorp/vagrant/pull/11453
-          output = ""
-          machine.communicate.sudo("cat /etc/redhat-release") do |_, data|
-            output = data
-          end
-          if output =~ /(CentOS|Red Hat Enterprise|Scientific|Cloud|Virtuozzo)\s*Linux( .+)? release 8/i
-            return :rhel_8
-          elsif output =~ /(CentOS|Red Hat Enterprise|Scientific|Cloud|Virtuozzo)\s*Linux( .+)? release 7/i
-            return :rhel_7
-          else
-            return :rhel
+          case machine.guest.capability("flavor")
+            when :rhel_9
+              machine.communicate.sudo("rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm")
+            when :rhel_7
+              machine.communicate.sudo("rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm")
+            when :rhel # rhel6
+              # Until a newer version of Vagrant ships with https://github.com/hashicorp/vagrant/pull/12785
+              # we need to handle the case where Alma 9 and RHEL 9 end up here.
+              if machine.communicate.test("grep 'VERSION_ID=\"9' /etc/os-release")
+                machine.communicate.sudo("rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm")
+              else
+                machine.communicate.sudo("rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm")
+              end
           end
         end
       end

data/lib/vagrant-sshfs/cap/guest/rocky/sshfs_client.rb

@@ -0,0 +1,39 @@
+module VagrantPlugins
+  module GuestRocky
+    module Cap
+      class SSHFSClient
+        def self.sshfs_install(machine)
+
+          case machine.guest.capability("flavor")
+            when :rocky_8
+              # No need to install epel. fuse-sshfs comes from the powertools repo
+              # https://bugzilla.redhat.com/show_bug.cgi?id=1758884
+              # https://github.com/dustymabe/vagrant-sshfs/issues/123
+              machine.communicate.sudo("yum -y install --enablerepo=powertools fuse-sshfs")
+            when :rocky_9, :rocky # rocky9 or unknown
+              # Install fuse-sshfs from epel
+              if !epel_installed(machine)
+                epel_install(machine)
+              end
+              machine.communicate.sudo("yum -y install fuse-sshfs")
+          end
+        end
+
+        def self.sshfs_installed(machine)
+          machine.communicate.test("rpm -q fuse-sshfs")
+        end
+
+        protected
+
+        def self.epel_installed(machine)
+          machine.communicate.test("rpm -q epel-release")
+        end
+
+        def self.epel_install(machine)
+          machine.communicate.sudo("yum -y install epel-release")
+        end
+
+      end
+    end
+  end
+end

data/lib/vagrant-sshfs/cap/host/darwin/sshfs_reverse_mount.rb

@@ -1,3 +1,4 @@
+require "etc"
 require "log4r"
 require "vagrant/util/retryable"
 require "tempfile"
@@ -56,6 +57,12 @@ module VagrantPlugins
           expanded_guest_path = machine.guest.capability(
             :shell_expand_guest_path, opts[:guestpath])
 
+          # Create the mountpoint inside the guest
+          machine.communicate.tap do |comm|
+            comm.sudo("mkdir -p #{expanded_guest_path}")
+            comm.sudo("chmod 777 #{expanded_guest_path}")
+          end
+
           # Mount path information
           hostpath = opts[:hostpath].dup
           hostpath.gsub!("'", "'\\\\''")
@@ -68,10 +75,8 @@ module VagrantPlugins
           opts[:ssh_opts]+= ' -o ServerAliveInterval=30 '  # send keepalives
 
           # SSH connection options
-          # Note the backslash escapes for IdentityFile - handles spaces in key path
           ssh_opts = opts[:ssh_opts]
           ssh_opts+= ' -o Port=' + machine.ssh_info[:port].to_s
-          ssh_opts+= ' -o "IdentityFile=\"' + machine.ssh_info[:private_key_path][0] + '\""'
           ssh_opts+= ' -o UserKnownHostsFile=/dev/null '
           ssh_opts+= ' -F /dev/null ' # Don't pick up options from user's config
           if machine.ssh_info.key?(:private_key_path) and
@@ -84,9 +89,35 @@ module VagrantPlugins
 
           ssh_opts_append = opts[:ssh_opts_append].to_s # provided by user
 
+          # Support for user provided mount_options, owner, group
+          # https://github.com/hashicorp/vagrant/blob/2c3397c46851ef29a3589bf3214a3eee12da8484/website/content/docs/synced-folders/basic_usage.mdx#options
+          mount_options = opts.fetch(:mount_options, [])
+          if (opts.has_key?(:owner) and opts[:owner]) or
+             (opts.has_key?(:group) and opts[:group])
+            # Identify the uid
+            if opts.has_key?(:owner) and opts[:owner]
+              mount_uid = Etc::getpwnam(opts[:owner]).uid
+            else
+              mount_uid = Etc::getpwnam(Etc.getlogin).uid
+            end
+            # Identify the gid. If a group was provided use that otherwise use
+            # the group detected with the detected user id.
+            if opts.has_key?(:group) and opts[:group]
+              mount_gid = Etc::getgrnam(opts[:group]).gid
+            else
+              mount_gid = Etc::getpwnam(Etc.getlogin).gid
+            end
+            # Add them to the mount options
+            mount_options.append("uid=#{mount_uid}")
+            mount_options.append("gid=#{mount_gid}")
+          end
+
           # SSHFS executable options
           sshfs_opts = opts[:sshfs_opts]
           sshfs_opts_append = opts[:sshfs_opts_append].to_s # provided by user
+          if not mount_options.empty?()
+            sshfs_opts_append+= ' -o ' + mount_options.join(',') + ' '
+          end
 
           username = machine.ssh_info[:username]
           host = machine.ssh_info[:host]
@@ -120,7 +151,7 @@ module VagrantPlugins
                            :thread_inherit => true,
                            :startup_info => {:stdin => w2, :stdout => r1, :stderr => f1})
           else
-            p1 = spawn(sshfs_cmd,   :out => f1, :err => f1, :pgroup => true)
+            p1 = spawn(sshfs_cmd,   :out => f1, :err => f1, :pgroup => true, :close_others => true)
             Process.detach(p1) # Detach so process will keep running
           end
 

data/lib/vagrant-sshfs/cap/host/linux/sshfs_reverse_mount.rb

@@ -1,3 +1,4 @@
+require "etc"
 require "log4r"
 require "vagrant/util/retryable"
 require "tempfile"
@@ -55,6 +56,12 @@ module VagrantPlugins
           expanded_guest_path = machine.guest.capability(
             :shell_expand_guest_path, opts[:guestpath])
 
+          # Create the mountpoint inside the guest
+          machine.communicate.tap do |comm|
+            comm.sudo("mkdir -p #{expanded_guest_path}")
+            comm.sudo("chmod 777 #{expanded_guest_path}")
+          end
+
           # Mount path information
           hostpath = opts[:hostpath].dup
           hostpath.gsub!("'", "'\\\\''")
@@ -81,9 +88,35 @@ module VagrantPlugins
 
           ssh_opts_append = opts[:ssh_opts_append].to_s # provided by user
 
+          # Support for user provided mount_options, owner, group
+          # https://github.com/hashicorp/vagrant/blob/2c3397c46851ef29a3589bf3214a3eee12da8484/website/content/docs/synced-folders/basic_usage.mdx#options
+          mount_options = opts.fetch(:mount_options, [])
+          if (opts.has_key?(:owner) and opts[:owner]) or
+             (opts.has_key?(:group) and opts[:group])
+            # Identify the uid
+            if opts.has_key?(:owner) and opts[:owner]
+              mount_uid = Etc::getpwnam(opts[:owner]).uid
+            else
+              mount_uid = Etc::getpwnam(Etc.getlogin).uid
+            end
+            # Identify the gid. If a group was provided use that otherwise use
+            # the group detected with the detected user id.
+            if opts.has_key?(:group) and opts[:group]
+              mount_gid = Etc::getgrnam(opts[:group]).gid
+            else
+              mount_gid = Etc::getpwnam(Etc.getlogin).gid
+            end
+            # Add them to the mount options
+            mount_options.append("uid=#{mount_uid}")
+            mount_options.append("gid=#{mount_gid}")
+          end
+
           # SSHFS executable options
           sshfs_opts = opts[:sshfs_opts]
           sshfs_opts_append = opts[:sshfs_opts_append].to_s # provided by user
+          if not mount_options.empty?()
+            sshfs_opts_append+= ' -o ' + mount_options.join(',') + ' '
+          end
 
           username = machine.ssh_info[:username]
           host = machine.ssh_info[:host]
@@ -117,7 +150,7 @@ module VagrantPlugins
                            :thread_inherit => true,
                            :startup_info => {:stdin => w2, :stdout => r1, :stderr => f1})
           else
-            p1 = spawn(sshfs_cmd,   :out => f1, :err => f1, :pgroup => true)
+            p1 = spawn(sshfs_cmd,   :out => f1, :err => f1, :pgroup => true, :close_others => true)
             Process.detach(p1) # Detach so process will keep running
           end
 

data/lib/vagrant-sshfs/plugin.rb

@@ -97,6 +97,36 @@ module VagrantPlugins
         VagrantPlugins::GuestRedHat::Cap::SSHFSClient
       end
 
+      guest_capability("centos", "sshfs_installed") do
+        require_relative "cap/guest/centos/sshfs_client"
+        VagrantPlugins::GuestCentOS::Cap::SSHFSClient
+      end
+
+      guest_capability("centos", "sshfs_install") do
+        require_relative "cap/guest/centos/sshfs_client"
+        VagrantPlugins::GuestCentOS::Cap::SSHFSClient
+      end
+
+      guest_capability("rocky", "sshfs_installed") do
+        require_relative "cap/guest/rocky/sshfs_client"
+        VagrantPlugins::GuestRocky::Cap::SSHFSClient
+      end
+
+      guest_capability("rocky", "sshfs_install") do
+        require_relative "cap/guest/rocky/sshfs_client"
+        VagrantPlugins::GuestRocky::Cap::SSHFSClient
+      end
+
+      guest_capability("alma", "sshfs_installed") do
+        require_relative "cap/guest/alma/sshfs_client"
+        VagrantPlugins::GuestAlma::Cap::SSHFSClient
+      end
+
+      guest_capability("alma", "sshfs_install") do
+        require_relative "cap/guest/alma/sshfs_client"
+        VagrantPlugins::GuestAlma::Cap::SSHFSClient
+      end
+
       guest_capability("fedora", "sshfs_installed") do
         require_relative "cap/guest/fedora/sshfs_client"
         VagrantPlugins::GuestFedora::Cap::SSHFSClient

data/lib/vagrant-sshfs/synced_folder.rb

@@ -110,6 +110,7 @@ module VagrantPlugins
             ENV['PATH'] += ';C:\cygwin64\usr\sbin'
           end
         else
+          ENV['PATH'] += ':/usr/libexec/ssh'     # Linux (openSUSE/SUSE Family)
           ENV['PATH'] += ':/usr/libexec/openssh' # Linux (Red Hat Family)
           ENV['PATH'] += ':/usr/lib/openssh'     # Linux (Debian Family)
           ENV['PATH'] += ':/usr/lib/ssh'         # Linux (Arch Linux Family)

data/lib/vagrant-sshfs/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module SyncedFolderSSHFS
-    VERSION = "1.3.4"
+    VERSION = "1.3.7"
   end
 end

data/test/misc/README.txt

@@ -5,32 +5,49 @@
 # To test we will first create the directory on the machine where
 # we will mount the guest /etc/ into the host (the reverse mount).
 
-mkdir /tmp/reverse_mount_etc
+mkdir /tmp/reverse_mount_etc_uid_gid/
 
 # Next we will define where our 3rd party host is (the normal mount).
 # This can be another vagrant box or whatever machine you want.
-export THIRD_PARTY_HOST='192.168.121.73'                                                                                                                                               
-export THIRD_PARTY_HOST_USER='vagrant'                                                                                                                                                 
+export THIRD_PARTY_HOST='192.168.121.73'
+export THIRD_PARTY_HOST_USER='vagrant'
 export THIRD_PARTY_HOST_PASS='vagrant'
 
-# Next vagrant up - will do 4 mounts
+# Open an extra file descriptor to test it is not passed onto child processes
+# https://github.com/dustymabe/vagrant-sshfs/issues/120
+tmpfile=$(mktemp)
+exec {extra_fd}<> "$tmpfile"
+
+# Next vagrant up - will do 5 mounts
 #  - slave
+#  - slave with owner/group
 #  - slave with sym link
-#  - normal
-#  - reverse
+#  - normal (from 3rd party host)
+#  - reverse with owner/group
 vagrant up
 
 # Next run the script to test the mounts:
 $ bash dotests.sh 
 Testing slave forward mount!
-        d635332fe7aa4d4fb48e5cb9357bdedf
+        1358d4a18a2d4ba7be380b991e899952
+Testing slave forward mount with owner/group!
+        root:wheel
+        1358d4a18a2d4ba7be380b991e899952
 Testing slave forward mount with a symlink!
-        d635332fe7aa4d4fb48e5cb9357bdedf
+        1358d4a18a2d4ba7be380b991e899952
 Testing normal forward mount!
-        6ccc3034df924bd289dd16205bf3d629
-Testing reverse mount!
-        508619e7e68e446c84d1fcdf7e0dc577
+        ef56862ae88f43c0a81962ba6f68a668
+Testing reverse mount with owner/group!
+        root:wheel
+        ef4f3b50e2034b3593a9eb8b71350abe
+
+# We are printing out the machine-id under each mount. The first three
+should be the same, because they are from the same machine (the host).
+The last two should be different; one from 3rd party machine and one
+from the test VM itself (read from the host).
 
-# We are printing out the machine-id under each mount. The first two
-should be the same, because they are from the same machine. The last
-two should be different.
+# Close our file descriptor. No other process should be using it
+exec {extra_fd}>&-
+if lsof -wn -d $extra_fd | grep "$tmpfile"; then
+  echo "Failure: there are processes running that hold an inherited file descriptor"
+fi

data/test/misc/Vagrantfile

@@ -1,28 +1,47 @@
 Vagrant.configure(2) do |config|
 
-    config.ssh.insert_key = 'true'
+    config.ssh.insert_key = true
 
     # Test a forward slave mount:
     #   mounting /etc/ from the vagrant host into the guest
-    config.vm.synced_folder "/etc/", "/tmp/forward_slave_mount_etc/", type: "sshfs"
+    config.vm.synced_folder "/etc/", "/tmp/forward_slave_mount_etc/",
+        type: "sshfs",
+        mount_options: ['ro']
+
+    # Test a forward slave with owner/group info:
+    #   mounting /etc/ from the vagrant host into the guest
+    config.vm.synced_folder "/etc/", "/tmp/forward_slave_mount_etc_uid_gid/",
+        type: "sshfs",
+        mount_options: ['ro', 'default_permissions'],
+        owner: "root",
+        group: "wheel"
 
     # Test a forward mount to a location that is a symbolic link
     # https://github.com/dustymabe/vagrant-sshfs/issues/44
-    config.vm.synced_folder "/etc/", "/sbin/forward_slave_mount_sym_link_test/", type: "sshfs"
+    config.vm.synced_folder "/etc/", "/var/run/forward_slave_mount_sym_link_test/",
+        type: "sshfs",
+        mount_options: ['ro']
 
     # Test a forward normal mount:
     #     mounting a folder from a 3rd party host into guest
-    config.vm.synced_folder "/etc/", "/tmp/forward_normal_mount_etc/", type: "sshfs",
+    config.vm.synced_folder "/etc/", "/tmp/forward_normal_mount_etc/",
+        type: "sshfs",
         ssh_host: ENV['THIRD_PARTY_HOST'],
         ssh_username: ENV['THIRD_PARTY_HOST_USER'],
-        ssh_password: ENV['THIRD_PARTY_HOST_PASS']
+        ssh_password: ENV['THIRD_PARTY_HOST_PASS'],
+        mount_options: ['ro']
 
-    # Test a reverse mount:
+    # Test a reverse mount with owner/group
     # mounting /etc/ from vagrant guest into vagrant host
-    config.vm.synced_folder "/tmp/reverse_mount_etc/", "/etc", type: "sshfs", reverse: true
+    config.vm.synced_folder "/tmp/reverse_mount_etc_uid_gid/", "/etc",
+        type: "sshfs",
+        reverse: true,
+        owner: "root",
+        group: "wheel",
+        mount_options: ['ro']
 
     host = 'sshfs-tests'
-    box  = 'fedora/31-cloud-base'
+    box  = 'fedora/36-cloud-base'
 
     config.vm.define host do | tmp |
         tmp.vm.hostname = host

data/test/misc/dotests.sh

@@ -6,12 +6,19 @@ set -eu
 echo -en "Testing slave forward mount!\n\t"
 vagrant ssh -- cat /tmp/forward_slave_mount_etc/machine-id
 
+echo -en "Testing slave forward mount with owner/group!\n\t"
+vagrant ssh -- stat --printf '%U:%G' /tmp/forward_slave_mount_etc_uid_gid
+echo -en "\n\t"
+vagrant ssh -- cat /tmp/forward_slave_mount_etc_uid_gid/machine-id
+
 # https://github.com/dustymabe/vagrant-sshfs/issues/44
 echo -en "Testing slave forward mount with a symlink!\n\t"
-vagrant ssh -- cat /usr/sbin/forward_slave_mount_sym_link_test/machine-id
+vagrant ssh -- cat /run/forward_slave_mount_sym_link_test/machine-id
 
 echo -en "Testing normal forward mount!\n\t"
 vagrant ssh -- cat /tmp/forward_normal_mount_etc/machine-id
 
-echo -en "Testing reverse mount!\n\t"
-cat /tmp/reverse_mount_etc/machine-id
+echo -en "Testing reverse mount with owner/group!\n\t"
+stat --printf '%U:%G' /tmp/reverse_mount_etc_uid_gid/
+echo -en "\n\t"
+cat /tmp/reverse_mount_etc_uid_gid/machine-id

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-sshfs
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.7
 platform: ruby
 authors:
 - Dusty Mabe
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-15 00:00:00.000000000 Z
+date: 2022-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: win32-process
@@ -69,8 +69,10 @@ files:
 - build.sh
 - lib/vagrant-sshfs.rb
 - lib/vagrant-sshfs/action_hostpath_fixup.rb
+- lib/vagrant-sshfs/cap/guest/alma/sshfs_client.rb
 - lib/vagrant-sshfs/cap/guest/alpine/sshfs_client.rb
 - lib/vagrant-sshfs/cap/guest/arch/sshfs_client.rb
+- lib/vagrant-sshfs/cap/guest/centos/sshfs_client.rb
 - lib/vagrant-sshfs/cap/guest/debian/sshfs_client.rb
 - lib/vagrant-sshfs/cap/guest/fedora/sshfs_client.rb
 - lib/vagrant-sshfs/cap/guest/freebsd/sshfs_client.rb
@@ -79,6 +81,7 @@ files:
 - lib/vagrant-sshfs/cap/guest/linux/sshfs_forward_mount.rb
 - lib/vagrant-sshfs/cap/guest/linux/sshfs_get_absolute_path.rb
 - lib/vagrant-sshfs/cap/guest/redhat/sshfs_client.rb
+- lib/vagrant-sshfs/cap/guest/rocky/sshfs_client.rb
 - lib/vagrant-sshfs/cap/guest/suse/sshfs_client.rb
 - lib/vagrant-sshfs/cap/host/darwin/sshfs_reverse_mount.rb
 - lib/vagrant-sshfs/cap/host/linux/sshfs_reverse_mount.rb
@@ -98,7 +101,7 @@ homepage: https://github.com/dustymabe/vagrant-sshfs
 licenses:
 - GPL-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -113,8 +116,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: 'A Vagrant synced folder plugin that mounts folders via SSHFS.  This is the
   successor to Fabio Kreusch''s implementation: https://github.com/fabiokr/vagrant-sshfs'