update changelog, fix tests, and finish adding support for non-standa…

…rd ports
markolson · Feb 20, 2017 · 5ef8855 · 5ef8855
1 parent f1287d9
commit 5ef8855
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,7 @@
 * updates for rubocop errors
 * Better handling for custom ssh ports - thanks @stissot
 * handle more than one option in authorized-hosts correctly - thanks @chazzly and @rongshen-daqri
-
+* Handle hashed vs non-hashed existing keys correctly - thanks @balous
 
 ## 0.10.16
 * #58 fix deprication warning in default value of provider (thanks to @CloCkWeRX)

diff --git a/providers/known_hosts.rb b/providers/known_hosts.rb
@@ -80,9 +80,9 @@ def load_current_resource
   cmd =
     if new_resource.key.nil?
       "ssh-keygen #{new_resource.hashed ? '-H ' : ''} -F #{Shellwords.escape(matching_host)} "\
-      "-f #{new_resource.path} | grep 'Host #{matching_host} found'"
+      "-f #{new_resource.path} | grep -F 'Host #{matching_host} found'"
     else
-      "cat '#{new_resource.path}' | grep '#{new_resource.key}'"
+      "grep -F '#{new_resource.key}' '#{new_resource.path}'"
     end
 
   search = Mixlib::ShellOut.new(cmd)

diff --git a/test/cookbooks/ssh_test/recipes/known_hosts.rb b/test/cookbooks/ssh_test/recipes/known_hosts.rb
@@ -27,6 +27,7 @@
 (1..3).step do |n|
   ssh_known_hosts "altssh.bitbucket.org converge #{n}" do
     host 'altssh.bitbucket.org'
+    hashed true
     port 443
     user 'root'
     key ::TestData.bitbucket_altssh_key