vagrant-unbundled 2.3.2.0 → 2.3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 011ad261587bca60f45ba75518042b42714fb3071f7d3b26a77e0a18c72128b5
-  data.tar.gz: 05527c04f7777abfd80b43af313a906e2951c52f01e6ed4c3580ca14f665cd22
+  metadata.gz: 6d80f12bb6896767fb93de74dca7ff025aeb935c32bf6a2ab202b30582329ea1
+  data.tar.gz: ff5d56384a90926d3393a85400f3b34579f1e901b348318ae71b0219b8a29049
 SHA512:
-  metadata.gz: 140d7455f8410bcf801b7aef6bdab946f0c17fa4f6f542f0587bf1cae69511fb07587a98760f822b3ff0b18218683f76f8c0baa424348e9acc040c0e1ea775f7
-  data.tar.gz: d3dd774a2b030c6b56794d3339846e0b049e64a67ec6dd534763e5d48ccb8a8bcdce21fd3fbc618d8568ee3fff49d84a94cc84f89105f7444406321402ea6de6
+  metadata.gz: c84b9f9edc34fcecd13ca1b740903d1074242e0797cef80d849055959ea95da61b77eb07fe86ba5e53cf3db23aeddec02d91459972101fc2bd18efa026a690e6
+  data.tar.gz: 3cf8aebc8ff49c47dc52c47bf4ef329ed7fd3e2109c72aacbc06d751aafbecdb2e10be61f2405015683031bb5a9ca9bbf639d8b0c08809078eb72a9a1f060fcc

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 2.3.3 (November 15, 2022) 
+
+IMPROVEMENTS:
+
+- core: Bump net-ssh dependency to 7.0 and remove patches [GH-12979]
+- synced_folders/rsync: Include ssh `extra_args` value [GH-12973]
+
+BUG FIXES:
+
+- command/serve: Force root level namespace for Google constant [GH-12989]
+- guest/solaris: Fix insecure key authorized keys removal [GH-12740]
+- provider/virtualbox: Fix `:private_network` support for VirtualBox 7 on macOS [GH-12983]
+- provider/virtualbox: Prevent localization of command output [GH-12994]
+- provisioner/ansible: Update setup packages in debian capability [GH-12832]
+
 ## 2.3.2 (October 18, 2022)
 
 FEATURES:

data/Gemfile.lock

@@ -12,7 +12,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-unbundled (2.3.2.0)
+    vagrant-unbundled (2.3.3.0)
       bcrypt_pbkdf (~> 1.1)
       childprocess (~> 4.1.0)
       ed25519 (~> 1.3.0)
@@ -26,9 +26,9 @@ PATH
       log4r (~> 1.1.9, < 1.1.11)
       mime-types (~> 3.3)
       net-ftp (~> 0.1)
-      net-scp (~> 3.0.0)
-      net-sftp (~> 3.0)
-      net-ssh (>= 6.1.0, < 6.2)
+      net-scp (~> 4.0)
+      net-sftp (~> 4.0)
+      net-ssh (~> 7.0)
       rb-kqueue (~> 0.2.0)
       rexml (~> 3.2)
       rgl (~> 0.5.7)
@@ -50,10 +50,10 @@ GEM
     diff-lcs (1.5.0)
     ed25519 (1.3.0)
     erubi (1.11.0)
-    excon (0.93.1)
+    excon (0.94.0)
     fake_ftp (0.3.0)
     ffi (1.15.5)
-    google-protobuf (3.21.8)
+    google-protobuf (3.21.9)
     googleapis-common-protos-types (1.4.0)
       google-protobuf (~> 3.14)
     grpc (1.50.0)
@@ -87,11 +87,11 @@ GEM
       time
     net-protocol (0.1.3)
       timeout
-    net-scp (3.0.0)
-      net-ssh (>= 2.6.5, < 7.0.0)
-    net-sftp (3.0.0)
-      net-ssh (>= 5.0.0, < 7.0.0)
-    net-ssh (6.1.0)
+    net-scp (4.0.0)
+      net-ssh (>= 2.6.5, < 8.0.0)
+    net-sftp (4.0.0)
+      net-ssh (>= 5.0.0, < 8.0.0)
+    net-ssh (7.0.1)
     nori (2.6.0)
     pairing_heap (1.0.0)
     rake (13.0.6)
@@ -160,7 +160,7 @@ DEPENDENCIES
   fake_ftp (~> 0.3.0)
   grpc-tools (~> 1.41)
   rake (~> 13.0)
-  rspec (~> 3.11.0)
+  rspec (~> 3.11)
   rspec-its (~> 1.3.0)
   vagrant-spec!
   vagrant-unbundled!

data/LICENSE

@@ -1,6 +1,4 @@
-The MIT License
-
-Copyright (c) 2010-2019 Mitchell Hashimoto
+Copyright (c) 2010 HashiCorp, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/vagrant/errors.rb

@@ -1020,6 +1020,10 @@ module Vagrant
       error_key(:virtualbox_install_incomplete)
     end
 
+    class VirtualBoxMachineFolderNotFound < VagrantError
+      error_key(:virtualbox_machine_folder_not_found)
+    end
+
     class VirtualBoxNoName < VagrantError
       error_key(:virtualbox_no_name)
     end

data/lib/vagrant/util/install_cli_autocomplete.rb

@@ -3,7 +3,7 @@ module Vagrant
     # Generic installation of content to shell config file
     class InstallShellConfig
 
-      PERPEND_STRING = "# >>>> Vagrant command completion (start)".freeze
+      PREPEND_STRING = "# >>>> Vagrant command completion (start)".freeze
       APPEND_STRING = "# <<<<  Vagrant command completion (end)".freeze
 
       attr_accessor :prepend_string
@@ -12,7 +12,7 @@ module Vagrant
       attr_accessor :config_paths
 
       def initialize(string_insert, config_paths)
-        @prepend_string = PERPEND_STRING
+        @prepend_string = PREPEND_STRING
         @string_insert = string_insert
         @append_string = APPEND_STRING
         @config_paths = config_paths
@@ -29,7 +29,7 @@ module Vagrant
         @logger.info("Searching for config in home #{home}")
         @config_paths.each do |path|
           config_file = File.join(home, path)
-          if File.exists?(config_file)
+          if File.exist?(config_file)
             @logger.info("Found config file #{config_file}")
             return config_file
           end

data/lib/vagrant.rb

@@ -15,9 +15,6 @@ class Log4r::BasicFormatter
   end
 end
 
-# Add our patches to net-ssh
-require "vagrant/patches/net-ssh"
-
 require "optparse"
 
 module Vagrant

data/plugins/commands/serve/command.rb

@@ -21,7 +21,7 @@ module VagrantPlugins
     # Simple constant aliases to reduce namespace typing
     SDK = Hashicorp::Vagrant::Sdk
     SRV = Hashicorp::Vagrant
-    Empty = Google::Protobuf::Empty
+    Empty = ::Google::Protobuf::Empty
 
     autoload :Broker, Vagrant.source_root.join("plugins/commands/serve/broker").to_s
     autoload :Client, Vagrant.source_root.join("plugins/commands/serve/client").to_s

data/plugins/guests/solaris/cap/remove_public_key.rb

@@ -5,14 +5,14 @@ module VagrantPlugins
     module Cap
       class RemovePublicKey
         def self.remove_public_key(machine, contents)
-          # TODO: code is identical to linux/cap/remove_public_key
+          # "sed -i" is specific to GNU sed and is not a posix standard option
           contents = contents.chomp
           contents = Vagrant::Util::ShellQuote.escape(contents, "'")
 
           machine.communicate.tap do |comm|
             if comm.test("test -f ~/.ssh/authorized_keys")
               comm.execute(
-                "sed -i '/^.*#{contents}.*$/d' ~/.ssh/authorized_keys")
+                "cp ~/.ssh/authorized_keys ~/.ssh/authorized_keys.temp && sed '/^.*#{contents}.*$/d' ~/.ssh/authorized_keys.temp > ~/.ssh/authorized_keys && rm ~/.ssh/authorized_keys.temp")
             end
           end
         end

data/plugins/hosts/gentoo/host.rb

@@ -4,7 +4,7 @@ module VagrantPlugins
   module HostGentoo
     class Host < Vagrant.plugin("2", :host)
       def detect?(env)
-        File.exists?("/etc/gentoo-release")
+        File.exist?("/etc/gentoo-release")
       end
     end
   end

data/plugins/hosts/slackware/host.rb

@@ -4,7 +4,7 @@ module VagrantPlugins
   module HostSlackware
     class Host < Vagrant.plugin("2", :host)
       def detect?(env)
-        return File.exists?("/etc/slackware-version") ||
+        return File.exist?("/etc/slackware-version") ||
           !Dir.glob("/usr/lib/setup/Plamo-*").empty?
       end
     end

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

@@ -21,6 +21,8 @@ module VagrantPlugins
         VBOX_NET_CONF = "/etc/vbox/networks.conf".freeze
         # Version of VirtualBox that introduced hostonly network range restrictions
         HOSTONLY_VALIDATE_VERSION = Gem::Version.new("6.1.28")
+        # Version of VirtualBox on darwin platform that ignores restrictions
+        DARWIN_IGNORE_HOSTONLY_VALIDATE_VERSION = Gem::Version.new("7.0.0")
         # Default valid range for hostonly networks
         HOSTONLY_DEFAULT_RANGE = [IPAddr.new("192.168.56.0/21").freeze].freeze
 
@@ -479,10 +481,7 @@ module VagrantPlugins
         #-----------------------------------------------------------------
         # This creates a host only network for the given configuration.
         def hostonly_create_network(config)
-          @env[:machine].provider.driver.create_host_only_network(
-            adapter_ip: config[:adapter_ip],
-            netmask:    config[:netmask]
-          )
+          @env[:machine].provider.driver.create_host_only_network(config)
         end
 
         # This finds a matching host only network for the given configuration.
@@ -517,7 +516,11 @@ module VagrantPlugins
         # placed on the valid ranges
         def validate_hostonly_ip!(ip, driver)
           return if Gem::Version.new(driver.version) < HOSTONLY_VALIDATE_VERSION ||
-            Vagrant::Util::Platform.windows?
+                    (
+                      Vagrant::Util::Platform.darwin? &&
+                      Gem::Version.new(driver.version) >= DARWIN_IGNORE_HOSTONLY_VALIDATE_VERSION
+                    ) ||
+                    Vagrant::Util::Platform.windows?
 
           ip = IPAddr.new(ip.to_s) if !ip.is_a?(IPAddr)
           valid_ranges = load_net_conf

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

@@ -460,7 +460,9 @@ module VagrantPlugins
           end
 
           # Append in the options for subprocess
-          command << { notify: [:stdout, :stderr] }
+          # NOTE: We include the LANG env var set to C to prevent command output
+          #       from being localized
+          command << { notify: [:stdout, :stderr], env: {LANG: "C"}}
 
           Vagrant::Util::Busy.busy(int_callback) do
             Vagrant::Util::Subprocess.execute(@vboxmanage_path, *command, &block)

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

@@ -104,15 +104,15 @@ module VagrantPlugins
           end
         end
 
-       # Creates a disk. Default format is VDI unless overridden
-       #
-       # @param [String] disk_file
-       # @param [Integer] disk_size - size in bytes
-       # @param [String] disk_format - format of disk, defaults to "VDI"
+        # Creates a disk. Default format is VDI unless overridden
+        #
+        # @param [String] disk_file
+        # @param [Integer] disk_size - size in bytes
+        # @param [String] disk_format - format of disk, defaults to "VDI"
         # @param [Hash]  opts -  additional options
-       def create_disk(disk_file, disk_size, disk_format="VDI", **opts)
-         execute("createmedium", '--filename', disk_file, '--sizebyte', disk_size.to_i.to_s, '--format', disk_format)
-       end
+        def create_disk(disk_file, disk_size, disk_format="VDI", **opts)
+          execute("createmedium", '--filename', disk_file, '--sizebyte', disk_size.to_i.to_s, '--format', disk_format)
+        end
 
 
         def create_host_only_network(options)
@@ -322,22 +322,22 @@ module VagrantPlugins
 
             if adapter[:bridge]
               args.concat(["--bridgeadapter#{adapter[:adapter]}",
-                          adapter[:bridge], "--cableconnected#{adapter[:adapter]}", "on"])
+                           adapter[:bridge], "--cableconnected#{adapter[:adapter]}", "on"])
             end
 
             if adapter[:hostonly]
               args.concat(["--hostonlyadapter#{adapter[:adapter]}",
-                          adapter[:hostonly], "--cableconnected#{adapter[:adapter]}", "on"])
+                           adapter[:hostonly], "--cableconnected#{adapter[:adapter]}", "on"])
             end
 
             if adapter[:intnet]
               args.concat(["--intnet#{adapter[:adapter]}",
-                          adapter[:intnet], "--cableconnected#{adapter[:adapter]}", "on"])
+                           adapter[:intnet], "--cableconnected#{adapter[:adapter]}", "on"])
             end
 
             if adapter[:mac_address]
               args.concat(["--macaddress#{adapter[:adapter]}",
-                          adapter[:mac_address]])
+                           adapter[:mac_address]])
             end
 
             if adapter[:nic_type]
@@ -361,7 +361,7 @@ module VagrantPlugins
 
               # If the file already exists we'll throw a custom error
               raise Vagrant::Errors::VirtualBoxFileExists,
-                stderr: e.extra_data[:stderr]
+                    stderr: e.extra_data[:stderr]
             end
           end
         end
@@ -370,14 +370,14 @@ module VagrantPlugins
           args = []
           ports.each do |options|
             pf_builder = [options[:name],
-              options[:protocol] || "tcp",
-              options[:hostip] || "",
-              options[:hostport],
-              options[:guestip] || "",
-              options[:guestport]]
+                          options[:protocol] || "tcp",
+                          options[:hostip] || "",
+                          options[:hostport],
+                          options[:guestip] || "",
+                          options[:guestport]]
 
             args.concat(["--natpf#{options[:adapter] || 1}",
-                        pf_builder.join(",")])
+                         pf_builder.join(",")])
           end
 
           execute("modifyvm", @uuid, *args, retryable: true) if !args.empty?
@@ -507,11 +507,11 @@ module VagrantPlugins
             # since this comes first.
             current_nic = $1.to_i if line =~ /^nic(\d+)=".+?"$/
 
-              # If we care about active VMs only, then we check the state
-              # to verify the VM is running.
-              if active_only && line =~ /^VMState="(.+?)"$/ && $1.to_s != "running"
-                return []
-              end
+            # If we care about active VMs only, then we check the state
+            # to verify the VM is running.
+            if active_only && line =~ /^VMState="(.+?)"$/ && $1.to_s != "running"
+              return []
+            end
 
             # Parse out the forwarded port information
             # Forwarding(1)="172.22.8.201tcp32977,tcp,172.22.8.201,32977,,3777"
@@ -600,7 +600,7 @@ module VagrantPlugins
 
           if !valid_ip_address?(ip)
             raise Vagrant::Errors::VirtualBoxGuestPropertyNotFound,
-              guest_property: "/VirtualBox/GuestInfo/Net/#{adapter_number}/V4/IP"
+                  guest_property: "/VirtualBox/GuestInfo/Net/#{adapter_number}/V4/IP"
           end
 
           return ip
@@ -662,13 +662,17 @@ module VagrantPlugins
         end
 
         def read_machine_folder
-          execute("list", "systemproperties", retryable: true).split("\n").each do |line|
-            if line =~ /^Default machine folder:\s+(.+?)$/i
-              return $1.to_s
-            end
+          info = execute("list", "systemproperties", retryable: true)
+          info.each_line do |line|
+            match = line.match(/Default machine folder:\s+(?<folder>.+?)$/i)
+            next if match.nil?
+            return match[:folder]
           end
 
-          nil
+          @logger.warn("failed to determine machine folder from system properties")
+          @logger.debug("processed output for machine folder lookup:\n#{info}")
+
+          raise Vagrant::Errors::VirtualBoxMachineFolderNotFound
         end
 
         def read_network_interfaces
@@ -771,7 +775,7 @@ module VagrantPlugins
               # We got VERR_ALREADY_EXISTS. This means that we're renaming to
               # a VM name that already exists. Raise a custom error.
               raise Vagrant::Errors::VirtualBoxNameExists,
-                stderr: e.extra_data[:stderr]
+                    stderr: e.extra_data[:stderr]
             end
           end
         end
@@ -791,9 +795,9 @@ module VagrantPlugins
               hostpath = Vagrant::Util::Platform.windows_path(folder[:hostpath])
             end
             args = ["--name",
-              folder[:name],
-              "--hostpath",
-              hostpath]
+                    folder[:name],
+                    "--hostpath",
+                    hostpath]
             args << "--transient" if folder.key?(:transient) && folder[:transient]
 
             args << "--automount" if folder.key?(:automount) && folder[:automount]
@@ -866,8 +870,8 @@ module VagrantPlugins
 
             # If we reached this point then it didn't work out.
             raise Vagrant::Errors::VBoxManageError,
-              command: command.inspect,
-              stderr: r.stderr
+                  command: command.inspect,
+                  stderr: r.stderr
           end
         end
 

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

@@ -6,12 +6,214 @@ module VagrantPlugins
     module Driver
       # Driver for VirtualBox 7.0.x
       class Version_7_0 < Version_6_1
+        # VirtualBox version requirement for using host only networks
+        # instead of host only interfaces
+        HOSTONLY_NET_REQUIREMENT=Gem::Requirement.new(">= 7")
+        # Prefix of name used for host only networks
+        HOSTONLY_NAME_PREFIX="vagrantnet-vbox"
+        DEFAULT_NETMASK="255.255.255.0"
+
         def initialize(uuid)
           super
 
           @logger = Log4r::Logger.new("vagrant::provider::virtualbox_7_0")
         end
 
+        def read_bridged_interfaces
+          ifaces = super
+          return ifaces if !use_host_only_nets?
+
+          # Get a list of all subnets which are in use for hostonly networks
+          hostonly_ifaces = read_host_only_networks.map do |net|
+            IPAddr.new(net[:lowerip]).mask(net[:networkmask])
+          end
+
+          # Prune any hostonly interfaces in the list
+          ifaces.delete_if { |i|
+            addr = IPAddr.new(i[:ip]).mask(i[:netmask])
+            hostonly_ifaces.include?(addr)
+          }
+
+          ifaces
+        end
+
+        def delete_unused_host_only_networks
+          return super if !use_host_only_nets?
+
+          # First get the list of existing host only network names
+          network_names = read_host_only_networks.map { |net| net[:name] }
+          # Prune the network names to only include ones we manage
+          network_names.delete_if { |name| !name.start_with?(HOSTONLY_NAME_PREFIX) }
+
+          @logger.debug("managed host only network names: #{network_names}")
+
+          return if network_names.empty?
+
+          # Next get the list of host only networks currently in use
+          inuse_names = []
+          execute("list", "vms", retryable: true).split("\n").each do |line|
+            match = line.match(/^".+?"\s+\{(?<vmid>.+?)\}$/)
+            next if match.nil?
+            begin
+              info = execute("showvminfo", match[:vmid].to_s, "--machinereadable", retryable: true)
+              info.split("\n").each do |vmline|
+                if vmline.start_with?("hostonly-network")
+                  net_name = vmline.split("=", 2).last.to_s.gsub('"', "")
+                  inuse_names << net_name
+                end
+              end
+            rescue Vagrant::Errors::VBoxManageError => err
+              raise if !err.extra_data[:stderr].include?("VBOX_E_OBJECT_NOT_FOUND")
+            end
+          end
+
+          @logger.debug("currently in use network names: #{inuse_names}")
+
+          # Now remove all the networks not in use
+          (network_names - inuse_names).each do |name|
+            execute("hostonlynet", "remove", "--name", name, retryable: true)
+          end
+        end
+
+        def enable_adapters(adapters)
+          return super if !use_host_only_nets?
+
+          hostonly_adapters = adapters.find_all { |adapter| adapter[:hostonly] }
+          other_adapters = adapters - hostonly_adapters
+          super(other_adapters) if !other_adapters.empty?
+
+          if !hostonly_adapters.empty?
+            args = []
+            hostonly_adapters.each do |adapter|
+              args.concat(["--nic#{adapter[:adapter]}", "hostonlynet"])
+              args.concat(["--host-only-net#{adapter[:adapter]}", adapter[:hostonly],
+                           "--cableconnected#{adapter[:adapter]}", "on"])
+            end
+
+            execute("modifyvm", @uuid, *args, retryable: true)
+          end
+        end
+
+        def create_host_only_network(options)
+          # If we are not on macOS, just setup the hostonly interface
+          return super if !use_host_only_nets?
+
+          opts = {
+            netmask: options.fetch(:netmask, DEFAULT_NETMASK),
+          }
+
+          if options[:type] == :dhcp
+            opts[:lower] = options[:dhcp_lower]
+            opts[:upper] = options[:dhcp_upper]
+          else
+            addr = IPAddr.new(options[:adapter_ip])
+            opts[:upper] = opts[:lower] = addr.mask(opts[:netmask]).to_range.first.to_s
+          end
+
+          name_idx = read_host_only_networks.map { |hn|
+            next if !hn[:name].start_with?(HOSTONLY_NAME_PREFIX)
+            hn[:name].sub(HOSTONLY_NAME_PREFIX, "").to_i
+          }.compact.max.to_i + 1
+          opts[:name] = HOSTONLY_NAME_PREFIX + name_idx.to_s
+
+          execute("hostonlynet", "add",
+                  "--name", opts[:name],
+                  "--netmask", opts[:netmask],
+                  "--lower-ip", opts[:lower],
+                  "--upper-ip", opts[:upper],
+                  retryable: true)
+
+          {
+            name: opts[:name],
+            ip: options[:adapter_ip],
+            netmask: opts[:netmask],
+          }
+        end
+
+        # Disabled when host only nets are in use
+        def reconfig_host_only(options)
+          return super if !use_host_only_nets?
+        end
+
+        # Disabled when host only nets are in use since
+        # the host only nets will provide the dhcp server
+        def remove_dhcp_server(*_, **_)
+          super if !use_host_only_nets?
+        end
+
+        # Disabled when host only nets are in use since
+        # the host only nets will provide the dhcp server
+        def create_dhcp_server(*_, **_)
+          super if !use_host_only_nets?
+        end
+
+        def read_host_only_interfaces
+          return super if !use_host_only_nets?
+
+          # When host only nets are in use, read them and
+          # reformat the information to line up with how
+          # the interfaces is structured
+          read_host_only_networks.map do |net|
+            addr = IPAddr.new(net[:lowerip])
+            net[:netmask] = net[:networkmask]
+            if addr.ipv4?
+              net[:ip] = addr.mask(net[:netmask]).succ.to_s
+              net[:ipv6] = ""
+            else
+              net[:ip] = ""
+              net[:ipv6] = addr.mask(net[:netmwask]).succ.to_s
+              net[:ipv6_prefix] = net[:netmask]
+            end
+
+            net[:status] = net[:state] == "Enabled" ? "Up" : "Down"
+
+            net
+          end
+        end
+
+        def read_network_interfaces
+          return super if !use_host_only_nets?
+
+          {}.tap do |nics|
+            execute("showvminfo", @uuid, "--machinereadable", retryable: true).each_line do |line|
+              if m = line.match(/nic(?<adapter>\d+)="(?<type>.+?)"$/)
+                nics[m[:adapter].to_i] ||= {}
+                if m[:type] == "hostonlynetwork"
+                  nics[m[:adapter].to_i][:type] = :hostonly
+                else
+                  nics[m[:adapter].to_i][:type] = m[:type].to_sym
+                end
+              elsif m = line.match(/^bridgeadapter(?<adapter>\d+)="(?<network>.+?)"$/)
+                nics[m[:adapter].to_i] ||= {}
+                nics[m[:adapter].to_i][:bridge] = m[:network]
+              elsif m = line.match(/^hostonly-network(?<adapter>\d+)="(?<network>.+?)"$/)
+                nics[m[:adapter].to_i] ||= {}
+                nics[m[:adapter].to_i][:hostonly] = m[:network]
+              end
+            end
+          end
+        end
+
+        # Generate list of host only networks
+        def read_host_only_networks
+          networks = []
+          current = nil
+          execute("list", "hostonlynets", retryable: true).split("\n").each do |line|
+            line.chomp!
+            next if line.empty?
+            key, value = line.split(":", 2).map(&:strip)
+            key = key.downcase
+            if key == "name"
+              networks.push(current) if !current.nil?
+              current = Vagrant::Util::HashWithIndifferentAccess.new
+            end
+            current[key] = value
+          end
+          networks.push(current) if !current.nil?
+
+          networks
+        end
+
         # The initial VirtualBox 7.0 release has an issue with displaying port
         # forward information. When a single port forward is defined, the forwarding
         # information can be found in the `showvminfo` output. Once more than a
@@ -20,11 +222,8 @@ module VagrantPlugins
         # file from the `showvminfo` output and extract the port forward information
         # from there instead.
         def read_forwarded_ports(uuid=nil, active_only=false)
-          @version ||= Meta.new.version
-
-          # Only use this override for the 7.0.0 release. If it is still broken
-          # on the 7.0.1 release we can modify the version check.
-          return super if @version != "7.0.0"
+          # Only use this override for the 7.0.0 release.
+          return super if get_version.to_s != "7.0.0"
 
           uuid ||= @uuid
 
@@ -61,6 +260,25 @@ module VagrantPlugins
 
           results
         end
+
+        private
+
+        # Returns if hostonlynets are enabled on the current
+        # host platform
+        #
+        # @return [Boolean]
+        def use_host_only_nets?
+          Vagrant::Util::Platform.darwin? &&
+            HOSTONLY_NET_REQUIREMENT.satisfied_by?(get_version)
+        end
+
+        # VirtualBox version in use
+        #
+        # @return [Gem::Version]
+        def get_version
+          return @version if @version
+          @version = Gem::Version.new(Meta.new.version)
+        end
       end
     end
   end