net-ssh 2.9.4 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7f14fbfcfd32cc75f187e18b727926b727993ec
-  data.tar.gz: 5aba78f7570373c5cbb0b441b620ade113c356d5
+  metadata.gz: 95e458a7ed58017d4658db4ac2b3126a0f09d43f
+  data.tar.gz: 1840e7ee533d79e4a42bb2e42cd1c3d6e31da5f8
 SHA512:
-  metadata.gz: 0f9f618270c98f579a6cb999fab3b4d1d58c38e200db68931c911cd8055a3e8cc51d1a84246de80889a5dabb1c138af5607d955766143d9a512ea5f2f6b95fc5
-  data.tar.gz: 5628810355c03a737accd6fae7225287183397edcce63b14a090caec1f3722455f6c98b76d4b4d5b11f19515ebe0f6ef3a78b37b4ef4fcd2ce4c8a868c786574
+  metadata.gz: 1906d2443742af07de4b8dad4b7c3f85cde768f703f4e445f0cbd249311febd8e9e33d276b37d90af4119d702b6dc5d4a7b7cc3e9b581b63444dd87d7141732c
+  data.tar.gz: edefc22e10946ea02716b0665c83f1d99ebc2db02f26c36f42dcc2e310dbb33052f749eb20f2726cbd361be007954d831f6740c37da8c43280472112ccdb2e3e

data/.travis.yml

@@ -1,10 +1,18 @@
 language: ruby
+sudo: false
 rvm:
-  - "1.9.3"
-  - "2.0.0"
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - 2.2.0
+  - jruby-head
+  - jruby-19mode
+  - rbx-2
 
-
-install: gem install jeweler test-unit mocha
+install: gem install test-unit mocha
 
 script: rake test
 
+matrix:
+  allow_failures:
+    - rvm: jruby-head

data/CHANGES.txt

@@ -1,10 +1,48 @@
-=== 2.9.4-rc1
+=== 3.0.1
+=== 3.0.1.rc1
 
-* Bugfix: CHANNEL_CLOSE was sent before draining ouput buffer #280 [Christopher F. Auston]
+* Breaking change from 2.* series: exec! without block now returns empty string instread of nil if command has no output [https://github.com/net-ssh/net-ssh/pull/273]
+* Support remote_user as %r in proxy commands [Dominic Scheirlinck]
+* Raise Net::SSH::ConnectionTimeout from connection timeout [Carl Hoerberg]
 
-[Note: 2.9.3 release changes went to 3.0, 2.9.4 is backport of fix form 3.0]
+=== 3.0.0.rc1
+
+* SemVer: Major version change because of dropping of ruby 1.9
+
+=== 2.10.1.rc2
+
+* Win: Use fiddle on ruby 2.1 too [Charlie Savage]
+
+=== 2.10.1.rc1
+
+* Added ruby 2.0 requirement to gemspec [Alex Schultz]
+
+=== 2.10.0
+
+=== 2.10.0-beta2
+
+* Fix :passphrase option with :non_interactive [Jeremy Stanley]
+* Use Socket.tcp with connect_timeout instead of Timeout::timeout [Carl Hörberg]
+* Support for hostname hashes [Jef Mathiot]
+* Ruby 1.9.3 is no longer supported but should moslty work expect for stuff like connect_timeout
+
+=== 2.10.0-beta1
+
+* Fix could not parse PKey error. [Andrey Voronkov]
+* Workaround for threading issue in MRI + singleton method declaration [Matt Brictson]
+* Configuration change: we no longer append all supported algorithms, this is so you can exclude insecure algorithms. If you want to use the old behaviour specify append_all_supported_algorithms => true [voidus, mfazekas]
+* New configuration option: :non_interactive => true in case you prefer an authmethod to fail rather than prompt. [mfazekas]
+* Configuration change: password will now ask for password up to the :number_of_password_prompts times. If you want the
+2.9.1 behaviour of never asking password please set number_of_password_prompts to 0.
+
+=== 2.9.4-beta1
+
+* Use sysread and syswrite on Windows instead of read_nonblock and write [marc-etienne]
+* Windows/peagant: use fiddle on ruby 2.2+/windows [Charlie Savage]
+* Check if ssh key is a file [kiela]
+
+=== 2.9.3
 
-=== 2.9.2
 === 2.9.2-rc3
 
 * Remove advertised algorithms that were not working (curve25519-sha256@libssh.org) [mfazekas]
@@ -21,7 +59,7 @@
 
 * Remove advertised algorithms that were not working (ssh-rsa-cert-* *ed25519 acm*-gcm@openssh.com) [mfazekas]
 * Unkown algorithms now ignored instead of failed [mfazekas]
-* Asks for password with password auth (up to number_of_password_prompts) [mfazekas]
+* Configuration change: Asks for password with password auth (up to number_of_password_prompts) [mfazekas]
 * Removed warnings [amatsuda]
 
 === 2.9.1 / 13 May 2014

data/README.rdoc

@@ -32,6 +32,7 @@ In a nutshell:
   Net::SSH.start('host', 'user', :password => "password") do |ssh|
     # capture all stderr and stdout output from a remote process
     output = ssh.exec!("hostname")
+    puts output
 
     # capture only stdout matching a particular pattern
     stdout = ""
@@ -101,8 +102,8 @@ However, in order to be sure the code you're installing hasn't been tampered wit
 
     # Add the public key as a trusted certificate
     # (You only need to do this once)
-    $ curl -O https://raw.github.com/net-ssh/net-ssh/master/gem-public_cert.pem
-    $ gem cert --add gem-public_cert.pem
+    $ curl -O https://raw.githubusercontent.com/net-ssh/net-ssh/master/net-ssh-public_cert.pem
+    $ gem cert --add net-ssh-public_cert.pem
 
 Then, when install the gem, do so with high security:
 
@@ -110,47 +111,11 @@ Then, when install the gem, do so with high security:
 
 If you don't add the public key, you'll see an error like "Couldn't verify data signature". If you're still having trouble let me know and I'll give you a hand.
 
-== RUBY 1.8 SUPPORT
-
-net-ssh supports Ruby 1.8.x up until the 2.5.1 release. Later releases will work but the test suite is no longer guaranteed to pass all tests.
-
-== JRUBY 1.6
-
-There is an issue with jruby-openssl that produces the following error in jruby 1.6:
-
-    <ArgumentError> wrong number of arguments (2 for 1)
-    /home/offers/tracking/shared/bundle/jruby/1.8/gems/net-ssh-2.6.0/lib/net/ssh/key_factory.rb:77:in `load_data_private_key'
-
-You can downgrade jruby-openssl to version 0.7.4 (before they added the PKey.read method) to resolve it or upgrade jruby to 1.7. See issue #61 for more info: https://github.com/net-ssh/net-ssh/issues/61.
-
-
-== ARCFOUR SUPPORT:
-
-from Karl Varga:
-
-Ruby's OpenSSL bindings always return a key length of 16 for RC4 ciphers, which means that when we try to use ARCFOUR256 or higher, Net::SSH generates keys which are consistently too short - 16 bytes as opposed to 32 bytes - resulting in the following error:
-
-    OpenSSL::CipherError: key length too short
-
-My patch simply instructs Net::SSH to build keys of the the proper length, regardless of the required key length reported by OpenSSL.
-
-You should also be aware that your OpenSSL C libraries may also contain this bug.  I've updated to 0.9.8k, but according to this thread[https://bugzilla.mindrot.org/show_bug.cgi?id=1291], the bug existed as recently as 0.9.8e!  I've manually taken a look at my header files and they look ok, which is what makes me think it's a bug in the Ruby implementation.
-
-To see your OpenSSL version:
-
-    $ openssl version
-    OpenSSL 0.9.8k 25 Mar 2009
-
-After installing this gem, verify that Net::SSH is generating keys of the correct length by running the script <tt>support/arcfour_check.rb</tt>:
-
-    $ ruby arcfour_support.rb
-
-which should produce the following:
-
-    arcfour128: [16, 8] OpenSSL::Cipher::Cipher
-    arcfour256: [32, 8] OpenSSL::Cipher::Cipher
-    arcfour512: [64, 8] OpenSSL::Cipher::Cipher
+== RUBY 1.x SUPPORT
 
+* Ruby 1.8.x is supported up until the net-ssh 2.5.1 release.
+* Ruby 1.9.x is supported up until the net-ssh 2.9.x release.
+* Current net-ssh releases require Ruby 2.0 or later.
 
 == RUNNING TESTS
 
@@ -162,14 +127,7 @@ Run a single test file like this:
 
      ruby -Ilib -Itest -rrubygems test/transport/test_server_version.rb
 
-
-=== EXPECTED RESULTS
-
-* Ruby 1.8: all tests pass
-
-* Ruby 1.9: all tests pass
-
-* JRuby 1.5: 99% tests pass (448 tests, 1846 assertions, 1 failures)
+To run integration tests see test/integration/README.txt
 
 === BUILDING GEM
 

data/Rakefile

@@ -8,6 +8,7 @@
 require "rubygems"
 require "rake"
 require "rake/clean"
+if RUBY_VERSION >= '1.9.0'
 require "rdoc/task"
 
 task :default => ["build"]
@@ -29,6 +30,7 @@ begin
     s.email = "net-ssh@solutious.com"
     s.homepage = "https://github.com/net-ssh/net-ssh"
     s.authors = ["Jamis Buck", "Delano Mandelbaum", "Miklós Fazekas"]
+    s.required_ruby_version = '>= 2.0'
 
     # Note: this is run at package time not install time so if you are
     # running on jruby, you need to install jruby-pageant manually.
@@ -55,11 +57,6 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-require 'rake/testtask'
-Rake::TestTask.new do |t|
-  t.libs = ["lib", "test"]
-end
-
 extra_files = %w[LICENSE.txt THANKS.txt CHANGES.txt ]
 RDoc::Task.new do |rdoc|
   rdoc.rdoc_dir = "rdoc"
@@ -73,3 +70,14 @@ RDoc::Task.new do |rdoc|
     rdoc.rdoc_files.include(file) if File.exists?(file)
   }
 end
+end
+
+require 'rake/testtask'
+Rake::TestTask.new do |t|
+  t.libs = ["lib", "test"]
+end
+
+Rake::TestTask.new(:'integration-test') do |t|
+  t.libs = ["lib", "test/integration"]
+  t.pattern = 'test/integration/test_*.rb'
+end

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

@@ -98,7 +98,7 @@ module Net
         def each_identity
           prepared_identities = prepare_identities_from_files + prepare_identities_from_data
 
-          user_identities = load_identities(prepared_identities, false)
+          user_identities = load_identities(prepared_identities, false, true)
 
           if agent
             agent.identities.each do |key|
@@ -114,7 +114,7 @@ module Net
             end
           end
 
-          user_identities = load_identities(user_identities, true)
+          user_identities = load_identities(user_identities, !options[:non_interactive], false)
 
           user_identities.each do |identity|
             key = identity.delete(:public_key)
@@ -139,7 +139,7 @@ module Net
 
           if info[:key].nil? && info[:from] == :file
             begin
-              info[:key] = KeyFactory.load_private_key(info[:file], options[:passphrase], true)
+              info[:key] = KeyFactory.load_private_key(info[:file], options[:passphrase], !options[:non_interactive])
             rescue Exception, OpenSSL::OpenSSLError => e
               raise KeyManagerError, "the given identity is known, but the private key could not be loaded: #{e.class} (#{e.message})"
             end
@@ -187,15 +187,24 @@ module Net
         # Prepares identities from user key_files for loading, preserving their order and sources.
         def prepare_identities_from_files
           key_files.map do |file|
-            public_key_file = file + ".pub"
-            if File.readable?(public_key_file)
-              { :load_from => :pubkey_file, :file => file }
-            elsif File.readable?(file)
-              { :load_from => :privkey_file, :file => file }
+            if readable_file?(file)
+              identity = {}
+              public_key_file = file + ".pub"
+              if readable_file?(public_key_file)
+                identity[:load_from] = :pubkey_file
+                identity[:pubkey_file] = public_key_file
+              else
+                identity[:load_from] = :privkey_file
+              end
+              identity.merge(privkey_file: file)
             end
           end.compact
         end
 
+        def readable_file?(path)
+          File.file?(path) && File.readable?(path)
+        end
+
         # Prepared identities from user key_data, preserving their order and sources.
         def prepare_identities_from_data
           key_data.map do |data|
@@ -203,18 +212,18 @@ module Net
           end
         end
 
-        # Load prepared identities. Private key decryption errors ignored if passphrase was not prompted.
-        def load_identities(identities, ask_passphrase)
+        # Load prepared identities. Private key decryption errors ignored if ignore_decryption_errors
+        def load_identities(identities, ask_passphrase, ignore_decryption_errors)
           identities.map do |identity|
             begin
               case identity[:load_from]
               when :pubkey_file
-                key = KeyFactory.load_public_key(identity[:file] + ".pub")
-                { :public_key => key, :from => :file, :file => identity[:file] }
+                key = KeyFactory.load_public_key(identity[:pubkey_file])
+                { :public_key => key, :from => :file, :file => identity[:privkey_file] }
               when :privkey_file
-                private_key = KeyFactory.load_private_key(identity[:file], options[:passphrase], ask_passphrase)
+                private_key = KeyFactory.load_private_key(identity[:privkey_file], options[:passphrase], ask_passphrase)
                 key = private_key.send(:public_key)
-                { :public_key => key, :from => :file, :file => identity[:file], :key => private_key }
+                { :public_key => key, :from => :file, :file => identity[:privkey_file], :key => private_key }
               when :data
                 private_key = KeyFactory.load_data_private_key(identity[:data], options[:passphrase], ask_passphrase)
                 key = private_key.send(:public_key)
@@ -224,11 +233,11 @@ module Net
               end
 
             rescue OpenSSL::PKey::RSAError, OpenSSL::PKey::DSAError, OpenSSL::PKey::ECError => e
-              if ask_passphrase
+              if ignore_decryption_errors
+                identity
+              else
                 process_identity_loading_error(identity, e)
                 nil
-              else
-                identity
               end
             rescue ArgumentError => e
               process_identity_loading_error(identity, e)
@@ -243,9 +252,9 @@ module Net
         def process_identity_loading_error(identity, e)
           case identity[:load_from]
           when :pubkey_file
-            error { "could not load public key file `#{identity[:file]}': #{e.class} (#{e.message})" }
+            error { "could not load public key file `#{identity[:pubkey_file]}': #{e.class} (#{e.message})" }
           when :privkey_file
-            error { "could not load private key file `#{identity[:file]}': #{e.class} (#{e.message})" }
+            error { "could not load private key file `#{identity[:privkey_file]}': #{e.class} (#{e.message})" }
           else
             raise e
           end

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

@@ -38,8 +38,10 @@ module Net
                 debug { "keyboard-interactive info request" }
 
                 unless password
-                  puts(name) unless name.empty?
-                  puts(instruction) unless instruction.empty?
+                  if interactive?
+                    puts(name) unless name.empty?
+                    puts(instruction) unless instruction.empty?
+                  end
                 end
 
                 _ = message.read_string # lang_tag
@@ -48,7 +50,8 @@ module Net
                 message.read_long.times do
                   text = message.read_string
                   echo = message.read_bool
-                  responses << (password || prompt(text, echo))
+                  password_to_send = password || (interactive? ? prompt(text, echo) : nil)
+                  responses << password_to_send
                 end
 
                 # if the password failed the first time around, don't try
@@ -62,8 +65,12 @@ module Net
               end
             end
           end
-        end
 
+          def interactive?
+            options = session.transport.options || {}
+            !options[:non_interactive]
+          end
+        end
       end
     end
   end

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

@@ -58,7 +58,9 @@ module Net
           end
 
           def get_max_retries
-            (session.transport.options||{})[:number_of_password_prompts] || NUMBER_OF_PASSWORD_PROMPTS
+            options = session.transport.options || {}
+            result = options[:number_of_password_prompts] || NUMBER_OF_PASSWORD_PROMPTS
+            options[:non_interactive] ? 0 : result
           end
         end
 

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

@@ -1,10 +1,20 @@
-require 'dl/import'
-
 if RUBY_VERSION < "1.9"
+  require 'dl/import'
   require 'dl/struct'
-else
+elsif RUBY_VERSION < "2.1"
+  require 'dl/import'
   require 'dl/types'
   require 'dl'
+else
+  require 'fiddle'
+  require 'fiddle/types'
+  require 'fiddle/import'
+
+  # For now map DL to Fiddler versus updating all the code below
+  module DL
+    CPtr = Fiddle::Pointer
+    RUBY_FREE = Fiddle::RUBY_FREE
+  end
 end
 
 require 'net/ssh/errors'
@@ -36,12 +46,17 @@ module Net; module SSH; module Authentication
         dlload 'advapi32'
 
         SIZEOF_DWORD = DL.sizeof('L')
-      else
+      elsif RUBY_VERSION < "2.1"
         extend DL::Importer
         dlload 'user32','kernel32', 'advapi32'
         include DL::Win32Types
 
         SIZEOF_DWORD = DL::SIZEOF_LONG
+      else
+        extend Fiddle::Importer
+        dlload 'user32','kernel32', 'advapi32'
+        include Fiddle::Win32Types
+        SIZEOF_DWORD = Fiddle::SIZEOF_LONG
       end
 
       typealias("LPCTSTR", "char *")         # From winnt.h
@@ -73,7 +88,7 @@ module Net; module SSH; module Authentication
       extern 'HANDLE CreateFileMapping(HANDLE, void *, DWORD, ' +
         'DWORD, DWORD, LPCTSTR)'
 
-      # args: hFileMappingObject, dwDesiredAccess, dwFileOffsetHigh, 
+      # args: hFileMappingObject, dwDesiredAccess, dwFileOffsetHigh,
       #           dwfileOffsetLow, dwNumberOfBytesToMap
       extern 'LPVOID MapViewOfFile(HANDLE, DWORD, DWORD, DWORD, DWORD)'
 
@@ -86,7 +101,7 @@ module Net; module SSH; module Authentication
       # args: hWnd, Msg, wParam, lParam, fuFlags, uTimeout, lpdwResult
       extern 'LRESULT SendMessageTimeout(HWND, UINT, WPARAM, LPARAM, ' +
         'UINT, UINT, PDWORD_PTR)'
-      
+
       # args: none
       extern 'DWORD GetLastError()'
 
@@ -112,8 +127,8 @@ module Net; module SSH; module Authentication
       extern 'BOOL IsValidSecurityDescriptor(LPVOID)'
 
       # Constants needed for security attribute retrieval.
-      # Specifies the access mask corresponding to the desired access 
-      # rights. 
+      # Specifies the access mask corresponding to the desired access
+      # rights.
       TOKEN_QUERY = 0x8
 
       # The value of TOKEN_USER from the TOKEN_INFORMATION_CLASS enum.
@@ -138,6 +153,9 @@ module Net; module SSH; module Authentication
                                     'LPVOID Group', 'LPVOID Sacl',
                                     'LPVOID Dacl']
 
+      # The COPYDATASTRUCT is used to send WM_COPYDATA messages
+      COPYDATASTRUCT = struct ['uintptr_t dwData', 'DWORD cbData', 'LPVOID lpData']
+
       # Compatibility for security attribute retrieval.
       if RUBY_VERSION < "1.9"
         # Alias functions to > 1.9 capitalization
@@ -198,11 +216,10 @@ module Net; module SSH; module Authentication
         raise_error_if_zero(
           Win.IsValidSecurityDescriptor(psd_information))
 
-        nLength = Win::SECURITY_ATTRIBUTES.size
-        lpSecurityDescriptor = psd_information
-        bInheritHandle = 1
-        sa = [nLength, lpSecurityDescriptor.to_i,
-              bInheritHandle].pack("LLC")
+        sa = Win::SECURITY_ATTRIBUTES.new(malloc_ptr(Win::SECURITY_ATTRIBUTES.size))
+        sa.nLength = Win::SECURITY_ATTRIBUTES.size
+        sa.lpSecurityDescriptor = psd_information.to_i
+        sa.bInheritHandle = 1
 
         return sa
       end
@@ -278,7 +295,7 @@ module Net; module SSH; module Authentication
         new
       end
 
-      # Create a new instance that communicates with the running pageant 
+      # Create a new instance that communicates with the running pageant
       # instance. If no such instance is running, this will cause an error.
       def initialize
         @win = Win.FindWindow("Pageant", "Pageant")
@@ -296,20 +313,20 @@ module Net; module SSH; module Authentication
       # the first.
       def send(data, *args)
         @input_buffer.append(data)
-        
+
         ret = data.length
-        
+
         while true
           return ret if @input_buffer.length < 4
           msg_length = @input_buffer.read_long + 4
           @input_buffer.reset!
-      
+
           return ret if @input_buffer.length < msg_length
           msg = @input_buffer.read!(msg_length)
           @output_buffer.append(send_query(msg))
         end
       end
-      
+
       # Reads +n+ bytes from the cached result of the last query. If +n+
       # is +nil+, returns all remaining data from the last query.
       def read(n = nil)
@@ -341,7 +358,7 @@ module Net; module SSH; module Authentication
             "Creation of file mapping failed with error: #{Win.GetLastError}"
         end
 
-        ptr = Win.MapViewOfFile(filemap, Win::FILE_MAP_WRITE, 0, 0, 
+        ptr = Win.MapViewOfFile(filemap, Win::FILE_MAP_WRITE, 0, 0,
                                 0)
 
         if ptr.nil? || ptr.null?
@@ -350,10 +367,13 @@ module Net; module SSH; module Authentication
 
         Win.set_ptr_data(ptr, query)
 
-        cds = Win.get_ptr [AGENT_COPYDATA_ID, mapname.size + 1,
-                           Win.get_cstr(mapname)].pack("LLp")
+        # using struct to achieve proper alignment and field size on 64-bit platform
+        cds = Win::COPYDATASTRUCT.new(Win.malloc_ptr(Win::COPYDATASTRUCT.size))
+        cds.dwData = AGENT_COPYDATA_ID
+        cds.cbData = mapname.size + 1
+        cds.lpData = Win.get_cstr(mapname)
         succ = Win.SendMessageTimeout(@win, Win::WM_COPYDATA, Win::NULL,
-                                      cds, Win::SMTO_NORMAL, 5000, id)
+                                      cds.to_ptr, Win::SMTO_NORMAL, 5000, id)
 
         if succ > 0
           retlen = 4 + ptr.to_s(4).unpack("N")[0]

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

@@ -126,7 +126,7 @@ module Net; module SSH; module Connection
       @pending_requests = []
       @on_open_failed = @on_data = @on_extended_data = @on_process = @on_close = @on_eof = nil
       @on_request = {}
-      @closing = @eof = @sent_eof = @local_closed = @remote_closed = false
+      @closing = @eof = @sent_eof = false
     end
 
     # A shortcut for accessing properties of the channel (see #properties).
@@ -269,28 +269,14 @@ module Net; module SSH; module Connection
       connection.loop { active? }
     end
 
-    # True if close() has been called; NOTE: if the channel has data waiting to
-    # be sent then the channel will close after all the data is sent. See
-    # closed?() to determine if we have actually sent CHANNEL_CLOSE to server.
-    # This may be true for awhile before closed? returns true if we are still
-    # sending buffered output to server.
+    # Returns true if the channel is currently closing, but not actually
+    # closed. A channel is closing when, for instance, #close has been
+    # invoked, but the server has not yet responded with a CHANNEL_CLOSE
+    # packet of its own.
     def closing?
       @closing
     end
 
-    # True if we have sent CHANNEL_CLOSE to the remote server.
-    def local_closed?
-      @local_closed
-    end
-
-    def remote_closed?
-      @remote_closed
-    end
-
-    def remote_closed!
-      @remote_closed = true
-    end
-
     # Requests that the channel be closed. If the channel is already closing,
     # this does nothing, nor does it do anything if the channel has not yet
     # been confirmed open (see #do_open_confirmation). Otherwise, it sends a
@@ -299,6 +285,7 @@ module Net; module SSH; module Connection
       return if @closing
       if remote_id
         @closing = true
+        connection.send_message(Buffer.from(:byte, CHANNEL_CLOSE, :long, remote_id))
       end
     end
 
@@ -324,16 +311,10 @@ module Net; module SSH; module Connection
       @on_process.call(self) if @on_process
       enqueue_pending_output
 
-      if @eof and not @sent_eof and output.empty? and remote_id and not @local_closed
+      if @eof and not @sent_eof and output.empty? and remote_id
         connection.send_message(Buffer.from(:byte, CHANNEL_EOF, :long, remote_id))
         @sent_eof = true
       end
-
-      if @closing and not @local_closed and output.empty? and remote_id
-        connection.send_message(Buffer.from(:byte, CHANNEL_CLOSE, :long, remote_id))
-        @local_closed = true
-        connection.cleanup_channel(self)
-      end
     end
 
     # Registers a callback to be invoked when data packets are received by the

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

@@ -220,7 +220,7 @@ module Net; module SSH; module Connection
     def preprocess
       return false if block_given? && !yield(self)
       dispatch_incoming_packets
-      channels.each { |id, channel| channel.process unless channel.local_closed? }
+      channels.each { |id, channel| channel.process unless channel.closing? }
       return false if block_given? && !yield(self)
       return true
     end
@@ -351,19 +351,21 @@ module Net; module SSH; module Connection
     end
 
     # Same as #exec, except this will block until the command finishes. Also,
-    # if a block is not given, this will return all output (stdout and stderr)
+    # if no block is given, this will return all output (stdout and stderr)
     # as a single string.
     #
     #   matches = ssh.exec!("grep something /some/files")
     def exec!(command, &block)
-      block ||= Proc.new do |ch, type, data|
+      block_or_concat = block || Proc.new do |ch, type, data|
         ch[:result] ||= ""
         ch[:result] << data
       end
 
-      channel = exec(command, &block)
+      channel = exec(command, &block_or_concat)
       channel.wait
 
+      channel[:result] ||= "" unless block
+
       return channel[:result]
     end
 
@@ -453,14 +455,6 @@ module Net; module SSH; module Connection
       old
     end
 
-    def cleanup_channel(channel)
-        if channel.local_closed? and channel.remote_closed?
-          info { "#{host} delete channel #{channel.local_id} which closed locally and remotely" }
-          channels.delete(channel.local_id)
-      end
-    end
-
-
     private
 
       # Read all pending packets from the connection and dispatch them as
@@ -589,10 +583,9 @@ module Net; module SSH; module Connection
         info { "channel_close: #{packet[:local_id]}" }
 
         channel = channels[packet[:local_id]]
-        channel.remote_closed!
         channel.close
 
-        cleanup_channel(channel)
+        channels.delete(packet[:local_id])
         channel.do_close
       end