vagrant-unbundled 2.2.0.0 → 2.2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eca7fc517602ce921c69b2a141cc57079df7b2a0834dc306e5820ea2bb107bee
-  data.tar.gz: 41808cc7d78dfbb081da51f3eb544c797b672e3eecefb124c6e3c2d913281593
+  metadata.gz: '092370f794df41aa0635fd8a28ca6cfb3b3bda4b23b073bbab6387cf3e5bff1b'
+  data.tar.gz: de1fccf9d6d443c4338db2870508c36fe0dd0807069be31898124fee88c7a5a4
 SHA512:
-  metadata.gz: 4c9588b9b89bb650b8973ab683c8b0ed011cde2b0078476dab14b9acfc121c7b409ce5dc4557330539177895bd04b0a237c9f348a80070e583a6453cd6f1621a
-  data.tar.gz: bf0449d3b45d3edbbe91dcbf70272cb830d65a7e35b200f5b461eebcced575e3438e2f73620bcdf4fd7ccc75b9b3ecfce928da6382b95c5ac3e584ea1fe87f04
+  metadata.gz: 6d45f2df2f9252d0de117c8f019ca22a418fdd58c1f5f8f9e6996f4e6e1b0e69a00be132324a80f4edc8babe724b7a5f5ff282eee71f8e05c5903e785bf56f56
+  data.tar.gz: adec6283e9e94b6585ba7ba4e19b203806503fed7cdd6562be94caa86ff89a08797b8e94b5e744e4eab3580b692831071460c7b145f853536bc2f2c054c0ddac

data/.travis.yml

@@ -10,10 +10,9 @@ addons:
     - bsdtar
 
 rvm:
-  - 2.3.7
-  - 2.4.4
-  - 2.5.0
-  - 2.5.1
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
 
 branches:
   only:

data/CHANGELOG.md

@@ -1,3 +1,52 @@
+## 2.2.2 (November 27, 2018)
+
+BUG FIXES:
+
+- providers/virtualbox: Update default_nic_type implementation and add warning [GH-10450]
+
+## 2.2.1 (November 15, 2018)
+
+FEATURES:
+
+- core/plugins: Add reset! method to communicator [GH-10399]
+- providers/virtualbox: Add support for VirtualBox 6.0 [GH-10379]
+
+IMPROVEMENTS:
+
+- command/validate: Allow validation of config while ignoring provider [GH-10351]
+- communicators/ssh: Prevent overly verbose output waiting for connection [GH-10321]
+- communicators/ssh: Support ed25519 keys [GH-10365]
+- communicators/ssh: Add reset! implementation [GH-10399]
+- communicators/winrm: Add reset! implementation [GH-10399]
+- core: Limit number of automatic box update checks [GH-10359]
+- host/windows: Remove PATH check in WSL detection [GH-10313]
+- providers/hyperv: Disable automatic checkpoints before deletion [GH-10406]
+- providers/virtualbox: Add `automount` flag if specified with synced_folder [GH-10326]
+- providers/virtualbox: Refactor host only network settings [GH-7699]
+- providers/virtualbox: Support setting default NIC type for network adapters [GH-10383]
+- providers/virtualbox: Update ssh_port helper to handle multiple matches [GH-10409]
+- provisioners/shell: Add :reset option to allow communicator reset [GH-10399]
+- synced_folders/smb: Allow for 'default' smb_username in prompt if set [GH-10319]
+- util/network_ip: Simplify `network_address` helper [GH-7693]
+- util/platform: Prevent hard failure during hyper-v enabled check [GH-10332]
+
+BUG FIXES:
+
+- command/login: Only show deprecation warning when command is invoked [GH-10374]
+- core: Fallback to Vagrantfile defined box information [GH-10368]
+- core/bundler: Update source ordering to properly resolve with new RubyGems [GH-10364]
+- core/triggers: Only split inline script if host is non-Windows [GH-10405]
+- communicator/winrm: Prepend computer name to username when running elevated commands [GH-10387]
+- guest/debian: Fix halting issue when setting hostname by restarting networking on guest [GH-10301, GH-10330]
+- guest/linux: Fix vagrant user access to docker after install [GH-10399]
+- guest/windows: Add reboot capability to fix hostname race condition [GH-10347]
+- guest/windows: Allow for reading key paths with spaces [GH-10389]
+- host/windows: Fix powershell to properly handle paths with spaces [GH-10390]
+- providers/docker: Deterministic host VM synced folder location for Docker VM [GH-10311]
+- providers/hyperv: Fix network vlan configuration script [GH-10366]
+- providers/hyperv: Properly output error message on failed guest import [GH-10404]
+- providers/hyperv: Fix typo in network configuration detection script [GH-10410]
+
 ## 2.2.0 (October 16, 2018)
 
 FEATURES:

data/lib/vagrant/action/builtin/box_check_outdated.rb

@@ -40,6 +40,7 @@ module Vagrant
           # Have download options specified in the environment override
           # options specified for the machine.
           download_options = {
+            automatic_check: true,
             ca_cert: env[:ca_cert] || machine.config.vm.box_download_ca_cert,
             ca_path: env[:ca_path] || machine.config.vm.box_download_ca_path,
             client_cert: env[:client_cert] ||

data/lib/vagrant/action/builtin/config_validate.rb

@@ -12,7 +12,7 @@ module Vagrant
 
         def call(env)
           if !env.key?(:config_validate) || env[:config_validate]
-            errors = env[:machine].config.validate(env[:machine])
+            errors = env[:machine].config.validate(env[:machine], env[:ignore_provider])
 
             if errors && !errors.empty?
               raise Errors::ConfigInvalid,

data/lib/vagrant/box.rb

@@ -16,6 +16,9 @@ module Vagrant
   class Box
     include Comparable
 
+    # Number of seconds to wait between checks for box updates
+    BOX_UPDATE_CHECK_INTERVAL = 3600
+
     # The box name. This is the logical name used when adding the box.
     #
     # @return [String]
@@ -154,6 +157,11 @@ module Vagrant
         raise Errors::BoxUpdateNoMetadata, name: @name
       end
 
+      if download_options.delete(:automatic_check) && !automatic_update_check_allowed?
+        @logger.info("Skipping box update check")
+        return
+      end
+
       version += ", " if version
       version ||= ""
       version += "> #{@version}"
@@ -164,6 +172,25 @@ module Vagrant
       [md, newer, newer.provider(@provider)]
     end
 
+    # Check if a box update check is allowed. Uses a file
+    # in the box data directory to track when the last auto
+    # update check was performed and returns true if the
+    # BOX_UPDATE_CHECK_INTERVAL has passed.
+    #
+    # @return [Boolean]
+    def automatic_update_check_allowed?
+      check_path = directory.join("box_update_check")
+      if check_path.exist?
+        last_check_span = Time.now.to_i - check_path.mtime.to_i
+        if last_check_span < BOX_UPDATE_CHECK_INTERVAL
+          @logger.info("box update check is under the interval threshold")
+          return false
+        end
+      end
+      FileUtils.touch(check_path)
+      true
+    end
+
     # This repackages this box and outputs it to the given path.
     #
     # @param [Pathname] path The full path (filename included) of where

data/lib/vagrant/bundler.rb

@@ -24,8 +24,8 @@ module Vagrant
 
     # Default gem repositories
     DEFAULT_GEM_SOURCES = [
-      "https://rubygems.org/".freeze,
-      HASHICORP_GEMSTORE
+      HASHICORP_GEMSTORE,
+      "https://rubygems.org/".freeze
     ].freeze
 
     def self.instance
@@ -62,7 +62,12 @@ module Vagrant
 
       # Add HashiCorp RubyGems source
       if !Gem.sources.include?(HASHICORP_GEMSTORE)
+        current_sources = Gem.sources.sources.dup
+        Gem.sources.clear
         Gem.sources << HASHICORP_GEMSTORE
+        current_sources.each do |src|
+          Gem.sources << src
+        end
       end
 
       # Generate dependencies for all registered plugins

data/lib/vagrant/cli.rb

@@ -23,6 +23,10 @@ module Vagrant
         return 0
       end
 
+      if @sub_command == "login"
+        $stderr.puts "WARNING: This command has been deprecated and aliased to `vagrant cloud auth login`"
+      end
+
       # If we reached this far then we must have a subcommand. If not,
       # then we also just print the help and exit.
       command_plugin = nil

data/lib/vagrant/config/v2/root.rb

@@ -60,14 +60,18 @@ module Vagrant
         #
         # @param [Environment] env
         # @return [Hash]
-        def validate(machine)
+        def validate(machine, ignore_provider=nil)
           # Go through each of the configuration keys and validate
           errors = {}
           @keys.each do |_key, instance|
             if instance.respond_to?(:validate)
               # Validate this single item, and if we have errors then
               # we merge them into our total errors list.
-              result = instance.validate(machine)
+              if _key == :vm
+                result = instance.validate(machine, ignore_provider)
+              else
+                result = instance.validate(machine)
+              end
               if result && !result.empty?
                 errors = Util.merge_errors(errors, result)
               end

data/lib/vagrant/plugin/v2/communicator.rb

@@ -117,6 +117,13 @@ module Vagrant
         # @see #execute
         def test(command, opts=nil)
         end
+
+        # Reset the communicator. For communicators which establish
+        # a persistent connection to the remote machine, this connection
+        # should be terminated and re-established. The communicator
+        # instance should be in a "fresh" state after calling this method.
+        def reset!
+        end
       end
     end
   end

data/lib/vagrant/plugin/v2/trigger.rb

@@ -161,7 +161,11 @@ module Vagrant
         # @param [Provisioners::Shell::Config] config A Shell provisioner config
         def run(config, on_error, exit_codes)
           if config.inline
-            cmd = Shellwords.split(config.inline)
+            if Vagrant::Util::Platform.windows?
+              cmd = config.inline
+            else
+              cmd = Shellwords.split(config.inline)
+            end
 
             @machine.ui.detail(I18n.t("vagrant.trigger.run.inline", command: config.inline))
           else

data/lib/vagrant/util/network_ip.rb

@@ -5,34 +5,9 @@ module Vagrant
     module NetworkIP
       # Returns the network address of the given IP and subnet.
       #
-      # If the IP address is an IPv6 address, subnet should be a prefix
-      # length such as "64".
-      #
       # @return [String]
       def network_address(ip, subnet)
-        # If this is an IPv6 address, then just mask it
-        if subnet.to_s =~ /^\d+$/
-          ip = IPAddr.new(ip)
-          return ip.mask(subnet.to_i).to_s
-        end
-
-        ip      = ip_parts(ip)
-        netmask = ip_parts(subnet)
-
-        # Bitwise-AND each octet to get the network address
-        # in octets and join each part with a period to get
-        # the resulting network address.
-        ip.map { |part| part & netmask.shift }.join(".")
-      end
-
-      protected
-
-      # Splits an IP into the four octets and returns each as an
-      # integer in an array.
-      #
-      # @return [Array<Integer>]
-      def ip_parts(ip)
-        ip.split(".").map { |i| i.to_i }
+        IPAddr.new(ip).mask(subnet).to_s
       end
     end
   end

data/lib/vagrant/util/platform.rb

@@ -13,6 +13,14 @@ module Vagrant
     # This class just contains some platform checking code.
     class Platform
       class << self
+
+        def logger
+          if !defined?(@_logger)
+            @_logger = Log4r::Logger.new("vagrant::util::platform")
+          end
+          @_logger
+        end
+
         def cygwin?
           if !defined?(@_cygwin)
             @_cygwin = ENV["VAGRANT_DETECTED_OS"].to_s.downcase.include?("cygwin") ||
@@ -35,11 +43,10 @@ module Vagrant
           if !defined?(@_wsl)
             @_wsl = false
             SilenceWarnings.silence! do
-              # Use PATH values to check for `/mnt/c` path indicative of WSL
-              if ENV.fetch("PATH", "").downcase.include?("/mnt/c")
-                # Validate WSL via uname output
-                uname = Subprocess.execute("uname", "-r")
-                if uname.exit_code == 0 && uname.stdout.downcase.include?("microsoft")
+              # Find 'microsoft' in /proc/version indicative of WSL
+              if File.file?('/proc/version')
+                osversion = File.open('/proc/version', &:gets)
+                if osversion.downcase.include?("microsoft")
                   @_wsl = true
                 end
               end
@@ -134,8 +141,13 @@ module Vagrant
           @_windows_hyperv_enabled = -> {
             ["Get-WindowsOptionalFeature", "Get-WindowsFeature"].each do |cmd_name|
               ps_cmd = "$(#{cmd_name} -FeatureName Microsoft-Hyper-V-Hypervisor).State"
-              output = Vagrant::Util::PowerShell.execute_cmd(ps_cmd)
-              return true if output == "Enabled"
+              begin
+                output = Vagrant::Util::PowerShell.execute_cmd(ps_cmd)
+                return true if output == "Enabled"
+              rescue Errors::PowerShellInvalidVersion
+                logger.warn("Invalid PowerShell version detected during Hyper-V enable check")
+                return false
+              end
             end
             return false
           }.call

data/lib/vagrant/util/powershell.rb

@@ -1,3 +1,4 @@
+require "base64"
 require "tmpdir"
 require_relative "subprocess"
 require_relative "which"
@@ -208,18 +209,26 @@ module Vagrant
       # @return [Array<String>]
       def self.powerup_command(path, args, opts)
         Dir.mktmpdir("vagrant") do |dpath|
-          all_args = ["-NoProfile", "-NonInteractive", "-ExecutionPolicy", "Bypass", path] + args
-          arg_list = "@('" + all_args.join("', '") + "')"
+          all_args = [path] + args.flatten.map{ |a|
+            a.gsub(/^['"](.+)['"]$/, "\\1")
+          }
+          arg_list = "\"" + all_args.join("\" \"") + "\""
           stdout = File.join(dpath, "stdout.txt")
           stderr = File.join(dpath, "stderr.txt")
-          exitcode = File.join(dpath, "exitcode.txt")
 
-          script = "$sp = Start-Process -FilePath powershell -ArgumentList #{arg_list} " \
-            "-PassThru -Wait -RedirectStandardOutput '#{stdout}' -RedirectStandardError '#{stderr}' -WindowStyle Hidden; " \
-            "if($sp){ Set-Content -Path '#{exitcode}' -Value $sp.ExitCode;exit $sp.ExitCode; }else{ exit 1 }"
+          script = "& #{arg_list} ; exit $LASTEXITCODE;"
+          script_content = Base64.urlsafe_encode64(script.encode("UTF-16LE", "UTF-8"))
 
-          # escape quotes so we can nest our script within a start-process
-          script.gsub!("'", "''")
+          # Wrap so we can redirect output to read later
+          wrapper = "$p = Start-Process -FilePath powershell -ArgumentList @('-NoLogo', '-NoProfile', " \
+            "'-NonInteractive', '-ExecutionPolicy', 'Bypass', '-EncodedCommand', '#{script_content}') " \
+            "-PassThru -WindowStyle Hidden -Wait -RedirectStandardOutput '#{stdout}' -RedirectStandardError '#{stderr}'; " \
+            "if($p){ exit $p.ExitCode; }else{ exit 1 }"
+          wrapper_content = Base64.urlsafe_encode64(wrapper.encode("UTF-16LE", "UTF-8"))
+
+          powerup = "$p = Start-Process -FilePath powershell -ArgumentList @('-NoLogo', '-NoProfile', " \
+            "'-NonInteractive', '-ExecutionPolicy', 'Bypass', '-EncodedCommand', '#{wrapper_content}') " \
+            "-PassThru -WindowStyle Hidden -Wait -Verb RunAs; if($p){ exit $p.ExitCode; }else{ exit 1 }"
 
           cmd = [
             "powershell",
@@ -227,31 +236,20 @@ module Vagrant
             "-NoProfile",
             "-NonInteractive",
             "-ExecutionPolicy", "Bypass",
-            "-Command", "$p = Start-Process -FilePath powershell -ArgumentList " \
-              "@('-NoLogo', '-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass', '-Command', '#{script}') " \
-              "-PassThru -Wait -WindowStyle Hidden -Verb RunAs; if($p){ exit $p.ExitCode; }else{ exit 1 }"
+            "-Command", powerup
           ]
 
           result = Subprocess.execute(*cmd.push(opts))
+          r_stdout = result.stdout
           if File.exist?(stdout)
-            r_stdout = File.read(stdout)
-          else
-            r_stdout = result.stdout
+            r_stdout += File.read(stdout)
           end
+          r_stderr = result.stderr
           if File.exist?(stderr)
-            r_stderr = File.read(stderr)
-          else
-            r_stderr = result.stderr
+            r_stderr += File.read(stderr)
           end
 
-          code = 1
-          if File.exist?(exitcode)
-            code_txt = File.read(exitcode).strip
-            if code_txt.match(/^\d+$/)
-              code = code_txt.to_i
-            end
-          end
-          Subprocess::Result.new(code, r_stdout, r_stderr)
+          Subprocess::Result.new(result.exit_code, r_stdout, r_stderr)
         end
       end
 

data/lib/vagrant/util/ssh.rb

@@ -150,11 +150,24 @@ module Vagrant
         if !plain_mode && options[:private_key_path]
           options[:private_key_path].each do |path|
 
-            # Use '-o' instead of '-i' because '-i' does not call
-            # percent_expand in misc.c, but '-o' does. when passing the path,
-            # replace '%' in the path with '%%' to escape the '%'
-            path = path.to_s.gsub('%', '%%')
-            command_options += ["-o", "IdentityFile=\"#{path}\""]
+            private_key_arr = []
+
+            if path.include?('%')
+              if path.include?(' ') && Platform.windows?
+                LOGGER.warn("Paths with spaces and % on windows is not supported and will fail to read the file")
+              end
+              # Use '-o' instead of '-i' because '-i' does not call
+              # percent_expand in misc.c, but '-o' does. when passing the path,
+              # replace '%' in the path with '%%' to escape the '%'
+              path = path.to_s.gsub('%', '%%')
+              private_key_arr = ["-o", "IdentityFile=\"#{path}\""]
+            else
+              # Pass private key file directly with '-i', which properly supports
+              # paths with spaces on Windows guests
+              private_key_arr = ["-i", path]
+            end
+
+            command_options += private_key_arr
           end
         end
 

data/lib/vagrant/vagrantfile.rb

@@ -170,8 +170,8 @@ module Vagrant
 
       # Track the original box so we know if we changed
       box = nil
-      original_box = config.vm.box
-      original_version = config.vm.box_version
+      initial_box = original_box = config.vm.box
+      initial_version = original_version = config.vm.box_version
 
       # Check if this machine has a local box metadata file
       # describing the existing guest. If so, load it and
@@ -232,6 +232,17 @@ module Vagrant
       # Load the box and provider overrides
       load_box_proc.call
 
+      # NOTE: In cases where the box_meta file contains stale information
+      #       and the reference box no longer exists, fall back to initial
+      #       configuration and attempt to load that
+      if box.nil?
+        @logger.warn("Failed to locate #{config.vm.box} with version #{config.vm.box_version}")
+        @logger.warn("Performing lookup with inital values #{initial_box} with version #{initial_version}")
+        config.vm.box = original_box = initial_box
+        config.vm.box_version = original_box = initial_version
+        load_box_proc.call
+      end
+
       # Ensure box attributes are set to original values in
       # case they were modified by the local box metadata
       config.vm.box = original_box