Merge pull request #33 from tejaycar/master

and here are the rest of the fixes.

Author: tejaycar

.kitchen.yml

@@ -1,16 +1,30 @@
 ---
-driver_plugin: vagrant
+driver:
+  name: vagrant
+
 driver_config:
   require_chef_omnibus: true
+  box: opscode-ubuntu-12.04
+  box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box
+
+provisioner:
+  name: chef_zero
+  require_chef_omnibus: true
+  chef_omnibus_url: https://www.getchef.com/chef/install.sh
 
 platforms:
 - name: ubuntu-12.04
-  driver_config:
-    box: opscode-ubuntu-12.04
-    box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box
+  run_list:
+    - recipe[apt]
 
 suites:
-- name: default
-  run_list:
-  - recipe[minitest-handler]
-  - recipe[ssh_test]
+  - name: known_hosts
+    run_list:
+      - recipe[ssh_test::known_hosts]
+    attributes:
+      ssh_test:
+        known_hosts:
+          test_entry: 'dummy5 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCe1poC4rUN8CoW+bWfij2KvY6wYhHdZsxbhyfwUVEclCDcjf4W9Xlso3dogVYXIlqdaeB7SqXmczvsOKl51UTE6Or7G7tiffwZoe4z4J1tRX9HCi+5ZOjUeLtvu6764mpMoTpEwFekER4osXosJw29Nu6cLeM+REpyH/RMZwpb1FUEIOptdupepWh7vlvv4fu0dw1ir0t2lHuW/QCmNh9umSsIxGSOJMnwt1ohk4LKYLykHEc3RRsWZS9rPjbNmAerrdbhF8FF5dyMi+rde5dcIApDmWz3hQwIrZdB+fF5oITVXulTsyhoERQyJf/70oWSECzTuO/jRudlx870bC7b'
+  - name: config
+    run_list:
+      - recipe[ssh_test::config]

Berksfile.lock

@@ -6,6 +6,8 @@ DEPENDENCIES
     path: test/cookbooks/ssh_test
 
 GRAPH
+  apt (2.6.0)
   ssh (0.10.0)
   ssh_test (0.2.0)
+    apt (>= 0.0.0)
     ssh (>= 0.0.0)

Gemfile.lock

@@ -5,21 +5,22 @@ GEM
     ast (2.0.0)
     astrolabe (1.3.0)
       parser (>= 2.2.0.pre.3, < 3.0)
-    berkshelf (3.1.5)
+    berkshelf (3.2.1)
       addressable (~> 2.3.4)
       berkshelf-api-client (~> 1.2)
       buff-config (~> 1.0)
       buff-extensions (~> 1.0)
       buff-shell_out (~> 0.1)
-      celluloid (~> 0.16.0.pre)
-      celluloid-io (~> 0.16.0.pre)
+      celluloid (~> 0.16.0)
+      celluloid-io (~> 0.16.1)
+      cleanroom (~> 1.0)
       faraday (~> 0.9.0)
       minitar (~> 0.5.4)
       octokit (~> 3.0)
       retryable (~> 1.3.3)
       ridley (~> 4.0)
       solve (~> 1.1)
-      thor (~> 0.18)
+      thor (~> 0.19)
     berkshelf-api-client (1.2.0)
       faraday (~> 0.9.0)
     buff-config (1.0.1)
@@ -54,9 +55,9 @@ GEM
       plist (~> 3.1.0)
       pry (~> 0.9)
       rest-client (>= 1.0.4, <= 1.6.7)
-    chef-zero (2.2)
+    chef-zero (2.2.1)
+      ffi-yajl (~> 1.1)
       hashie (~> 2.0)
-      json
       mixlib-log (~> 1.3)
       rack
     chefspec (4.1.1)
@@ -65,6 +66,7 @@ GEM
       rspec (~> 3.0)
     ci_reporter (1.9.3)
       builder (>= 2.1.2)
+    cleanroom (1.0.0)
     coderay (1.1.0)
     dep-selector-libgecode (1.0.2)
     dep_selector (1.0.3)
@@ -78,9 +80,9 @@ GEM
       net-ssh
       ohai
     ffi (1.9.6)
-    ffi-yajl (1.2.0)
+    ffi-yajl (1.3.1)
       ffi (~> 1.5)
-      libyajl2 (~> 1.0)
+      libyajl2 (~> 1.2)
     foodcritic (4.0.0)
       erubis
       gherkin (~> 2.11)
@@ -103,10 +105,10 @@ GEM
       test-kitchen (>= 1.0.0)
     kitchen-vagrant (0.15.0)
       test-kitchen (~> 1.0)
-    libyajl2 (1.1.0)
+    libyajl2 (1.2.0)
     method_source (0.8.2)
     mime-types (1.25.1)
-    mini_portile (0.6.0)
+    mini_portile (0.6.1)
     minitar (0.5.4)
     minitest (4.7.5)
     minitest-chef-handler (1.0.3)
@@ -118,7 +120,7 @@ GEM
     mixlib-cli (1.5.0)
     mixlib-config (2.1.0)
     mixlib-log (1.6.0)
-    mixlib-shellout (1.6.0)
+    mixlib-shellout (1.6.1)
     multi_json (1.10.1)
     multipart-post (2.0.0)
     net-http-persistent (2.9.4)
@@ -133,10 +135,10 @@ GEM
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
     nio4r (1.0.1)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
-    octokit (3.4.0)
-      sawyer (~> 0.5.3)
+    nokogiri (1.6.5)
+      mini_portile (~> 0.6.0)
+    octokit (3.7.0)
+      sawyer (~> 0.6.0, >= 0.5.3)
     ohai (7.4.0)
       ffi (~> 1.9)
       ffi-yajl (~> 1.0)
@@ -148,7 +150,7 @@ GEM
       mixlib-shellout (~> 1.2)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
-    parser (2.2.0.pre.5)
+    parser (2.2.0.pre.8)
       ast (>= 1.1, < 3.0)
       slop (~> 3.4, >= 3.4.5)
     plist (3.1.0)
@@ -160,18 +162,18 @@ GEM
       slop (~> 3.4)
     rack (1.5.2)
     rainbow (2.0.0)
-    rake (10.3.2)
+    rake (10.4.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     retryable (1.3.6)
-    ridley (4.0.0)
+    ridley (4.1.1)
       addressable
       buff-config (~> 1.0)
       buff-extensions (~> 1.0)
       buff-ignore (~> 1.1)
       buff-shell_out (~> 0.1)
-      celluloid (~> 0.16.0.pre)
-      celluloid-io (~> 0.16.0.pre)
+      celluloid (~> 0.16.0)
+      celluloid-io (~> 0.16.1)
       erubis
       faraday (~> 0.9.0)
       hashie (>= 2.0.2, < 3.0.0)
@@ -193,16 +195,16 @@ GEM
     rspec-mocks (3.1.3)
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
-    rubocop (0.26.1)
+    rubocop (0.28.0)
       astrolabe (~> 1.3)
-      parser (>= 2.2.0.pre.4, < 3.0)
+      parser (>= 2.2.0.pre.7, < 3.0)
       powerpack (~> 0.0.6)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.6.0)
+    ruby-progressbar (1.7.0)
     rufus-lru (1.0.5)
     safe_yaml (1.0.4)
-    sawyer (0.5.5)
+    sawyer (0.6.0)
       addressable (~> 2.3.5)
       faraday (~> 0.8, < 0.10)
     semverse (1.2.1)

ROADMAP.md

@@ -13,6 +13,12 @@ v0.10.1
 ==========
 * add foodcritic support
 
+v1.0
+=========
+* Switch to MWRP using poise
+* Rename some actions and attributes
+  * known_hosts.key becomes known_hosts.entry
+THIS WILL BREAK stuff
 
 Eventually (PRs are VERY welcome)
 ===========

libraries/ssh_helpers.rb

@@ -7,6 +7,17 @@ def user_dir(username)
         pwent.dir
       end
 
+      def user_group(username)
+        gid = user_gid(username)
+        return nil unless gid
+
+        Etc.getgrgid(gid).name
+      end
+
+      def user_gid(username)
+        username ? pwent_for(username).gid : nil
+      end
+
       def pwent_for(uid)
         uid.is_a?(Fixnum) ? Etc.getpwuid(uid) : Etc.getpwnam(uid)
       end

providers/config.rb

@@ -7,12 +7,13 @@ def whyrun_supported?
 end
 
 action :add do
-  return if @new_resource.options.eql? @existing_entries[new_resource.name]
-  @existing_entries[@new_resource.name] = @new_resource.options
+  unless @new_resource.options.eql? @existing_entries[new_resource.name]
+    @existing_entries[@new_resource.name] = @new_resource.options
 
-  converge_by "Adding {@new_resource.name} to #{@path} with #{new_resource.options.inspect}" do
-    create_directory
-    create_file
+    converge_by "Adding {@new_resource.name} to #{@path} with #{new_resource.options.inspect}" do
+      create_directory
+      create_file
+    end
   end
 end
 
@@ -21,11 +22,12 @@ def whyrun_supported?
 end
 
 action :remove do
-  return unless @current_resource.exists?
-  @existing_entries.delete @new_resource.name
+  if @current_resource.exists?
+    @existing_entries.delete @new_resource.name
 
-  converge_by "Remove #{@new_resource.name} from #{@path}" do
-    create_file
+    converge_by "Remove #{@new_resource.name} from #{@path}" do
+      create_file
+    end
   end
 end
 
@@ -48,7 +50,7 @@ def create_file
 
 def load_current_resource
   @user = new_resource.user || 'root'
-  @group = new_resource.group || pwent_for(@user).gid
+  @group = new_resource.group || user_group(@user)
   @path = new_resource.path || default_or_user_path(new_resource.user)
   @existing_entries = parse_file @path
 

providers/known_hosts.rb

@@ -1,39 +1,91 @@
 require 'shellwords'
+require 'mixlib/shellout'
+
 include Chef::SSH::Helpers
 
+use_inline_resources
+
+def whyrun_supported?
+  true
+end
+
 action :add do
-  ssh_user = new_resource.user || 'root'
-  known_hosts_path = default_or_user_path(node['ssh']['known_hosts_path'], ssh_user)
-  host, port = new_resource.host.split(':')
-  # set the port to the default (22) if it wasn't already set
-  port = new_resource.port unless port
-
-  key = new_resource.key
-  if key.nil?
-    results = `ssh-keyscan #{new_resource.hashed ? '-H ' : ''} -p #{port.to_i} #{Shellwords.escape(host)}`
-    Chef::Application.fatal! results.strip if key =~ /getaddrinfo/
-    key = results.strip
-  end
+  unless @current_resource.exists?
+    directory ::File.basename(new_resource.path) do
+      action :create
+      owner  new_resource.user if new_resource.user
+      group  new_resource.group if new_resource.group
+      mode   new_resource.user ? 00700 : 00755
+    end
 
-  execute "add known_host entry for #{host}" do
-    not_if "ssh-keygen -H -F #{Shellwords.escape(host)} -f #{known_hosts_path} | grep 'Host #{host} found'"
-    command "echo '#{key}' >> #{known_hosts_path}"
-    user ssh_user
-  end
+    file new_resource.path do
+      action :create
+      mode   new_resource.user ? 00600 : 00644
+      owner  new_resource.user if new_resource.user
+      group  new_resource.group if new_resource.group
+    end
 
-  log "entry_for_#{host}_exists" do
-    message "An entry for #{host} already exists in #{known_hosts_path}."
-    level :debug
-    only_if "ssh-keygen -H -F #{Shellwords.escape(host)} -f #{known_hosts_path} | grep 'Host #{host} found'"
+    execute "add known_host entry for #{new_resource.host}" do
+      command "echo '#{new_resource.key}' >> #{new_resource.path}"
+      user    new_resource.user if new_resource.user
+      umask   new_resource.user ? 0077 : 0022
+    end
   end
 end
 
 action :remove do
-  ssh_user = new_resource.user || 'root'
-  known_hosts_path = default_or_user_path(node['ssh']['known_hosts_path'], ssh_user)
-  execute "remove known_host entry for #{new_resource.host}" do
-    command "ssh-keygen -R #{Shellwords.escape(new_resource.host)}"
-    user ssh_user
-    umask '0600'
+  if @current_resource.exists?
+    execute "remove known_host entry for #{new_resource.host}" do
+      command "ssh-keygen -R #{Shellwords.escape(new_resource.host)} -f #{new_resource.path}"
+      user    new_resource.user if new_resource.user
+      umask   new_resource.user ? 0077 : 0022
+    end
   end
 end
+
+def initialize(new_resource, run_context)
+  super(new_resource, run_context)
+
+  new_resource.path default_or_user_path(new_resource.user) unless new_resource.path
+  if new_resource.host.match(/:/)
+    host, port = new_resource.host.split(':')
+    new_resource.host host
+    new_resource.port port unless new_resource.port
+  end
+
+  new_resource.port 22 unless new_resource.port
+
+  new_resource.group user_group(new_resource.user) unless new_resource.group
+
+  load_current_resource
+  load_key_if_needed
+end
+
+def load_key_if_needed
+  return if @current_resource.exists?
+  return if new_resource.key
+  return if new_resource.action.is_a?(Array) ? new_resource.action.include?(:remove) : new_resource.action == :remove
+
+  keyscan = Mixlib::ShellOut.new(
+    "ssh-keyscan #{new_resource.hashed ? '-H ' : ''} -p #{new_resource.port.to_i} #{Shellwords.escape(new_resource.host)}"
+  )
+  keyscan.run_command
+  keyscan.error! # this will raise an error if the command failed for any reason.
+  new_resource.key keyscan.stdout.strip
+end
+
+def load_current_resource
+  search = Mixlib::ShellOut.new(
+    "ssh-keygen -H -F #{Shellwords.escape(new_resource.host)} "\
+    "-f #{new_resource.path} | grep 'Host #{new_resource.host} found'"
+  )
+  search.run_command
+  @current_resource = Chef::Resource::SshKnownHosts.new(@new_resource.name)
+  @current_resource.exists = search.status.success?
+end
+
+protected
+
+def default_or_user_path(username = nil)
+  username ? "#{user_dir(username)}/.ssh/known_hosts" : node['ssh']['known_hosts_path']
+end