vagrant-unbundled 1.9.7.1 → 1.9.8.1

data/plugins/commands/validate/command.rb

@@ -16,10 +16,10 @@ module VagrantPlugins
         argv = parse_options(opts)
         return if !argv
 
-        # Validate the configuration
-        @env.machine(@env.machine_names.first, @env.default_provider).action_raw(
-          :config_validate,
-          Vagrant::Action::Builtin::ConfigValidate)
+        # Validate the configuration of all machines
+        with_target_vms() do |machine|
+          machine.action_raw(:config_validate, Vagrant::Action::Builtin::ConfigValidate)
+        end
 
         @env.ui.info(I18n.t("vagrant.commands.validate.success"))
 

data/plugins/guests/darwin/cap/shell_expand_guest_path.rb

@@ -4,7 +4,7 @@ module VagrantPlugins
       class ShellExpandGuestPath
         def self.shell_expand_guest_path(machine, path)
           real_path = nil
-          machine.communicate.execute("printf #{path}") do |type, data|
+          machine.communicate.execute("printf \"#{path}\"") do |type, data|
             if type == :stdout
               real_path ||= ""
               real_path += data
@@ -14,7 +14,7 @@ module VagrantPlugins
           if !real_path
             # If no real guest path was detected, this is really strange
             # and we raise an exception because this is a bug.
-            raise ShellExpandFailed
+            raise Vagrant::Errors::ShellExpandFailed
           end
 
           # Chomp the string so that any trailing newlines are killed

data/plugins/guests/freebsd/cap/configure_networks.rb

@@ -18,7 +18,7 @@ module VagrantPlugins
           # Remove any previous network additions to the configuration file.
           commands << "sed -i'' -e '/^#VAGRANT-BEGIN/,/^#VAGRANT-END/ d' /etc/rc.conf"
 
-          comm.sudo("ifconfig -a | grep -o ^[0-9a-z]* | grep -v '^lo'", options) do |_, stdout|
+          comm.sudo("ifconfig -a | grep -o '^[0-9a-z]*' | grep -v '^lo'", options) do |_, stdout|
             interfaces = stdout.split("\n")
           end
 

data/plugins/guests/freebsd/cap/shell_expand_guest_path.rb

@@ -4,7 +4,7 @@ module VagrantPlugins
       class ShellExpandGuestPath
         def self.shell_expand_guest_path(machine, path)
           real_path = nil
-          machine.communicate.execute("printf #{path}",
+          machine.communicate.execute("printf \"#{path}\"",
                                       shell: "sh") do |type, data|
             if type == :stdout
               real_path ||= ""
@@ -15,7 +15,7 @@ module VagrantPlugins
           if !real_path
             # If no real guest path was detected, this is really strange
             # and we raise an exception because this is a bug.
-            raise ShellExpandFailed
+            raise Vagrant::Errors::ShellExpandFailed
           end
 
           # Chomp the string so that any trailing newlines are killed

data/plugins/guests/linux/cap/shell_expand_guest_path.rb

@@ -4,7 +4,7 @@ module VagrantPlugins
       class ShellExpandGuestPath
         def self.shell_expand_guest_path(machine, path)
           real_path = nil
-          machine.communicate.execute("echo; printf #{path}") do |type, data|
+          machine.communicate.execute("echo; printf \"#{path}\"") do |type, data|
             if type == :stdout
               real_path ||= ""
               real_path += data
@@ -19,7 +19,7 @@ module VagrantPlugins
           if !real_path
             # If no real guest path was detected, this is really strange
             # and we raise an exception because this is a bug.
-            raise ShellExpandFailed
+            raise Vagrant::Errors::ShellExpandFailed
           end
 
           # Chomp the string so that any trailing newlines are killed

data/plugins/guests/netbsd/cap/shell_expand_guest_path.rb

@@ -4,7 +4,7 @@ module VagrantPlugins
       class ShellExpandGuestPath
         def self.shell_expand_guest_path(machine, path)
           real_path = nil
-          machine.communicate.execute("printf #{path}") do |type, data|
+          machine.communicate.execute("printf \"#{path}\"") do |type, data|
             if type == :stdout
               real_path ||= ""
               real_path += data
@@ -14,7 +14,7 @@ module VagrantPlugins
           if !real_path
             # If no real guest path was detected, this is really strange
             # and we raise an exception because this is a bug.
-            raise ShellExpandFailed
+            raise Vagrant::Errors::ShellExpandFailed
           end
 
           # Chomp the string so that any trailing newlines are killed

data/plugins/guests/openbsd/cap/shell_expand_guest_path.rb

@@ -4,7 +4,7 @@ module VagrantPlugins
       class ShellExpandGuestPath
         def self.shell_expand_guest_path(machine, path)
           real_path = nil
-          machine.communicate.execute("printf #{path}") do |type, data|
+          machine.communicate.execute("printf \"#{path}\"") do |type, data|
             if type == :stdout
               real_path ||= ""
               real_path += data
@@ -14,7 +14,7 @@ module VagrantPlugins
           if !real_path
             # If no real guest path was detected, this is really strange
             # and we raise an exception because this is a bug.
-            raise ShellExpandFailed
+            raise Vagrant::Errors::ShellExpandFailed
           end
 
           # Chomp the string so that any trailing newlines are killed

data/plugins/guests/windows/cap/public_key.rb

@@ -6,7 +6,12 @@ module VagrantPlugins
       class PublicKey
         def self.insert_public_key(machine, contents)
           if machine.communicate.is_a?(CommunicatorWinSSH::Communicator)
-            winssh_insert_public_key(machine, contents)
+            contents = contents.strip
+            winssh_modify_authorized_keys machine do |keys|
+              if !keys.include?(contents)
+                keys << contents
+              end
+            end
           else
             raise Vagrant::Errors::SSHInsertKeyUnsupported
           end
@@ -14,73 +19,44 @@ module VagrantPlugins
 
         def self.remove_public_key(machine, contents)
           if machine.communicate.is_a?(CommunicatorWinSSH::Communicator)
-            winssh_remove_public_key(machine, contents)
+            winssh_modify_authorized_keys machine do |keys|
+              keys.delete(contents)
+            end
           else
             raise Vagrant::Errors::SSHInsertKeyUnsupported
           end
         end
 
-        def self.winssh_insert_public_key(machine, contents)
+        def self.winssh_modify_authorized_keys(machine)
           comm = machine.communicate
-          contents = contents.strip
-
           directories = fetch_guest_paths(comm)
           home_dir = directories[:home]
           temp_dir = directories[:temp]
 
-          remote_ssh_dir = "#{home_dir}\\.ssh"
-          remote_upload_path = "#{temp_dir}\\vagrant-insert-pubkey-#{Time.now.to_i}"
-          remote_authkeys_path = "#{remote_ssh_dir}\authorized_keys"
-
           # Ensure the user's ssh directory exists
+          remote_ssh_dir = "#{home_dir}\\.ssh"
           comm.execute("dir \"#{remote_ssh_dir}\"\n if errorlevel 1 (mkdir \"#{remote_ssh_dir}\")", shell: "cmd")
           remote_upload_path = "#{temp_dir}\\vagrant-insert-pubkey-#{Time.now.to_i}"
           remote_authkeys_path = "#{remote_ssh_dir}\\authorized_keys"
 
           keys_file = Tempfile.new("vagrant-windows-insert-public-key")
+          keys_file.close
           # Check if an authorized_keys file already exists
           result = comm.execute("dir \"#{remote_authkeys_path}\"", shell: "cmd", error_check: false)
           if result == 0
-            keys_file.close
             comm.download(remote_authkeys_path, keys_file.path)
-            current_content = File.read(keys_file.path).split(/[\r\n]+/)
-            if !current_content.include?(contents)
-              current_content << contents
-            end
-            File.write(keys_file.path, current_content.join("\r\n") + "\r\n")
+            keys = File.read(keys_file.path).split(/[\r\n]+/)
           else
-            keys_file.puts(contents)
-            keys_file.close
+            keys = []
           end
-          keys_file.delete
+          yield keys
+          File.write(keys_file.path, keys.join("\r\n") + "\r\n")
           comm.upload(keys_file.path, remote_upload_path)
-          comm.execute("move /y \"#{remote_upload_path}\" \"#{remote_authkeys_path}\"", shell: "cmd")
-        end
-
-        def self.winssh_remove_public_key(machine, contents)
-          comm = machine.communicate
-
-          directories = fetch_guest_paths(comm)
-          home_dir = directories[:home]
-          temp_dir = directories[:temp]
-
-          remote_ssh_dir = "#{home_dir}\\.ssh"
-          remote_upload_path = "#{temp_dir}\\vagrant-remove-pubkey-#{Time.now.to_i}"
-          remote_authkeys_path = "#{remote_ssh_dir}\\authorized_keys"
-
-          # Check if an authorized_keys file already exists
-          result = comm.execute("dir \"#{remote_authkeys_path}\"", shell: "cmd", error_check: false)
-          if result == 0
-            keys_file = Tempfile.new("vagrant-windows-remove-public-key")
-            keys_file.close
-            comm.download(remote_authkeys_path, keys_file.path)
-            current_content = File.read(keys_file.path).split(/[\r\n]+/)
-            current_content.delete(contents)
-            File.write(keys_file.path, current_content.join("\r\n") + "\r\n")
-            comm.upload(keys_file.path, remote_upload_path)
-            keys_file.delete
-            comm.execute("move /y \"#{remote_upload_path}\" \"#{remote_authkeys_path}\"", shell: "cmd")
-          end
+          keys_file.delete
+          comm.execute <<-EOC.gsub(/^\s*/, ""), shell: "powershell"
+            Set-Acl "#{remote_upload_path}" (Get-Acl "#{remote_authkeys_path}")
+            Move-Item -Force "#{remote_upload_path}" "#{remote_authkeys_path}"
+          EOC
         end
 
         # Fetch user's temporary and home directory paths from the Windows guest

data/plugins/kernel_v2/config/ssh_connect.rb

@@ -11,6 +11,7 @@ module VagrantPlugins
       attr_accessor :paranoid
       attr_accessor :compression
       attr_accessor :dsa_authentication
+      attr_accessor :extra_args
 
       def initialize
         @host             = UNSET_VALUE
@@ -23,6 +24,7 @@ module VagrantPlugins
         @paranoid         = UNSET_VALUE
         @compression      = UNSET_VALUE
         @dsa_authentication = UNSET_VALUE
+        @extra_args       = UNSET_VALUE
       end
 
       def finalize!
@@ -36,6 +38,7 @@ module VagrantPlugins
         @paranoid         = false if @paranoid == UNSET_VALUE
         @compression      = true if @compression == UNSET_VALUE
         @dsa_authentication = true if @dsa_authentication == UNSET_VALUE
+        @extra_args       = nil if @extra_args == UNSET_VALUE
 
         if @private_key_path && !@private_key_path.is_a?(Array)
           @private_key_path = [@private_key_path]

data/plugins/providers/docker/config.rb

@@ -281,6 +281,10 @@ module VagrantPlugins
           errors << I18n.t("docker_provider.errors.config.compose_configuration_hash")
         end
 
+        if @compose && @force_host_vm
+          errors << I18n.t("docker_provider.errors.config.compose_force_vm")
+        end
+
         if !@create_args.is_a?(Array)
           errors << I18n.t("docker_provider.errors.config.create_args_array")
         end

data/plugins/providers/docker/driver/compose.rb

@@ -83,20 +83,27 @@ module VagrantPlugins
           # need to worry about uniqueness with compose
           name    = machine.name.to_s
           image   = params.fetch(:image)
-          links   = params.fetch(:links)
+          links   = Array(params.fetch(:links, [])).map do |link|
+            case link
+            when Array
+              link
+            else
+              link.to_s.split(":")
+            end
+          end
           ports   = Array(params[:ports])
           volumes = Array(params[:volumes]).map do |v|
             v = v.to_s
+            host, guest = v.split(":", 2)
             if v.include?(":") && (Vagrant::Util::Platform.windows? || Vagrant::Util::Platform.wsl?)
-              host, guest = v.split(":", 2)
               host = Vagrant::Util::Platform.windows_path(host)
               # NOTE: Docker does not support UNC style paths (which also
               # means that there's no long path support). Hopefully this
               # will be fixed someday and the gsub below can be removed.
               host.gsub!(/^[^A-Za-z]+/, "")
-              v = [host, guest].join(":")
             end
-            v
+            host = @machine.env.cwd.join(host).to_s
+            "#{host}:#{guest}"
           end
           cmd     = Array(params.fetch(:cmd))
           env     = Hash[*params.fetch(:env).flatten.map(&:to_s)]

data/plugins/providers/hyperv/action/wait_for_ip_address.rb

@@ -23,19 +23,23 @@ module VagrantPlugins
               return if env[:interrupted]
 
               # Try to get the IP
-              network_info = env[:machine].provider.driver.read_guest_ip
-              guest_ip = network_info["ip"]
-
-              if guest_ip
-                begin
-                  IPAddr.new(guest_ip)
-                  break
-                rescue IPAddr::InvalidAddressError
-                  # Ignore, continue looking.
-                  @logger.warn("Invalid IP address returned: #{guest_ip}")
+              begin
+                network_info = env[:machine].provider.driver.read_guest_ip
+                guest_ip = network_info["ip"]
+
+                if guest_ip
+                  begin
+                    IPAddr.new(guest_ip)
+                    break
+                  rescue IPAddr::InvalidAddressError
+                    # Ignore, continue looking.
+                    @logger.warn("Invalid IP address returned: #{guest_ip}")
+                  end
                 end
+              rescue Errors::PowerShellError
+                # Ignore, continue looking.
+                @logger.warn("Failed to read guest IP.")
               end
-
               sleep 1
             end
           end

data/plugins/providers/hyperv/scripts/get_network_config.ps1

@@ -7,21 +7,36 @@ Param(
 $Dir = Split-Path $script:MyInvocation.MyCommand.Path
 . ([System.IO.Path]::Combine($Dir, "utils\write_messages.ps1"))
 
-$ip_address = ""
 $vm = Get-VM -Id $VmId -ErrorAction "Stop"
 $networks = Get-VMNetworkAdapter -VM $vm
 foreach ($network in $networks) {
   if ($network.IpAddresses.Length -gt 0) {
-    $ip_address = $network.IpAddresses[0]
-    if (-Not ([string]::IsNullOrEmpty($ip_address))) {
-      # We found our IP address!
-      break
+    foreach ($ip_address in $network.IpAddresses) {
+      if ($ip_address.Contains(".")) {
+        $ip4_address = $ip_address
+      } elseif ($ip_address.Contains(":")) {
+        $ip6_address = $ip_address
+      }
+      if (-Not ([string]::IsNullOrEmpty($ip4_address)) -Or -Not ([string]::IsNullOrEmpty($ip6_address))) {
+        # We found our IP address!
+        break
+      }
     }
   }
 }
 
-$resultHash = @{
-    ip = "$ip_address"
+if (-Not ([string]::IsNullOrEmpty($ip4_address))) {
+  $guest_ipaddress = $ip4_address
+} elseif (-Not ([string]::IsNullOrEmpty($ip6_address))) {
+  $guest_ipaddress = $ip6_address
+}
+
+if (-Not ([string]::IsNullOrEmpty($guest_ipaddress))) {
+  $resultHash = @{
+      ip = $guest_ipaddress
+  }
+  $result = ConvertTo-Json $resultHash
+  Write-Output-Message $result
+} else {
+  Write-Error-Message "Failed to determine IP address"
 }
-$result = ConvertTo-Json $resultHash
-Write-Output-Message $result

data/plugins/providers/virtualbox/action/prepare_nfs_settings.rb

@@ -1,3 +1,4 @@
+require "ipaddr"
 require "vagrant/action/builtin/mixin_synced_folders"
 
 module VagrantPlugins
@@ -59,6 +60,23 @@ module VagrantPlugins
             end
           end
 
+          if host_ip && !machine_ip.empty?
+            interface = @machine.provider.driver.read_host_only_interfaces.detect do |iface|
+              iface[:ip] == host_ip
+            end
+            host_ipaddr = IPAddr.new("#{host_ip}/#{interface.fetch(:netmask, "0.0.0.0")}")
+
+            case machine_ip
+            when String
+              machine_ip = nil if !host_ipaddr.include?(machine_ip)
+            when Array
+              machine_ip.delete_if do |m_ip|
+                !host_ipaddr.include?(m_ip)
+              end
+              machine_ip = nil if machine_ip.empty?
+            end
+          end
+
           raise Vagrant::Errors::NFSNoHostonlyNetwork if !host_ip || !machine_ip
 
           env[:nfs_host_ip]    = host_ip

data/plugins/provisioners/ansible/provisioner/host.rb

@@ -255,7 +255,7 @@ module VagrantPlugins
           # Multiple Private Keys
           unless !config.inventory_path && @ssh_info[:private_key_path].size == 1
             @ssh_info[:private_key_path].each do |key|
-              ssh_options << "-i '#{key}'"
+              ssh_options += ["-o", "IdentityFile=%s" % [key.gsub('%', '%%')]]
             end
           end
 

data/plugins/provisioners/chef/cap/debian/chef_install.rb

@@ -5,11 +5,11 @@ module VagrantPlugins
     module Cap
       module Debian
         module ChefInstall
-          def self.chef_install(machine, project, version, channel, options = {})
+          def self.chef_install(machine, project, version, channel, omnibus_url, options = {})
             machine.communicate.sudo("apt-get update -y -qq")
             machine.communicate.sudo("apt-get install -y -qq curl")
 
-            command = Omnibus.sh_command(project, version, channel, options)
+            command = Omnibus.sh_command(project, version, channel, omnibus_url, options)
             machine.communicate.sudo(command)
           end
         end

data/plugins/provisioners/chef/cap/freebsd/chef_install.rb

@@ -5,10 +5,10 @@ module VagrantPlugins
     module Cap
       module FreeBSD
         module ChefInstall
-          def self.chef_install(machine, project, version, channel, options = {})
+          def self.chef_install(machine, project, version, channel, omnibus_url, options = {})
             machine.communicate.sudo("pkg install -y -qq curl bash")
 
-            command = Omnibus.sh_command(project, version, channel, options)
+            command = Omnibus.sh_command(project, version, channel, omnibus_url, options)
             machine.communicate.sudo(command)
           end
         end

data/plugins/provisioners/chef/cap/omnios/chef_install.rb

@@ -5,12 +5,12 @@ module VagrantPlugins
     module Cap
       module OmniOS
         module ChefInstall
-          def self.chef_install(machine, project, version, channel, options = {})
+          def self.chef_install(machine, project, version, channel, omnibus_url, options = {})
             su = machine.config.solaris.suexec_cmd
 
             machine.communicate.execute("#{su} pkg list --no-refresh web/curl > /dev/null 2>&1 || pkg install -q --accept web/curl")
 
-            command = Omnibus.sh_command(project, version, channel, options)
+            command = Omnibus.sh_command(project, version, channel, omnibus_url, options)
             machine.communicate.execute("#{su} #{command}")
           end
         end