vagrant-unbundled 2.2.0.0 → 2.2.2.0

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

@@ -9,6 +9,9 @@ $ErrorActionPreference = "Stop"
 
 try {
     $VM = Hyper-V\Get-VM -Id $VmId
+    if((Get-Command Hyper-V\Set-VM).Parameters["AutomaticCheckpointsEnabled"] -ne $null) {
+        Hyper-V\Set-VM -VM $VM -AutomaticCheckpointsEnabled $false -ErrorAction SilentlyContinue
+    }
     Hyper-V\Remove-VM $VM -Force
 } catch {
     Write-ErrorMessage "Failed to delete VM: ${PSItem}"

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

@@ -35,7 +35,7 @@ try {
         foreach ($macaddr in $macaddresses) {
             $macaddress = $macaddr.MacAddress -replace '(.{2})(?!$)', '${1}-'
             $addr = Get-NetNeighbor -LinkLayerAddress $macaddress -ErrorAction SilentlyContinue | select IPAddress
-            if ($ip_address) {
+            if ($addr) {
                 $ip_address = $addr.IPAddress
                 if ($ip_address.Contains(".")) {
                     $ip4_address = $ip_address

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

@@ -7,12 +7,6 @@ param (
     [int]$VlanId
 )
 
-# Include the following modules
-$presentDir = Split-Path -parent $PSCommandPath
-$modules = @()
-$modules += $presentDir + "\utils\write_messages.ps1"
-forEach ($module in $modules) { . $module }
-
 try {
   $vm = Hyper-V\Get-VM -Id $VmId -ErrorAction "stop"
   Hyper-V\Set-VMNetworkAdapterVlan $vm -Access -Vlanid $VlanId

data/plugins/providers/hyperv/scripts/utils/VagrantVM/VagrantVM.psm1

@@ -85,7 +85,7 @@ function New-VagrantVMVMCX {
         VhdDestinationPath = Join-Path $DataPath "Virtual Hard Disks";
         VirtualMachinePath = $DataPath;
     }
-    $VMConfig = (Hyper-V\Compare-VM -Copy -GenerateNewID @NewVMConfig)
+    $VMConfig = (Hyper-V\Compare-VM -Copy -GenerateNewID @NewVMConfig -ErrorAction SilentlyContinue)
 
     # If the config is empty it means the import failed. Attempt to provide
     # context for failure

data/plugins/providers/virtualbox/action.rb

@@ -42,6 +42,7 @@ module VagrantPlugins
       autoload :PrepareForwardedPortCollisionParams, File.expand_path("../action/prepare_forwarded_port_collision_params", __FILE__)
       autoload :Resume, File.expand_path("../action/resume", __FILE__)
       autoload :SaneDefaults, File.expand_path("../action/sane_defaults", __FILE__)
+      autoload :SetDefaultNICType, File.expand_path("../action/set_default_nic_type", __FILE__)
       autoload :SetName, File.expand_path("../action/set_name", __FILE__)
       autoload :SnapshotDelete, File.expand_path("../action/snapshot_delete", __FILE__)
       autoload :SnapshotRestore, File.expand_path("../action/snapshot_restore", __FILE__)
@@ -71,6 +72,7 @@ module VagrantPlugins
           b.use SyncedFolderCleanup
           b.use SyncedFolders
           b.use PrepareNFSSettings
+          b.use SetDefaultNICType
           b.use ClearNetworkInterfaces
           b.use Network
           b.use NetworkFixIPv6

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

@@ -261,16 +261,26 @@ module VagrantPlugins
 
           begin
             ip = IPAddr.new(options[:ip])
-          rescue IPAddr::InvalidAddressError => e
-            raise Vagrant::Errors::NetworkAddressInvalid, :ip => options[:ip], :error_msg => e.message
-          end
+            if ip.ipv4?
+              options[:netmask] ||= "255.255.255.0"
+            elsif ip.ipv6?
+              options[:netmask] ||= 64
 
-          if ip.ipv4?
-            options[:netmask] ||= "255.255.255.0"
+              # Append a 6 to the end of the type
+              options[:type] = "#{options[:type]}6".to_sym
+            else
+              raise IPAddr::AddressFamilyError, 'unknown address family'
+            end
 
             # Calculate our network address for the given IP/netmask
-            netaddr  = network_address(options[:ip], options[:netmask])
+            netaddr = IPAddr.new("#{options[:ip]}/#{options[:netmask]}")
+          rescue IPAddr::Error => e
+            raise Vagrant::Errors::NetworkAddressInvalid,
+              address: options[:ip], mask: options[:netmask],
+              error: e.message
+          end
 
+          if ip.ipv4?
             # Verify that a host-only network subnet would not collide
             # with a bridged networking interface.
             #
@@ -287,44 +297,24 @@ module VagrantPlugins
                   interface_name: interface[:name]
               end
             end
-
-            # Split the IP address into its components
-            ip_parts = netaddr.split(".").map { |i| i.to_i }
-
-            # Calculate the adapter IP, which we assume is the IP ".1" at
-            # the end usually.
-            adapter_ip    = ip_parts.dup
-            adapter_ip[3] += 1
-            options[:adapter_ip] ||= adapter_ip.join(".")
-          elsif ip.ipv6?
-            # Default subnet prefix length
-            options[:netmask] ||= 64
-
-            # Set adapter IP to <prefix>::1
-            options[:adapter_ip] ||= (ip.mask(options[:netmask].to_i) | 1).to_s
-
-            # Append a 6 to the end of the type
-            options[:type] = "#{options[:type]}6".to_sym
-          else
-            raise "BUG: Unknown IP type: #{ip.inspect}"
           end
 
+          # Calculate the adapter IP which is the network address with
+          # the final bit + 1. Usually it is "x.x.x.1" for IPv4 and
+          # "<prefix>::1" for IPv6
+          options[:adapter_ip] ||= (netaddr | 1).to_s
+
           dhcp_options = {}
           if options[:type] == :dhcp
-            # Calculate the DHCP server IP, which is the network address
-            # with the final octet + 2. So "172.28.0.0" turns into "172.28.0.2"
-            dhcp_ip    = ip_parts.dup
-            dhcp_ip[3] += 2
-            dhcp_options[:dhcp_ip] = options[:dhcp_ip] || dhcp_ip.join(".")
-
-            # Calculate the lower and upper bound for the DHCP server
-            dhcp_lower    = ip_parts.dup
-            dhcp_lower[3] += 3
-            dhcp_options[:dhcp_lower] = options[:dhcp_lower] || dhcp_lower.join(".")
-
-            dhcp_upper    = ip_parts.dup
-            dhcp_upper[3] = 254
-            dhcp_options[:dhcp_upper] = options[:dhcp_upper] || dhcp_upper.join(".")
+            # Calculate the DHCP server IP and lower & upper bound
+            # Example: for "192.168.22.64/26" network range those are:
+            # dhcp_ip: "192.168.22.66",
+            # dhcp_lower: "192.168.22.67"
+            # dhcp_upper: "192.168.22.126"
+            ip_range = netaddr.to_range
+            dhcp_options[:dhcp_ip] = options[:dhcp_ip] || (ip_range.first | 2).to_s
+            dhcp_options[:dhcp_lower] = options[:dhcp_lower] || (ip_range.first | 3).to_s
+            dhcp_options[:dhcp_upper] = options[:dhcp_upper] || (ip_range.last(2).first).to_s
           end
 
           return {
@@ -413,15 +403,16 @@ module VagrantPlugins
         end
 
         def nat_config(options)
-          return {
+          return options.merge(
             auto_config: false
-          }
+          )
         end
 
         def nat_adapter(config)
           return {
             adapter: config[:adapter],
             type:    :nat,
+            nic_type: config[:nic_type],
           }
         end
 

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

@@ -0,0 +1,69 @@
+require "log4r"
+
+module VagrantPlugins
+  module ProviderVirtualBox
+    module Action
+      # This sets the default NIC type used for network adapters created
+      # on the guest. Also includes a check of NIC types in use and VirtualBox
+      # version to determine if E1000 NIC types are vulnerable.
+      #
+      # NOTE: Vulnerability was fixed here: https://www.virtualbox.org/changeset/75330/vbox
+      class SetDefaultNICType
+        # Defines versions of VirtualBox with susceptible implementation
+        # of the E1000 devices.
+        E1000_SUSCEPTIBLE = Gem::Requirement.new("<= 5.2.22").freeze
+
+        def initialize(app, env)
+          @logger = Log4r::Logger.new("vagrant::plugins::virtualbox::set_default_nic_type")
+          @app    = app
+        end
+
+        def call(env)
+          default_nic_type = env[:machine].provider_config.default_nic_type
+
+          e1000_in_use = [
+            # simple check on default_nic_type
+            ->{ default_nic_type.nil? || default_nic_type.to_s.start_with?("8254") },
+            # check provider defined adapters
+            ->{ env[:machine].provider_config.network_adapters.values.detect{ |_, opts|
+                opts[:nic_type].to_s.start_with?("8254") } },
+            # finish with inspecting configured networks
+            ->{ env[:machine].config.vm.networks.detect{ |_, opts|
+                opts.fetch(:virtualbox__nic_type, opts[:nic_type]).to_s.start_with?("8254") } }
+          ]
+
+          # Check if VirtualBox E1000 implementation is vulnerable
+          if E1000_SUSCEPTIBLE.satisfied_by?(Gem::Version.new(env[:machine].provider.driver.version))
+            @logger.info("Detected VirtualBox version with susceptible E1000 implementation (`#{E1000_SUSCEPTIBLE}`)")
+            if e1000_in_use.any?(&:call)
+              env[:ui].warn I18n.t("vagrant.actions.vm.set_default_nic_type.e1000_warning")
+            end
+          end
+
+          if default_nic_type
+            @logger.info("Default NIC type for VirtualBox interfaces `#{default_nic_type}`")
+            # Update network adapters defined in provider configuration
+            env[:machine].provider_config.network_adapters.each do |slot, args|
+              _, opts = args
+              if opts && !opts.key?(:nic_type)
+                @logger.info("Setting default NIC type (`#{default_nic_type}`) adapter `#{slot}` - `#{args}`")
+                opts[:nic_type] = default_nic_type
+              end
+            end
+
+            # Update generally defined networks
+            env[:machine].config.vm.networks.each do |type, options|
+              next if !type.to_s.end_with?("_network")
+              if !options.key?(:nic_type) && !options.key?(:virtualbox__nic_type)
+                @logger.info("Setting default NIC type (`#{default_nic_type}`) for `#{type}` - `#{options}`")
+                options[:virtualbox__nic_type] = default_nic_type
+              end
+            end
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/plugins/providers/virtualbox/config.rb

@@ -19,6 +19,13 @@ module VagrantPlugins
       # @return [Array]
       attr_reader :customizations
 
+      # Set the default type of NIC hardware to be used for network
+      # devices. By default this is `nil` and VirtualBox's default
+      # will be used.
+      #
+      # @return [String]
+      attr_accessor :default_nic_type
+
       # If true, unused network interfaces will automatically be deleted.
       # This defaults to false because the detection does not work across
       # multiple users, and because on Windows this operation requires
@@ -68,6 +75,7 @@ module VagrantPlugins
         @auto_nat_dns_proxy = UNSET_VALUE
         @check_guest_additions = UNSET_VALUE
         @customizations   = []
+        @default_nic_type = UNSET_VALUE
         @destroy_unused_network_interfaces = UNSET_VALUE
         @functional_vboxsf = UNSET_VALUE
         @name             = UNSET_VALUE
@@ -158,6 +166,8 @@ module VagrantPlugins
 
         # The default name is just nothing, and we default it
         @name = nil if @name == UNSET_VALUE
+
+        @default_nic_type = nil if @default_nic_type == UNSET_VALUE
       end
 
       def validate(machine)

data/plugins/providers/virtualbox/driver/meta.rb

@@ -63,6 +63,7 @@ module VagrantPlugins
             "5.0" => Version_5_0,
             "5.1" => Version_5_1,
             "5.2" => Version_5_2,
+            "6.0" => Version_6_0,
           }
 
           if @@version.start_with?("4.2.14")

data/plugins/providers/virtualbox/driver/version_5_0.rb

@@ -674,6 +674,8 @@ module VagrantPlugins
               hostpath]
             args << "--transient" if folder.key?(:transient) && folder[:transient]
 
+            args << "--automount" if folder.key?(:automount) && folder[:automount]
+
             if folder[:SharedFoldersEnableSymlinksCreate]
               # Enable symlinks on the shared folder
               execute("setextradata", @uuid, "VBoxInternal2/SharedFoldersEnableSymlinksCreate/#{folder[:name]}", "1", retryable: true)
@@ -687,12 +689,21 @@ module VagrantPlugins
         def ssh_port(expected_port)
           @logger.debug("Searching for SSH port: #{expected_port.inspect}")
 
-          # Look for the forwarded port only by comparing the guest port
-          read_forwarded_ports.each do |_, _, hostport, guestport|
-            return hostport if guestport == expected_port
-          end
-
-          nil
+          # Look for the forwarded port. Valid based on the guest port, but will do
+          # scoring based matching to determine best value when multiple results are
+          # available.
+          matches = read_forwarded_ports.map do |_, name, hostport, guestport, host_ip|
+            next if guestport != expected_port
+            match = [0, hostport]
+            match[0] += 1 if name == "ssh"
+            match[0] += 1 if name.downcase == "ssh"
+            match[0] += 1 if host_ip == "127.0.0.1"
+            match
+          end.compact
+
+          result = matches.sort_by(&:first).last
+
+          result.last if result
         end
 
         def resume

data/plugins/providers/virtualbox/driver/version_5_2.rb

@@ -1,10 +1,10 @@
-require File.expand_path("../version_5_1", __FILE__)
+require File.expand_path("../version_5_0", __FILE__)
 
 module VagrantPlugins
   module ProviderVirtualBox
     module Driver
       # Driver for VirtualBox 5.2.x
-      class Version_5_2 < Version_5_1
+      class Version_5_2 < Version_5_0
         def initialize(uuid)
           super
 

data/plugins/providers/virtualbox/driver/version_6_0.rb

@@ -0,0 +1,105 @@
+require File.expand_path("../version_5_0", __FILE__)
+
+module VagrantPlugins
+  module ProviderVirtualBox
+    module Driver
+      # Driver for VirtualBox 6.0.x
+      class Version_6_0 < Version_5_0
+        def initialize(uuid)
+          super
+
+          @logger = Log4r::Logger.new("vagrant::provider::virtualbox_6_0")
+        end
+
+        def import(ovf)
+          ovf = Vagrant::Util::Platform.windows_path(ovf)
+
+          output = ""
+          total = ""
+          last  = 0
+
+          # Dry-run the import to get the suggested name and path
+          @logger.debug("Doing dry-run import to determine parallel-safe name...")
+          output = execute("import", "-n", ovf)
+          result = /Suggested VM name "(.+?)"/.match(output)
+          if !result
+            raise Vagrant::Errors::VirtualBoxNoName, output: output
+          end
+          suggested_name = result[1].to_s
+
+          # Append millisecond plus a random to the path in case we're
+          # importing the same box elsewhere.
+          specified_name = "#{suggested_name}_#{(Time.now.to_f * 1000.0).to_i}_#{rand(100000)}"
+          @logger.debug("-- Parallel safe name: #{specified_name}")
+
+          # Build the specified name param list
+          name_params = [
+            "--vsys", "0",
+            "--vmname", specified_name,
+          ]
+
+          # Target path for disks is no longer a full path. Extract the path for the
+          # settings file to determine the base directory which we can then use to
+          # build the disk paths
+          result = /Suggested VM settings file name "(?<settings_path>.+?)"/.match(output)
+          if !result
+            @logger.warn("Failed to locate base path for disks. Using current working directory.")
+            base_path = "."
+          else
+            base_path = File.dirname(result[:settings_path])
+          end
+
+          @logger.info("Base path for disk import: #{base_path}")
+
+          # Extract the disks list and build the disk target params
+          disk_params = []
+          disks = output.scan(/(\d+): Hard disk image: source image=.+, target path=(.+),/)
+          disks.each do |unit_num, path|
+            path = File.join(base_path, File.basename(path))
+            disk_params << "--vsys"
+            disk_params << "0"
+            disk_params << "--unit"
+            disk_params << unit_num
+            disk_params << "--disk"
+            if Vagrant::Util::Platform.windows?
+              # we use the block form of sub here to ensure that if the specified_name happens to end with a number (which is fairly likely) then
+              # we won't end up having the character sequence of a \ followed by a number be interpreted as a back reference.  For example, if
+              # specified_name were "abc123", then "\\abc123\\".reverse would be "\\321cba\\", and the \3 would be treated as a back reference by the sub
+              disk_params << path.reverse.sub("\\#{suggested_name}\\".reverse) { "\\#{specified_name}\\".reverse }.reverse # Replace only last occurrence
+            else
+              disk_params << path.reverse.sub("/#{suggested_name}/".reverse, "/#{specified_name}/".reverse).reverse # Replace only last occurrence
+            end
+          end
+
+          execute("import", ovf , *name_params, *disk_params, retryable: true) do |type, data|
+            if type == :stdout
+              # Keep track of the stdout so that we can get the VM name
+              output << data
+            elsif type == :stderr
+              # Append the data so we can see the full view
+              total << data.gsub("\r", "")
+
+              # Break up the lines. We can't get the progress until we see an "OK"
+              lines = total.split("\n")
+              if lines.include?("OK.")
+                # The progress of the import will be in the last line. Do a greedy
+                # regular expression to find what we're looking for.
+                match = /.+(\d{2})%/.match(lines.last)
+                if match
+                  current = match[1].to_i
+                  if current > last
+                    last = current
+                    yield current if block_given?
+                  end
+                end
+              end
+            end
+          end
+
+          return get_machine_id specified_name
+        end
+
+      end
+    end
+  end
+end

data/plugins/providers/virtualbox/plugin.rb

@@ -58,6 +58,7 @@ module VagrantPlugins
       autoload :Version_5_0, File.expand_path("../driver/version_5_0", __FILE__)
       autoload :Version_5_1, File.expand_path("../driver/version_5_1", __FILE__)
       autoload :Version_5_2, File.expand_path("../driver/version_5_2", __FILE__)
+      autoload :Version_6_0, File.expand_path("../driver/version_6_0", __FILE__)
     end
 
     module Model

data/plugins/providers/virtualbox/synced_folder.rb

@@ -124,7 +124,8 @@ module VagrantPlugins
               name: os_friendly_id(id),
               hostpath: hostpath.to_s,
               transient: transient,
-              SharedFoldersEnableSymlinksCreate: enable_symlink_create
+              SharedFoldersEnableSymlinksCreate: enable_symlink_create,
+              automount: !!data[:automount]
             }
           end
         end