net-ssh 2.2.1 → 2.2.2

data/CHANGELOG.rdoc

@@ -1,4 +1,9 @@
 
+=== 2.2.2 / 04 Jan 2012
+
+* Fixed: Connection hangs on ServerVersion.new(socket, logger) [muffl0n]
+* Avoid dying when unsupported auth mechanisms are defined [pcn]
+
 === 2.2.1 / 24 Aug 2011
 
 * Do not prompt any passphrases before trying all identities from agent. [musybite]

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

@@ -68,7 +68,12 @@ module Net; module SSH; module Authentication
           attempted << name
 
           debug { "trying #{name}" }
-          method = Methods.const_get(name.split(/\W+/).map { |p| p.capitalize }.join).new(self, :key_manager => key_manager)
+          begin 
+            method = Methods.const_get(name.split(/\W+/).map { |p| p.capitalize }.join).new(self, :key_manager => key_manager)
+          rescue NameError => ne
+            debug{"Mechanism #{name} was requested, but isn't a known type.  Ignoring it."}
+            next
+          end
 
           return true if method.authenticate(next_service, username, password)
         rescue Net::SSH::Authentication::DisallowedMethod

data/lib/net/ssh/transport/session.rb

@@ -73,7 +73,8 @@ module Net; module SSH; module Transport
 
       @host_key_verifier = select_host_key_verifier(options[:paranoid])
 
-      @server_version = ServerVersion.new(socket, logger)
+
+      @server_version = timeout(options[:timeout] || 0) { ServerVersion.new(socket, logger) }
 
       @algorithms = Algorithms.new(self, options)
       wait { algorithms.initialized? }

data/lib/net/ssh/version.rb

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

data/net-ssh.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
 	s.name = "net-ssh"
         s.rubyforge_project = 'net-ssh'
-	s.version = "2.2.1"
+	s.version = "2.2.2"
 	s.summary = "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol."
 	s.description = s.summary
 	s.authors = ["Jamis Buck", "Delano Mandelbaum"]

metadata

@@ -2,7 +2,7 @@
 name: net-ssh
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors: 
 - Jamis Buck
@@ -11,8 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-24 00:00:00 -04:00
-default_executable: 
+date: 2012-01-05 00:00:00 Z
 dependencies: []
 
 description: "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol."
@@ -141,7 +140,6 @@ files:
 - test/transport/test_server_version.rb
 - test/transport/test_session.rb
 - test/transport/test_state.rb
-has_rdoc: true
 homepage: http://github.com/net-ssh/net-ssh
 licenses: []
 
@@ -169,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: net-ssh
-rubygems_version: 1.5.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol."