vagrant-multi-putty 1.4.4 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bacc6ba971fbc91534399ecb9d33d9bf23205c3b
-  data.tar.gz: 12323e84aebfe94943e7f4757ebed1c5ff06793f
+  metadata.gz: 1bcb1308ea1efd27389c9ed1b0c9a988dd1181c4
+  data.tar.gz: 715f131affcf007ee8371f747f9207dcc8949d09
 SHA512:
-  metadata.gz: db1f52218f789fb70bfaa41eae1ef755e906da3197b9e65aadaa9ebedfcb2797debdd6a418fd4c38e41b3c2b4872210f0f2dd52aa9947fba278989c1163512ce
-  data.tar.gz: ac0f7efbb260d0175a9b6b1512a2645c8f958dfe18bdccf680343b1e4d40644fbf726e93cc813a6a13fbbd5067b750c19af3ae076dde1ef86ccad3e1a978843f
+  metadata.gz: 17562cedbad15454687a397f27c5e63ac0be8353a2513f6c4016c91769c455f892f1b8471bf11aca4c34e567e02388c79fef5e791406c5ba53622b394899e061
+  data.tar.gz: fca69320f02eae511e8abb2afbf0c8c6b81951210b7beadb4d6061e83e2b98d136ec53259d8d952956e576ca275004ee18fd71e2c71818b6a8f96b230ce917bb

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+v1.5.0 (2016-04-04)
+-------------------
+
+Added automatic putty .ppk file generation [GH-20]

data/Gemfile

@@ -1,3 +1,9 @@
 source "http://rubygems.org"
 
-gemspec
+group :development do
+  gem "vagrant", git: "https://github.com/mitchellh/vagrant.git"
+end
+
+group :plugins do
+  gem "vagrant-multi-putty", path: "."
+end

data/README.md

@@ -21,32 +21,14 @@ Download the putty executable for your platform and add it's location to your
 PATH environment variable. Seek your operating system manual for instructions
 on how to modify your PATH variable.
 
-### SSH Private Key conversion using PuTTYgen
-Download: http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html
-
-Putty uses a custom format for SSH keys. It does not support openssl keys
-directly. Using PuTTYgen, you can convert the private key shipped with vagrant
-or convert a private key of your own.
-
-#### Steps for converting the shipped insecure private key
- 1. Open puttygen and click the Conversions -> Import Key menu option.
- 2. Select the insecure_private_key located at ~/.vagrant.d/insecure_private_key
- 3. Click the "Save private key" button and store the key right along side the
-    insecure key.
- 4. Answer yes when prompted to save without a password.
- 5. Save the key using the filename of "insecure_private_key.ppk".
-
-If you do not explicity set the `config.putty.private_key_path`
-variable, you need to convert the insecure_private_key and store it
-with a ".ppk" extension. The vagrant-multi-putty plugin appends this
-extension automatically.
+### SSH Private Key conversion
+SSH keys will be automatically converted to the ppk format used by putty.
 
 As of Vagrant 1.4.0, the `config.ssh.private_key_path` variable is converted into
 an array. This allows multiple SSH keys to be passed to ssh. PuTTY does not
 allow for a list of ssh keys via the command line. Therefore, if the
 `config.putty.private_key_path` variable is not set, we attempt to use the first
-key in the `config.ssh.private_key_path` list and append the '.ppk' extension
-to it.
+key in the `config.ssh.private_key_path` list.
 
 ## Configuration
 Most of the ssh configuration options used to control vagrant ssh also
@@ -55,7 +37,6 @@ vagrant-multi-putty:
 
 *    `config.ssh.max_tries`
 *    `config.ssh.timeout`
-*    `config.ssh.private_key_path`
 *    `config.ssh.shell`
 
 All other config.ssh options should work for vagrant-multi-putty just like they
@@ -66,7 +47,8 @@ There are currently a few additional configuration parameters available:
 *    `config.putty.username`: Overrides the username set with
     ` config.ssh.username`.
 *    `config.putty.private_key_path`: Used to explicity set the path to the
-     private key variable.
+     private key variable. When set to `:agent`, no private key file is supplied
+     and PuTTY will try private keys loaded by Pageant.
 *    `config.putty.modal`: change vagrant-multi-putty to use modal window mode.
      Execute putty and block the terminal until all putty processes have exited.
      Can be set on the command line with `-m` or `--modal`. This is false by default.

data/lib/vagrant-multi-putty/command.rb

@@ -1,6 +1,10 @@
 # Pieces of this plugin were taken from the bundled vagrant ssh plugin.
 require 'rubygems'
+require 'openssl'
 require 'optparse'
+require 'putty/key'
+
+using PuTTY::Key
 
 module VagrantMultiPutty
   class Command < Vagrant.plugin(2, :command)
@@ -87,9 +91,10 @@ module VagrantMultiPutty
       # so we default to choosing the first default key if it is not
       # explicitly set.
       private_key = vm.config.putty.private_key_path ||
-        ssh_info[:private_key_path][0] + ".ppk"
+        get_putty_key_file(ssh_info[:private_key_path][0])
       @logger.debug("Putty Private Keys: #{private_key.to_s}")
-      ssh_options += ["-i", private_key] unless options[:plain_auth]
+      ssh_options += ["-i", private_key] unless
+        options[:plain_auth] || private_key == :agent
 
       # Add in additional args from the command line.
       ssh_options.concat(args) if !args.nil?
@@ -100,5 +105,18 @@ module VagrantMultiPutty
       @logger.debug("Putty Child Pid: #{pid}")
       Process.detach(pid)
     end
+    
+    private
+    
+    def get_putty_key_file(ssh_key_path)
+      "#{ssh_key_path}.ppk".tap do |ppk_path|
+        if !File.exist?(ppk_path) || File.mtime(ssh_key_path) > File.mtime(ppk_path)
+          ssh_key = OpenSSL::PKey.read(File.read(ssh_key_path, mode: 'rb'))
+          ppk = ssh_key.to_ppk
+          ppk.comment = "Converted by vagrant-multi-putty at #{Time.now}"
+          ppk.save(ppk_path)
+        end
+      end
+    end
   end
 end

data/lib/vagrant-multi-putty/version.rb

@@ -1,3 +1,3 @@
 module VagrantMultiPutty
-  VERSION = "1.4.4"
+  VERSION = "1.5.0"
 end

data/vagrant-multi-putty.gemspec

@@ -11,8 +11,11 @@ Gem::Specification.new do |s|
   s.summary     = "Vagrant plugin to allow VM ssh with PuTTY (multi-vm supported)"
   s.description = "Vagrant plugin to allow VM ssh with PuTTY (multi-vm supported)"
 
+  s.required_ruby_version = ">= 2.1.0"
   s.required_rubygems_version = ">= 1.4.0"
 
   s.files        = `git ls-files`.split("\n")
   s.require_path = 'lib'
+  
+  s.add_runtime_dependency "putty-key", "~> 1.0"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-multi-putty
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.5.0
 platform: ruby
 authors:
 - Nick Downs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
-dependencies: []
+date: 2016-04-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: putty-key
+  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: Vagrant plugin to allow VM ssh with PuTTY (multi-vm supported)
 email:
 - nickryand@gmail.com
@@ -17,7 +31,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -38,17 +53,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.4.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Vagrant plugin to allow VM ssh with PuTTY (multi-vm supported)