net-ssh 2.0.7 → 2.0.8

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+=== 2.0.8 / 29 December 2008
+
+* Fix private key change from 2.0.7 so that keys are loaded just-in-time, avoiding unecessary prompts from encrypted keys. [Jamis Buck]
+
+
 === 2.0.7 / 29 December 2008
 
 * Make key manager use private keys instead of requiring public key to exist [arilerner@mac.com]

data/lib/net/ssh/authentication/key_manager.rb

@@ -74,17 +74,16 @@ module Net
           @agent = nil
         end
 
-        # Returns an array of identities (public keys) known to this manager.
+        # Iterates over all available identities (public keys) known to this
+        # manager. As it finds one, it will then yield it to the caller.
         # The origin of the identities may be from files on disk or from an
         # ssh-agent. Note that identities from an ssh-agent are always listed
         # first in the array, with other identities coming after.
-        def identities
-          identities = []
-
+        def each_identity
           if agent
             agent.identities.each do |key|
-              identities.push key
               known_identities[key] = { :from => :agent }
+              yield key
             end
           end
           
@@ -93,15 +92,15 @@ module Net
               begin
                 private_key = KeyFactory.load_private_key(file)
                 key = private_key.send :public_key
-                identities.push key
                 known_identities[key] = { :from => :file, :file => file }
+                yield key
               rescue Exception => e
                 error { "could not load public key file `#{file}.pub': #{e.class} (#{e.message})" }
               end
             end
           end
 
-          identities
+          self
         end
 
         # Sign the given data, using the corresponding private key of the given

data/lib/net/ssh/authentication/methods/hostbased.rb

@@ -14,7 +14,7 @@ module Net
           def authenticate(next_service, username, password=nil)
             return false unless key_manager
 
-            key_manager.identities.each do |identity|
+            key_manager.each_identity do |identity|
               return true if authenticate_with(identity, next_service,
                 username, key_manager)
             end

data/lib/net/ssh/authentication/methods/publickey.rb

@@ -16,7 +16,7 @@ module Net
           def authenticate(next_service, username, password=nil)
             return false unless key_manager
 
-            key_manager.identities.each do |identity|
+            key_manager.each_identity do |identity|
               return true if authenticate_with(identity, next_service, username)
             end
 

data/lib/net/ssh/version.rb

@@ -51,7 +51,7 @@ module Net; module SSH
     MINOR = 0
 
     # The tiny component of this version of the Net::SSH library
-    TINY  = 7
+    TINY  = 8
 
     # The current version of the Net::SSH library as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

data/net-ssh.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{net-ssh}
-  s.version = "2.0.7"
+  s.version = "2.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jamis Buck"]

data/test/authentication/methods/test_hostbased.rb

@@ -79,7 +79,11 @@ module Authentication; module Methods
       end
 
       def key_manager(options={})
-        @key_manager ||= stub("key_manager", :identities => options[:keys] || keys)
+        @key_manager ||= begin
+          manager = stub("key_manager")
+          manager.stubs(:each_identity).multiple_yields(*(options[:keys] || keys))
+          manager
+        end
       end
 
       def subject(options={})
@@ -107,4 +111,4 @@ module Authentication; module Methods
 
   end
 
-end; end
+end; end

data/test/authentication/methods/test_publickey.rb

@@ -110,7 +110,11 @@ module Authentication; module Methods
       end
 
       def key_manager(options={})
-        @key_manager ||= stub("key_manager", :identities => options[:keys] || keys)
+        @key_manager ||= begin
+          manager = stub("key_manager")
+          manager.stubs(:each_identity).multiple_yields(*(options[:keys] || keys))
+          manager
+        end
       end
 
       def subject(options={})
@@ -120,4 +124,4 @@ module Authentication; module Methods
 
   end
 
-end; end
+end; end

data/test/authentication/test_key_manager.rb

@@ -28,13 +28,15 @@ module Authentication
       assert !manager.use_agent?
     end
 
-    def test_identities_should_load_from_key_files
+    def test_each_identity_should_load_from_key_files
       manager.stubs(:agent).returns(nil)
 
       stub_file_key "/first", rsa
       stub_file_key "/second", dsa      
 
-      identities = manager.identities
+      identities = []
+      manager.each_identity { |identity| identities << identity }
+
       assert_equal 2, identities.length
       assert_equal rsa.to_blob, identities.first.to_blob
       assert_equal dsa.to_blob, identities.last.to_blob
@@ -45,7 +47,9 @@ module Authentication
 
     def test_identities_should_load_from_agent
       manager.stubs(:agent).returns(agent)
-      identities = manager.identities
+
+      identities = []
+      manager.each_identity { |identity| identities << identity }
 
       assert_equal 2, identities.length
       assert_equal rsa.to_blob, identities.first.to_blob
@@ -57,7 +61,7 @@ module Authentication
 
     def test_sign_with_agent_originated_key_should_request_signature_from_agent
       manager.stubs(:agent).returns(agent)
-      manager.identities
+      manager.each_identity { |identity| } # preload the known_identities
       agent.expects(:sign).with(rsa, "hello, world").returns("abcxyz123")
       assert_equal "abcxyz123", manager.sign(rsa, "hello, world")
     end
@@ -66,7 +70,7 @@ module Authentication
       manager.stubs(:agent).returns(nil)
       stub_file_key "/first", rsa(512), true
       rsa.expects(:ssh_do_sign).with("hello, world").returns("abcxyz123")
-      manager.identities
+      manager.each_identity { |identity| } # preload the known_identities
       assert_equal "\0\0\0\assh-rsa\0\0\0\011abcxyz123", manager.sign(rsa, "hello, world")
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: net-ssh
 version: !ruby/object:Gem::Version 
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors: 
 - Jamis Buck