sshkeyauth 0.0.6 → 0.0.7

data/lib/ssh/key/signer.rb

@@ -63,6 +63,8 @@ module SSH; module Key; class Signer
     return signatures
   end
 
+  # Get a list of all identities we can sign with. This will pull from your
+  # ssh-agent if enabled.
   def signing_identities
     identities = []
     if @use_agent
@@ -80,4 +82,11 @@ module SSH; module Key; class Signer
     end
     return identities
   end # def signing_identities
+
+  # Add a private key to this Signer from a file (like ".ssh/id_rsa")
+  # * path - the string path to the key
+  # * passphrase - the passphrase for this key, omit if no passphrase.
+  def add_private_key_file(path, passphrase=nil)
+    @keys << Net::SSH::KeyFactory.load_private_key(path, passphrase)
+  end # def add_private_key_file(path)
 end; end; end # class SSH::Key::Signer

data/lib/ssh/key/verifier.rb

@@ -38,9 +38,8 @@ module SSH; module Key; class Verifier
     @use_authorized_keys = true
     @sshd_config_file = "/etc/ssh/sshd_config"
     @authorized_keys_file = nil
-    #@logger = Logger.new("/tmp/verifier.log")
     @logger = Logger.new(STDERR)
-    @logger.level = Logger::WARN
+    @logger.level = $DEBUG ? Logger::DEBUG : Logger::WARN
     @keys = []
   end # def initialize
 
@@ -66,7 +65,6 @@ module SSH; module Key; class Verifier
   def verify?(signature, original)
     results = verify(signature, original)
     results.each do |identity, verified|
-      @logger.info "Trying key #{identity.to_s[0..30]}... #{verified}"
       return true if verified
     end
     return false
@@ -84,20 +82,26 @@ module SSH; module Key; class Verifier
     results = {}
 
     if signatures.is_a? Hash
+      @logger.debug("verify 'signatures' is a Hash")
       inputs = signatures.values
     elsif signatures.is_a? Array
+      @logger.debug("verify 'signatures' is an Array")
       inputs = signatures
     elsif signatures.is_a? String
+      @logger.debug("verify 'signatures' is an String")
       inputs = [signatures]
     end
 
     if inputs[0].is_a? SSH::Key::Signature
+      @logger.debug("verify 'signatures' is an array of Signatures")
       inputs = inputs.collect { |i| i.signature }
     end
 
     inputs.each do |signature|
       identities.each do |identity|
-        results[identity] = identity.ssh_do_verify(signature, original)
+        key = [signature, identity]
+        results[key] = identity.ssh_do_verify(signature, original)
+        @logger.info "Trying key #{identity.to_s.split("\n")[1]}... #{results[key]}"
       end
     end
     return results
@@ -207,6 +211,7 @@ module SSH; module Key; class Verifier
       end
 
       identity = Net::SSH::KeyFactory.load_data_public_key(line)
+
       # Add the '.comment' attribute to our key
       identity.extend(Net::SSH::Authentication::Agent::Comment)
 
@@ -222,4 +227,22 @@ module SSH; module Key; class Verifier
     end
     return keys
   end
+
+  # Add a private key to this Verifier from a file (like ".ssh/id_rsa")
+  # * path - the string path to the key
+  # * passphrase - the passphrase for this key, omit if no passphrase.
+  def add_private_key_file(path, passphrase=nil)
+    @keys << Net::SSH::KeyFactory.load_private_key(path, passphrase)
+  end # def add_private_key_file(path)
+
+  # Add a public  key to this Verifier from a file (like ".ssh/id_rsa.pub")
+  #
+  # This is for individual key files. If you want to specify an alternate
+  # location for your authorized_keys file, set:
+  #   Verifier#authorized_keys_file = "/path/to/authorized_keys"
+  #
+  # * path - the string path to the public key
+  def add_public_key_file(path)
+    @keys << Net::SSH::KeyFactory.load_public_key(path)
+  end # def add_private_key_file(path)
 end; end; end # class SSH::Key::Verifier

data/samples/client.rb

@@ -3,8 +3,8 @@
 
 require "base64"
 require "json"
-$:.unshift "../lib"
-$:.unshift "lib"
+
+$:.unshift "#{File.dirname(__FILE__)}/../lib"
 require "ssh/key/signer"
 
 def main(argv)

data/samples/server.rb

@@ -3,7 +3,8 @@
 
 require "base64"
 require "json"
-$:.unshift "../lib"
+
+$:.unshift "#{File.dirname(__FILE__)}/../lib"
 require "ssh/key/verifier"
 
 def main(argv)
@@ -13,6 +14,7 @@ def main(argv)
     input = argv
   end
   verifier = SSH::Key::Verifier.new
+  verifier.use_agent = false
 
   input.each do |line|
     data = JSON.parse(line)

metadata

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