vagrant-unbundled 2.2.7.0 → 2.2.16.0

data/plugins/hosts/linux/cap/nfs.rb

@@ -67,6 +67,7 @@ module VagrantPlugins
 
           nfs_opts_setup(folders)
           folders = folder_dupe_check(folders)
+          ips = ips.uniq
           output = Vagrant::Util::TemplateRenderer.render('nfs/exports_linux',
                                            uuid: id,
                                            ips: ips,

data/plugins/hosts/linux/cap/rdp.rb

@@ -48,7 +48,7 @@ module VagrantPlugins
           end
 
           # Finally, run the client.
-          Vagrant::Util::Subprocess.execute(rdp_client, *args)
+          Vagrant::Util::Subprocess.execute(rdp_client, *args, {:detach => true})
         end
       end
     end

data/plugins/hosts/linux/plugin.rb

@@ -11,6 +11,16 @@ module VagrantPlugins
         Host
       end
 
+      host_capability("linux", "isofs_available") do
+        require_relative "cap/fs_iso"
+        Cap::FsISO
+      end
+
+      host_capability("linux", "create_iso") do
+        require_relative "cap/fs_iso"
+        Cap::FsISO
+      end
+
       host_capability("linux", "nfs_export") do
         require_relative "cap/nfs"
         Cap::NFS

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

@@ -0,0 +1,48 @@
+require "pathname"
+require "vagrant/util/caps"
+
+module VagrantPlugins
+  module HostWindows
+    module Cap
+      class FsISO
+        extend Vagrant::Util::Caps::BuildISO
+
+        @@logger = Log4r::Logger.new("vagrant::host::windows::fs_iso")
+
+        BUILD_ISO_CMD = "oscdimg".freeze
+
+        # Check that the host has the ability to generate ISOs
+        #
+        # @param [Vagrant::Environment] env
+        # @return [Boolean]
+        def self.isofs_available(env)
+          !!Vagrant::Util::Which.which(BUILD_ISO_CMD)
+        end
+
+        # Generate an ISO file of the given source directory
+        #
+        # @param [Vagrant::Environment] env
+        # @param [String] source_directory Contents of ISO
+        # @param [Map] extra arguments to pass to the iso building command
+        #              :file_destination (string) location to store ISO
+        #              :volume_id (String) to set the volume name
+        # @return [Pathname] ISO location
+        # @note If file_destination exists, source_directory will be checked
+        #       for recent modifications and a new ISO will be generated if requried.
+        def self.create_iso(env, source_directory, extra_opts={})
+          source_directory = Pathname.new(source_directory)
+          file_destination = self.ensure_output_iso(extra_opts[:file_destination])
+
+          iso_command = [BUILD_ISO_CMD, "-j1", "-o", "-m"]
+          iso_command << "-l#{extra_opts[:volume_id]}" if extra_opts[:volume_id]
+          iso_command << source_directory.to_s
+          iso_command << file_destination.to_s
+          self.build_iso(iso_command, source_directory, file_destination)
+
+          @@logger.info("ISO available at #{file_destination}")
+          file_destination
+        end
+      end
+    end
+  end
+end

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

@@ -22,7 +22,7 @@ module VagrantPlugins
             args = rdp_info[:extra_args] + args
           end
           # Launch it
-          Vagrant::Util::Subprocess.execute("mstsc", *args)
+          Vagrant::Util::Subprocess.execute("mstsc", *args, {:detach => true})
         end
       end
     end

data/plugins/hosts/windows/plugin.rb

@@ -11,6 +11,16 @@ module VagrantPlugins
         Host
       end
 
+      host_capability("windows", "isofs_available") do
+        require_relative "cap/fs_iso"
+        Cap::FsISO
+      end
+
+      host_capability("windows", "create_iso") do
+        require_relative "cap/fs_iso"
+        Cap::FsISO
+      end
+
       host_capability("windows", "provider_install_virtualbox") do
         require_relative "cap/provider_install_virtualbox"
         Cap::ProviderInstallVirtualBox
@@ -60,6 +70,11 @@ module VagrantPlugins
         require_relative "cap/ssh"
         Cap::SSH
       end
+
+      host_capability("windows", "smb_validate_password") do
+        require_relative "cap/smb"
+        Cap::SMB
+      end
     end
   end
 end

data/plugins/kernel_v2/config/cloud_init.rb

@@ -0,0 +1,133 @@
+require "log4r"
+require "securerandom"
+
+module VagrantPlugins
+  module Kernel_V2
+    class VagrantConfigCloudInit < Vagrant.plugin("2", :config)
+      #-------------------------------------------------------------------
+      # Config class for cloud-init
+      #-------------------------------------------------------------------
+
+      DEFAULT_CONTENT_TYPES = ["text/cloud-boothook", "text/cloud-config",
+                               "text/cloud-config-archive", "text/jinja2",
+                               "text/part-handler", "text/upstart-job",
+                               "text/x-include-once-url", "text/x-include-url",
+                               "text/x-shellscript"].map(&:freeze).freeze
+
+      DEFAULT_CONFIG_TYPE = :user_data
+
+      # @note This value is for internal use only
+      #
+      # @return [String]
+      attr_reader :id
+
+      # The 'type' of data being stored. If not defined,
+      # will default to :user_data
+      #
+      # @return [Symbol]
+      attr_accessor :type
+
+      # @return [String]
+      attr_accessor :content_type
+
+      # The optional mime-part content-disposition filename.
+      #
+      # @return [String]
+      attr_accessor :content_disposition_filename
+
+      # @return [String]
+      attr_accessor :path
+
+      # @return [String]
+      attr_accessor :inline
+
+      def initialize(type=nil)
+        @logger = Log4r::Logger.new("vagrant::config::vm::cloud_init")
+
+        @type = type if type
+
+        @content_type = UNSET_VALUE
+        @content_disposition_filename = UNSET_VALUE
+        @path = UNSET_VALUE
+        @inline = UNSET_VALUE
+
+        # Internal options
+        @id = SecureRandom.uuid
+      end
+
+      def finalize!
+        if !@type
+          @type = DEFAULT_CONFIG_TYPE
+        else
+          @type = @type.to_sym
+        end
+
+        @content_type = nil if @content_type == UNSET_VALUE
+        @content_disposition_filename = nil if @content_disposition_filename == UNSET_VALUE
+        @path = nil if @path == UNSET_VALUE
+        @inline = nil if @inline == UNSET_VALUE
+      end
+
+      # @return [Array] array of strings of error messages from config option validation
+      def validate(machine)
+        errors = _detected_errors
+
+        if @type && @type != DEFAULT_CONFIG_TYPE
+          errors << I18n.t("vagrant.cloud_init.incorrect_type_set",
+                           type: @type,
+                           machine: machine.name,
+                           default_type: DEFAULT_CONFIG_TYPE)
+        end
+
+        if !@content_type
+          errors << I18n.t("vagrant.cloud_init.content_type_not_set",
+                           machine: machine.name,
+                           accepted_types: DEFAULT_CONTENT_TYPES.join(', '))
+        elsif !DEFAULT_CONTENT_TYPES.include?(@content_type)
+          errors << I18n.t("vagrant.cloud_init.incorrect_content_type",
+                           machine: machine.name,
+                           content_type: @content_type,
+                           accepted_types: DEFAULT_CONTENT_TYPES.join(', '))
+        end
+
+        if @path && @inline
+          errors << I18n.t("vagrant.cloud_init.path_and_inline_set",
+                           machine: machine.name)
+        end
+
+        if @path
+          if !@path.is_a?(String)
+            errors << I18n.t("vagrant.cloud_init.incorrect_path_type",
+                              machine: machine.name,
+                              path: @path,
+                              type: @path.class.name)
+          else
+            expanded_path = Pathname.new(@path).expand_path(machine.env.root_path)
+            if !expanded_path.file?
+              errors << I18n.t("vagrant.cloud_init.path_invalid",
+                               path: expanded_path,
+                               machine: machine.name)
+            end
+          end
+        end
+
+        if @inline
+          if !@inline.is_a?(String)
+            errors << I18n.t("vagrant.cloud_init.incorrect_inline_type",
+                             machine: machine.name,
+                             type: @inline.class.name)
+          end
+        end
+
+        errors
+      end
+
+      # The String representation of this config.
+      #
+      # @return [String]
+      def to_s
+        "cloud_init config"
+      end
+    end
+  end
+end

data/plugins/kernel_v2/config/disk.rb

@@ -12,6 +12,8 @@ module VagrantPlugins
 
       DEFAULT_DISK_TYPES = [:disk, :dvd, :floppy].freeze
 
+      FILE_CHAR_REGEX = /[^-a-z0-9_]/i.freeze
+
       # Note: This value is for internal use only
       #
       # @return [String]
@@ -29,12 +31,18 @@ module VagrantPlugins
       # @return [Symbol]
       attr_accessor :type
 
+      # Type of disk extension to create. Defaults to `vdi`
+      #
+      # @return [String]
+      attr_accessor :disk_ext
+
       # Size of disk to create
       #
       # @return [Integer,String]
       attr_accessor :size
 
-      # Path to the location of the disk file (Optional)
+      # Path to the location of the disk file (Optional for `:disk` type,
+      # required for `:dvd` type.)
       #
       # @return [String]
       attr_accessor :file
@@ -61,6 +69,7 @@ module VagrantPlugins
         @size = UNSET_VALUE
         @primary = UNSET_VALUE
         @file = UNSET_VALUE
+        @disk_ext = UNSET_VALUE
 
         # Internal options
         @id = SecureRandom.uuid
@@ -91,7 +100,11 @@ module VagrantPlugins
         end
 
         current = @provider_config.merge(current) if !@provider_config.empty?
-        @provider_config = current
+        if current
+          @provider_config = current
+        else
+          @provider_config = {}
+        end
       end
 
       def finalize!
@@ -105,21 +118,21 @@ module VagrantPlugins
           @primary = false
         end
 
-        if @name == UNSET_VALUE
+        if @name.is_a?(String) && @name.match(FILE_CHAR_REGEX)
+            @logger.warn("Vagrant will remove detected invalid characters in '#{@name}' and convert the disk name into something usable for a file")
+            @name.gsub!(FILE_CHAR_REGEX, "_")
+        elsif @name == UNSET_VALUE
           if @primary
             @name = "vagrant_primary"
           else
-            @name = "name_#{@type.to_s}_#{@id.split("-").last}"
+            @name = nil
           end
         end
-
-        @provider_config = nil if @provider_config == {}
       end
 
       # @return [Array] array of strings of error messages from config option validation
       def validate(machine)
         errors = _detected_errors
-
         # validate type with list of known disk types
 
         if !DEFAULT_DISK_TYPES.include?(@type)
@@ -127,14 +140,48 @@ module VagrantPlugins
                            types: DEFAULT_DISK_TYPES.join(', '))
         end
 
+        if @disk_ext == UNSET_VALUE
+          if machine.provider.capability?(:set_default_disk_ext)
+            @disk_ext = machine.provider.capability(:set_default_disk_ext)
+          else
+            @logger.warn("No provider capability defined to set default 'disk_ext' type. Will use 'vdi' for disk extension.")
+            @disk_ext = "vdi"
+          end
+        elsif @disk_ext
+          @disk_ext = @disk_ext.downcase
+
+          if machine.provider.capability?(:validate_disk_ext)
+            if !machine.provider.capability(:validate_disk_ext, @disk_ext)
+              if machine.provider.capability?(:default_disk_exts)
+                disk_exts = machine.provider.capability(:default_disk_exts).join(', ')
+              else
+                disk_exts = "not found"
+              end
+              errors << I18n.t("vagrant.config.disk.invalid_ext", ext: @disk_ext,
+                               name: @name,
+                               exts: disk_exts)
+            end
+          else
+            @logger.warn("No provider capability defined to validate 'disk_ext' type")
+          end
+        end
+
         if @size && !@size.is_a?(Integer)
           if @size.is_a?(String)
             @size = Vagrant::Util::Numeric.string_to_bytes(@size)
           end
+        end
 
-          if !@size
-            errors << I18n.t("vagrant.config.disk.invalid_size", name: @name, machine: machine.name)
-          end
+        if !@size && type == :disk
+          errors << I18n.t("vagrant.config.disk.invalid_size", name: @name, machine: machine.name)
+        end
+
+        if @type == :dvd && !@file
+          errors << I18n.t("vagrant.config.disk.dvd_type_file_required", name: @name, machine: machine.name)
+        end
+
+        if @type == :dvd && @primary
+          errors << I18n.t("vagrant.config.disk.dvd_type_primary", name: @name, machine: machine.name)
         end
 
         if @file
@@ -147,13 +194,19 @@ module VagrantPlugins
         end
 
         if @provider_config
-          if !@provider_config.keys.include?(machine.provider_name)
-            machine.env.ui.warn(I18n.t("vagrant.config.disk.missing_provider",
-                                       machine: machine.name,
-                                       provider_name: machine.provider_name))
+          if !@provider_config.empty?
+            if !@provider_config.key?(machine.provider_name)
+              machine.env.ui.warn(I18n.t("vagrant.config.disk.missing_provider",
+                                         machine: machine.name,
+                                         provider_name: machine.provider_name))
+            end
           end
         end
 
+        if !@name
+          errors << I18n.t("vagrant.config.disk.no_name_set", machine: machine.name)
+        end
+
         errors
       end
 

data/plugins/kernel_v2/config/ssh_connect.rb

@@ -1,9 +1,12 @@
 module VagrantPlugins
   module Kernel_V2
     class SSHConnectConfig < Vagrant.plugin("2", :config)
+      DEFAULT_SSH_CONNECT_TIMEOUT = 15
+
       attr_accessor :host
       attr_accessor :port
       attr_accessor :config
+      attr_accessor :connect_timeout
       attr_accessor :private_key_path
       attr_accessor :username
       attr_accessor :password
@@ -20,6 +23,7 @@ module VagrantPlugins
         @host             = UNSET_VALUE
         @port             = UNSET_VALUE
         @config           = UNSET_VALUE
+        @connect_timeout  = UNSET_VALUE
         @private_key_path = UNSET_VALUE
         @username         = UNSET_VALUE
         @password         = UNSET_VALUE
@@ -47,6 +51,7 @@ module VagrantPlugins
         @dsa_authentication = true if @dsa_authentication == UNSET_VALUE
         @extra_args       = nil if @extra_args == UNSET_VALUE
         @config           = nil if @config == UNSET_VALUE
+        @connect_timeout  = DEFAULT_SSH_CONNECT_TIMEOUT if @connect_timeout == UNSET_VALUE
 
         if @private_key_path && !@private_key_path.is_a?(Array)
           @private_key_path = [@private_key_path]
@@ -76,6 +81,15 @@ module VagrantPlugins
         when :secure
           @verify_host_key = :always
         end
+
+        # Attempt to convert timeout to integer value
+        # If we can't convert the connect timeout into an integer or
+        # if the value is less than 1, set it to the default value
+        begin
+          @connect_timeout = @connect_timeout.to_i
+        rescue
+          # ignore
+        end
       end
 
       # NOTE: This is _not_ a valid config validation method, since it
@@ -110,6 +124,16 @@ module VagrantPlugins
           machine.env.ui.warn(I18n.t("vagrant.config.ssh.paranoid_deprecated"))
         end
 
+        if !@connect_timeout.is_a?(Integer)
+          errors << I18n.t(
+            "vagrant.config.ssh.connect_timeout_invalid_type",
+            given: @connect_timeout.class.name)
+        elsif @connect_timeout < 1
+          errors << I18n.t(
+            "vagrant.config.ssh.connect_timeout_invalid_value",
+            given: @connect_timeout.to_s)
+        end
+
         errors
       end
     end