vagrant-unbundled 2.2.14.0 → 2.2.16.0

data/lib/vagrant/plugin/manager.rb

@@ -179,8 +179,26 @@ module Vagrant
         result
       rescue Gem::GemNotFoundException
         raise Errors::PluginGemNotFound, name: name
-      rescue Gem::Exception => e
-        raise Errors::BundlerError, message: e.to_s
+      rescue Gem::Exception => err
+        @logger.warn("Failed to install plugin: #{err}")
+        @logger.debug("#{err.class}: #{err}\n#{err.backtrace.join("\n")}")
+        # Try and determine a cause for the failure
+        case err.message
+        when /install development tools first/
+          raise Errors::PluginNeedsDeveloperTools
+        when /library not found in default locations/
+          lib = err.message.match(/(\w+) library not found in default locations/)
+          if lib.nil?
+            raise Errors::BundlerError, message: err.message
+          end
+          raise Errors::PluginMissingLibrary,
+            library: lib.captures.first,
+            name: name
+        when /find header files for ruby/
+          raise Errors::PluginMissingRubyDev
+        else
+          raise Errors::BundlerError, message: err.message
+        end
       end
 
       # Uninstalls the plugin with the given name.

data/lib/vagrant/util.rb

@@ -11,6 +11,7 @@ module Vagrant
     autoload :HashWithIndifferentAccess, 'vagrant/util/hash_with_indifferent_access'
     autoload :GuestInspection,           'vagrant/util/guest_inspection'
     autoload :LoggingFormatter,          'vagrant/util/logging_formatter'
+    autoload :Numeric,                   'vagrant/util/numeric'
     autoload :Platform,                  'vagrant/util/platform'
     autoload :Retryable,                 'vagrant/util/retryable'
     autoload :SafeExec,                  'vagrant/util/safe_exec'

data/lib/vagrant/util/curl_helper.rb

@@ -4,6 +4,7 @@ module Vagrant
 
       # Hosts that do not require notification on redirect
       SILENCED_HOSTS = [
+        "vagrantcloud-files-production.s3-accelerate.amazonaws.com".freeze,
         "vagrantcloud.com".freeze,
         "vagrantup.com".freeze
       ].freeze
@@ -21,6 +22,7 @@ module Vagrant
           # Accumulate progress_data
           progress_data << data
 
+          redirect_notify = false
           while true
             # If the download has been redirected and we are no longer downloading
             # from the original host, notify the user that the target host has
@@ -30,16 +32,15 @@ module Vagrant
               if !location.empty?
                 location_uri = URI.parse(location)
 
-                unless location_uri.host.nil?
-                  redirect_notify = false
+                if !location_uri.host.nil? && !redirect_notify
                   logger.info("download redirected to #{location}")
                   source_uri = URI.parse(source)
                   source_host = source_uri.host.to_s.split(".", 2).last
                   location_host = location_uri.host.to_s.split(".", 2).last
-                  if !redirect_notify && location_host != source_host && !SILENCED_HOSTS.include?(location_host)
-                    ui.rewriting do |ui|
-                      ui.clear_line
-                      ui.detail "Download redirected to host: #{location_uri.host}"
+                  if location_host != source_host && !SILENCED_HOSTS.include?(location_host) && !SILENCED_HOSTS.include?(location_uri.host.to_s)
+                    ui.rewriting do |_ui|
+                      _ui.clear_line
+                      _ui.detail "Download redirected to host: #{location_uri.host}"
                     end
                   end
                   redirect_notify = true

data/lib/vagrant/util/guest_hosts.rb

@@ -17,7 +17,7 @@ module Vagrant
           basename = name.split(".", 2)[0]
           comm.sudo <<-EOH.gsub(/^ {14}/, '')
           grep -w '#{name}' /etc/hosts || {
-            for i in {1..#{loop_bound}}; do
+            for i in #{[*1..loop_bound].join(' ')}; do
               grep -w "127.0.${i}.1" /etc/hosts || {
                 echo "127.0.${i}.1 #{name} #{basename}" >> /etc/hosts
                 break

data/lib/vagrant/util/numeric.rb

@@ -49,6 +49,26 @@ module Vagrant
           bytes
         end
 
+        # Convert bytes to a user friendly string representation
+        #
+        # @param [Numeric] bytes Number of bytes to represent
+        # @return [String] user friendly output
+        def bytes_to_string(bytes)
+          # We want to locate the size that will return the
+          # smallest whole value number
+          BYTES_CONVERSION_MAP.sort { |a, b|
+            b.last <=> a.last
+          }.each do |suffix, size|
+            val = bytes.to_f / size
+            next if val < 1
+            val = sprintf("%.2f", val)
+            val.slice!(-1, 1) while val.end_with?("0")
+            val.slice!(-1, 1) if val.end_with?(".")
+            return "#{val}#{suffix}"
+          end
+          "#{bytes} byte#{"s" if bytes > 1}"
+        end
+
         # Rounds actual value to two decimal places
         #
         # @param [Integer] bytes

data/lib/vagrant/util/powershell.rb

@@ -14,28 +14,44 @@ module Vagrant
       MINIMUM_REQUIRED_VERSION = 3
       # Number of seconds to wait while attempting to get powershell version
       DEFAULT_VERSION_DETECTION_TIMEOUT = 30
+      # Names of the powershell executable
+      POWERSHELL_NAMES = ["powershell", "pwsh"].map(&:freeze).freeze
+      # Paths to powershell executable
+      POWERSHELL_PATHS = [
+        "%WINDIR%/WindowsPowerShell/v1.0",
+        "%PROGRAMFILES%/PowerShell/7",
+        "%PROGRAMFILES%/PowerShell/6"
+      ].map(&:freeze).freeze
+
       LOGGER = Log4r::Logger.new("vagrant::util::powershell")
 
       # @return [String|nil] a powershell executable, depending on environment
       def self.executable
         if !defined?(@_powershell_executable)
-          @_powershell_executable = "powershell"
+          # First start with detecting executable on configured path
+          POWERSHELL_NAMES.detect do |psh|
+            return @_powershell_executable = psh if Which.which(psh)
+            psh += ".exe"
+            return @_powershell_executable = psh if Which.which(psh)
+          end
+
+          # Now attempt with paths
+          paths = POWERSHELL_PATHS.map do |ppath|
+            result = Util::Subprocess.execute("cmd.exe", "/c", "echo #{ppath}")
+            result.stdout.gsub("\"", "").strip if result.exit_code == 0
+          end.compact
 
-          if Which.which(@_powershell_executable).nil?
-            # Try to use WSL interoperability if PowerShell is not symlinked to
-            # the container.
-            if Platform.wsl?
-              @_powershell_executable += ".exe"
+          paths.each do |psh_path|
+            POWERSHELL_NAMES.each do |psh|
+              path = File.join(psh_path, psh)
+              return @_powershell_executable = path if Which.which(path)
 
-              if Which.which(@_powershell_executable).nil?
-                @_powershell_executable = "/mnt/c/Windows/System32/WindowsPowerShell/v1.0/powershell.exe"
+              path += ".exe"
+              return @_powershell_executable = path if Which.which(path)
 
-                if Which.which(@_powershell_executable).nil?
-                  @_powershell_executable = nil
-                end
-              end
-            else
-              @_powershell_executable = nil
+              # Finally test the msys2 style path
+              path = path.sub(/^([A-Za-z]):/, "/mnt/\\1")
+              return @_powershell_executable = path if Which.which(path)
             end
           end
         end

data/lib/vagrant/vagrantfile.rb

@@ -241,7 +241,7 @@ module Vagrant
       #       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}")
+        @logger.warn("Performing lookup with initial 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

data/plugins/commands/cloud/auth/middleware/add_authentication.rb

@@ -1,5 +1,6 @@
 require "cgi"
 require "uri"
+require "log4r"
 
 require Vagrant.source_root.join("plugins/commands/cloud/client/client")
 
@@ -27,55 +28,83 @@ module VagrantPlugins
 
       def initialize(app, env)
         @app = app
+        @logger = Log4r::Logger.new("vagrant::cloud::auth::authenticate-box-url")
         CloudCommand::Plugin.init!
       end
 
       def call(env)
-        client = Client.new(env[:env])
-        token  = client.token
+        if ENV["VAGRANT_SERVER_ACCESS_TOKEN_BY_URL"]
+          @logger.warn("Adding access token as GET parameter by user request")
+          client = Client.new(env[:env])
+          token  = client.token
 
-        env[:box_urls].map! do |url|
-          begin
-            u = URI.parse(url)
-            if u.host != TARGET_HOST && REPLACEMENT_HOSTS.include?(u.host)
-              u.host = TARGET_HOST
-              u.to_s
-            else
+          env[:box_urls].map! do |url|
+            begin
+              u = URI.parse(url)
+              if u.host != TARGET_HOST && REPLACEMENT_HOSTS.include?(u.host)
+                u.host = TARGET_HOST
+                u.to_s
+              else
+                url
+              end
+            rescue URI::Error
               url
             end
-          rescue URI::Error
-            url
           end
-        end
 
-        server_uri = URI.parse(Vagrant.server_url.to_s)
+          server_uri = URI.parse(Vagrant.server_url.to_s)
 
-        if token && !server_uri.host.to_s.empty?
-          env[:box_urls].map! do |url|
-            u = URI.parse(url)
+          if token && !server_uri.host.to_s.empty?
+            env[:box_urls].map! do |url|
+              begin
+                u = URI.parse(url)
 
-            if u.host == server_uri.host
-              if server_uri.host != TARGET_HOST && !self.class.custom_host_notified?
-                env[:ui].warn(I18n.t("cloud_command.middleware.authentication.different_target",
-                  custom_host: server_uri.host, known_host: TARGET_HOST) + "\n")
-                sleep CUSTOM_HOST_NOTIFY_WAIT
-                self.class.custom_host_notified!
-              end
+                if u.host == server_uri.host
+                  if server_uri.host != TARGET_HOST && !self.class.custom_host_notified?
+                    env[:ui].warn(I18n.t("cloud_command.middleware.authentication.different_target",
+                      custom_host: server_uri.host, known_host: TARGET_HOST) + "\n")
+                    sleep CUSTOM_HOST_NOTIFY_WAIT
+                    self.class.custom_host_notified!
+                  end
 
-              q = CGI.parse(u.query || "")
+                  q = CGI.parse(u.query || "")
 
-              current = q["access_token"]
-              if current && current.empty?
-                q["access_token"] = token
-              end
+                  current = q["access_token"]
+                  if current && current.empty?
+                    q["access_token"] = token
+                  end
 
-              u.query = URI.encode_www_form(q)
+                  u.query = URI.encode_www_form(q)
+                end
+
+                u.to_s
+              rescue URI::Error
+                url
+              end
             end
+          end
+        else
+          env[:box_urls].map! do |url|
+            begin
+              u = URI.parse(url)
+              q = CGI.parse(u.query || "")
+              if q["access_token"]
+                @logger.warn("Removing access token from URL parameter.")
+                q.delete("access_token")
+                if q.empty?
+                  u.query = nil
+                else
+                  u.query = URI.encode_www_form(q)
+                end
+              end
 
-            u.to_s
+              u.to_s
+            rescue URI::Error
+              url
+            end
           end
+          @logger.warn("Authentication token not added as GET parameter.")
         end
-
         @app.call(env)
       end.freeze
     end

data/plugins/commands/cloud/auth/middleware/add_downloader_authentication.rb

@@ -7,47 +7,54 @@ require_relative "./add_authentication"
 require Vagrant.source_root.join("plugins/commands/cloud/client/client")
 
 # Similar to AddAuthentication this middleware will add authentication for interacting
-# with Vagrant cloud. It does this by adding Authentication headers to a 
-# Vagrant::Util::Downloader object. 
+# with Vagrant cloud. It does this by adding Authentication headers to a
+# Vagrant::Util::Downloader object.
 module VagrantPlugins
   module CloudCommand
     class AddDownloaderAuthentication <  AddAuthentication
 
-      @@logger = Log4r::Logger.new("vagrant::clout::add_download_authentication")
+      def initialize(app, env)
+        super
+        @logger = Log4r::Logger.new("vagrant::cloud::auth::add-download-authentication")
+      end
 
       def call(env)
-        client = Client.new(env[:env])
-        token  = client.token
-        Vagrant::Util::CredentialScrubber.sensitive(token)
+        if ENV["VAGRANT_SERVER_ACCESS_TOKEN_BY_URL"]
+          @logger.warn("Authentication header not added due to user requested access token URL parameter")
+        else
+          client = Client.new(env[:env])
+          token  = client.token
+          Vagrant::Util::CredentialScrubber.sensitive(token)
 
-        begin
-          target_url = URI.parse(env[:downloader].source)
-          if target_url.host != TARGET_HOST && REPLACEMENT_HOSTS.include?(target_url.host)
+          begin
+            target_url = URI.parse(env[:downloader].source)
+            if target_url.host != TARGET_HOST && REPLACEMENT_HOSTS.include?(target_url.host)
               target_url.host = TARGET_HOST
               env[:downloader].source = target_url.to_s
+            end
+          rescue URI::Error
+            # if there is an error, use current target_url
           end
-        rescue URI::Error
-          # if there is an error, use current target_url
-        end
 
-        server_uri = URI.parse(Vagrant.server_url.to_s)
-        if token && !server_uri.host.to_s.empty?
-          if target_url.host == server_uri.host
-            if server_uri.host != TARGET_HOST && !self.class.custom_host_notified?
-              env[:ui].warn(I18n.t("cloud_command.middleware.authentication.different_target",
-                custom_host: server_uri.host, known_host: TARGET_HOST) + "\n")
-              sleep CUSTOM_HOST_NOTIFY_WAIT
-              self.class.custom_host_notified!
-            end
+          server_uri = URI.parse(Vagrant.server_url.to_s)
+          if token && !server_uri.host.to_s.empty?
+            if target_url.host == server_uri.host
+              if server_uri.host != TARGET_HOST && !self.class.custom_host_notified?
+                env[:ui].warn(I18n.t("cloud_command.middleware.authentication.different_target",
+                  custom_host: server_uri.host, known_host: TARGET_HOST) + "\n")
+                sleep CUSTOM_HOST_NOTIFY_WAIT
+                self.class.custom_host_notified!
+              end
 
-            if Array(env[:downloader].headers).any? { |h| h.include?("Authorization") }
-              @@logger.info("Not adding an authentication header, one already found")
-            else
-              env[:downloader].headers << "Authorization: Bearer #{token}"
+              if Array(env[:downloader].headers).any? { |h| h.include?("Authorization") }
+                @logger.info("Not adding an authentication header, one already found")
+              else
+                env[:downloader].headers << "Authorization: Bearer #{token}"
+              end
             end
-          end
 
-          env[:downloader]
+            env[:downloader]
+          end
         end
 
         @app.call(env)

data/plugins/commands/cloud/client/client.rb

@@ -18,6 +18,7 @@ module VagrantPlugins
       ######################################################################
       APP = "app".freeze
 
+      include Util
       include Vagrant::Util::Presence
 
       attr_accessor :client
@@ -32,7 +33,10 @@ module VagrantPlugins
       def initialize(env)
         @logger = Log4r::Logger.new("vagrant::cloud::client")
         @env    = env
-        @client = VagrantCloud::Client.new(access_token: token)
+        @client = VagrantCloud::Client.new(
+          access_token: token,
+          url_base: api_server_url
+        )
       end
 
       # Removes the token, effectively logging the user out.
@@ -72,7 +76,10 @@ module VagrantPlugins
             password: password, description: description, code: code)
 
           Vagrant::Util::CredentialScrubber.sensitive(r[:token])
-          @client = VagrantCloud::Client.new(access_token: r[:token])
+          @client = VagrantCloud::Client.new(
+            access_token: r[:token],
+            url_base: api_server_url
+          )
           r[:token]
         end
       end
@@ -106,7 +113,7 @@ module VagrantPlugins
         end
 
         # Reset after we store the token since this is now _our_ token
-        @client = VagrantCloud::Client.new(access_token: token)
+        @client = VagrantCloud::Client.new(access_token: token, url_base: api_server_url)
 
         nil
       end

data/plugins/commands/cloud/locales/en.yml

@@ -75,6 +75,10 @@ en:
         Updated provider %{provider} on %{org}/%{box_name} for version %{version}
       not_found: |-
         Failed to locate %{provider_name} provider for %{org}/%{box_name} on version %{version}
+      direct_disable: |-
+        Vagrant is automatically disabling direct upload to backend storage.
+        Uploads directly to backend storage are currently only supported for
+        files 5G in size or smaller. Box file to upload is: %{size}
     version:
       create_success: |-
         Created version %{version} on %{org}/%{box_name} for version %{version}
@@ -112,7 +116,7 @@ en:
           Failed to update box %{org}/%{box_name}
       whoami:
         read_error: |-
-          Failed to read organization %{org}
+          Failed to locate account information
       provider:
         create_fail: |-
           Failed to create provider %{provider} on box %{org}/%{box_name} for version %{version}