net-ssh 3.0.1 → 3.0.2.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95e458a7ed58017d4658db4ac2b3126a0f09d43f
-  data.tar.gz: 1840e7ee533d79e4a42bb2e42cd1c3d6e31da5f8
+  metadata.gz: 93524ab10733902b604b76acc36193d8bcf4ca1b
+  data.tar.gz: 88e5c681181e9011458adb039bc2853b4f31310b
 SHA512:
-  metadata.gz: 1906d2443742af07de4b8dad4b7c3f85cde768f703f4e445f0cbd249311febd8e9e33d276b37d90af4119d702b6dc5d4a7b7cc3e9b581b63444dd87d7141732c
-  data.tar.gz: edefc22e10946ea02716b0665c83f1d99ebc2db02f26c36f42dcc2e310dbb33052f749eb20f2726cbd361be007954d831f6740c37da8c43280472112ccdb2e3e
+  metadata.gz: afbd93ffc5d6ce03bdd1e4a311baf4b7341ab46d0048fe165c32ab7d6de403c6070ae9d5be78cd7ebbebf71d0dd03cc42ab2b2602f453c013cba92ece19c87db
+  data.tar.gz: 0a1f1f8cdd3abc441295acba9ff48b7149bd7625aa9d0fa53a505c62b697d87b8661ca02324047b2fbc348b02f5039bd0b9e8239413de708edfa6ae9c5e8228b

checksums.yaml.gz.sig

@@ -1 +1 @@
-H��.�m18�zmGq-��v"�Gn+�b�N���������B����޿�&�pZ�D�)f$[��Nܹ�#tւ�n�A�S�y���x�A��@5��b�g�ן�D�H��4�WT�`@��L~��]|�ە"�&>�P���E�y�H��Wشl{:�!�=W`��h�O��ixt����8�	�i#IG��էm�ރwW}�*�ق��[���BLI�g]t����=3 ��ۘ�yw��3D8��V���ru��6��/V��
+�?�.���$�?\��dË��(��h�Qڛ���J�s&(/�W��C1AaWͩkEF��}	�S�����������g)"��i7o	�I�ĩ�<JCY0?}��&qt"��_��+i1*`�I�ޞ�f9����ژ�X*�9��<�晚���.

data/CHANGES.txt

@@ -1,3 +1,7 @@
+* fixed rare WaitWritable error with proxy commands [Miklos Fazkas, Andre Meij]]
+* if Net::SSH.start user is nil and config has no entry we default to Etc.getlogin
+* Bugfix: CHANNEL_CLOSE was sent before draining ouput buffer #280 [Christopher F. Auston]
+
 === 3.0.1
 === 3.0.1.rc1
 

data/README.rdoc

@@ -1,4 +1,4 @@
-= Net::SSH 2.x
+= Net::SSH 3.x
 
 <em><b>Please note: this project is in maintenance mode. It is not under active development but pull requests are very much welcome. Just be sure to include tests! -- delano</b></em>
 

data/Rakefile

@@ -74,7 +74,11 @@ end
 
 require 'rake/testtask'
 Rake::TestTask.new do |t|
-  t.libs = ["lib", "test"]
+  if ENV['NET_SSH_RUN_INTEGRATION_TESTS']
+    t.libs = ["lib","test","test/integration"]
+  else
+    t.libs = ["lib", "test"]
+  end
 end
 
 Rake::TestTask.new(:'integration-test') do |t|

data/lib/net/ssh.rb

@@ -188,7 +188,10 @@ module Net
     #   password auth method
     # * :non_interactive => non interactive applications should set it to true
     #   to prefer failing a password/etc auth methods vs asking for password
-    def self.start(host, user, options={}, &block)
+    #
+    # If +user+ parameter is nil it defaults to USER from ssh_config, or
+    # local username
+    def self.start(host, user=nil, options={}, &block)
       invalid_options = options.keys - VALID_OPTIONS
       if invalid_options.any?
         raise ArgumentError, "invalid option(s): #{invalid_options.join(', ')}"
@@ -222,7 +225,7 @@ module Net
       transport = Transport::Session.new(host, options)
       auth = Authentication::Session.new(transport, options)
 
-      user = options.fetch(:user, user)
+      user = options.fetch(:user, user) || Etc.getlogin
       if auth.authenticate("ssh-connection", user, options[:password])
         connection = Connection::Session.new(transport, options)
         if block_given?

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

@@ -232,16 +232,13 @@ module Net
                 identity
               end
 
-            rescue OpenSSL::PKey::RSAError, OpenSSL::PKey::DSAError, OpenSSL::PKey::ECError => e
+            rescue OpenSSL::PKey::RSAError, OpenSSL::PKey::DSAError, OpenSSL::PKey::ECError, ArgumentError => e
               if ignore_decryption_errors
                 identity
               else
                 process_identity_loading_error(identity, e)
                 nil
               end
-            rescue ArgumentError => e
-              process_identity_loading_error(identity, e)
-              nil
             rescue Exception => e
               process_identity_loading_error(identity, e)
               nil

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 = false
+      @closing = @eof = @sent_eof = @local_closed = @remote_closed = false
     end
 
     # A shortcut for accessing properties of the channel (see #properties).
@@ -269,14 +269,28 @@ module Net; module SSH; module Connection
       connection.loop { active? }
     end
 
-    # 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.
+    # 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.
     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
@@ -285,7 +299,6 @@ 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
 
@@ -311,10 +324,16 @@ 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
+      if @eof and not @sent_eof and output.empty? and remote_id and not @local_closed
         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.closing? }
+      channels.each { |id, channel| channel.process unless channel.local_closed? }
       return false if block_given? && !yield(self)
       return true
     end
@@ -455,6 +455,14 @@ 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
@@ -583,9 +591,10 @@ module Net; module SSH; module Connection
         info { "channel_close: #{packet[:local_id]}" }
 
         channel = channels[packet[:local_id]]
+        channel.remote_closed!
         channel.close
 
-        channels.delete(packet[:local_id])
+        cleanup_channel(channel)
         channel.do_close
       end
 

data/lib/net/ssh/proxy/command.rb

@@ -79,11 +79,26 @@ module Net; module SSH; module Proxy
         end
       else
         def io.send(data, flag)
-          write_nonblock(data)
+          begin
+            result = write_nonblock(data)
+          rescue IO::WaitWritable, Errno::EINTR
+            IO.select(nil, [self])
+            retry
+          end
+          result
         end
 
         def io.recv(size)
-          read_nonblock(size)
+          begin
+            result = read_nonblock(size)
+          rescue IO::WaitReadable, Errno::EINTR
+            timeout_in_seconds = 20
+            if IO.select([self], nil, [self], timeout_in_seconds) == nil
+              raise "Unexpected spurious read wakeup"
+            end
+            retry
+          end
+          result
         end
       end
       io

data/lib/net/ssh/version.rb

@@ -51,11 +51,11 @@ module Net; module SSH
     MINOR = 0
 
     # The tiny component of this version of the Net::SSH library
-    TINY  = 1
+    TINY  = 2
 
     # The prerelease component of this version of the Net::SSH library 
     # nil allowed
-    PRE   = nil
+    PRE   = "rc1"
 
     # The current version of the Net::SSH library as a Version instance
     CURRENT = new(*[MAJOR, MINOR, TINY, PRE].compact)

data/net-ssh-public_cert.pem

@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
 MIIDODCCAiCgAwIBAgIBADANBgkqhkiG9w0BAQUFADBCMRAwDgYDVQQDDAduZXQt
 c3NoMRkwFwYKCZImiZPyLGQBGRYJc29sdXRpb3VzMRMwEQYKCZImiZPyLGQBGRYD
-Y29tMB4XDTE0MTIwMjE3MzkyMFoXDTE1MTIwMjE3MzkyMFowQjEQMA4GA1UEAwwH
+Y29tMB4XDTE1MTIwNjIxMDYyNFoXDTE2MTIwNTIxMDYyNFowQjEQMA4GA1UEAwwH
 bmV0LXNzaDEZMBcGCgmSJomT8ixkARkWCXNvbHV0aW91czETMBEGCgmSJomT8ixk
-ARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ0qnw4JV5JN
-MWelqu7pnW2z6GZJ7+zLFYJQNETJyF0U5zo7aCRK08OeUxnpu/TCCXK8iQVkNLfz
-9pVIhF+X8pMEIruAkYGwBt1aWfuSNeyodyMk0vpZdxBHbOTJ4qBRUc6qOtNOeOzv
-8ObYUX52P/EMMaeXTRU+e7MGkB9pb6FvPPNx5akxwIaoRvtcMsc/hJnQuP5r96w6
-t06MgKbXhWAX6gev0RVlrQqzxXst6iuvsrgZGjFqzob5wbTiX9M0+bFAB0EI7tJC
-sv5keEbtNRaU7p3ZbMm4wTHHJLOtD+BpUCSzwv4ToNj9mZtJBMYw2Eeo7z1DklEG
-mr95zbe+zNMCAwEAAaM5MDcwCQYDVR0TBAIwADAdBgNVHQ4EFgQU1bTfpzmitXwv
-LmTXi0IO5vd8NGYwCwYDVR0PBAQDAgSwMA0GCSqGSIb3DQEBBQUAA4IBAQA0Aps8
-UPINGa8XUUtrZtzrgX0/iyXNkKY1ld85g1N3WKEAVLfQI7TlGr0Qv2Ekx6RqlxbR
-Vyq08pytSnghW2otR3bIGMGQzqxAeRLb25cjEwH7YIJ32n7ZC1fpMnBZOBDmueWA
-B9EonmoO3ne7AJSgIvBbZzBPhzM4HrQGRW8LsPFsuj+dcJI43HOQwkmv2TRz0+t6
-mGZldmqLcK0abv4JepLfB9XTue3kuyA29NGBibqyvRwlKckLpvKfHZX6Jxad8xxm
-MbvRpzgROzyfw1qYi4dnIyMwTtXFFcZ0a2jpxHPkcTYFK6TzvFgDLAP0Y/u9jqUQ
-eZ7/3CdSi/isZHEw
+ARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMYnhNtn0f6p
+nTylB8mE8lMdoMLJC8KwpMWsvk73Pe2WVDsH/OSwwwz6oUGk1i70cJyDjIEBNpwT
+88GpVXJSumvqVsf9fCg3mWNeb5t0J+aeNm9MIvYVMTqj5tydoXQiwnILRDYHV9tZ
+1c3o59/VlahSTpZ7YEgzVufpAkvEGkbJiG849exiipK7MN/ZIkMOxYVnyRXk43Xc
+6GYlsHOfSgPwcXwW5g57DCwLQLWrjDsTka28dxDmO7B5Lv5EqzINxVxWsu43OgZG
+21Io/jIyf5PNpeKPKNGDuAQJ8mvdMYBJoDhtCwgsUYbl0BZzA7g4ytl51HtIeP+j
+Qp/eAvs/RrECAwEAAaM5MDcwCQYDVR0TBAIwADAdBgNVHQ4EFgQUBfKiwO2eM4NE
+iRrVG793qEPLYyMwCwYDVR0PBAQDAgSwMA0GCSqGSIb3DQEBBQUAA4IBAQCfZFdb
+p4jzkfIzGDbiOxd0R8sdqJoC4nMLEgnQ7dLulawwA3IXe3sHAKgA5kmH3prsKc5H
+zVmM5NlH2P1nRbegIkQTYiIod1hZQCNxdmVG/fprMqPq0ybpUOjjrP5pj0OtszE1
+F2dQia1hOEstMR+n0nAtWII9HJAEyeZjVV0s2Cl7Pt85XJ3hxFcCKwzqsK5xRI7a
+B3vwh3/JJYrFonIohQ//Lg9qTZASEkoKLlq1/hFeICoCGGIGLq45ZB7CzXLooCKi
+s/ZUKye79ELwFYKJOhjW5g725OL3hy+llhEleytwKRwgXFQBPTC4f5UkdxZVVWGH
+e2C9M1m/2odPZo8h
 -----END CERTIFICATE-----

data/net-ssh.gemspec

@@ -2,17 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: net-ssh 3.0.1 ruby lib
+# stub: net-ssh 3.0.2.rc1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "net-ssh"
-  s.version = "3.0.1"
+  s.version = "3.0.2.rc1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Jamis Buck", "Delano Mandelbaum", "Mikl\u{f3}s Fazekas"]
   s.cert_chain = ["net-ssh-public_cert.pem"]
-  s.date = "2015-09-25"
+  s.date = "2015-12-10"
   s.description = "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol. It allows you to write programs that invoke and interact with processes on remote servers, via SSH2."
   s.email = "net-ssh@solutious.com"
   s.extra_rdoc_files = [
@@ -144,14 +144,16 @@ Gem::Specification.new do |s|
     "test/integration/Vagrantfile",
     "test/integration/common.rb",
     "test/integration/playbook.yml",
+    "test/integration/test_forward.rb",
     "test/integration/test_id_rsa_keys.rb",
+    "test/integration/test_proxy.rb",
     "test/known_hosts/github",
     "test/known_hosts/github_hash",
-    "test/manual/test_forward.rb",
     "test/manual/test_pageant.rb",
     "test/start/test_connection.rb",
     "test/start/test_options.rb",
     "test/start/test_transport.rb",
+    "test/start/test_user_nil.rb",
     "test/test_all.rb",
     "test/test_buffer.rb",
     "test/test_buffered_io.rb",

data/test/README.txt

@@ -16,25 +16,3 @@ INTEGRATION TESTS
 
      brew install ansible ; ansible-galaxy install rvm_io.rvm1-ruby ; vagrant up ; vagrant ssh
      cd /net-ssh ; rake integration-test
-
-PORT FORWARDING TESTS
-
-     ruby -Ilib -Itest -rrubygems test/manual/test_forward.rb
-
-test_forward.rb must be run separately from the test suite because
-it requires authorizing your public SSH keys on you localhost.
-
-If you already have keys you can do this:
-
-     cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
-
-If you don't have keys see:
-
-     http://kimmo.suominen.com/docs/ssh/#ssh-keygen
-
-You should now be able to login to your localhost with out
-bring prompted for a password:
-
-     ssh localhost
-
--Delano

data/test/connection/test_channel.rb

@@ -74,8 +74,11 @@ module Connection
       assert !channel.closing?
 
       connection.expect { |t,packet| assert_equal CHANNEL_CLOSE, packet.type }
+      connection.expects(:cleanup_channel).with(channel)
       channel.close
 
+      channel.process
+
       assert channel.closing?
     end
 

data/test/connection/test_session.rb

@@ -117,14 +117,14 @@ module Connection
     end
 
     def test_process_should_exit_after_processing_if_block_is_true_then_false
-      session.channels[0] = stub("channel", :closing? => false)
+      session.channels[0] = stub("channel", :local_closed? => false)
       session.channels[0].expects(:process)
       IO.expects(:select).never
       process_times(2)
     end
 
     def test_process_should_not_process_channels_that_are_closing
-      session.channels[0] = stub("channel", :closing? => true)
+      session.channels[0] = stub("channel", :local_closed? => true)
       session.channels[0].expects(:process).never
       IO.expects(:select).never
       process_times(2)
@@ -299,8 +299,17 @@ module Connection
     end
 
     def test_channel_close_packet_should_be_routed_to_corresponding_channel_and_channel_should_be_closed_and_removed
-      channel_at(14).expects(:do_close).with()
-      session.channels[14].expects(:close).with()
+      session.channels[14] = stub("channel") do
+          # this simulates the case where we closed the channel first, sent
+          # CHANNEL_CLOSE to server and are waiting for server's response.
+          expects(:local_closed?).returns(true)
+          expects(:do_close)
+          expects(:close).with()
+          expects(:remote_closed!).with()
+          expects(:remote_closed?).with().returns(true)
+          expects(:local_id).returns(14)
+      end
+
       transport.return(CHANNEL_CLOSE, :long, 14)
       process_times(2)
       assert session.channels.empty?
@@ -526,7 +535,7 @@ module Connection
       end
 
       def channel_at(local_id)
-        session.channels[local_id] = stub("channel", :process => true, :closing? => false)
+        session.channels[local_id] = stub("channel", :process => true, :local_closed? => false)
       end
 
       def transport(options={})

data/test/integration/README.txt

@@ -8,10 +8,8 @@ Requirements:
 Setup:
 
     ansible-galaxy install rvm_io.rvm1-ruby
-    vagrant up
-    vagrant ssh
-    cd /net-ssh
-    rake integration-test
+    vagrant up ; vagrant ssh
+    rake test
 
 # TODO
 

data/test/integration/common.rb

@@ -14,6 +14,12 @@ module IntegrationTestHelpers
     raise "Command: #{command} failed:#{status.exitstatus}" unless res
   end
 
+  def tmpdir(&block)
+    Dir.mktmpdir do |dir|
+      yield(dir)
+    end
+  end
+
   def set_authorized_key(user,pubkey)
     authorized_key = "/home/#{user}/.ssh/authorized_keys"
     sh "sudo cp #{pubkey} #{authorized_key}"

data/test/integration/playbook.yml

@@ -34,6 +34,14 @@
     - name: sshd debug
       lineinfile: dest='/etc/ssh/sshd_config' line='LogLevel DEBUG' regexp=LogLevel
       notify: restart sshd
+    - name: put NET_SSH_RUN_INTEGRATION_TESTS=YES environment
+      lineinfile: dest='/etc/environment' line='NET_SSH_RUN_INTEGRATION_TESTS=YES'
+    - name: change dir in bashrc
+      lineinfile: dest=/home/vagrant/.bashrc owner=vagrant mode=0644
+        regexp='^cd ' line='cd /net-ssh'
+    - apt: name="{{item}}" state=present
+      with_items:
+        - pv
     - gem: name="{{item}}" state=present executable=/usr/local/rvm/rubies/ruby-{{ruby_version}}/bin/gem
       with_items:
         - byebug