vagrant-unbundled 1.9.1.1 → 1.9.5.1

data/lib/vagrant/util/powershell.rb

@@ -19,7 +19,9 @@ module Vagrant
       def self.execute(path, *args, **opts, &block)
         command = [
           "powershell",
+          "-NoLogo",
           "-NoProfile",
+          "-NonInteractive",
           "-ExecutionPolicy", "Bypass",
           "&('#{path}')",
           args
@@ -32,14 +34,37 @@ module Vagrant
         Subprocess.execute(*command, &block)
       end
 
+      # Execute a powershell command.
+      #
+      # @param [String] command PowerShell command to execute.
+      # @return [Subprocess::Result]
+      def self.execute_cmd(command)
+        c = [
+          "powershell",
+          "-NoLogo",
+          "-NoProfile",
+          "-NonInteractive",
+          "-ExecutionPolicy", "Bypass",
+          "-Command",
+          command
+        ].flatten
+
+        r = Subprocess.execute(*c)
+        return nil if r.exit_code != 0
+        return r.stdout.chomp
+      end
+
       # Returns the version of PowerShell that is installed.
       #
       # @return [String]
       def self.version
         command = [
           "powershell",
+          "-NoLogo",
           "-NoProfile",
+          "-NonInteractive",
           "-ExecutionPolicy", "Bypass",
+          "-Command",
           "$PSVersionTable.PSVersion.Major"
         ].flatten
 

data/lib/vagrant/util/safe_exec.rb

@@ -40,7 +40,15 @@ module Vagrant
               Process.wait(pid)
             end
           else
-            Kernel.exec(command, *args)
+            if Vagrant::Util::Platform.windows?
+              @@logger.debug("Converting command and arguments to single string for exec")
+              @@logger.debug("Command: `#{command.inspect}` Args: `#{args.inspect}`")
+              full_command = "#{command} #{args.join(" ")}"
+              @@logger.debug("Converted command: #{full_command}")
+              Kernel.exec(full_command)
+            else
+              Kernel.exec(command, *args)
+            end
           end
         rescue *rescue_from
           # We retried already, raise the issue and be done

data/lib/vagrant/util/ssh.rb

@@ -28,7 +28,7 @@ module Vagrant
       def self.check_key_permissions(key_path)
         # Don't do anything if we're on Windows, since Windows doesn't worry
         # about key permissions.
-        return if Platform.windows?
+        return if Platform.windows? || Platform.wsl_windows_access_bypass?(key_path)
 
         LOGGER.debug("Checking key permissions: #{key_path}")
         stat = key_path.stat

data/lib/vagrant/util/subprocess.rb

@@ -25,7 +25,6 @@ module Vagrant
       def initialize(*command)
         @options = command.last.is_a?(Hash) ? command.pop : {}
         @command = command.dup
-        @command = @command.map { |s| s.encode(Encoding.default_external) }
         @command[0] = Which.which(@command[0]) if !File.file?(@command[0])
         if !@command[0]
           raise Errors::CommandUnavailableWindows, file: command[0] if Platform.windows?
@@ -35,6 +34,26 @@ module Vagrant
         @logger  = Log4r::Logger.new("vagrant::util::subprocess")
       end
 
+      # @return [TrueClass, FalseClass] subprocess is currently running
+      def running?
+        !!(@process && @process.alive?)
+      end
+
+      # Stop the subprocess if running
+      #
+      # @return [TrueClass] FalseClass] true if process was running and stopped
+      def stop
+        if @process && @process.alive?
+          @process.stop
+          true
+        else
+          false
+        end
+      end
+
+      # Start the process
+      #
+      # @return [Result]
       def execute
         # Get the timeout, if we have one
         timeout = @options[:timeout]
@@ -62,7 +81,7 @@ module Vagrant
 
         # Build the ChildProcess
         @logger.info("Starting process: #{@command.inspect}")
-        process = ChildProcess.build(*@command)
+        @process = process = ChildProcess.build(*@command)
 
         # Create the pipes so we can read the output in real time as
         # we execute the command.

data/lib/vagrant/util/which.rb

@@ -29,10 +29,12 @@ module Vagrant
           exts = ENV['PATHEXT'].split(';')
         end
 
-        ENV['PATH'].encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '').split(File::PATH_SEPARATOR).each do |path|
-          exts.each do |ext|
-            exe = "#{path}#{File::SEPARATOR}#{cmd}#{ext}"
-            return exe if File.executable? exe
+        SilenceWarnings.silence! do
+          ENV['PATH'].encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '').split(File::PATH_SEPARATOR).each do |path|
+            exts.each do |ext|
+              exe = "#{path}#{File::SEPARATOR}#{cmd}#{ext}"
+              return exe if File.executable? exe
+            end
           end
         end
 

data/plugins/commands/box/command/list.rb

@@ -22,7 +22,7 @@ module VagrantPlugins
           argv = parse_options(opts)
           return if !argv
 
-          boxes = @env.boxes.all.sort
+          boxes = @env.boxes.all
           if boxes.empty?
             return @env.ui.warn(I18n.t("vagrant.commands.box.no_installed_boxes"), prefix: false)
           end

data/plugins/commands/package/command.rb

@@ -1,4 +1,5 @@
 require 'optparse'
+require 'securerandom'
 
 module VagrantPlugins
   module CommandPackage
@@ -16,7 +17,7 @@ module VagrantPlugins
           o.separator "Options:"
           o.separator ""
 
-          o.on("--base NAME", "Name of a VM in virtualbox to package as a base box") do |b|
+          o.on("--base NAME", "Name of a VM in VirtualBox to package as a base box (VirtualBox Only)") do |b|
             options[:base] = b
           end
 
@@ -24,7 +25,7 @@ module VagrantPlugins
             options[:output] = output
           end
 
-          o.on("--include FILE...", Array, "Additional files to package with the box") do |i|
+          o.on("--include FILE,FILE..", Array, "Comma separated additional files to package with the box") do |i|
             options[:include] = i
           end
 

data/plugins/commands/plugin/action.rb

@@ -5,13 +5,14 @@ require "vagrant/action/builder"
 module VagrantPlugins
   module CommandPlugin
     module Action
-      # This middleware sequence will install a plugin.
+      # This middleware sequence will remove all plugins.
       def self.action_expunge
         Vagrant::Action::Builder.new.tap do |b|
           b.use ExpungePlugins
         end
       end
 
+      # This middleware sequence will install a plugin.
       def self.action_install
         Vagrant::Action::Builder.new.tap do |b|
           b.use InstallGem

data/plugins/commands/plugin/action/expunge_plugins.rb

@@ -17,11 +17,26 @@ module VagrantPlugins
 
         def call(env)
           if !env[:force]
-            result = env[:ui].ask(
-              I18n.t("vagrant.commands.plugin.expunge_confirm") +
-                " [Y/N]:"
-            )
-            if result.to_s.downcase.strip != 'y'
+
+            result = nil
+            attempts = 0
+            while attempts < 5 && result.nil?
+              attempts += 1
+              result = env[:ui].ask(
+                I18n.t("vagrant.commands.plugin.expunge_confirm") +
+                  " [N]: "
+              )
+              result = result.to_s.downcase.strip
+              result = "n" if result.empty?
+              if !["y", "yes", "n", "no"].include?(result)
+                result = nil
+                env[:ui].error("Please answer Y or N")
+              else
+                result = result[0,1]
+              end
+            end
+
+            if result != 'y'
               abort_action = true
             end
           end

data/plugins/commands/plugin/action/install_gem.rb

@@ -19,14 +19,6 @@ module VagrantPlugins
           sources     = env[:plugin_sources]
           version     = env[:plugin_version]
 
-          # If we're on Windows and the user data path has a space in it,
-          # then things won't work because of a Ruby bug.
-          if Vagrant::Util::Platform.windows?
-            if Vagrant.user_data_path.to_s.include?(" ")
-              raise Vagrant::Errors::PluginInstallSpace
-            end
-          end
-
           # Install the gem
           plugin_name_label = plugin_name
           plugin_name_label += " --version '#{version}'" if version

data/plugins/commands/plugin/command/expunge.rb

@@ -29,11 +29,24 @@ module VagrantPlugins
           plugins = Vagrant::Plugin::Manager.instance.installed_plugins
 
           if !options[:reinstall] && !options[:force] && !plugins.empty?
-            result = @env.ui.ask(
-              I18n.t("vagrant.commands.plugin.expunge_request_reinstall") +
-                " [Y/N]:"
-            )
-            options[:reinstall] = result.to_s.downcase.strip == "y"
+            result = nil
+            attempts = 0
+            while attempts < 5 && result.nil?
+              attempts += 1
+              result = @env.ui.ask(
+                I18n.t("vagrant.commands.plugin.expunge_request_reinstall") +
+                  " [N]: "
+              )
+              result = result.to_s.downcase.strip
+              result = "n" if result.empty?
+              if !["y", "yes", "n", "no"].include?(result)
+                result = nil
+                @env.ui.error("Please answer Y or N")
+              else
+                result = result[0,1]
+              end
+            end
+            options[:reinstall] = result == "y"
           end
 
           # Remove all installed user plugins

data/plugins/commands/plugin/command/mixin_install_opts.rb

@@ -3,10 +3,7 @@ module VagrantPlugins
     module Command
       module MixinInstallOpts
         def build_install_opts(o, options)
-          options[:plugin_sources] = [
-            "https://rubygems.org",
-            "https://gems.hashicorp.com",
-          ]
+          options[:plugin_sources] = Vagrant::Bundler::DEFAULT_GEM_SOURCES.dup
 
           o.on("--entry-point NAME", String,
                "The name of the entry point file for loading the plugin.") do |entry_point|

data/plugins/commands/plugin/gem_helper.rb

@@ -43,7 +43,11 @@ module VagrantPlugins
         # Clear the sources so that installation uses custom sources
         old_sources = Gem.sources
         Gem.sources = Gem.default_sources
-        Gem.sources << "https://gems.hashicorp.com"
+        Vagrant::Bundler::DEFAULT_GEM_SOURCES.each do |source|
+          if !Gem.sources.include?(source)
+            Gem.sources << source
+          end
+        end
 
         # Use a silent UI so that we have no output
         Gem::DefaultUserInteraction.use_ui(Gem::SilentUI.new) do

data/plugins/commands/up/command.rb

@@ -128,7 +128,7 @@ module VagrantPlugins
         # First create a set of all the providers we need to check for.
         # Most likely this will be a set of one.
         providers = Set.new
-        with_target_vms(names) do |machine|
+        with_target_vms(names, provider: provider) do |machine|
           # Check if we have this machine in the index
           entry    = @env.machine_index.get(machine.name.to_s)
 

data/plugins/commands/validate/command.rb

@@ -0,0 +1,31 @@
+require 'optparse'
+
+module VagrantPlugins
+  module CommandValidate
+    class Command < Vagrant.plugin("2", :command)
+      def self.synopsis
+        "validates the Vagrantfile"
+      end
+
+      def execute
+        opts = OptionParser.new do |o|
+          o.banner = "Usage: vagrant validate"
+        end
+
+        # Parse the options
+        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)
+
+        @env.ui.info(I18n.t("vagrant.commands.validate.success"))
+
+        # Success, exit status 0
+        0
+      end
+    end
+  end
+end

data/plugins/commands/validate/plugin.rb

@@ -0,0 +1,17 @@
+require "vagrant"
+
+module VagrantPlugins
+  module CommandValidate
+    class Plugin < Vagrant.plugin("2")
+      name "validate command"
+      description <<-DESC
+      The `validate` command validates the Vagrantfile.
+      DESC
+
+      command("validate") do
+        require File.expand_path("../command", __FILE__)
+        Command
+      end
+    end
+  end
+end

data/plugins/communicators/ssh/communicator.rb

@@ -25,6 +25,20 @@ module VagrantPlugins
       PTY_DELIM_END = "bccbb768c119429488cfd109aacea6b5-pty"
       # Marker for start of regular command output
       CMD_GARBAGE_MARKER = "41e57d38-b4f7-4e46-9c38-13873d338b86-vagrant-ssh"
+      # These are the exceptions that we retry because they represent
+      # errors that are generally fixed from a retry and don't
+      # necessarily represent immediate failure cases.
+      SSH_RETRY_EXCEPTIONS = [
+        Errno::EACCES,
+        Errno::EADDRINUSE,
+        Errno::ECONNABORTED,
+        Errno::ECONNREFUSED,
+        Errno::ECONNRESET,
+        Errno::ENETUNREACH,
+        Errno::EHOSTUNREACH,
+        Net::SSH::Disconnect,
+        Timeout::Error
+      ]
 
       include Vagrant::Util::ANSIEscapeCodeRemover
       include Vagrant::Util::Retryable
@@ -81,6 +95,8 @@ module VagrantPlugins
               message = "Connection refused."
             rescue Vagrant::Errors::SSHConnectionReset
               message = "Connection reset."
+            rescue Vagrant::Errors::SSHConnectionAborted
+              message = "Connection aborted."
             rescue Vagrant::Errors::SSHHostDown
               message = "Host appears down."
             rescue Vagrant::Errors::SSHNoRoute
@@ -143,7 +159,7 @@ module VagrantPlugins
         # If we're already attempting to switch out the SSH key, then
         # just return that we're ready (for Machine#guest).
         @lock.synchronize do
-          return true if @inserted_key || !@machine.config.ssh.insert_key
+          return true if @inserted_key || !machine_config_ssh.insert_key
           @inserted_key = true
         end
 
@@ -350,24 +366,10 @@ module VagrantPlugins
         # Connect to SSH, giving it a few tries
         connection = nil
         begin
-          # These are the exceptions that we retry because they represent
-          # errors that are generally fixed from a retry and don't
-          # necessarily represent immediate failure cases.
-          exceptions = [
-            Errno::EACCES,
-            Errno::EADDRINUSE,
-            Errno::ECONNREFUSED,
-            Errno::ECONNRESET,
-            Errno::ENETUNREACH,
-            Errno::EHOSTUNREACH,
-            Net::SSH::Disconnect,
-            Timeout::Error
-          ]
-
           timeout = 60
 
           @logger.info("Attempting SSH connection...")
-          connection = retryable(tries: opts[:retries], on: exceptions) do
+          connection = retryable(tries: opts[:retries], on: SSH_RETRY_EXCEPTIONS) do
             Timeout.timeout(timeout) do
               begin
                 # This logger will get the Net-SSH log data for us.
@@ -426,6 +428,10 @@ module VagrantPlugins
           # This is raised if we failed to connect the max number of times
           # due to an ECONNRESET.
           raise Vagrant::Errors::SSHConnectionReset
+        rescue Errno::ECONNABORTED
+          # This is raised if we failed to connect the max number of times
+          # due to an ECONNABORTED
+          raise Vagrant::Errors::SSHConnectionAborted
         rescue Errno::EHOSTDOWN
           # This is raised if we get an ICMP DestinationUnknown error.
           raise Vagrant::Errors::SSHHostDown
@@ -458,9 +464,9 @@ module VagrantPlugins
         # Determine the shell to execute. Prefer the explicitly passed in shell
         # over the default configured shell. If we are using `sudo` then we
         # need to wrap the shell in a `sudo` call.
-        cmd = @machine.config.ssh.shell
+        cmd = machine_config_ssh.shell
         cmd = shell if shell
-        cmd = @machine.config.ssh.sudo_command.gsub("%c", cmd) if sudo
+        cmd = machine_config_ssh.sudo_command.gsub("%c", cmd) if sudo
         cmd
       end
 
@@ -482,7 +488,7 @@ module VagrantPlugins
 
         # Open the channel so we can execute or command
         channel = connection.open_channel do |ch|
-          if @machine.config.ssh.pty
+          if machine_config_ssh.pty
             ch.request_pty do |ch2, success|
               pty = success && command != ""
 
@@ -496,6 +502,8 @@ module VagrantPlugins
 
           marker_found = false
           data_buffer = ''
+          stderr_marker_found = false
+          stderr_data_buffer = ''
 
           ch.exec(shell_cmd(opts)) do |ch2, _|
             # Setup the channel callbacks so we can get data and exit status
@@ -512,12 +520,12 @@ module VagrantPlugins
                   if marker_index
                     marker_found = true
                     data_buffer.slice!(0, marker_index + CMD_GARBAGE_MARKER.size)
-                    data.replace data_buffer
+                    data.replace(data_buffer)
                     data_buffer = nil
                   end
                 end
 
-                if block_given? && marker_found
+                if block_given? && marker_found && !data.empty?
                   yield :stdout, data
                 end
               end
@@ -527,7 +535,20 @@ module VagrantPlugins
               # Filter out the clear screen command
               data = remove_ansi_escape_codes(data)
               @logger.debug("stderr: #{data}")
-              yield :stderr, data if block_given?
+              if !stderr_marker_found
+                stderr_data_buffer << data
+                marker_index = stderr_data_buffer.index(CMD_GARBAGE_MARKER)
+                if marker_index
+                  marker_found = true
+                  stderr_data_buffer.slice!(0, marker_index + CMD_GARBAGE_MARKER.size)
+                  data.replace(stderr_data_buffer)
+                  data_buffer = nil
+                end
+              end
+
+              if block_given? && marker_found && !data.empty?
+                yield :stderr, data
+              end
             end
 
             ch2.on_request("exit-status") do |ch3, data|
@@ -583,7 +604,7 @@ module VagrantPlugins
               data = data.force_encoding('ASCII-8BIT')
               ch2.send_data data
             else
-              ch2.send_data "printf '#{CMD_GARBAGE_MARKER}'\n#{command}\n".force_encoding('ASCII-8BIT')
+              ch2.send_data "printf '#{CMD_GARBAGE_MARKER}'\n(>&2 printf '#{CMD_GARBAGE_MARKER}')\n#{command}\n".force_encoding('ASCII-8BIT')
               # Remember to exit or this channel will hang open
               ch2.send_data "exit\n"
             end
@@ -596,7 +617,7 @@ module VagrantPlugins
         begin
           keep_alive = nil
 
-          if @machine.config.ssh.keep_alive
+          if machine_config_ssh.keep_alive
             # Begin sending keep-alive packets while we wait for the script
             # to complete. This avoids connections closing on long-running
             # scripts.
@@ -672,9 +693,13 @@ module VagrantPlugins
       end
 
       def generate_environment_export(env_key, env_value)
-        template = @machine.config.ssh.export_command_template
+        template = machine_config_ssh.export_command_template
         template.sub("%ENV_KEY%", env_key).sub("%ENV_VALUE%", env_value) + "\n"
       end
+
+      def machine_config_ssh
+        @machine.config.ssh
+      end
     end
   end
 end