vagrant-unbundled 2.3.3.0 → 2.3.6.0

data/plugins/commands/serve/constants.rb

@@ -0,0 +1,8 @@
+module VagrantPlugins
+  module CommandServe
+    # Simple constant aliases to reduce namespace typing
+    SDK = Hashicorp::Vagrant::Sdk
+    SRV = Hashicorp::Vagrant
+    Empty = ::Google::Protobuf::Empty
+  end
+end

data/plugins/communicators/ssh/communicator.rb

@@ -404,7 +404,7 @@ module VagrantPlugins
 
         # Set some valid auth methods. We disable the auth methods that
         # we're not using if we don't have the right auth info.
-        auth_methods = ["none", "hostbased"]
+        auth_methods = ["none", "hostbased", "keyboard-interactive"]
         auth_methods << "publickey" if ssh_info[:private_key_path]
         auth_methods << "password" if ssh_info[:password]
 
@@ -456,6 +456,15 @@ module VagrantPlugins
                   connect_opts[:remote_user] = ssh_info[:remote_user]
                 end
 
+                if @machine.config.ssh.keep_alive
+                  connect_opts[:keepalive] = true
+                  connect_opts[:keepalive_interval] = 5
+                end
+                
+                if ssh_info[:password]
+                  connect_opts[:non_interactive] = true
+                end
+
                 @logger.info("Attempting to connect to SSH...")
                 @logger.info("  - Host: #{ssh_info[:host]}")
                 @logger.info("  - Port: #{ssh_info[:port]}")
@@ -464,7 +473,7 @@ module VagrantPlugins
                 @logger.info("  - Key Path: #{ssh_info[:private_key_path]}")
                 @logger.debug("  - connect_opts: #{connect_opts}")
 
-                Net::SSH.start(ssh_info[:host], ssh_info[:username], connect_opts)
+                Net::SSH.start(ssh_info[:host], ssh_info[:username], **connect_opts)
               ensure
                 # Make sure we output the connection log
                 @logger.debug("== Net-SSH connection debug-level log START ==")
@@ -683,21 +692,6 @@ module VagrantPlugins
         end
 
         begin
-          keep_alive = nil
-
-          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.
-            keep_alive = Thread.new do
-              loop do
-                sleep 5
-                @logger.debug("Sending SSH keep-alive...")
-                connection.send_global_request("keep-alive@openssh.com")
-              end
-            end
-          end
-
           # Wait for the channel to complete
           begin
             channel.wait
@@ -711,9 +705,6 @@ module VagrantPlugins
           rescue Net::SSH::Disconnect
             raise Vagrant::Errors::SSHDisconnected
           end
-        ensure
-          # Kill the keep-alive thread
-          keep_alive.kill if keep_alive
         end
 
         # If we're in a PTY, we now finally parse the output

data/plugins/hosts/arch/host.rb

@@ -4,7 +4,7 @@ module VagrantPlugins
   module HostArch
     class Host < Vagrant.plugin("2", :host)
       def detect?(env)
-        File.exist?("/etc/arch-release")
+        File.exist?("/etc/arch-release") && !File.exist?("/etc/artix-release")
       end
     end
   end

data/plugins/kernel_v2/config/vm.rb

@@ -10,15 +10,6 @@ require "vagrant/util/presence"
 require "vagrant/util/experimental"
 require "vagrant/util/map_command_options"
 
-$LOAD_PATH << Vagrant.source_root.join("lib/vagrant/protobufs/proto").to_s
-
-require "vagrant/protobufs/proto/protostructure_pb"
-require "vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb"
-require "vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb"
-
-# Include mappers
-require Vagrant.source_root.join("plugins/commands/serve/command").to_s
-
 require File.expand_path("../vm_provisioner", __FILE__)
 require File.expand_path("../vm_subvm", __FILE__)
 require File.expand_path("../disk", __FILE__)

data/plugins/providers/docker/action.rb

@@ -231,6 +231,7 @@ module VagrantPlugins
             b2.use HostMachineSyncFolders
             b2.use PrepareNFSValidIds
             b2.use SyncedFolderCleanup
+            b2.use SyncedFolders
             b2.use PrepareNFSSettings
             b2.use PrepareNetworks
             b2.use Login
@@ -248,7 +249,6 @@ module VagrantPlugins
                   b3.use ForwardedPorts # This action converts the `ports` param into proper network configs
                   b3.use PrepareForwardedPortCollisionParams
                   b3.use HandleForwardedPortCollisions
-                  b3.use SyncedFolders
                   b3.use Pull
                   b3.use Create
                   b3.use WaitForRunning
@@ -268,7 +268,6 @@ module VagrantPlugins
               end
             else
               # We're in a run command, so we do things a bit differently.
-              b2.use SyncedFolders
               b2.use Create
             end
           end

data/plugins/providers/docker/driver.rb

@@ -140,6 +140,9 @@ module VagrantPlugins
         all_containers.each do |c|
           container_info = inspect_container(c)
 
+          active = container_info["State"]["Running"]
+          next unless active # Ignore used ports on inactive containers
+
           if container_info["HostConfig"]["PortBindings"]
             port_bindings = container_info["HostConfig"]["PortBindings"]
             next if port_bindings.empty? # Nothing defined, but not nil either
@@ -233,9 +236,22 @@ module VagrantPlugins
         execute('docker', 'ps', '-a', '-q', '--no-trunc').to_s.split
       end
 
+      # Attempts to first use the docker-cli tool to inspect the default bridge subnet
+      # Falls back to using /sbin/ip if that fails
+      #
       # @return [String] IP address of the docker bridge
       def docker_bridge_ip
-        output = execute('/sbin/ip', '-4', 'addr', 'show', 'scope', 'global', 'docker0')
+        bridge = inspect_network("bridge")&.first
+        if bridge 
+          bridge_ip = bridge.dig("IPAM", "Config", 0, "Gateway")
+        end
+        return bridge_ip if bridge_ip
+        @logger.debug("Failed to get bridge ip from docker, falling back to `ip`")
+        docker_bridge_ip_fallback
+      end
+
+      def docker_bridge_ip_fallback
+        output = execute('ip', '-4', 'addr', 'show', 'scope', 'global', 'docker0')
         if output =~ /^\s+inet ([0-9.]+)\/[0-9]+\s+/
           return $1.to_s
         else

data/plugins/providers/hyperv/driver.rb

@@ -1,4 +1,5 @@
 require "json"
+require "log4r"
 
 require "vagrant/util/powershell"
 
@@ -26,6 +27,7 @@ module VagrantPlugins
 
       def initialize(id)
         @vm_id = id
+        @logger = Log4r::Logger.new("vagrant::hyperv::driver")
       end
 
       # @return [Boolean] Supports VMCX
@@ -294,7 +296,10 @@ module VagrantPlugins
       # @param [String] enhanced session transport type of the VM
       # @return [nil]
       def set_enhanced_session_transport_type(transport_type)
-        execute(:set_enhanced_session_transport_type, VmID: vm_id, type: transport_type)
+        result = execute(:set_enhanced_session_transport_type, VmID: vm_id, type: transport_type)
+        if !result.nil?
+          @logger.debug("EnhancedSessionTransportType is not supported by this version of hyperv, ignoring")
+        end
       end
 
       protected

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

@@ -17,8 +17,17 @@ try {
 }
 
 try {
-    Hyper-V\Set-VM -VM $VM -EnhancedSessionTransportType $Type
+    # HyperV 1.1 (Windows Server 2012R2) crashes on this call. Vagrantfiles before 2.2.10 do break without skipping this.
+    $present = Get-Command Hyper-V\Set-VM -ParameterName EnhancedSessionTransportType -ErrorAction SilentlyContinue
+    if($present) {
+        Hyper-V\Set-VM -VM $VM -EnhancedSessionTransportType $Type
+    }else{
+        $message = @{
+            "EnhancedSessionTransportTypeSupportPresent"=$false;
+            } | ConvertTo-Json
+        Write-OutputMessage $message
+    }
 } catch {
-    Write-ErrorMessage "Failed to assign EnhancedSessionTransportType to ${Type}: ${PSItem}"
+    Write-ErrorMessage "Failed to assign EnhancedSessionTransportType to ${Type}:${PSItem}"
     exit 1
 }

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

@@ -1,6 +1,21 @@
 # Always stop when errors are encountered unless instructed not to
 $ErrorActionPreference = "Stop"
 
+# Check the version of Powershell currently in use. If it's
+# under 7.3.0 we need to restrict the maximum version of the
+# security module to prevent errors.
+# Source: https://github.com/PowerShell/PowerShell/issues/18530
+$checkVersion = $PSVersionTable.PSVersion
+if($checkVersion -eq "") {
+    $checkVersion = $(Get-Host).Version
+}
+
+if([System.Version]$checkVersion -lt [System.Version]"7.3.0") {
+    Import-Module Microsoft.Powershell.Security -MaximumVersion 3.0.0.0
+} else {
+    Import-Module Microsoft.Powershell.Security
+}
+
 # Vagrant VM creation functions
 
 function New-VagrantVM {

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

@@ -16,12 +16,6 @@ module VagrantPlugins
           # which will break us out of execution of the middleware sequence.
           Driver::Meta.new.verify!
 
-          if Vagrant::Util::Platform.windows? && Vagrant::Util::Platform.windows_hyperv_enabled?
-            @logger.error("Virtualbox and Hyper-V cannot be used together at the same time on Windows and will result in a system crash.")
-
-            raise Vagrant::Errors::HypervVirtualBoxError
-          end
-
           # Carry on.
           @app.call(env)
         end

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

@@ -71,6 +71,21 @@ module VagrantPlugins
               type = :internal_network
             end
 
+            if !options.key?(:type) && options.key?(:ip)
+              begin
+                addr = IPAddr.new(options[:ip])
+                options[:type] = if addr.ipv4?
+                                   :static
+                                 else
+                                   :static6
+                                 end
+              rescue IPAddr::Error => err
+                raise Vagrant::Errors::NetworkAddressInvalid,
+                      address: options[:ip], mask: options[:netmask],
+                      error: err.message
+              end
+            end
+
             # Configure it
             data = nil
             if type == :private_network

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

@@ -462,7 +462,7 @@ module VagrantPlugins
           # Append in the options for subprocess
           # NOTE: We include the LANG env var set to C to prevent command output
           #       from being localized
-          command << { notify: [:stdout, :stderr], env: {LANG: "C"}}
+          command << { notify: [:stdout, :stderr], env: env_lang}
 
           Vagrant::Util::Busy.busy(int_callback) do
             Vagrant::Util::Subprocess.execute(@vboxmanage_path, *command, &block)
@@ -471,6 +471,52 @@ module VagrantPlugins
           raise Vagrant::Errors::VBoxManageLaunchError,
             message: e.to_s
         end
+
+        private
+
+        # List of LANG values to attempt to use
+        LANG_VARIATIONS = %w(C.UTF-8 C.utf8 en_US.UTF-8 en_US.utf8 C POSIX).map(&:freeze).freeze
+
+        # By default set the LANG to C. If the host has the locale command
+        # available, check installed locales and verify C is included (or
+        # use C variant if available).
+        def env_lang
+          # If already set, just return immediately
+          return @env_lang if @env_lang
+
+          # Default the LANG to C
+          @env_lang = {LANG: "C"}
+
+          # If the locale command is not available, return default
+          return @env_lang if !Vagrant::Util::Which.which("locale")
+
+          @logger.debug("validating LANG value for virtualbox cli commands")
+          # Get list of available locales on the system
+          result = Vagrant::Util::Subprocess.execute("locale", "-a")
+
+          # If the command results in an error, just log the error
+          # and return the default value
+          if result.exit_code != 0
+            @logger.warn("locale command failed (exit code: #{result.exit_code}): #{result.stderr}")
+            return @env_lang
+          end
+          available = result.stdout.lines.map(&:chomp).find_all { |l|
+            l == "C" || l == "POSIX" || l.start_with?("C.") || l.start_with?("en_US.")
+          }
+          @logger.debug("list of available C locales: #{available.inspect}")
+
+          # Attempt to find a valid LANG from locale list
+          lang = LANG_VARIATIONS.detect { |l| available.include?(l) }
+
+          if lang
+            @logger.debug("valid variation found for LANG value: #{lang}")
+            @env_lang[:LANG] = lang
+          end
+
+          @logger.debug("LANG value set: #{@env_lang[:LANG].inspect}")
+
+          @env_lang
+        end
       end
     end
   end

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

@@ -30,8 +30,14 @@ module VagrantPlugins
 
           # Prune any hostonly interfaces in the list
           ifaces.delete_if { |i|
-            addr = IPAddr.new(i[:ip]).mask(i[:netmask])
-            hostonly_ifaces.include?(addr)
+            addr = begin
+                     IPAddr.new(i[:ip]).mask(i[:netmask])
+                   rescue IPAddr::Error => err
+                     @logger.warn("skipping bridged interface due to parse error #{err} (#{i}) ")
+                     nil
+                   end
+            addr.nil? ||
+              hostonly_ifaces.include?(addr)
           }
 
           ifaces
@@ -154,21 +160,32 @@ module VagrantPlugins
           # reformat the information to line up with how
           # the interfaces is structured
           read_host_only_networks.map do |net|
-            addr = IPAddr.new(net[:lowerip])
+            addr = begin
+                     IPAddr.new(net[:lowerip])
+                   rescue IPAddr::Error => err
+                     @logger.warn("invalid host only network lower IP encountered: #{err} (#{net})")
+                     next
+                   end
+            # Address of the interface will be the lower bound of the range or
+            # the first available address in the subnet
+            if addr == addr.mask(net[:networkmask])
+              addr = addr.succ
+            end
+
             net[:netmask] = net[:networkmask]
             if addr.ipv4?
-              net[:ip] = addr.mask(net[:netmask]).succ.to_s
+              net[:ip] = addr.to_s
               net[:ipv6] = ""
             else
               net[:ip] = ""
-              net[:ipv6] = addr.mask(net[:netmwask]).succ.to_s
+              net[:ipv6] = addr.to_s
               net[:ipv6_prefix] = net[:netmask]
             end
 
             net[:status] = net[:state] == "Enabled" ? "Up" : "Down"
 
             net
-          end
+          end.compact
         end
 
         def read_network_interfaces
@@ -240,7 +257,7 @@ module VagrantPlugins
 
           File.open(result[:path], "r") do |f|
             doc = REXML::Document.new(f)
-            networks = REXML::XPath.each(doc.root, "//Adapter")
+            networks = REXML::XPath.each(doc.root, "Machine/Hardware/Network/Adapter")
             networks.each do |net|
               REXML::XPath.each(doc.root, net.xpath + "/NAT/Forwarding") do |fwd|
                 # Result Array values:

data/plugins/provisioners/ansible/cap/guest/debian/ansible_install.rb

@@ -37,7 +37,11 @@ INLINE_CRIPT
 
             def self.pip_setup(machine, pip_install_cmd = "")
               machine.communicate.sudo "apt-get update -y -qq"
-              machine.communicate.sudo "DEBIAN_FRONTEND=noninteractive apt-get install -y -qq --option \"Dpkg::Options::=--force-confold\" build-essential curl git libssl-dev libffi-dev python-dev-is-python3"
+              python_dev_pkg = "python-dev"
+              if machine.communicate.test "apt-cache show python-dev-is-python3"
+                python_dev_pkg = "python-dev-is-python3"
+              end
+              machine.communicate.sudo "DEBIAN_FRONTEND=noninteractive apt-get install -y -qq --option \"Dpkg::Options::=--force-confold\" build-essential curl git libssl-dev libffi-dev #{python_dev_pkg}"
               Pip::get_pip machine, pip_install_cmd
             end
 

data/plugins/provisioners/ansible/cap/guest/posix/ansible_installed.rb

@@ -10,8 +10,8 @@ module VagrantPlugins
             def self.ansible_installed(machine, version)
               command = 'test -x "$(command -v ansible)"'
 
-              if !version.empty?
-                command << "&& ansible --version | grep 'ansible #{version}'"
+              unless version.empty?
+                command << "&& [[ $(python3 -c \"import importlib.metadata; print(importlib.metadata.version('ansible'))\") == \"#{version}\" ]]"
               end
 
               machine.communicate.test command, sudo: false

data/plugins/provisioners/ansible/provisioner/guest.rb

@@ -75,7 +75,7 @@ module VagrantPlugins
           raw_output = ""
 
           result = @machine.communicate.execute(
-            "ansible --version",
+            "python3 -c \"import importlib.metadata; print('ansible ' + importlib.metadata.version('ansible'))\"",
             error_class: Ansible::Errors::AnsibleNotFoundOnGuest,
             error_key: :ansible_not_found_on_guest) do |type, output|
             if type == :stdout && output.lines[0]

data/plugins/provisioners/ansible/provisioner/host.rb

@@ -108,8 +108,9 @@ module VagrantPlugins
         end
 
         def gather_ansible_version
-          raw_output = ""
-          command = %w(ansible --version)
+          raw_output = ''
+          command = ['python3', '-c',
+                     "\"import importlib.metadata; print('ansible ' + importlib.metadata.version('ansible'))\""]
 
           command << {
             notify: [:stdout, :stderr]

data/plugins/synced_folders/rsync/helper.rb

@@ -27,18 +27,15 @@ module VagrantPlugins
 
         if exclude.start_with?("/")
           start_anchor = true
-          exclude      = exclude[1..-1]
         end
 
-        exclude = "#{exclude}/" if !exclude.end_with?("/")
-        exclude = "^#{exclude}"
-        exclude += ".*" if !start_anchor
+        exclude = "#{exclude}/" if !exclude.end_with?("/") if start_anchor
+        exclude = "^#{exclude}" if start_anchor
+        exclude += ".*" if (!start_anchor && !exclude.end_with?("*"))
 
         # This is not an ideal solution, but it's a start. We can improve and
         # keep unit tests passing in the future.
         exclude = exclude.gsub("**", "|||GLOBAL|||")
-        exclude = exclude.gsub("*", "|||PATH|||")
-        exclude = exclude.gsub("|||PATH|||", "[^/]*")
         exclude = exclude.gsub("|||GLOBAL|||", ".*")
 
         Regexp.new(exclude)

data/templates/commands/init/Vagrantfile.erb

@@ -54,6 +54,13 @@ Vagrant.configure("2") do |config|
   # argument is a set of non-required options.
   # config.vm.synced_folder "../data", "/vagrant_data"
 
+  # Disable the default share of the current code directory. Doing this
+  # provides improved isolation between the vagrant box and your host
+  # by making sure your Vagrantfile isn't accessable to the vagrant box.
+  # If you use this you may want to enable additional shared subfolders as
+  # shown above.
+  # config.vm.synced_folder ".", "/vagrant", disabled: true
+
   # Provider-specific configuration so you can fine-tune various
   # backing providers for Vagrant. These expose provider-specific options.
   # Example for VirtualBox:

data/templates/locales/en.yml

@@ -895,6 +895,13 @@ en:
         support.
 
         State file path: %{state_file}
+      download_already_in_progress_error: |-
+        Download to global Vagrant location already in progress. This
+        may be caused by other Vagrant processes attempting to download
+        a file to the same location.
+
+        Download path: %{dest_path}
+        Lock file path: %{lock_file_path}
       downloader_error: |-
         An error occurred while downloading the remote file. The error
         message, if any, is reproduced below. Please fix this error and try
@@ -1668,6 +1675,11 @@ en:
       uploader_interrupted: |-
         The upload was interrupted by an external signal. It did not
         complete.
+      vagrant_locked: |-
+        The requested Vagrant action is locked. This may be caused
+        by other Vagrant processes attempting to do a similar action.
+
+        Lock file path: %{lock_file_path}
       vagrantfile_exists: |-
         `Vagrantfile` already exists in this directory. Remove it before
         running `vagrant init`.

data/tools.go

@@ -0,0 +1,10 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+//go:build tools
+
+package tools
+
+import (
+	_ "github.com/randall77/makefat"
+)

data/vagrant.gemspec

@@ -21,23 +21,23 @@ Gem::Specification.new do |s|
   s.add_dependency 'googleapis-common-protos-types', '~> 1.3'
   s.add_dependency "grpc"
   s.add_dependency "hashicorp-checkpoint", "~> 0.1.5"
-  s.add_dependency "i18n", "~> 1.8"
-  s.add_dependency "listen", "~> 3.6"
+  s.add_dependency "i18n", "~> 1.12"
+  s.add_dependency "listen", "~> 3.7"
   s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
   s.add_dependency "mime-types", "~> 3.3"
-  s.add_dependency "net-ftp", "~> 0.1"
+  s.add_dependency "net-ftp", "~> 0.2"
   s.add_dependency "net-ssh", "~> 7.0"
   s.add_dependency "net-sftp", "~> 4.0"
   s.add_dependency "net-scp", "~> 4.0"
   s.add_dependency "rb-kqueue", "~> 0.2.0"
   s.add_dependency "rexml", "~> 3.2"
-  s.add_dependency "rgl", "~> 0.5.7"
-  s.add_dependency "rubyzip", "~> 2.0"
+  s.add_dependency "rgl", "~> 0.5.10"
+  s.add_dependency "rubyzip", "~> 2.3.2"
   s.add_dependency "vagrant_cloud", "~> 3.0.5"
-  s.add_dependency "wdm", "~> 0.1.0"
-  s.add_dependency "winrm", ">= 2.3.4", "< 3.0"
-  s.add_dependency "winrm-elevated", ">= 1.2.1", "< 2.0"
-  s.add_dependency "winrm-fs", ">= 1.3.4", "< 2.0"
+  s.add_dependency "wdm", "~> 0.1.1"
+  s.add_dependency "winrm", ">= 2.3.6", "< 3.0"
+  s.add_dependency "winrm-elevated", ">= 1.2.3", "< 2.0"
+  s.add_dependency "winrm-fs", ">= 1.3.5", "< 2.0"
 
   # Needed for go generate to use grpc_tools_ruby_protoc
   s.add_development_dependency "grpc-tools", "~> 1.41"

data/version.txt

@@ -1 +1 @@
-2.3.3.0
+2.3.6.0