sshkeyauth 0.0.4 → 0.0.5

data/lib/ssh/key/helper.rb

@@ -1,5 +1,8 @@
 require "net/ssh"
 
+module SSH; module Key; class KeyNotFound < StandardError
+end; end; end
+
 module SSH; module Key; module Helper
   # Add a private key to this signer.
   def add_key_file(path, passphrase=nil)
@@ -9,7 +12,11 @@ module SSH; module Key; module Helper
 
   # Add a public key from your known_hosts file
   def add_key_from_host(hostname)
-    hostkey = %x{ssh-keygen -F #{identity}}.split("\n")[1].chomp.split(" ",2)[-1]
+    hostkey = %x{ssh-keygen -F "#{hostname}"}.split("\n")[1].chomp.split(" ",2)[-1] rescue nil
+    if hostkey == nil
+      raise SSH::Key::KeyNotFound.new("Could not find host key '#{hostname}' " \
+                                       "in known_hosts (using ssh-keygen -F)")
+    end
     @keys << Net::SSH::KeyFactory.load_data_public_key(hostkey)
   end
 

data/lib/ssh/key/verifier.rb

@@ -163,7 +163,7 @@ module SSH; module Key; class Verifier
     end
 
     # If relative path, use the homedir.
-    if authorized_keys_file[0] != "/" 
+    if authorized_keys_file.start_with?("/")
       if account_info == nil
         @logger.warn("No homedirectory for #{@account} and authorized_keys path is relative, skipping authorized_keys")
         return nil

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-10 00:00:00 -07:00
+date: 2010-10-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency