vagrant-vmware-esxi 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b27af15025065ae2b975b2dace40a65ad09aadab
-  data.tar.gz: 8d7b51d2ee434aca4c1acb52496907fcf30c9a93
+  metadata.gz: 4b492ed5cff029e4fd8de183ed3fe60bb2cf7fa2
+  data.tar.gz: 398277bd2f8d457495d20364d02f8af7920e15d3
 SHA512:
-  metadata.gz: 7ffacc56f89bcdcba403c52a151bfa92c5ba3dcbfeaf69abc6a0e5ebb2db140d1b1bdd3a16bd5f3792625b05d174bf7705f138a986dd20e3ef6f6f8acf90df23
-  data.tar.gz: 02f91eb5356872ea1d301e1e027940f1a960c3ec136d6cc1e406349eab36e2f65a13998725e533e0e119652f4f8d92de8756c6b0fdcf7576266bea8f6a0d77a9
+  metadata.gz: fb9b631795bd52722a72fe6d2da9409a461680e90c4b2192867f4f0c46438b64b3c13885e0985e78442f1ad834ec14972fac0510d154c39458ae8882cac27827
+  data.tar.gz: 20c7f5420df573bd8b954fe4b31845129066c88b59b5ae4495c11d3f2f841e555f10df8c6ec638eb82555176101c28048f7c3fb3d5846545629166fdc6779664

data/Gemfile

@@ -1,14 +1,9 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in vagrant-exsi.gemspec
-#gemspec
-
 group :development do
   gem 'vagrant', git: 'https://github.com/hashicorp/vagrant.git'
-  #gem 'vagrant-vmware-esxi', path: '.'
 end
 
 group :plugins do
-  #gem 'vagrant-vmware-esxi', path: '.'
   gemspec
 end

data/README.md

@@ -258,10 +258,16 @@ Known issues with vmware_esxi
 * Cleanup doesn't always destroy a VM that has been partially built.  Use the local_allow_overwrite = 'True' option if you need to force a rebuild, or you can delete the vm using the VSphere client.
 * ovftool installer for windows doesn't put ovftool.exe in your path.  You can manually set your path, or install ovftool in the \HashiCorp\Vagrant\bin directory.
 * In general I find the vagrant NFS synced folders a little 'flaky'...
+* V2.0.1 - 2.0.5 is not compatible with Windows (to support ed25519 ssh keys, net-ssh requires libsodium but it's not compatible with Windows).  Update to a newer version.
 
 
 Version History
 ---------------
+* 2.0.6 Fix Windows compatibility by not supporting ed25519 ssh keys.  When net-ssh 5.x is released AND vagrant allows it's use, I will support ed25519 again.
+        Fix, encode '/' in esxi passwords.
+        Fix, Get local IP address for NFS syncd folders.  Filter out localhost 127.0.0.0/8.
+        Work-around 'prompt:' issues with unsupported consoles. Cygwin & gitbash, for example.
+
 * 2.0.5 Performance enhancement. Guest IP caching
         Performance enhancement. Optimize esxi connectivity checks.
         Performance enhancement & bugfix.  Get local IP address for NFS syncd folders.

data/lib/vagrant-vmware-esxi/action/createvm.rb

@@ -473,6 +473,7 @@ module VagrantPlugins
                            "  Please download and "\
                            '  install from http://www.vmware.com.'
           end
+
           ovf_cmd = "ovftool --noSSLVerify #{overwrite_opts} "\
                 "#{netOpts} -dm=#{guest_disk_type} #{local_laxoption} "\
                 "-ds=\"#{@guestvm_dsname}\" --name=\"#{desired_guest_name}\" "\
@@ -487,7 +488,11 @@ module VagrantPlugins
             @logger.info("vagrant-vmware-esxi, createvm: ovf_cmd #{ovf_cmd}")
             puts "ovftool command: #{ovf_cmd}"
           elsif config.debug =~ %r{true}i
-            ovf_cmd_nopw = ovf_cmd.gsub(/#{$encoded_esxi_password}/, '******')
+            if $encoded_esxi_password == ''
+              ovf_cmd_nopw = ovf_cmd
+            else
+              ovf_cmd_nopw = ovf_cmd.gsub(/#{$encoded_esxi_password}/, '******')
+            end
             puts "ovftool command: #{ovf_cmd_nopw}"
           end
           unless system "#{ovf_cmd}"

data/lib/vagrant-vmware-esxi/action/esxi_password.rb

@@ -33,12 +33,25 @@ module VagrantPlugins
               #  Prompt for password
               #
               begin
-                print "#{config.esxi_hostname} password:"
+                print "#{config.esxi_username}@#{config.esxi_hostname} password:"
                 $esxi_password = STDIN.noecho(&:gets).chomp
                 puts ''
               rescue
-                raise Errors::ESXiError,
-                      message: 'Prompt for password error???'
+                begin
+                  #  There is something funky with STDIN... (unsupported console)
+                  puts ''
+                  puts ''
+                  puts 'Error! Your console doesn\'t support hiding input. We\'ll ask for'
+                  puts 'input again below, but we WILL NOT be able to hide input. If this'
+                  puts 'is a problem for you, ctrl-C / [ENTER] to exit and fix your stdin.'
+                  puts ''
+                  print "#{config.esxi_username}@#{config.esxi_hostname} password:"
+                  $esxi_password = $stdin.readline().chomp
+                  puts ''
+                rescue
+                  raise Errors::ESXiError,
+                        message: 'Prompt for password error???'
+                end
               end
             elsif config.esxi_password =~ %r{^env:}i
               #
@@ -84,9 +97,7 @@ module VagrantPlugins
               #
               $esxi_password = ''
               esxi_password_key = config.esxi_password.gsub(/key:/i, '').chomp
-              if esxi_password_key.empty?
-                config.local_private_keys = config.system_private_keys_path
-              else
+              unless esxi_password_key.empty?
                 config.local_private_keys = esxi_password_key
               end
             else
@@ -106,7 +117,8 @@ module VagrantPlugins
               '/', '%2f').gsub('\\','%5c').gsub(\
               '"', '%22').gsub('\'','%27').gsub(\
               '*', '%2a').gsub('?', '%3f').gsub(\
-              '$', '%24').gsub(' ', '%20')
+              '$', '%24').gsub(' ', '%20').gsub(\
+              '/', '%2f')
 
             @logger.info('vagrant-vmware-esxi, connect_esxi: local_private_keys: '\
                          "#{config.local_private_keys}")
@@ -115,7 +127,9 @@ module VagrantPlugins
             #  Test ESXi host connectivity
             #
             begin
+              puts "RUBY_PLATFORM: #{RUBY_PLATFORM}" if config.debug =~ %r{true}i
               puts "Testing esxi connectivity" if config.debug =~ %r{ip}i
+              puts "esxi_ssh_keys: #{config.local_private_keys}" if config.debug =~ %r{ip}i
               Net::SSH.start(config.esxi_hostname, config.esxi_username,
                 password:                   $esxi_password,
                 port:                       config.esxi_hostport,

data/lib/vagrant-vmware-esxi/action/read_state.rb

@@ -33,7 +33,7 @@ module VagrantPlugins
                 puts "Get local IP address for NFS. (alt)" if env[:machine].provider_config.debug =~ %r{ip}i
                 #  Alt method.  Get list of ip_addresses on system and use the first.
                 Socket.ip_address_list.each do |ip|
-                  if (ip.ip_address =~ /^(\d{1,3}).(\d{1,3}).(\d{1,3}).(\d{1,3})$/) && (ip.ip_address !~ /^127.0.0/)
+                  if (ip.ip_address =~ /^(\d{1,3}).(\d{1,3}).(\d{1,3}).(\d{1,3})$/) && (ip.ip_address !~ /^127./)
                     env[:nfs_host_ip] = ip.ip_address
                     break
                   end

data/lib/vagrant-vmware-esxi/config.rb

@@ -87,12 +87,14 @@ module VagrantPlugins
         @debug = 'False'
         @saved_ipaddress = nil
         @saved_ipaddress_count = 0
-        @system_private_keys_path = [
+        @system_private_keys = [
           '~/.ssh/id_rsa',
           '~/.ssh/id_ecdsa',
-          '~/.ssh/id_ed25519',
           '~/.ssh/id_dsa'
         ]
+        #'~/.ssh/id_ed25519',
+        # Removed support for ed25519 because libsodium is not compatible with windows.
+        # Should be added back when net-ssh 5.0 is out of beta.
         @supported_guest_virtualhw_versions = [
           4,7,8,9,10,11,12,13
         ]
@@ -367,7 +369,7 @@ module VagrantPlugins
 
         @esxi_virtual_network = ['--NotSet--'] if @esxi_virtual_network.nil?
 
-        @local_private_keys = @system_private_keys_path if @local_private_keys == nil
+        @local_private_keys = @system_private_keys if @local_private_keys == nil
 
         # @guest_virtualhw_version = @guest_virtualhw_version.to_i unless @guest_virtualhw_version.nil?
 

data/lib/vagrant-vmware-esxi/version.rb

@@ -1,7 +1,7 @@
 #  VERSION
 module VagrantPlugins
   module ESXi
-    VERSION = '2.0.5'
+    VERSION = '2.0.6'
     $vagrant_vmware_esxi_version = VERSION
   end
 end

data/vagrant-vmware-esxi.gemspec

@@ -20,13 +20,10 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'log4r', '~> 1.1'
   s.add_runtime_dependency "iniparse", '> 1.0'
   s.add_runtime_dependency "nokogiri", '> 1.5'
-  #s.add_runtime_dependency "net-ssh", '> 4.0'
-  s.add_runtime_dependency 'rbnacl', '>= 3.2', '< 4.0'
-  s.add_runtime_dependency 'rbnacl-libsodium'
-  s.add_runtime_dependency 'bcrypt_pbkdf', '>= 1.0'
 
-  #s.add_development_dependency "bundler"
-  #s.add_development_dependency "rspec-core"
+  # Needed only to support ed25519 ssh keys with net-ssh 4.x.  Won't need this for net-ssh 5.x.
+  #s.add_runtime_dependency 'rbnacl', '>= 4.0', '< 5.0'
+  #s.add_runtime_dependency 'rbnacl-libsodium', '= 1.0.16.1'
+  #s.add_runtime_dependency 'bcrypt_pbkdf', '>= 1.0'
 
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vmware-esxi
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Jonathan Senkerik
@@ -66,54 +66,6 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: rbnacl
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: rbnacl-libsodium
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bcrypt_pbkdf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: A Vagrant plugin that adds a VMware ESXi provider support
 email: josenk@jintegrate.co
 executables: []