net-ssh 2.0.8 → 2.0.9

data/CHANGELOG.rdoc

@@ -1,3 +1,16 @@
+=== 2.0.9 / 1 Feb 2009
+
+* Specifying non-nil user argument overrides user in .ssh/config [Jamis Buck]
+
+* Ignore requests for non-existent channels (workaround ssh server bug) [Jamis Buck]
+
+* Add terminate! method for hard shutdown scenarios [Jamis Buck]
+
+* Revert to pre-2.0.7 key-loading behavior by default, but load private-key if public-key doesn't exist [Jamis Buck]
+
+* Make sure :passphrase option gets passed to key manager [Bob Cotton]
+
+
 === 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]

data/lib/net/ssh.rb

@@ -159,6 +159,7 @@ module Net
         else Array(options[:config])
         end
       
+      options[:user] = user if user
       options = Net::SSH::Config.for(host, files).merge(options)
       host = options.fetch(:host_name, host)
 
@@ -196,4 +197,4 @@ module Net
       end
     end
   end
-end
+end

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

@@ -88,14 +88,23 @@ module Net
           end
           
           key_files.each do |file|
-            if File.readable?(file)
+            public_key_file = file + ".pub"
+            if File.readable?(public_key_file)
               begin
-                private_key = KeyFactory.load_private_key(file)
-                key = private_key.send :public_key
+                key = KeyFactory.load_public_key(public_key_file)
                 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})" }
+                error { "could not load public key file `#{public_key_file}': #{e.class} (#{e.message})" }
+              end
+            elsif File.readable?(file)
+              begin
+                private_key = KeyFactory.load_private_key(file, options[:passphrase])
+                key = private_key.send(:public_key)
+                known_identities[key] = { :from => :file, :file => file, :key => private_key }
+                yield key
+              rescue Exception => e
+                error { "could not load private key file `#{file}': #{e.class} (#{e.message})" }
               end
             end
           end

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

@@ -46,6 +46,16 @@ module Net; module SSH; module Connection
     # The list of callbacks for pending requests. See #send_global_request.
     attr_reader :pending_requests #:nodoc:
 
+    class NilChannel
+      def initialize(session)
+        @session = session
+      end
+
+      def method_missing(sym, *args)
+        @session.lwarn { "ignoring request #{sym.inspect} for non-existent (closed?) channel; probably ssh server bug" }
+      end
+    end
+
     # Create a new connection service instance atop the given transport
     # layer. Initializes the listeners to be only the underlying socket object.
     def initialize(transport, options={})
@@ -55,7 +65,7 @@ module Net; module SSH; module Connection
       @options = options
 
       @channel_id_counter = -1
-      @channels = {}
+      @channels = Hash.new(NilChannel.new(self))
       @listeners = { transport.socket => nil }
       @pending_requests = []
       @channel_open_handlers = {}
@@ -100,6 +110,14 @@ module Net; module SSH; module Connection
       transport.close
     end
 
+    # Performs a "hard" shutdown of the connection. In general, this should
+    # never be done, but it might be necessary (in a rescue clause, for instance,
+    # when the connection needs to close but you don't know the status of the
+    # underlying protocol's state).
+    def shutdown!
+      transport.shutdown!
+    end
+
     # preserve a reference to Kernel#loop
     alias :loop_forever :loop
 
@@ -575,4 +593,4 @@ module Net; module SSH; module Connection
       end
   end
 
-end; end; end
+end; end; end

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

@@ -104,6 +104,15 @@ module Net; module SSH; module Transport
       socket.close
     end
 
+    # Performs a "hard" shutdown of the connection. In general, this should
+    # never be done, but it might be necessary (in a rescue clause, for instance,
+    # when the connection needs to close but you don't know the status of the
+    # underlying protocol's state).
+    def shutdown!
+      error { "forcing connection closed" }
+      socket.close
+    end
+
     # Returns a new service_request packet for the given service name, ready
     # for sending to the server.
     def service_request(service)
@@ -264,4 +273,4 @@ module Net; module SSH; module Transport
         end
       end
   end
-end; end; end
+end; end; 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  = 8
+    TINY  = 9
 
     # The current version of the Net::SSH library as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

data/net-ssh.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name = %q{net-ssh}
-  s.version = "2.0.8"
+  s.version = "2.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jamis Buck"]
-  s.date = %q{2008-12-29}
+  s.date = %q{2009-02-01}
   s.description = %q{a pure-Ruby implementation of the SSH2 client protocol}
   s.email = %q{jamis@jamisbuck.org}
   s.extra_rdoc_files = ["CHANGELOG.rdoc", "lib/net/ssh/authentication/agent.rb", "lib/net/ssh/authentication/constants.rb", "lib/net/ssh/authentication/key_manager.rb", "lib/net/ssh/authentication/methods/abstract.rb", "lib/net/ssh/authentication/methods/hostbased.rb", "lib/net/ssh/authentication/methods/keyboard_interactive.rb", "lib/net/ssh/authentication/methods/password.rb", "lib/net/ssh/authentication/methods/publickey.rb", "lib/net/ssh/authentication/pageant.rb", "lib/net/ssh/authentication/session.rb", "lib/net/ssh/buffer.rb", "lib/net/ssh/buffered_io.rb", "lib/net/ssh/config.rb", "lib/net/ssh/connection/channel.rb", "lib/net/ssh/connection/constants.rb", "lib/net/ssh/connection/session.rb", "lib/net/ssh/connection/term.rb", "lib/net/ssh/errors.rb", "lib/net/ssh/key_factory.rb", "lib/net/ssh/known_hosts.rb", "lib/net/ssh/loggable.rb", "lib/net/ssh/packet.rb", "lib/net/ssh/prompt.rb", "lib/net/ssh/proxy/errors.rb", "lib/net/ssh/proxy/http.rb", "lib/net/ssh/proxy/socks4.rb", "lib/net/ssh/proxy/socks5.rb", "lib/net/ssh/ruby_compat.rb", "lib/net/ssh/service/forward.rb", "lib/net/ssh/test/channel.rb", "lib/net/ssh/test/extensions.rb", "lib/net/ssh/test/kex.rb", "lib/net/ssh/test/local_packet.rb", "lib/net/ssh/test/packet.rb", "lib/net/ssh/test/remote_packet.rb", "lib/net/ssh/test/script.rb", "lib/net/ssh/test/socket.rb", "lib/net/ssh/test.rb", "lib/net/ssh/transport/algorithms.rb", "lib/net/ssh/transport/cipher_factory.rb", "lib/net/ssh/transport/constants.rb", "lib/net/ssh/transport/hmac/abstract.rb", "lib/net/ssh/transport/hmac/md5.rb", "lib/net/ssh/transport/hmac/md5_96.rb", "lib/net/ssh/transport/hmac/none.rb", "lib/net/ssh/transport/hmac/sha1.rb", "lib/net/ssh/transport/hmac/sha1_96.rb", "lib/net/ssh/transport/hmac.rb", "lib/net/ssh/transport/identity_cipher.rb", "lib/net/ssh/transport/kex/diffie_hellman_group1_sha1.rb", "lib/net/ssh/transport/kex/diffie_hellman_group_exchange_sha1.rb", "lib/net/ssh/transport/kex.rb", "lib/net/ssh/transport/openssl.rb", "lib/net/ssh/transport/packet_stream.rb", "lib/net/ssh/transport/server_version.rb", "lib/net/ssh/transport/session.rb", "lib/net/ssh/transport/state.rb", "lib/net/ssh/verifiers/lenient.rb", "lib/net/ssh/verifiers/null.rb", "lib/net/ssh/verifiers/strict.rb", "lib/net/ssh/version.rb", "lib/net/ssh.rb", "README.rdoc", "THANKS.rdoc"]

data/test/authentication/test_key_manager.rb

@@ -41,8 +41,8 @@ module Authentication
       assert_equal rsa.to_blob, identities.first.to_blob
       assert_equal dsa.to_blob, identities.last.to_blob
       
-      assert_equal({:from => :file, :file => "/first"}, manager.known_identities[rsa])
-      assert_equal({:from => :file, :file => "/second"}, manager.known_identities[dsa])
+      assert_equal({:from => :file, :file => "/first", :key => rsa}, manager.known_identities[rsa])
+      assert_equal({:from => :file, :file => "/second", :key => dsa}, manager.known_identities[dsa])
     end
 
     def test_identities_should_load_from_agent
@@ -78,7 +78,8 @@ module Authentication
 
       def stub_file_key(name, key, also_private=false)
         manager.add(name)
-        File.expects(:readable?).returns(true)
+        File.expects(:readable?).with(name).returns(true)
+        File.expects(:readable?).with(name + ".pub").returns(false)
         Net::SSH::KeyFactory.expects(:load_private_key).with(name, nil).returns(key).at_least_once
         key.expects(:public_key).returns(key)
       end

data/test/connection/test_session.rb

@@ -257,6 +257,11 @@ module Connection
       process_times(2)
     end
 
+    def test_channel_request_for_nonexistant_channel_should_be_ignored
+      transport.return(CHANNEL_REQUEST, :long, 14, :string, "testing", :bool, false)
+      assert_nothing_raised { process_times(2) }
+    end
+
     def test_channel_request_packet_should_be_routed_to_corresponding_channel
       channel_at(14).expects(:do_request).with("testing", false, Net::SSH::Buffer.new)
       transport.return(CHANNEL_REQUEST, :long, 14, :string, "testing", :bool, false)
@@ -480,4 +485,4 @@ module Connection
       end
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: net-ssh
 version: !ruby/object:Gem::Version 
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors: 
 - Jamis Buck
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-29 00:00:00 -07:00
+date: 2009-02-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency