vagrant-unbundled 2.2.6.1 → 2.2.10.0

data/plugins/communicators/winrm/config.rb

@@ -56,7 +56,7 @@ module VagrantPlugins
         errors << "winrm.port cannot be nil."        if @port.nil?
         errors << "winrm.guest_port cannot be nil."  if @guest_port.nil?
         errors << "winrm.max_tries cannot be nil."   if @max_tries.nil?
-        errors << "winrm.retry_delay cannot be nil." if @max_tries.nil?
+        errors << "winrm.retry_delay cannot be nil." if @retry_delay.nil?
         errors << "winrm.timeout cannot be nil."     if @timeout.nil?
         errors << "winrm.execution_time_limit cannot be nil."     if @execution_time_limit.nil?
         unless @ssl_peer_verification == true || @ssl_peer_verification == false

data/plugins/communicators/winrm/helper.rb

@@ -58,7 +58,7 @@ module VagrantPlugins
           # ports.
           port = nil
           if machine.provider.capability?(:forwarded_ports)
-            machine.provider.capability(:forwarded_ports).each do |host, guest|
+            Array(machine.provider.capability(:forwarded_ports)).each do |host, guest|
               if guest == machine.config.winrm.guest_port
                 port = host
                 break

data/plugins/communicators/winrm/shell.rb

@@ -19,7 +19,7 @@ module VagrantPlugins
 
       # Exit code generated when user is invalid. Can occur
       # after a hostname update
-      INVALID_USERID_EXITCODE = -196608
+      INVALID_USERID_EXITCODE = -2147024809
 
       # These are the exceptions that we retry because they represent
       # errors that are generally fixed from a retry and don't

data/plugins/communicators/winssh/communicator.rb

@@ -1,27 +1,39 @@
 require File.expand_path("../../ssh/communicator", __FILE__)
 
+require 'net/sftp'
+
 module VagrantPlugins
   module CommunicatorWinSSH
     # This class provides communication with a Windows VM running
     # the Windows native port of OpenSSH
     class Communicator < VagrantPlugins::CommunicatorSSH::Communicator
+      # Command to run when checking if connection is ready and working
+      READY_COMMAND="dir"
 
       def initialize(machine)
         super
         @logger = Log4r::Logger.new("vagrant::communication::winssh")
       end
 
+      # Wrap the shell if required. By default we are using powershell
+      # which requires no modification. If cmd is defined as shell, add
+      # prefix to start within cmd.exe
+      def shell_cmd(opts)
+        case opts[:shell].to_s
+        when "cmd"
+          "cmd.exe /c '#{opts[:command]}'"
+        else
+          opts[:command]
+        end
+      end
+
       # Executes the command on an SSH connection within a login shell.
       def shell_execute(connection, command, **opts)
-        opts = {
-          sudo: false,
-          shell: nil
-        }.merge(opts)
+        opts[:shell] ||= machine_config_ssh.shell
 
-        sudo  = opts[:sudo]
-        shell = (opts[:shell] || machine_config_ssh.shell).to_s
+        command = shell_cmd(opts.merge(command: command))
 
-        @logger.info("Execute: #{command} (sudo=#{sudo.inspect})")
+        @logger.info("Execute: #{command} - opts: #{opts}")
         exit_status = nil
 
         # Open the channel so we can execute or command
@@ -31,36 +43,10 @@ module VagrantPlugins
           stderr_marker_found = false
           stderr_data_buffer = ''
 
-          tfile = Tempfile.new('vagrant-ssh')
-          remote_ext = shell == "powershell" ? "ps1" : "bat"
-          remote_name = "#{machine_config_ssh.upload_directory}\\#{File.basename(tfile.path)}.#{remote_ext}"
-
-          if shell == "powershell"
-            base_cmd = "powershell -File #{remote_name}"
-            tfile.puts <<-SCRIPT.force_encoding('ASCII-8BIT')
-Remove-Item #{remote_name}
-Write-Host #{CMD_GARBAGE_MARKER}
-[Console]::Error.WriteLine("#{CMD_GARBAGE_MARKER}")
-#{command}
-SCRIPT
-          else
-            base_cmd = remote_name
-            tfile.puts <<-SCRIPT.force_encoding('ASCII-8BIT')
-ECHO OFF
-ECHO #{CMD_GARBAGE_MARKER}
-ECHO #{CMD_GARBAGE_MARKER} 1>&2
-#{command}
-SCRIPT
-          end
-
-          tfile.close
-          upload(tfile.path, remote_name)
-          tfile.delete
-
-          base_cmd = shell_cmd(opts.merge(shell: base_cmd))
-          @logger.debug("Base SSH exec command: #{base_cmd}")
+          @logger.debug("Base SSH exec command: #{command}")
+          command = "$ProgressPreference = 'SilentlyContinue';Write-Output #{CMD_GARBAGE_MARKER};[Console]::Error.WriteLine('#{CMD_GARBAGE_MARKER}');#{command}"
 
-          ch.exec(base_cmd) do |ch2, _|
+          ch.exec(command) do |ch2, _|
             # Setup the channel callbacks so we can get data and exit status
             ch2.on_data do |ch3, data|
               # Filter out the clear screen command
@@ -90,14 +76,14 @@ SCRIPT
                 stderr_data_buffer << data
                 marker_index = stderr_data_buffer.index(CMD_GARBAGE_MARKER)
                 if marker_index
-                  marker_found = true
+                  stderr_marker_found = true
                   stderr_data_buffer.slice!(0, marker_index + CMD_GARBAGE_MARKER.size)
                   data.replace(stderr_data_buffer.lstrip)
                   data_buffer = nil
                 end
               end
 
-              if block_given? && marker_found
+              if block_given? && stderr_marker_found && !data.empty?
                 yield :stderr, data
               end
             end
@@ -156,6 +142,108 @@ SCRIPT
         @machine.config.winssh
       end
 
+      def download(from, to=nil)
+        @logger.debug("Downloading: #{from} to #{to}")
+
+        sftp_connect do |sftp|
+          sftp.download!(from, to)
+        end
+      end
+
+      # Note: I could not get Net::SFTP to throw a permissions denied error,
+      # even when uploading to a directory where I did not have write
+      # privileges. I believe this is because Windows SSH sessions are started
+      # in an elevated process.
+      def upload(from, to)
+        to = Vagrant::Util::Platform.unix_windows_path(to)
+        @logger.debug("Uploading: #{from} to #{to}")
+
+        if File.directory?(from)
+          if from.end_with?(".")
+            @logger.debug("Uploading directory contents of: #{from}")
+            from = from.sub(/\.$/, "")
+          else
+            @logger.debug("Uploading full directory container of: #{from}")
+            to = File.join(to, File.basename(File.expand_path(from)))
+          end
+        end
+
+        sftp_connect do |sftp|
+          uploader = lambda do |path, remote_dest=nil|
+            if File.directory?(path)
+              Dir.new(path).each do |entry|
+                next if entry == "." || entry == ".."
+                full_path = File.join(path, entry)
+                dest = File.join(to, path.sub(/^#{Regexp.escape(from)}/, ""))
+                sftp.mkdir(dest)
+                uploader.call(full_path, dest)
+              end
+            else
+              if remote_dest
+                dest = File.join(remote_dest, File.basename(path))
+              else
+                dest = to
+                if to.end_with?(File::SEPARATOR)
+                  dest = File.join(to, File.basename(path))
+                end
+              end
+              @logger.debug("Ensuring remote directory exists for destination upload")
+              sftp.mkdir(File.dirname(dest))
+              @logger.debug("Uploading file #{path} to remote #{dest}")
+              upload_file = File.open(path, "rb")
+              begin
+                sftp.upload!(upload_file, dest)
+              ensure
+                upload_file.close
+              end
+            end
+          end
+          uploader.call(from)
+        end
+      end
+
+      # Opens an SFTP connection and yields it so that you can download and
+      # upload files. SFTP works more reliably than SCP on Windows due to
+      # issues with shell quoting and escaping.
+      def sftp_connect
+        # Connect to SFTP and yield the SFTP object
+        connect do |connection|
+          return yield connection.sftp
+        end
+      end
+
+      protected
+
+      # The WinSSH communicator connection provides isolated modification
+      # to the generated connection instances. This modification forces
+      # all provided commands to run within powershell
+      def connect(**opts)
+        connection = nil
+        super { |c| connection = c }
+
+        if !connection.instance_variable_get(:@winssh_patched)
+          open_chan = connection.method(:open_channel)
+          connection.define_singleton_method(:open_channel) do |*args, &chan_block|
+            open_chan.call(*args) do |ch|
+              exec = ch.method(:exec)
+              ch.define_singleton_method(:exec) do |command, &block|
+                command = Base64.strict_encode64(command.encode("UTF-16LE", "UTF-8"))
+                command = "powershell -NoLogo -NonInteractive -ExecutionPolicy Bypass " \
+                  "-NoProfile -EncodedCommand #{command}"
+                exec.call(command, &block)
+              end
+              chan_block.call(ch)
+            end
+          end
+          connection.instance_variable_set(:@winssh_patched, true)
+        end
+
+        if block_given?
+          yield connection
+        else
+          connection
+        end
+      end
     end
   end
 end

data/plugins/communicators/winssh/config.rb

@@ -12,15 +12,11 @@ module VagrantPlugins
       end
 
       def finalize!
-        @shell = "cmd" if @shell == UNSET_VALUE
+        @shell = "powershell" if @shell == UNSET_VALUE
         @sudo_command = "%c" if @sudo_command == UNSET_VALUE
-        @upload_directory = "C:\\Windows\\Temp" if @upload_directory == UNSET_VALUE
+        @upload_directory = "C:/Windows/Temp" if @upload_directory == UNSET_VALUE
         if @export_command_template == UNSET_VALUE
-          if @shell == "cmd"
-            @export_command_template = 'set %ENV_KEY%="%ENV_VALUE%"'
-          else
-            @export_command_template = '$env:%ENV_KEY%="%ENV_VALUE%"'
-          end
+          @export_command_template = '$env:%ENV_KEY%="%ENV_VALUE%"'
         end
         super
       end

data/plugins/guests/alpine/cap/change_host_name.rb

@@ -1,7 +1,11 @@
+require 'vagrant/util/guest_hosts'
+
 module VagrantPlugins
   module GuestAlpine
     module Cap
       class ChangeHostName
+        include Vagrant::Util::GuestHosts::Linux
+
         def self.change_host_name(machine, name)
           new(machine, name).change!
         end
@@ -14,10 +18,10 @@ module VagrantPlugins
         end
 
         def change!
+          update_etc_hosts
           return unless should_change?
 
           update_etc_hostname
-          update_etc_hosts
           refresh_hostname_service
           update_mailname
           renew_dhcp
@@ -48,17 +52,12 @@ module VagrantPlugins
         # 127.0.0.1   localhost
         # 127.0.1.1   host.fqdn.com host.fqdn host
         def update_etc_hosts
-          if machine.communicate.test("grep '#{current_hostname}' /etc/hosts")
-            # Current hostname entry is in /etc/hosts
-            ip_address = '([0-9]{1,3}\.){3}[0-9]{1,3}'
-            search     = "^(#{ip_address})\\s+#{Regexp.escape(current_hostname)}(\\s.*)?$"
-            replace    = "\\1 #{new_hostname} #{short_hostname}"
-            expression = ['s', search, replace, 'g'].join('@')
-
-            machine.communicate.sudo("sed -ri '#{expression}' /etc/hosts")
+          comm = machine.communicate
+          network_with_hostname = machine.config.vm.networks.map {|_, c| c if c[:hostname] }.compact[0]
+          if network_with_hostname
+            replace_host(comm, new_hostname, network_with_hostname[:ip])
           else
-            # Current hostname entry isn't in /etc/hosts, just append it
-            machine.communicate.sudo("echo '127.0.1.1 #{new_hostname} #{short_hostname}' >>/etc/hosts")
+            add_hostname_to_loopback_interface(comm, new_hostname)
           end
         end
 

data/plugins/guests/alpine/cap/rsync.rb

@@ -8,7 +8,7 @@ module VagrantPlugins
 
         def self.rsync_install(machine)
           machine.communicate.tap do |comm|
-            comm.sudo('apk add rsync')
+            comm.sudo('apk add --update-cache rsync')
           end
         end
       end

data/plugins/guests/alpine/plugin.rb

@@ -45,6 +45,22 @@ module VagrantPlugins
         require_relative 'cap/smb'
         Cap::SMB
       end
+
+      def self.check_community_plugin
+        plugins = Vagrant::Plugin::Manager.instance.installed_plugins
+        if plugins.keys.include?("vagrant-alpine")
+          $stderr.puts <<-EOF
+WARNING: Vagrant has detected the `vagrant-alpine` plugin. This plugin's
+functionality has been merged into the main Vagrant project and should be
+considered deprecated. To uninstall the plugin, run the command shown below:
+
+  vagrant plugin uninstall vagrant-alpine
+
+EOF
+        end
+      end
+
+      self.check_community_plugin
     end
   end
 end

data/plugins/guests/alt/cap/change_host_name.rb

@@ -1,63 +1,50 @@
+require_relative '../../linux/cap/change_host_name'
+
 module VagrantPlugins
   module GuestALT
     module Cap
       class ChangeHostName
-        def self.change_host_name(machine, name)
-          comm = machine.communicate
-
-          if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
-            basename = name.split('.', 2)[0]
-            comm.sudo <<-EOH.gsub(/^ {14}/, '')
-              # Save current hostname saved in /etc/hosts
-              CURRENT_HOSTNAME_FULL="$(hostname -f)"
-              CURRENT_HOSTNAME_SHORT="$(hostname -s)"
-
-              # New hostname to be saved in /etc/hosts
-              NEW_HOSTNAME_FULL='#{name}'
-              NEW_HOSTNAME_SHORT="${NEW_HOSTNAME_FULL%%.*}"
-
-              # Set the hostname - use hostnamectl if available
-              if command -v hostnamectl; then
-                hostnamectl set-hostname --static '#{name}'
-                hostnamectl set-hostname --transient '#{name}'
-              else
-                hostname '#{name}'
-              fi
-
-              # Update ourselves in /etc/hosts
-              if grep -w "$CURRENT_HOSTNAME_FULL" /etc/hosts; then
-                sed -i -e "s/\(\s\)$CURRENT_HOSTNAME_FULL\(\s\)/\1$NEW_HOSTNAME_FULL\2/g" -e "s/\(\s\)$CURRENT_HOSTNAME_FULL$/\1$NEW_HOSTNAME_FULL/g" /etc/hosts
-              fi
-              if grep -w "$CURRENT_HOSTNAME_SHORT" /etc/hosts; then
-                sed -i -e "s/\(\s\)$CURRENT_HOSTNAME_SHORT\(\s\)/\1$NEW_HOSTNAME_SHORT\2/g" -e "s/\(\s\)$CURRENT_HOSTNAME_SHORT$/\1$NEW_HOSTNAME_SHORT/g" /etc/hosts
-              fi
+        extend VagrantPlugins::GuestLinux::Cap::ChangeHostName
+        
+        def self.change_name_command(name)
+          basename = name.split(".", 2)[0]
+          return <<-EOH.gsub(/^ {14}/, '')
+          # Save current hostname saved in /etc/hosts
+          CURRENT_HOSTNAME_FULL="$(hostname -f)"
+          CURRENT_HOSTNAME_SHORT="$(hostname -s)"
 
-              # Persist hostname change across reboots
-              if [ -f /etc/sysconfig/network ]; then
-                sed -i 's/\\(HOSTNAME=\\).*/\\1#{name}/' /etc/sysconfig/network
-              elif [ -f /etc/hostname ]; then
-                sed -i 's/.*/#{name}/' /etc/hostname
-              else
-                echo 'Unrecognized system. Hostname change may not persist across reboots.'
-                exit 0
-              fi
+          # Set the hostname - use hostnamectl if available
+          if command -v hostnamectl; then
+            hostnamectl set-hostname --static '#{name}'
+            hostnamectl set-hostname --transient '#{name}'
+          else
+            hostname '#{name}'
+          fi
 
-              # Restart the network if we find a recognized SYS V init script
-              if command -v service; then
-                if [ -f /etc/init.d/network ]; then
-                  service network restart
-                elif [ -f /etc/init.d/networking ]; then
-                  service networking restart
-                elif [ -f /etc/init.d/NetworkManager ]; then
-                  service NetworkManager restart
-                else
-                  echo 'Unrecognized system. Networking was not restarted following hostname change.'
-                  exit 0
-                fi
-              fi
+          # Persist hostname change across reboots
+          if [ -f /etc/sysconfig/network ]; then
+            sed -i 's/\\(HOSTNAME=\\).*/\\1#{name}/' /etc/sysconfig/network
+          elif [ -f /etc/hostname ]; then
+            sed -i 's/.*/#{name}/' /etc/hostname
+          else
+            echo 'Unrecognized system. Hostname change may not persist across reboots.'
+            exit 0
+          fi
 
-            EOH
-          end
+          # Restart the network if we find a recognized SYS V init script
+          if command -v service; then
+            if [ -f /etc/init.d/network ]; then
+              service network restart
+            elif [ -f /etc/init.d/networking ]; then
+              service networking restart
+            elif [ -f /etc/init.d/NetworkManager ]; then
+              service NetworkManager restart
+            else
+              echo 'Unrecognized system. Networking was not restarted following hostname change.'
+              exit 0
+            fi
+          fi
+          EOH
         end
       end
     end

data/plugins/guests/arch/cap/change_host_name.rb

@@ -1,22 +1,13 @@
+require_relative '../../linux/cap/change_host_name'
+
 module VagrantPlugins
   module GuestArch
     module Cap
       class ChangeHostName
-        def self.change_host_name(machine, name)
-          comm = machine.communicate
-
-          if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
-            basename = name.split(".", 2)[0]
-            comm.sudo <<-EOH.gsub(/^ {14}/, "")
-              # Set hostname
-              hostnamectl set-hostname '#{basename}'
+        extend VagrantPlugins::GuestLinux::Cap::ChangeHostName
 
-              # Prepend ourselves to /etc/hosts
-              test $? -eq 0 && (grep -w '#{name}' /etc/hosts || {
-                sed -i'' '1i 127.0.0.1\\t#{name}\\t#{basename}' /etc/hosts
-              })
-            EOH
-          end
+        def self.change_name_command(name)
+          "hostnamectl set-hostname '#{name.split(".", 2).first}'"
         end
       end
     end