vagrant-unbundled 2.2.7.0 → 2.2.16.0

data/lib/vagrant/util/uploader.rb

@@ -13,9 +13,11 @@ module Vagrant
     # a hand-rolled Ruby library, so we defer to its expertise.
     class Uploader
 
-      # @param [String] destination - valid URL to upload file to
-      # @param [String] file - location of file to upload on disk
-      # @param [Hash]   options
+      # @param [String] destination Valid URL to upload file to
+      # @param [String] file Location of file to upload on disk
+      # @param [Hash] options
+      # @option options [Vagrant::UI] :ui UI interface for output
+      # @option options [String, Symbol] :method Request method for upload
       def initialize(destination, file, options=nil)
         options ||= {}
         @logger         = Log4r::Logger.new("vagrant::util::uploader")
@@ -27,6 +29,7 @@ module Vagrant
         if !@request_method
           @request_method = "PUT"
         end
+        @request_method = @request_method.to_s.upcase
       end
 
       def upload!
@@ -51,7 +54,7 @@ module Vagrant
       protected
 
       def build_options
-        options = [@destination, "--request", @request_method, "--upload-file", @file]
+        options = [@destination, "--request", @request_method, "--upload-file", @file, "--fail"]
         return options
       end
 

data/lib/vagrant/vagrantfile.rb

@@ -197,7 +197,7 @@ module Vagrant
         local_keys = keys.dup
 
         # Load the box Vagrantfile, if there is one
-        if config.vm.box && boxes
+        if !config.vm.box.to_s.empty? && boxes
           box = boxes.find(config.vm.box, box_formats, config.vm.box_version)
           if box
             box_vagrantfile = find_vagrantfile(box.directory)
@@ -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/autocomplete/command/install.rb

@@ -0,0 +1,49 @@
+require 'optparse'
+
+require 'vagrant/util/install_cli_autocomplete'
+
+module VagrantPlugins
+  module CommandAutocomplete
+    module Command
+      class Install < Vagrant.plugin("2", :command)
+        def execute
+          options = {
+            shells: []
+          }
+
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant autocomplete install [-h] [shell name]"
+            o.separator ""
+            o.separator "Available shells: #{Vagrant::Util::InstallCLIAutocomplete::SUPPORTED_SHELLS.keys.join(' ')}"
+            o.separator ""
+            o.separator "Options:"
+            o.separator ""
+
+            o.on("-b", "--bash", "Install bash autocomplete") do |c|
+              options[:shells].append("bash")
+            end
+
+            o.on("-z", "--zsh", "Install zsh autocomplete") do |c|
+              options[:shells].append("zsh")
+            end
+          end
+
+          # Parse the options
+          argv = parse_options(opts)
+          return if !argv
+          raise Vagrant::Errors::CLIInvalidUsage, help: opts.help.chomp if argv.length > 0
+
+          written_paths = Vagrant::Util::InstallCLIAutocomplete.install(options[:shells])
+          if written_paths && written_paths.length > 0
+            @env.ui.info(I18n.t("vagrant.autocomplete.installed", paths: written_paths.join("\n- ")))
+          else
+            @env.ui.info(I18n.t("vagrant.autocomplete.not_installed"))
+          end
+
+          # Success, exit status 0
+          0
+        end
+      end
+    end
+  end
+end

data/plugins/commands/autocomplete/command/root.rb

@@ -0,0 +1,64 @@
+require "optparse"
+require 'vagrant/util/install_cli_autocomplete'
+
+module VagrantPlugins
+  module CommandAutocomplete
+    module Command
+      class Root < Vagrant.plugin("2", :command)
+        def self.synopsis
+          "manages autocomplete installation on host"
+        end
+
+        def initialize(argv, env)
+          super
+
+          @main_args, @sub_command, @sub_args = split_main_and_subcommand(argv)
+
+          @subcommands = Vagrant::Registry.new
+          @subcommands.register(:install) do
+            require File.expand_path("../install", __FILE__)
+            Install
+          end
+        end
+
+        def execute
+          if @main_args.include?("-h") || @main_args.include?("--help")
+            # Print the help for all the box commands.
+            return help
+          end
+
+          # If we reached this far then we must have a subcommand. If not,
+          # then we also just print the help and exit.
+          command_class = @subcommands.get(@sub_command.to_sym) if @sub_command
+          return help if !command_class || !@sub_command
+          @logger.debug("Invoking command class: #{command_class} #{@sub_args.inspect}")
+
+          # Initialize and execute the command class
+          command_class.new(@sub_args, @env).execute
+        end
+
+        def help
+          opts = OptionParser.new do |opts|
+            opts.banner = "Usage: vagrant autocomplete <subcommand>"
+            opts.separator ""
+            opts.separator "Available subcommands:"
+
+            # Add the available subcommands as separators in order to print them
+            # out as well.
+            keys = []
+            keys = @subcommands.keys.map(&:to_s)
+
+            keys.sort.each do |key|
+              opts.separator "     #{key}"
+            end
+
+            opts.separator ""
+            opts.separator "For help on any individual subcommand run `vagrant autocomplete <subcommand> -h`"
+          end
+
+          @env.ui.info(opts.help, prefix: false)
+        end
+      end
+    end
+  end
+end

data/plugins/commands/autocomplete/plugin.rb

@@ -0,0 +1,18 @@
+require "vagrant"
+
+
+module VagrantPlugins
+  module CommandAutocomplete
+    class Plugin < Vagrant.plugin("2")
+      name "autocomplete command"
+      description <<-DESC
+      The `autocomplete` manipulates Vagrant the autocomplete feature.
+      DESC
+
+      command("autocomplete") do
+        require File.expand_path("../command/root", __FILE__)
+        Command::Root
+      end
+    end
+  end
+end

data/plugins/commands/cap/command.rb

@@ -27,6 +27,10 @@ module VagrantPlugins
           o.on("--check", "Only checks for a capability, does not execute") do |f|
             options[:check] = f
           end
+
+          o.on("-t", "--target=TARGET", "Target guest to run against (if applicable)") do |t|
+            options[:target] = t
+          end
         end
 
         # Parse the options
@@ -45,7 +49,7 @@ module VagrantPlugins
         if type == :host
           cap_host = @env.host
         else
-          with_target_vms([]) do |vm|
+          with_target_vms(options[:target] || []) do |vm|
             cap_host = case type
                        when :provider
                          vm.provider

data/plugins/commands/cloud/auth/login.rb

@@ -5,6 +5,8 @@ module VagrantPlugins
     module AuthCommand
       module Command
         class Login < Vagrant.plugin("2", :command)
+          include Util
+
           def execute
             options = {}
 
@@ -16,15 +18,10 @@ module VagrantPlugins
               o.on("-c", "--check", "Checks if currently logged in") do |c|
                 options[:check] = c
               end
-
               o.on("-d", "--description DESCRIPTION", String, "Set description for the Vagrant Cloud token") do |d|
                 options[:description] = d
               end
 
-              o.on("-k", "--logout", "Logout from Vagrant Cloud") do |k|
-                options[:logout] = k
-              end
-
               o.on("-t", "--token TOKEN", String, "Set the Vagrant Cloud token") do |t|
                 options[:token] = t
               end
@@ -37,26 +34,32 @@ module VagrantPlugins
             # Parse the options
             argv = parse_options(opts)
             return if !argv
+            if !argv.empty?
+              raise Vagrant::Errors::CLIInvalidUsage,
+                help: opts.help.chomp
+            end
 
-            @client = Client.new(@env)
-            @client.username_or_email = options[:login]
+            client = Client.new(@env)
+            client.username_or_email = options[:login]
 
             # Determine what task we're actually taking based on flags
             if options[:check]
-              return execute_check
-            elsif options[:logout]
-              return execute_logout
+              return execute_check(client)
             elsif options[:token]
-              return execute_token(options[:token])
+              return execute_token(client, options[:token])
             else
-              @client = VagrantPlugins::CloudCommand::Util.client_login(@env, options)
+              if client.logged_in?
+                @env.ui.success(I18n.t("cloud_command.check_logged_in"))
+              else
+                client_login(@env, options.slice(:login, :description))
+              end
             end
 
             0
           end
 
-          def execute_check
-            if @client.logged_in?
+          def execute_check(client)
+            if client.logged_in?
               @env.ui.success(I18n.t("cloud_command.check_logged_in"))
               return 0
             else
@@ -65,17 +68,11 @@ module VagrantPlugins
             end
           end
 
-          def execute_logout
-            @client.clear_token
-            @env.ui.success(I18n.t("cloud_command.logged_out"))
-            return 0
-          end
-
-          def execute_token(token)
-            @client.store_token(token)
+          def execute_token(client, token)
+            client.store_token(token)
             @env.ui.success(I18n.t("cloud_command.token_saved"))
 
-            if @client.logged_in?
+            if client.logged_in?
               @env.ui.success(I18n.t("cloud_command.check_logged_in"))
               return 0
             else

data/plugins/commands/cloud/auth/logout.rb

@@ -9,15 +9,9 @@ module VagrantPlugins
             options = {}
 
             opts = OptionParser.new do |o|
-              o.banner = "Usage: vagrant cloud auth logout [options]"
+              o.banner = "Usage: vagrant cloud auth logout"
               o.separator ""
               o.separator "Log out of Vagrant Cloud"
-              o.separator ""
-              o.separator "Options:"
-              o.separator ""
-              o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |l|
-                options[:login] = l
-              end
             end
 
             # Parse the options
@@ -28,9 +22,7 @@ module VagrantPlugins
                 help: opts.help.chomp
             end
 
-            # Initializes client and deletes token on disk
-            @client = VagrantPlugins::CloudCommand::Util.client_login(@env, options[:username])
-
+            @client = Client.new(@env)
             @client.clear_token
             @env.ui.success(I18n.t("cloud_command.logged_out"))
             return 0

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

@@ -0,0 +1,64 @@
+require "cgi"
+require "uri"
+
+require "vagrant/util/credential_scrubber"
+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.
+module VagrantPlugins
+  module CloudCommand
+    class AddDownloaderAuthentication <  AddAuthentication
+
+      def initialize(app, env)
+        super
+        @logger = Log4r::Logger.new("vagrant::cloud::auth::add-download-authentication")
+      end
+
+      def call(env)
+        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)
+              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
+
+          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}"
+              end
+            end
+
+            env[:downloader]
+          end
+        end
+
+        @app.call(env)
+      end.freeze
+    end
+  end
+end