vagrant-unbundled 2.2.18.0 → 2.2.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b90047b34470b2d69cc9dc0409a87d8827dd8a8b851c111e4ecd6dba4c539ce9
-  data.tar.gz: 1840e1f9e2886d4ab9e653bd90a57057cbed31ece30cc3fa2996b6f1369f48bd
+  metadata.gz: 54a028024291e4538676f5c0b426facd4668d839afe46a6c62def66358317bc9
+  data.tar.gz: cedbca4e8f4d3003875506217a34bf1e3abb29e0726e6799f6e86a1bc2f77af7
 SHA512:
-  metadata.gz: 1129a72cea58bcbb471d1181912b65646c1994edb0b58505bddd08719351f048cf3c978b4ced74bbc3347ba2e85b373b2de13baf56a1b95fdfa055629059ab17
-  data.tar.gz: 4a93781f5da96363b624f2f4377aa49033bb7bb492ad817b4ab71fc190aa55d30eb087d19ecc1bfac10c336af92d659e4f7f99b813f369ef6d8dc7dbf9dba7a2
+  metadata.gz: 65709b560351a9547f47391889803cfea3b5ac89df8be43cb4670be1c23d402d95f6aef3d9154d446012b1d8035eb7203e8b7c6e9131acbf0e4c7eb184834f51
+  data.tar.gz: 469141800334a479d4fef8e15518a2efdac426c4ed2afeef0add67b37026857b08d02fdaa710fb68c1368af3efc955849437116ac4d5bba2884e6b008039e87a

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 2.2.19 (November 5, 2021)
+
+IMPROVEMENTS:
+
+- guest/suse: Add fallback shutdown for versions without systemd [GH-12489]
+- provider/virtualbox: Validate VirtualBox hostonly network range [GH-12564]
+
+BUG FIXES
+
+- guest/atomic: Update detection to prevent matching on non-atomic guests [GH-12575]
+- guest/coreos: Fix configure network capability [GH-12575]
+- guest/windows: Fix directory creation with rsync [GH-11880]
+- host/windows: Properly handle spaces in path to SSH key [GH-12398]
+- provisioner/chef: Update install checks [GH-12555]
+
 ## 2.2.18 (July 27, 2021)
 
 BUG FIXES:

data/Gemfile.lock

@@ -12,14 +12,14 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-unbundled (2.2.18.0)
+    vagrant-unbundled (2.2.19.0)
       bcrypt_pbkdf (~> 1.1)
       childprocess (~> 4.1.0)
       ed25519 (~> 1.2.4)
       erubi
       hashicorp-checkpoint (~> 0.1.5)
       i18n (~> 1.8)
-      listen (~> 3.5)
+      listen (~> 3.6)
       log4r (~> 1.1.9, < 1.1.11)
       mime-types (~> 3.3)
       net-scp (~> 3.0.0)
@@ -44,7 +44,7 @@ GEM
     diff-lcs (1.4.4)
     ed25519 (1.2.4)
     erubi (1.10.0)
-    excon (0.88.0)
+    excon (0.89.0)
     fake_ftp (0.1.1)
     ffi (1.15.4)
     gssapi (1.3.1)
@@ -53,7 +53,7 @@ GEM
       builder (>= 2.1.2)
     hashicorp-checkpoint (0.1.5)
     httpclient (2.8.3)
-    i18n (1.8.10)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     listen (3.7.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
@@ -63,9 +63,9 @@ GEM
     logging (2.3.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.14)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0901)
+    mime-types-data (3.2021.1115)
     multi_json (1.15.0)
     net-scp (3.0.0)
       net-ssh (>= 2.6.5, < 7.0.0)

data/contrib/zsh/generate_zsh_completion.rb

@@ -121,11 +121,11 @@ def get_top_level_commands(root_command, cmd_list)
   return commands, flags_def, case_string
 end
 
-def format_script(root_command, subcommands, funciton_name)
+def format_script(root_command, subcommands, function_name)
   top_level_commands, top_level_args, state_case = get_top_level_commands(root_command, subcommands)
   
   script = """
-function #{funciton_name} () {
+function #{function_name} () {
 
   #{top_level_commands}
 

data/lib/vagrant/errors.rb

@@ -356,6 +356,10 @@ module Vagrant
       error_key(:darwin_mount_failed)
     end
 
+    class DarwinVersionFailed < VagrantError
+      error_key(:darwin_version_failed)
+    end
+
     class DestroyRequiresForce < VagrantError
       error_key(:destroy_requires_force)
     end
@@ -1024,6 +1028,10 @@ module Vagrant
       error_key(:virtualbox_version_empty)
     end
 
+    class VirtualBoxInvalidHostSubnet < VagrantError
+      error_key(:virtualbox_invalid_host_subnet)
+    end
+
     class VMBaseMacNotSpecified < VagrantError
       error_key(:no_base_mac, "vagrant.actions.vm.match_mac")
     end

data/plugins/commands/upload/command.rb

@@ -52,7 +52,7 @@ module VagrantPlugins
         end
 
         # NOTE: We do this to handle paths on Windows like: "..\space dir\"
-        # because the final separater acts to escape the quote and ends up
+        # because the final separator acts to escape the quote and ends up
         # in the source value.
         source = source.sub(/["']$/, "")
         destination ||= File.basename(source)

data/plugins/guests/atomic/guest.rb

@@ -4,7 +4,7 @@ module VagrantPlugins
   module GuestAtomic
     class Guest < Vagrant.plugin("2", :guest)
       def detect?(machine)
-        machine.communicate.test("grep 'ostree=' /proc/cmdline")
+        machine.communicate.test("grep 'ostree=.*atomic' /proc/cmdline")
       end
     end
   end

data/plugins/guests/coreos/cap/configure_networks.rb

@@ -1,4 +1,5 @@
 require "tempfile"
+require "yaml"
 
 require_relative "../../../../lib/vagrant/util/template_renderer"
 
@@ -8,9 +9,73 @@ module VagrantPlugins
       class ConfigureNetworks
         extend Vagrant::Util::GuestInspection::Linux
 
+        NETWORK_MANAGER_CONN_DIR = "/etc/NetworkManager/system-connections".freeze
         DEFAULT_ENVIRONMENT_IP = "127.0.0.1".freeze
 
         def self.configure_networks(machine, networks)
+          comm = machine.communicate
+          return configure_networks_cloud_init(machine, networks) if comm.test("command -v cloud-init")
+
+          interfaces = machine.guest.capability(:network_interfaces)
+          nm_dev = {}
+          comm.execute("nmcli -t c show") do |type, data|
+            if type == :stdout
+              _, id, _, dev = data.strip.split(":")
+              nm_dev[dev] = id
+            end
+          end
+          comm.sudo("rm #{File.join(NETWORK_MANAGER_CONN_DIR, 'vagrant-*.conf')}",
+            error_check: false)
+
+          networks.each_with_index do |network, i|
+            network[:device] = interfaces[network[:interface]]
+            addr = IPAddr.new(network[:ip])
+            mask = addr.mask(network[:netmask])
+            if !network[:mac_address]
+              comm.execute("cat /sys/class/net/#{network[:device]}/address") do |type, data|
+                if type == :stdout
+                  network[:mac_address] = data
+                end
+              end
+            end
+
+            f = Tempfile.new("vagrant-coreos-network")
+            {
+              connection: {
+                type: "ethernet",
+                id: network[:device],
+                "interface-name": network[:device]
+              },
+              ethernet: {
+                "mac-address": network[:mac_address]
+              },
+              ipv4: {
+                method: "manual",
+                addresses: "#{network[:ip]}/#{mask.prefix}",
+                gateway: network.fetch(:gateway, mask.to_range.first.succ),
+              },
+            }.each_pair do |section, content|
+              f.puts "[#{section}]"
+              content.each_pair do |key, value|
+                f.puts "#{key}=#{value}"
+              end
+            end
+            f.close
+            comm.sudo("nmcli d disconnect '#{network[:device]}'", error_check: false)
+            comm.sudo("nmcli c delete '#{nm_dev[network[:device]]}'", error_check: false)
+            dst = File.join("/var/tmp", "vagrant-#{network[:device]}.conf")
+            final = File.join(NETWORK_MANAGER_CONN_DIR, "vagrant-#{network[:device]}.conf")
+            comm.upload(f.path, dst)
+            comm.sudo("chown root:root '#{dst}'")
+            comm.sudo("chmod 0600 '#{dst}'")
+            comm.sudo("mv '#{dst}' '#{final}'")
+            comm.sudo("nmcli c load '#{final}'")
+            comm.sudo("nmcli d connect '#{network[:device]}'")
+            f.delete
+          end
+        end
+
+        def self.configure_networks_cloud_init(machine, networks)
           cloud_config = {}
           # Locate configured IP addresses to drop in /etc/environment
           # for export. If no addresses found, fall back to default

data/plugins/guests/darwin/cap/mount_smb_shared_folder.rb

@@ -29,9 +29,12 @@ module VagrantPlugins
             "//#{options[:smb_username]}:#{smb_password}@#{options[:smb_host]}/#{name} " +
             "#{expanded_guest_path}"
           retryable(on: Vagrant::Errors::DarwinMountFailed, tries: 10, sleep: 2) do
-            machine.communicate.execute(
-              mount_command,
-              error_class: Vagrant::Errors::DarwinMountFailed)
+            result = machine.communicate.execute(mount_command)
+            if result.exit_code != 0
+              raise Vagrant::Errors::DarwinMountFailed,
+                command: mount_command,
+                output: result.stderr
+            end
           end
         end
       end

data/plugins/guests/suse/cap/halt.rb

@@ -4,7 +4,11 @@ module VagrantPlugins
       class Halt
         def self.halt(machine)
           begin
-            machine.communicate.sudo("/usr/bin/systemctl poweroff &")
+            if machine.communicate.test("test -e /usr/bin/systemctl")
+              machine.communicate.sudo("/usr/bin/systemctl poweroff &")
+            else
+              machine.communicate.sudo("/sbin/shutdown -h now &")
+            end
           rescue IOError, Vagrant::Errors::SSHDisconnected
             # Do nothing, because it probably means the machine shut down
             # and SSH connection was lost.

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

@@ -13,7 +13,11 @@ module VagrantPlugins
           machine.communicate.tap do |comm|
             # rsync does not construct any gaps in the path to the target directory
             # make sure that all subdirectories are created
-            comm.execute("mkdir -p '#{opts[:guestpath]}'")
+            # NB: Per #11878, the `mkdir` command on Windows is different than used on Unix.
+            # This formulation matches the form used in the WinRM communicator plugin.
+            # This will ignore any -p switches, which are redundant in PowerShell,
+            # and ambiguous in PowerShell 4+
+            comm.execute("mkdir \"#{opts[:guestpath]}\" -force")
           end
         end
       end

data/plugins/hosts/darwin/cap/path.rb

@@ -6,6 +6,7 @@ module VagrantPlugins
 
         FIRMLINK_DEFS = "/usr/share/firmlinks".freeze
         FIRMLINK_DATA_PATH = "/System/Volumes/Data".freeze
+        CATALINA_CONSTRAINT = Gem::Requirement.new("~> 10.15")
 
         # Resolve the given host path to the actual
         # usable system path by detecting firmlinks
@@ -15,6 +16,9 @@ module VagrantPlugins
         # @return [String] resolved path
         def self.resolve_host_path(env, path)
           path = File.expand_path(path)
+          # Only expand firmlink paths on Catalina
+          return path if !CATALINA_CONSTRAINT.satisfied_by?(Cap::Version.version(env))
+
           firmlink = firmlink_map.detect do |mount_path, data_path|
             path.start_with?(mount_path)
           end

data/plugins/hosts/darwin/cap/version.rb

@@ -0,0 +1,23 @@
+module VagrantPlugins
+  module HostDarwin
+    module Cap
+      class Version
+        def self.version(env)
+          r = Vagrant::Util::Subprocess.execute("sw_vers", "-productVersion")
+          if r.exit_code != 0
+            raise Vagrant::Errors::DarwinVersionFailed,
+              version: r.stdout,
+              error: r.stderr
+          end
+          begin
+            Gem::Version.new(r.stdout)
+          rescue => err
+            raise Vagrant::Errors::DarwinVersionFailed,
+              version: r.stdout,
+              error: err.message
+          end
+        end
+      end
+    end
+  end
+end

data/plugins/hosts/darwin/plugin.rb

@@ -70,6 +70,11 @@ module VagrantPlugins
         require_relative "cap/nfs"
         Cap::NFS
       end
+
+      host_capability("darwin", "version") do
+        require_relative "cap/version"
+        Cap::Version
+      end
     end
   end
 end

data/plugins/hosts/windows/cap/ssh.rb

@@ -10,7 +10,7 @@ module VagrantPlugins
         def self.set_ssh_key_permissions(env, key_path)
           script_path = Host.scripts_path.join("set_ssh_key_permissions.ps1")
           result = Vagrant::Util::PowerShell.execute(
-            script_path.to_s, "-KeyPath", key_path.to_s,
+            script_path.to_s, "-KeyPath", key_path.to_s.gsub(' ', '` '),
             module_path: Host.modules_path.to_s
           )
           if result.exit_code != 0

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

@@ -16,6 +16,14 @@ module VagrantPlugins
       #
       # This handles all the `config.vm.network` configurations.
       class Network
+
+        # Location of the VirtualBox networks configuration file
+        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")
+        # Default valid range for hostonly networks
+        HOSTONLY_DEFAULT_RANGE = [IPAddr.new("192.168.56.0/21").freeze].freeze
+
         include Vagrant::Util::NetworkIP
         include Vagrant::Util::ScopedHashOverride
 
@@ -255,7 +263,7 @@ module VagrantPlugins
 
           # Make sure the type is a symbol
           options[:type] = options[:type].to_sym
-         
+
           if options[:type] == :dhcp && !options[:ip]
             # Try to find a matching device to set the config ip to
             matching_device = hostonly_find_matching_network(options)
@@ -263,7 +271,7 @@ module VagrantPlugins
               options[:ip] = matching_device[:ip]
             else
               # Default IP is in the 20-bit private network block for DHCP based networks
-              options[:ip] = "172.28.128.1"
+              options[:ip] = "192.168.56.1"
             end
           end
 
@@ -288,6 +296,8 @@ module VagrantPlugins
               error: e.message
           end
 
+          validate_hostonly_ip!(options[:ip], @env[:machine].provider.driver)
+
           if ip.ipv4?
             # Verify that a host-only network subnet would not collide
             # with a bridged networking interface.
@@ -501,6 +511,33 @@ module VagrantPlugins
           nil
         end
 
+        # Validates the IP used to configure the network is within the allowed
+        # ranges. It only validates if the network configuration file exists.
+        # This was introduced in 6.1.28 so previous version won't have restrictions
+        # 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?
+
+          ip = IPAddr.new(ip.to_s) if !ip.is_a?(IPAddr)
+          valid_ranges = load_net_conf
+          return if valid_ranges.any?{ |range| range.include?(ip) }
+          raise Vagrant::Errors::VirtualBoxInvalidHostSubnet,
+            address: ip,
+            ranges: valid_ranges.map{ |r| "#{r}/#{r.prefix}" }.join(", ")
+        end
+
+        def load_net_conf
+          return HOSTONLY_DEFAULT_RANGE if !File.exist?(VBOX_NET_CONF)
+          File.readlines(VBOX_NET_CONF).map do |line|
+            line = line.strip
+            next if !line.start_with?("*")
+            line[1,line.length].strip.split(" ").map do |entry|
+              IPAddr.new(entry)
+            end
+          end.flatten.compact
+        end
+
         #-----------------------------------------------------------------
         # DHCP Server Helper Functions
         #-----------------------------------------------------------------

data/plugins/provisioners/chef/cap/freebsd/chef_installed.rb

@@ -6,11 +6,13 @@ module VagrantPlugins
           # Check if Chef is installed at the given version.
           # @return [true, false]
           def self.chef_installed(machine, product, version)
-            knife = "/opt/#{product}/bin/knife"
-            command = "test -x #{knife}"
+            product_name = product == 'chef-workstation' ? 'chef-workstation' : 'chef'
+            verify_bin = product_name == 'chef-workstation' ? 'chef' : 'chef-client'
+            verify_path = "/opt/#{product_name}/bin/#{verify_bin}"
+            command = "test -x #{verify_path}"
 
             if version != :latest
-              command << "&& #{knife} --version | grep '#{version}'"
+              command << "&& #{verify_path} --version | grep '#{version}'"
             end
 
             machine.communicate.test(command, sudo: true)

data/plugins/provisioners/chef/cap/linux/chef_installed.rb

@@ -6,11 +6,13 @@ module VagrantPlugins
           # Check if Chef is installed at the given version.
           # @return [true, false]
           def self.chef_installed(machine, product, version)
-            knife = "/opt/#{product}/bin/knife"
-            command = "test -x #{knife}"
+            product_name = product == 'chef-workstation' ? 'chef-workstation' : 'chef'
+            verify_bin = product_name == 'chef-workstation' ? 'chef' : 'chef-client'
+            verify_path = "/opt/#{product_name}/bin/#{verify_bin}"
+            command = "test -x #{verify_path}"
 
             if version != :latest
-              command << "&& #{knife} --version | grep '#{version}'"
+              command << "&& #{verify_path} --version | grep '#{version}'"
             end
 
             machine.communicate.test(command, sudo: true)

data/plugins/provisioners/chef/cap/omnios/chef_installed.rb

@@ -2,19 +2,21 @@ module VagrantPlugins
   module Chef
     module Cap
       module OmniOS
-        module ChefInstalled 
+        module ChefInstalled
           # TODO: this is the same code as cap/linux/chef_installed, consider merging
           # Check if Chef is installed at the given version.
           # @return [true, false]
           def self.chef_installed(machine, product, version)
-            knife = "/opt/#{product}/bin/knife"
-            command = "test -x #{knife}"
+            product_name = product == 'chef-workstation' ? 'chef-workstation' : 'chef'
+            verify_bin = product_name == 'chef-workstation' ? 'chef' : 'chef-client'
+            verify_path = "/opt/#{product_name}/bin/#{verify_bin}"
+            command = "test -x #{verify_path}"
 
             if version != :latest
-              command << "&& #{knife} --version | grep '#{version}'"
+              command << "&& #{verify_path} --version | grep '#{version}'"
             end
 
-            machine.communicate.test(command, sudo: true)         
+            machine.communicate.test(command, sudo: true)
           end
         end
       end

data/plugins/provisioners/chef/cap/windows/chef_installed.rb

@@ -6,10 +6,11 @@ module VagrantPlugins
           # Check if Chef is installed at the given version.
           # @return [true, false]
           def self.chef_installed(machine, product, version)
+            verify_bin = product == 'chef-workstation' ? 'chef' : 'chef-client'
             if version != :latest
-              command = 'if ((&knife --version) -Match "' + version.to_s + '"){ exit 0 } else { exit 1 }'
+              command = 'if ((&' + verify_bin + ' --version) -Match "' + version.to_s + '"){ exit 0 } else { exit 1 }'
             else
-              command = 'if ((&knife --version) -Match "Chef*"){ exit 0 } else { exit 1 }'
+              command = 'if ((&' + verify_bin + ' --version) -Match "Chef*"){ exit 0 } else { exit 1 }'
             end
             machine.communicate.test(command, sudo: true)
           end

data/templates/locales/en.yml

@@ -845,6 +845,19 @@ en:
       create_iso_host_cap_not_found: |-
         Vagrant cannot create an iso due to the host capability for creating isos not existing.
         Vagrant will now exit.
+      darwin_mount_failed: |-
+        Failed to mount folders in Darwin guest. The command attempted was:
+
+        %{command}
+
+        The error output from the last command was:
+
+        %{output}
+      darwin_version_failed: |-
+        Failed to determine macOS version.
+
+          Version string: %{version}
+          Error information: %{error}
       destroy_requires_force: |-
         Destroy doesn't have a TTY to ask for confirmation. Please pass the
         `--force` flag to force a destroy, otherwise attach a TTY so that
@@ -1842,6 +1855,18 @@ en:
         outputted:
 
         %{vboxmanage} --version
+      virtualbox_invalid_host_subnet: |-
+        The IP address configured for the host-only network is not within the
+        allowed ranges. Please update the address used to be within the allowed
+        ranges and run the command again.
+
+          Address: %{address}
+          Ranges: %{ranges}
+
+        Valid ranges can be modified in the /etc/vbox/networks.conf file. For
+        more information including valid format see:
+
+          https://www.virtualbox.org/manual/ch06.html#network_hostonly
       vm_creation_required: |-
         VM must be created before running this command. Run `vagrant up` first.
       vm_inaccessible: |-

data/vagrant.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_dependency "erubi"
   s.add_dependency "hashicorp-checkpoint", "~> 0.1.5"
   s.add_dependency "i18n", "~> 1.8"
-  s.add_dependency "listen", "~> 3.5"
+  s.add_dependency "listen", "~> 3.6"
   s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
   s.add_dependency "mime-types", "~> 3.3"
   s.add_dependency "net-ssh", ">= 6.1.0", "< 6.2"

data/vendor/bundle/ruby/3.0.0/gems/excon-0.89.0/CONTRIBUTING.md

@@ -0,0 +1,23 @@
+## Getting Involved
+
+New contributors are always welcome, when it doubt please ask questions. We strive to be an open and welcoming community. Please be nice to one another.
+
+### Coding
+
+* Pick a task:
+  * Offer feedback on open [pull requests](https://github.com/excon/excon/pulls).
+  * Review open [issues](https://github.com/excon/excon/issues) for things to help on.
+  * [Create an issue](https://github.com/excon/excon/issues/new) to start a discussion on additions or features.
+* Fork the project, add your changes and tests to cover them in a topic branch.
+* Commit your changes and rebase against `excon/excon` to ensure everything is up to date.
+* [Submit a pull request](https://github.com/excon/excon/compare/).
+
+### Non-Coding
+
+* Work for [twitter](http://twitter.com)? I'd love to reclaim the unused [@excon](http://twitter.com/excon) account!
+* Offer feedback on open [issues](https://github.com/excon/excon/issues).
+* Write and help edit [documentation](https://github.com/excon/excon.github.com).
+* Translate [documentation](https://github.com/excon/excon.github.com) in to other languages.
+* Organize or volunteer at events.
+* [Donate](https://www.gittip.com/geemus/)!
+* Discuss other ideas for contribution with [geemus](mailto:geemus+excon@gmail.com).