net-ssh 3.0.1 → 3.0.2.rc1

data/test/integration/test_proxy.rb

@@ -0,0 +1,93 @@
+require_relative './common'
+require 'net/ssh/buffer'
+require 'net/ssh'
+require 'timeout'
+require 'tempfile'
+require 'net/ssh/proxy/command'
+
+class TestProxy < Test::Unit::TestCase
+  include IntegrationTestHelpers
+
+  def localhost
+    'localhost'
+  end
+
+  def user
+    'net_ssh_1'
+  end
+
+  def ssh_start_params(options)
+    [localhost ,user , {:keys => @key_id_rsa, :verbose => :debug}.merge(options)]
+  end
+
+  def setup_ssh_env(&block)
+    tmpdir do |dir|
+      @key_id_rsa = "#{dir}/id_rsa"
+      sh "rm -rf #{@key_id_rsa} #{@key_id_rsa}.pub"
+      sh "ssh-keygen -f #{@key_id_rsa} -t rsa -N ''"
+      set_authorized_key(user,"#{@key_id_rsa}.pub")
+      yield
+    end
+  end
+
+  def test_smoke
+    setup_ssh_env do
+      proxy = Net::SSH::Proxy::Command.new("/bin/nc localhost 22")
+      msg = 'echo123'
+      ret = Net::SSH.start(*ssh_start_params(:proxy => proxy)) do |ssh|
+        ssh.exec! "echo \"$USER:#{msg}\""
+      end
+      assert_equal "net_ssh_1:#{msg}\n", ret
+    end
+  end
+
+  def with_spurious_write_wakeup_emulate(rate=99,&block)
+    orig_io_select = Net::SSH::Compat.method(:io_select)
+    count = 0
+    Net::SSH::Compat.singleton_class.send(:define_method,:io_select) do |*params|
+      count += 1
+      if (count % rate != 0)
+        if params && params[1] && !params[1].empty?
+          return [[],params[1],[]]
+        end
+        #if params && params[0] && !params[0].empty?
+        #return [params[0],[],[]]
+        #end
+      end
+      IO.select(*params)
+    end
+    begin
+      yield
+    ensure
+      Net::SSH::Compat.singleton_class.send(:define_method,:io_select,&orig_io_select)
+    end
+  end
+
+  def test_with_rate_limit_and_spurious_wakeup
+    system("sudo sh -c 'echo 4096 > /proc/sys/fs/pipe-max-size'")
+    begin
+      setup_ssh_env do
+        proxy = Net::SSH::Proxy::Command.new("/usr/bin/pv --rate-limit 100k | /bin/nc localhost 22")
+        #proxy = Net::SSH::Proxy::Command.new("/bin/nc localhost 22")
+        begin
+          large_msg = 'echo123'*30000
+          ok = Net::SSH.start(*ssh_start_params(:proxy => proxy)) do |ssh|
+              with_spurious_write_wakeup_emulate do
+                ret = ssh.exec! "echo \"$USER:#{large_msg}\""
+                #assert_equal "net_ssh_1:#{large_msg}\n", ret
+                assert_equal "/bin/sh: Argument list too long\n", ret
+                hello_count = 1000
+                ret = ssh.exec! "ruby -e 'puts \"Hello\"*#{hello_count}'"
+                assert_equal "Hello"*hello_count+"\n", ret
+              end
+              :ok
+            end
+        end
+        assert_equal :ok, ok
+      end
+    ensure
+      system("sudo sh -c 'echo 1048576 > /proc/sys/fs/pipe-max-size'")
+    end
+  end
+
+end

data/test/start/test_user_nil.rb

@@ -0,0 +1,27 @@
+require 'common'
+require 'net/ssh'
+
+module NetSSH
+  class TestStartUserNil < Test::Unit::TestCase
+    def setup
+      @authentication_session = mock('authentication_session')
+      Net::SSH::Authentication::Session.stubs(:new).returns(@authentication_session)
+      Net::SSH::Transport::Session.stubs(:new).returns(mock('transport_session'))
+      Net::SSH::Connection::Session.stubs(:new).returns(mock('connection_session'))
+    end
+
+    def test_start_should_accept_nil_user
+      @authentication_session.stubs(:authenticate).returns(true)
+      assert_nothing_raised do
+        Net::SSH.start('localhost')
+      end
+    end
+
+    def test_start_should_use_default_user_when_nil
+      @authentication_session.stubs(:authenticate).with() {|_next_service, user, _password| user == Etc.getlogin }.returns(true)
+      assert_nothing_raised do
+        Net::SSH.start('localhost')
+      end
+    end
+  end
+end

data/test/test_all.rb

@@ -4,7 +4,7 @@ $: << '.'
 #     $ ruby -Ilib -Itest -rrubygems test/transport/test_server_version.rb
 Dir.chdir(File.dirname(__FILE__)) do
   test_files = Dir['**/test_*.rb']-['test_all.rb'] # prevent circular require
-  test_files -= Dir['integration/test_*.rb']
+  test_files -= Dir['integration/test_*.rb'] unless ENV['NET_SSH_RUN_INTEGRATION_TESTS']
   test_files = test_files.reject { |f| f =~ /^manual/ }
   test_files = test_files.select { |f| f =~ Regexp.new(ENV['ONLY']) } if ENV['ONLY']
   test_files = test_files.reject { |f| f =~ Regexp.new(ENV['EXCEPT']) } if ENV['EXCEPT']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2.rc1
 platform: ruby
 authors:
 - Jamis Buck
@@ -14,24 +14,24 @@ cert_chain:
   -----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-----
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -195,14 +195,16 @@ files:
 - 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
@@ -249,9 +251,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: net-ssh
 rubygems_version: 2.4.6

data/test/manual/test_forward.rb

@@ -1,285 +0,0 @@
-#     $ ruby -Ilib -Itest -rrubygems test/manual/test_forward.rb
-
-# Tests for the following patch:
-#
-#   http://github.com/net-ssh/net-ssh/tree/portfwfix
-#
-# It fixes 3 issues, regarding closing forwarded ports:
-#
-# 1.) if client closes a forwarded connection, but the server is reading, net-ssh terminates with IOError socket closed.
-# 2.) if client force closes (RST) a forwarded connection, but server is reading, net-ssh terminates with
-# 3.) if server closes the sending side, the on_eof is not handled.
-#
-# More info:
-#
-# http://net-ssh.lighthouseapp.com/projects/36253/tickets/7
-
-require 'common'
-require 'net/ssh/buffer'
-require 'net/ssh'
-require 'timeout'
-require 'tempfile'
-
-class TestForward < Test::Unit::TestCase
-
-  def localhost
-    'localhost'
-  end
-
-  def ssh_start_params
-    [localhost ,ENV['USER'], {:keys => "~/.ssh/id_rsa", :verbose => :debug}]
-  end
-
-  def start_server_sending_lot_of_data(exceptions)
-    server = TCPServer.open(0)
-    Thread.start do
-      loop do
-        Thread.start(server.accept) do |client|
-          begin
-            10000.times do |i|
-              client.puts "item#{i}"
-            end
-            client.close
-          rescue
-            exceptions << $!
-            raise
-          end
-        end
-      end
-    end
-    return server
-  end
-
-  def start_server_closing_soon(exceptions=nil)
-    server = TCPServer.open(0)
-    Thread.start do
-      loop do
-        Thread.start(server.accept) do |client|
-          begin
-            client.recv(1024)
-            client.setsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER, [1, 0].pack("ii"))
-            client.close
-          rescue
-            exceptions <<  $!
-            raise
-          end
-        end
-      end
-    end
-    return server
-  end
-
-  def test_local_ephemeral_port_should_work_correctly
-    session = Net::SSH.start(*ssh_start_params)
-
-    assert_nothing_raised do
-      assigned_port = session.forward.local(0, localhost, 22)
-      assert_not_nil assigned_port
-      assert_operator assigned_port, :>, 0
-    end
-  end
-
-  def test_remote_ephemeral_port_should_work_correctly
-    session = Net::SSH.start(*ssh_start_params)
-
-    assert_nothing_raised do
-      session.forward.remote(22, localhost, 0, localhost)
-      session.loop { !(session.forward.active_remotes.length > 0) }
-      assigned_port = session.forward.active_remotes.first[0]
-      assert_not_nil assigned_port
-      assert_operator assigned_port, :>, 0
-    end
-  end
-
-  def test_remote_callback_should_fire
-    session = Net::SSH.start(*ssh_start_params)
-
-    assert_nothing_raised do
-      got_port = nil
-      session.forward.remote(22, localhost, 0, localhost) do |port|
-        got_port = port
-      end
-      session.loop { !(session.forward.active_remotes.length > 0) }
-      assert_operator session.forward.active_remote_destinations.length, :==, 1
-      assert_operator session.forward.active_remote_destinations.keys.first, :==, [ 22, localhost ]
-      assert_operator session.forward.active_remote_destinations.values.first, :==, [ got_port, localhost ]
-      assert_operator session.forward.active_remotes.first, :==, [ got_port, localhost ]
-      assigned_port = session.forward.active_remotes.first[0]
-      assert_operator got_port, :==, assigned_port
-      assert_not_nil assigned_port
-      assert_operator assigned_port, :>, 0
-    end
-  end
-
-  def test_remote_callback_should_fire_on_error_and_still_throw_exception
-    session = Net::SSH.start(*ssh_start_params)
-
-    assert_nothing_raised do
-      session.forward.remote(22, localhost, 22, localhost) do |port|
-        assert_operator port, :==, :error
-      end
-    end
-    assert_raises(Net::SSH::Exception) do
-      session.loop { true }
-    end
-  end
-
-  def test_remote_callback_should_fire_on_error_but_not_throw_exception_if_asked_not_to
-    session = Net::SSH.start(*ssh_start_params)
-
-    assert_nothing_raised do
-      got_port = nil
-      session.forward.remote(22, localhost, 22, localhost) do |port|
-        assert_operator port, :==, :error
-        got_port = port
-        :no_exception
-      end
-      session.loop { !got_port }
-      assert_operator port, :==, :error
-      assert_operator session.forward.active_remotes.length, :==, 0
-    end
-  end
-
-  def test_loop_should_not_abort_when_local_side_of_forward_is_closed
-    session = Net::SSH.start(*ssh_start_params)
-    server_exc = Queue.new
-    server = start_server_sending_lot_of_data(server_exc)
-    remote_port = server.addr[1]
-    local_port = 0 # request ephemeral port
-    session.forward.local(local_port, localhost, remote_port)
-    client_done = Queue.new
-    Thread.start do
-      begin
-        client = TCPSocket.new(localhost, local_port)
-        client.recv(1024)
-        client.close
-        sleep(0.2)
-      ensure
-        client_done << true
-      end
-    end
-    session.loop(0.1) { client_done.empty? }
-    assert_equal "Broken pipe", "#{server_exc.pop}" unless server_exc.empty?
-  end
-
-  def test_loop_should_not_abort_when_local_side_of_forward_is_reset
-    session = Net::SSH.start(*ssh_start_params)
-    server_exc = Queue.new
-    server = start_server_sending_lot_of_data(server_exc)
-    remote_port = server.addr[1]
-    local_port = 0 # request ephemeral port
-    session.forward.local(local_port, localhost, remote_port)
-    client_done = Queue.new
-    Thread.start do
-      begin
-        client = TCPSocket.new(localhost, local_port)
-        client.recv(1024)
-        client.setsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER, [1, 0].pack("ii"))
-        client.close
-        sleep(0.1)
-      ensure
-        client_done << true
-      end
-    end
-    session.loop(0.1) { client_done.empty? }
-    assert_equal "Broken pipe", "#{server_exc.pop}" unless server_exc.empty?
-  end
-
-  def create_local_socket(&blk)
-    tempfile = Tempfile.new("net_ssh_forward_test")
-    path = tempfile.path
-    tempfile.delete
-    yield UNIXServer.open(path)
-    File.delete(path)
-  end if defined?(UNIXServer)
-
-  def test_forward_local_unix_socket_to_remote_port
-    session = Net::SSH.start(*ssh_start_params)
-    server_exc = Queue.new
-    server = start_server_sending_lot_of_data(server_exc)
-    remote_port = server.addr[1]
-    client_data = nil
-
-    create_local_socket do |local_socket|
-      session.forward.local(local_socket, localhost, remote_port)
-      client_done = Queue.new
-
-      Thread.start do
-        begin
-          client = UNIXSocket.new(local_socket.path)
-          client_data = client.recv(1024)
-          client.close
-          sleep(0.2)
-        ensure
-          client_done << true
-        end
-      end
-
-      session.loop(0.1) { client_done.empty? }
-    end
-
-    assert_not_nil(client_data, "client should have received data")
-    assert(client_data.match(/item\d/), 'client should have received the string item')
-  end if defined?(UNIXSocket)
-
-  def test_loop_should_not_abort_when_server_side_of_forward_is_closed
-    session = Net::SSH.start(*ssh_start_params)
-    server = start_server_closing_soon
-    remote_port = server.addr[1]
-    local_port = 0 # request ephemeral port
-    session.forward.local(local_port, localhost, remote_port)
-    client_done = Queue.new
-    Thread.start do
-      begin
-        client = TCPSocket.new(localhost, local_port)
-        1.times do |i|
-          client.puts "item#{i}"
-        end
-        client.close
-        sleep(0.1)
-      ensure
-        client_done << true
-      end
-    end
-    session.loop(0.1) { client_done.empty? }
-  end
-
-  def start_server
-    server = TCPServer.open(0)
-    Thread.start do
-      loop do
-        Thread.start(server.accept) do |client|
-          yield(client)
-        end
-      end
-    end
-    return server
-  end
-
-  def test_server_eof_should_be_handled
-    session = Net::SSH.start(*ssh_start_params)
-    server = start_server do |client|
-      client.write "This is a small message!"
-      client.close
-    end
-    client_done = Queue.new
-    client_exception = Queue.new
-    client_data = Queue.new
-    remote_port = server.addr[1]
-    local_port = session.forward.local(0, localhost, remote_port)
-    Thread.start do
-      begin
-        client = TCPSocket.new(localhost, local_port)
-        data = client.read(4096)
-        client.close
-        client_done << data
-      rescue
-        client_done << $!
-      end
-    end
-    timeout(5) do
-      session.loop(0.1) { client_done.empty? }
-      assert_equal "This is a small message!", client_done.pop
-    end
-  end
-end