net-ssh 2.9.4 → 3.0.1

data/test/integration/common.rb

@@ -0,0 +1,57 @@
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../lib"
+gem "test-unit" # http://rubyforge.org/pipermail/test-unit-tracker/2009-July/000075.html
+gem 'mocha'
+require 'test/unit'
+require 'mocha/setup'
+require 'pty'
+require 'expect'
+
+module IntegrationTestHelpers
+  def sh command
+    puts "$ #{command}"
+    res = system(command)
+    status = $?
+    raise "Command: #{command} failed:#{status.exitstatus}" unless res
+  end
+
+  def set_authorized_key(user,pubkey)
+    authorized_key = "/home/#{user}/.ssh/authorized_keys"
+    sh "sudo cp #{pubkey} #{authorized_key}"
+    sh "sudo chown #{user} #{authorized_key}"
+    sh "sudo chmod 0744 #{authorized_key}"
+  end
+
+  def with_agent(&block)
+    puts "/usr/bin/ssh-agent -c"
+    agent_out = `/usr/bin/ssh-agent -c`
+    agent_out.split("\n").each do |line|
+      if line =~ /setenv (\S+) (\S+);/
+        ENV[$1] = $2
+        puts "ENV[#{$1}]=#{$2}"
+      end
+    end
+    begin
+      yield
+    ensure
+      sh "/usr/bin/ssh-agent -k"
+    end
+  end
+
+  def ssh_add(key,password)
+    command = "ssh-add #{key}"
+    status = nil
+    PTY.spawn(command) do |reader, writer, pid|
+      begin
+        reader.expect(/Enter passphrase for .*:/) { |data| puts data }
+        writer.puts(password)
+        until reader.eof? do
+          puts reader.readline
+        end
+      rescue Errno::EIO => e
+      end
+      pid, status = Process.wait2 pid
+    end
+    raise "Command: #{command} failed:#{status.exitstatus}" unless status
+    status.exitstatus
+  end
+end

data/test/integration/playbook.yml

@@ -0,0 +1,48 @@
+---
+- hosts: all
+  sudo: yes
+  vars:
+    ruby_version: '2.0.0-p598'
+    rvm1_install_path: '/usr/local/rvm'
+    foopwd: "$6$mhOzf/yapZwS$3RwDl4GfWZ5VcfcsHrK9xNNTxyzLOJBsmMttDNaegIbXxMahV86.v/5HsNtit16MEl0EFf5CSW8Dz2yXV.8GB0"
+    foo2pwd: "$6$JiB7y7.M0yI$Abt.ZGIc4DwkRWeI6nKxzzPUZcux7hLRXSdpoKoZvswJz1SZyg5GRQWn9pGID0dgC6e4wFglfW6ev/qZoTqGk/"
+  pre_tasks:
+    - name: get currently installed ruby version
+      command: "{{rvm1_install_path}}/rubies/ruby-{{ruby_version}}/bin/ruby -e 'puts \"#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}\"'"
+      register: current_ruby_version
+      ignore_errors: True
+  roles:
+    - { role: rvm_io.rvm1-ruby,
+        tags: ruby, sudo: True,
+        rvm1_rubies: ["ruby-{{ruby_version}}"],
+        rvm1_install_path: "{{rvm1_install_path}}",
+        rvm1_gpg_key_server: pool.sks-keyservers.net,
+        when: "'{{current_ruby_version.stdout|default()}}' != '{{ruby_version}}'" }
+  tasks:
+    - user: name=net_ssh_1 password="{{foopwd}}" group=vagrant state=present
+    - user: name=net_ssh_2 password="{{foo2pwd}}" group=vagrant state=present
+    - file: dest=/home/net_ssh_1/.ssh/ state=directory mode=0740 owner=net_ssh_1
+    - file: dest=/home/net_ssh_2/.ssh/ state=directory mode=0740 owner=net_ssh_2
+    - lineinfile: dest=/etc/sudoers.d/net_ssh_1 mode=0440 state=present create=yes
+        line='net_ssh_1 ALL=(ALL) NOPASSWD:ALL' regexp=net_ssh_1
+    - lineinfile: dest=/etc/sudoers.d/net_ssh_1 mode=0440 state=present create=yes
+        line='net_ssh_2 ALL=(ALL) NOPASSWD:ALL' regexp=net_ssh_2
+    - command: ssh-keygen -A
+      args:
+        creates: /etc/ssh/ssh_host_ed25519_key
+      notify: restart sshd
+    - name: sshd debug
+      lineinfile: dest='/etc/ssh/sshd_config' line='LogLevel DEBUG' regexp=LogLevel
+      notify: restart sshd
+    - gem: name="{{item}}" state=present executable=/usr/local/rvm/rubies/ruby-{{ruby_version}}/bin/gem
+      with_items:
+        - byebug
+        - jeweler
+        - mocha
+        - rbnacl
+        - rbnacl-libsodium
+    - copy: content='echo "cd /net-ssh ; rake integration-test"' dest=/etc/update-motd.d/99-net-ssh-tests mode=0755
+  handlers:
+    - name: restart sshd
+      service: name=ssh state=restarted
+

data/test/integration/test_id_rsa_keys.rb

@@ -0,0 +1,84 @@
+require 'common'
+require 'fileutils'
+require 'tmpdir'
+
+require 'net/ssh'
+
+# see Vagrantfile,playbook for env.
+# we're running as net_ssh_1 user password foo
+# and usually connecting to net_ssh_2 user password foo2pwd
+class TestIDRSAPKeys < Test::Unit::TestCase
+  include IntegrationTestHelpers
+
+  def tmpdir(&block)
+    Dir.mktmpdir do |dir|
+      yield(dir)
+    end
+  end
+
+  def test_in_file_no_password
+    tmpdir do |dir|
+      sh "rm -rf #{dir}/id_rsa #{dir}/id_rsa.pub"
+      sh "ssh-keygen -f #{dir}/id_rsa -t rsa -N ''"
+      set_authorized_key('net_ssh_1',"#{dir}/id_rsa.pub")
+
+      sshopts = '-vvvv -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no'
+      #sh "ssh -i #{dir}/id_rsa #{sshopts} net_ssh_1@localhost echo 'hello'"
+
+      ret = Net::SSH.start("localhost", "net_ssh_1", {keys: "#{dir}/id_rsa"}) do |ssh|
+        ssh.exec! 'echo "hello from:$USER"'
+      end
+      assert_equal "hello from:net_ssh_1\n", ret
+    end
+  end
+
+
+  def test_ssh_agent
+    tmpdir do |dir|
+      with_agent do
+        sh "rm -rf #{dir}/id_rsa #{dir}/id_rsa.pub"
+        sh "ssh-keygen -f #{dir}/id_rsa -t rsa -N 'pwd123'"
+        set_authorized_key('net_ssh_1',"#{dir}/id_rsa.pub")
+        ssh_add("#{dir}/id_rsa","pwd123")
+
+        ret = Net::SSH.start("localhost", "net_ssh_1",verbose: :debug) do |ssh|
+          ssh.exec! 'echo "hello from:$USER"'
+        end
+        assert_equal "hello from:net_ssh_1\n", ret
+      end
+    end
+  end
+
+  def test_ssh_agent_ignores_if_already_in_agent
+    tmpdir do |dir|
+      with_agent do
+        sh "rm -rf #{dir}/id_rsa #{dir}/id_rsa.pub"
+        sh "ssh-keygen -f #{dir}/id_rsa -t rsa -N 'pwd123'"
+        set_authorized_key('net_ssh_1',"#{dir}/id_rsa.pub")
+        ssh_add("#{dir}/id_rsa","pwd123")
+
+        ret = Net::SSH.start("localhost", "net_ssh_1",verbose: :debug, keys: ["#{dir}/id_rsa"]) do |ssh|
+          ssh.exec! 'echo "hello from:$USER"'
+        end
+        assert_equal "hello from:net_ssh_1\n", ret
+      end
+    end
+  end
+
+  def test_in_file_with_password
+    tmpdir do |dir|
+      sh "rm -rf #{dir}/id_rsa #{dir}/id_rsa.pub"
+      sh "ssh-keygen -f #{dir}/id_rsa -t rsa -N 'pwd12'"
+      set_authorized_key('net_ssh_1',"#{dir}/id_rsa.pub")
+
+      sshopts = '-vvvv -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no'
+      #sh "ssh -i #{dir}/id_rsa #{sshopts} net_ssh_1@localhost echo 'hello'"
+
+      ret = Net::SSH.start("localhost", "net_ssh_1", {keys: "#{dir}/id_rsa",
+        passphrase: 'pwd12', verbose: :debug}) do |ssh|
+        ssh.exec! 'echo "hello from:$USER"'
+      end
+      assert_equal "hello from:net_ssh_1\n", ret
+    end
+  end
+end

data/test/known_hosts/github_hash

@@ -0,0 +1 @@
+|1|eKp+6E0rZ3lONgsIziurXEnaIik=|rcQB/rlJMUquUyFta64KugPjX4o= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==

data/test/start/test_options.rb

@@ -32,12 +32,26 @@ module NetSSH
       end
     end
 
-    def test_star_should_accept_number_of_password_prompts_option
+    def test_start_should_accept_number_of_password_prompts_option
       assert_nothing_raised do
         options = { :number_of_password_prompts => 2 }
         Net::SSH.start('localhost', 'testuser', options)
       end
     end
+
+    def test_start_should_accept_non_interactive_option
+      assert_nothing_raised do
+        options = { :non_interactive => true }
+        Net::SSH.start('localhost', 'testuser', options)
+      end
+    end
+
+    def test_start_should_accept_remote_user_option
+      assert_nothing_raised do
+        options = { :remote_user => 'foo' }
+        Net::SSH.start('localhost', 'testuser', options)
+      end
+    end
   end
 end
 

data/test/test_all.rb

@@ -4,6 +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 = 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']

data/test/test_config.rb

@@ -213,6 +213,12 @@ class TestConfig < Test::Unit::TestCase
     assert_equal [/^GIT_.*$/, /^LANG$/, /^LC_.*$/], net_ssh[:send_env]
   end
 
+  def test_load_with_remote_user
+    config = Net::SSH::Config.load(config(:proxy_remote_user), "behind-proxy")
+    net_ssh = Net::SSH::Config.translate(config)
+    assert net_ssh[:proxy]
+  end
+
   private
 
     def config(name)

data/test/test_known_hosts.rb

@@ -2,12 +2,20 @@ require 'common'
 
 class TestKnownHosts < Test::Unit::TestCase
 
-  def test_key_for_when_all_hosts_are_recognized
-    source = File.join(File.dirname(__FILE__),"known_hosts/github")
+  def perform_test(hostfile)
+    source = File.join(File.dirname(__FILE__), hostfile)
     kh = Net::SSH::KnownHosts.new(source)
     keys = kh.keys_for("github.com")
     assert_equal(1, keys.count)
     assert_equal("ssh-rsa", keys[0].ssh_type)
   end
 
-end
+  def test_key_for_when_all_hosts_are_recognized
+    perform_test("known_hosts/github")
+  end
+
+  def test_key_for_when_an_host_hash_is_recognized
+    perform_test("known_hosts/github_hash")
+  end
+
+end

data/test/transport/kex/test_diffie_hellman_group1_sha1.rb

@@ -12,12 +12,16 @@ module Transport; module Kex
         @packet_data = @shared_secret = nil
     end
 
+    def digest_type
+      OpenSSL::Digest::SHA1
+    end
+
     def test_exchange_keys_should_return_expected_results_when_successful
       result = exchange!
       assert_equal session_id, result[:session_id]
       assert_equal server_key.to_blob, result[:server_key].to_blob
       assert_equal shared_secret, result[:shared_secret]
-      assert_equal OpenSSL::Digest::SHA1, result[:hashing_algorithm]
+      assert_equal digest_type, result[:hashing_algorithm]
     end
 
     def test_exchange_keys_with_unverifiable_host_should_raise_exception

data/test/transport/kex/test_diffie_hellman_group_exchange_sha1.rb

@@ -69,6 +69,10 @@ module Transport; module Kex
         Net::SSH::Transport::Kex::DiffieHellmanGroupExchangeSHA1
       end
 
+      def digest_type
+        OpenSSL::Digest::SHA1
+      end
+
       def session_id
         @session_id ||= begin
           buffer = Net::SSH::Buffer.from(:string, packet_data[:client_version_string],
@@ -84,7 +88,7 @@ module Transport; module Kex
             :bignum, dh.dh.pub_key,
             :bignum, server_dh_pubkey,
             :bignum, shared_secret)
-          OpenSSL::Digest::SHA1.digest(buffer.to_s)
+          digest_type.digest(buffer.to_s)
         end
       end
   end

data/test/transport/kex/test_diffie_hellman_group_exchange_sha256.rb

@@ -11,23 +11,8 @@ module Transport; module Kex
         Net::SSH::Transport::Kex::DiffieHellmanGroupExchangeSHA256
       end
 
-      def session_id
-        @session_id ||= begin
-          buffer = Net::SSH::Buffer.from(:string, packet_data[:client_version_string],
-            :string, packet_data[:server_version_string],
-            :string, packet_data[:client_algorithm_packet],
-            :string, packet_data[:server_algorithm_packet],
-            :string, Net::SSH::Buffer.from(:key, server_key),
-            :long,   1024,
-            :long,   1024,
-            :long,   8192,
-            :bignum, dh.dh.p,
-            :bignum, dh.dh.g,
-            :bignum, dh.dh.pub_key,
-            :bignum, server_dh_pubkey,
-            :bignum, shared_secret)
-          OpenSSL::Digest::SHA256.digest(buffer.to_s)
-        end
+      def digest_type
+        OpenSSL::Digest::SHA256
       end
   end
 

data/test/transport/test_algorithms.rb

@@ -36,7 +36,7 @@ module Transport
     end
 
     def test_constructor_with_preferred_host_key_type_should_put_preferred_host_key_type_first
-      assert_equal %w(ssh-dss ssh-rsa ssh-rsa-cert-v01@openssh.com ssh-rsa-cert-v00@openssh.com)+ec_host_keys, algorithms(:host_key => "ssh-dss")[:host_key]
+      assert_equal %w(ssh-dss ssh-rsa ssh-rsa-cert-v01@openssh.com ssh-rsa-cert-v00@openssh.com)+ec_host_keys, algorithms(:host_key => "ssh-dss", :append_all_supported_algorithms => true)[:host_key]
     end
 
     def test_constructor_with_known_hosts_reporting_known_host_key_should_use_that_host_key_type
@@ -53,7 +53,7 @@ module Transport
     end
 
     def test_constructor_with_unrecognized_host_key_type_should_return_whats_supported
-      assert_equal %w(ssh-rsa ssh-dss ssh-rsa-cert-v01@openssh.com ssh-rsa-cert-v00@openssh.com )+ec_host_keys, algorithms(:host_key => "bogus ssh-rsa")[:host_key]
+      assert_equal %w(ssh-rsa ssh-dss ssh-rsa-cert-v01@openssh.com ssh-rsa-cert-v00@openssh.com )+ec_host_keys, algorithms(:host_key => "bogus ssh-rsa",:append_all_supported_algorithms => true)[:host_key]
     end
 
     def ec_kex
@@ -65,52 +65,56 @@ module Transport
     end
 
     def test_constructor_with_preferred_kex_should_put_preferred_kex_first
-      assert_equal %w(diffie-hellman-group1-sha1 diffie-hellman-group-exchange-sha1 diffie-hellman-group14-sha1 diffie-hellman-group-exchange-sha256)+ec_kex, algorithms(:kex => "diffie-hellman-group1-sha1")[:kex]
+      assert_equal %w(diffie-hellman-group1-sha1 diffie-hellman-group-exchange-sha1 diffie-hellman-group14-sha1 diffie-hellman-group-exchange-sha256)+ec_kex, algorithms(:kex => "diffie-hellman-group1-sha1", :append_all_supported_algorithms => true)[:kex]
     end
 
-    def test_constructor_with_unrecognized_kex_should_raise_exception
-      assert_equal %w(diffie-hellman-group1-sha1 diffie-hellman-group-exchange-sha1 diffie-hellman-group14-sha1 diffie-hellman-group-exchange-sha256)+ec_kex, algorithms(:kex => %w(bogus diffie-hellman-group1-sha1))[:kex]
+    def test_constructor_with_unrecognized_kex_should_not_raise_exception
+      assert_equal %w(diffie-hellman-group1-sha1 diffie-hellman-group-exchange-sha1 diffie-hellman-group14-sha1 diffie-hellman-group-exchange-sha256)+ec_kex, algorithms(
+        :kex => %w(bogus diffie-hellman-group1-sha1),:append_all_supported_algorithms => true)[:kex]
     end
 
     def test_constructor_with_preferred_encryption_should_put_preferred_encryption_first
-      assert_equal %w(aes256-cbc aes128-cbc 3des-cbc blowfish-cbc cast128-cbc aes192-cbc rijndael-cbc@lysator.liu.se idea-cbc none arcfour128 arcfour256 arcfour aes128-ctr aes192-ctr aes256-ctr camellia128-cbc camellia192-cbc camellia256-cbc camellia128-cbc@openssh.org camellia192-cbc@openssh.org camellia256-cbc@openssh.org camellia128-ctr camellia192-ctr camellia256-ctr camellia128-ctr@openssh.org camellia192-ctr@openssh.org camellia256-ctr@openssh.org cast128-ctr blowfish-ctr 3des-ctr), algorithms(:encryption => "aes256-cbc")[:encryption]
+      assert_equal %w(aes256-cbc aes128-cbc 3des-cbc blowfish-cbc cast128-cbc aes192-cbc rijndael-cbc@lysator.liu.se idea-cbc none arcfour128 arcfour256 arcfour aes128-ctr aes192-ctr aes256-ctr camellia128-cbc camellia192-cbc camellia256-cbc camellia128-cbc@openssh.org camellia192-cbc@openssh.org camellia256-cbc@openssh.org camellia128-ctr camellia192-ctr camellia256-ctr camellia128-ctr@openssh.org camellia192-ctr@openssh.org camellia256-ctr@openssh.org cast128-ctr blowfish-ctr 3des-ctr), algorithms(:encryption => "aes256-cbc",
+      :append_all_supported_algorithms => true)[:encryption]
     end
 
     def test_constructor_with_multiple_preferred_encryption_should_put_all_preferred_encryption_first
-      assert_equal %w(aes256-cbc 3des-cbc idea-cbc aes128-cbc blowfish-cbc cast128-cbc aes192-cbc rijndael-cbc@lysator.liu.se none arcfour128 arcfour256 arcfour aes128-ctr aes192-ctr aes256-ctr camellia128-cbc camellia192-cbc camellia256-cbc camellia128-cbc@openssh.org camellia192-cbc@openssh.org camellia256-cbc@openssh.org camellia128-ctr camellia192-ctr camellia256-ctr camellia128-ctr@openssh.org camellia192-ctr@openssh.org camellia256-ctr@openssh.org cast128-ctr blowfish-ctr 3des-ctr), algorithms(:encryption => %w(aes256-cbc 3des-cbc idea-cbc))[:encryption]
+      assert_equal %w(aes256-cbc 3des-cbc idea-cbc aes128-cbc blowfish-cbc cast128-cbc aes192-cbc rijndael-cbc@lysator.liu.se none arcfour128 arcfour256 arcfour aes128-ctr aes192-ctr aes256-ctr camellia128-cbc camellia192-cbc camellia256-cbc camellia128-cbc@openssh.org camellia192-cbc@openssh.org camellia256-cbc@openssh.org camellia128-ctr camellia192-ctr camellia256-ctr camellia128-ctr@openssh.org camellia192-ctr@openssh.org camellia256-ctr@openssh.org cast128-ctr blowfish-ctr 3des-ctr), algorithms(:encryption => %w(aes256-cbc 3des-cbc idea-cbc), :append_all_supported_algorithms => true)[:encryption]
     end
 
     def test_constructor_with_unrecognized_encryption_should_keep_whats_supported
-      assert_equal %w(aes256-cbc aes128-cbc 3des-cbc blowfish-cbc cast128-cbc aes192-cbc rijndael-cbc@lysator.liu.se idea-cbc none arcfour128 arcfour256 arcfour aes128-ctr aes192-ctr aes256-ctr camellia128-cbc camellia192-cbc camellia256-cbc camellia128-cbc@openssh.org camellia192-cbc@openssh.org camellia256-cbc@openssh.org camellia128-ctr camellia192-ctr camellia256-ctr camellia128-ctr@openssh.org camellia192-ctr@openssh.org camellia256-ctr@openssh.org cast128-ctr blowfish-ctr 3des-ctr), algorithms(:encryption => %w(bogus aes256-cbc))[:encryption]
+      assert_equal %w(aes256-cbc aes128-cbc 3des-cbc blowfish-cbc cast128-cbc aes192-cbc rijndael-cbc@lysator.liu.se idea-cbc none arcfour128 arcfour256 arcfour aes128-ctr aes192-ctr aes256-ctr camellia128-cbc camellia192-cbc camellia256-cbc camellia128-cbc@openssh.org camellia192-cbc@openssh.org camellia256-cbc@openssh.org camellia128-ctr camellia192-ctr camellia256-ctr camellia128-ctr@openssh.org camellia192-ctr@openssh.org camellia256-ctr@openssh.org cast128-ctr blowfish-ctr 3des-ctr), algorithms(:encryption => %w(bogus aes256-cbc), :append_all_supported_algorithms => true)[:encryption]
     end
 
     def test_constructor_with_preferred_hmac_should_put_preferred_hmac_first
-      assert_equal %w(hmac-md5-96 hmac-sha1 hmac-md5 hmac-sha1-96 hmac-ripemd160 hmac-ripemd160@openssh.com hmac-sha2-256 hmac-sha2-512 hmac-sha2-256-96 hmac-sha2-512-96 none), algorithms(:hmac => "hmac-md5-96")[:hmac]
+      assert_equal %w(hmac-md5-96 hmac-sha1 hmac-md5 hmac-sha1-96 hmac-ripemd160 hmac-ripemd160@openssh.com hmac-sha2-256 hmac-sha2-512 hmac-sha2-256-96 hmac-sha2-512-96 none), algorithms(:hmac => "hmac-md5-96", :append_all_supported_algorithms => true)[:hmac]
     end
 
     def test_constructor_with_multiple_preferred_hmac_should_put_all_preferred_hmac_first
-      assert_equal %w(hmac-md5-96 hmac-sha1-96 hmac-sha1 hmac-md5 hmac-ripemd160 hmac-ripemd160@openssh.com hmac-sha2-256 hmac-sha2-512 hmac-sha2-256-96 hmac-sha2-512-96 none), algorithms(:hmac => %w(hmac-md5-96 hmac-sha1-96))[:hmac]
+      assert_equal %w(hmac-md5-96 hmac-sha1-96 hmac-sha1 hmac-md5 hmac-ripemd160 hmac-ripemd160@openssh.com hmac-sha2-256 hmac-sha2-512 hmac-sha2-256-96 hmac-sha2-512-96 none), algorithms(:hmac => %w(hmac-md5-96 hmac-sha1-96), :append_all_supported_algorithms => true)[:hmac]
     end
 
     def test_constructor_with_unrecognized_hmac_should_ignore_those
       assert_equal %w(hmac-md5-96 hmac-sha1 hmac-md5 hmac-sha1-96 hmac-ripemd160 hmac-ripemd160@openssh.com hmac-sha2-256 hmac-sha2-512 hmac-sha2-256-96 hmac-sha2-512-96 none), 
-        algorithms(:hmac => "hmac-md5-96")[:hmac]
+        algorithms(:hmac => "hmac-md5-96", :append_all_supported_algorithms => true)[:hmac]
     end
 
     def test_constructor_with_preferred_compression_should_put_preferred_compression_first
-      assert_equal %w(zlib none zlib@openssh.com), algorithms(:compression => "zlib")[:compression]
+      assert_equal %w(zlib none zlib@openssh.com), algorithms(:compression => "zlib", :append_all_supported_algorithms => true)[:compression]
     end
 
     def test_constructor_with_multiple_preferred_compression_should_put_all_preferred_compression_first
-      assert_equal %w(zlib@openssh.com zlib none), algorithms(:compression => %w(zlib@openssh.com zlib))[:compression]
+      assert_equal %w(zlib@openssh.com zlib none), algorithms(:compression => %w(zlib@openssh.com zlib),
+         :append_all_supported_algorithms => true)[:compression]
     end
 
     def test_constructor_with_general_preferred_compression_should_put_none_last
-      assert_equal %w(zlib@openssh.com zlib none), algorithms(:compression => true)[:compression]
+      assert_equal %w(zlib@openssh.com zlib none), algorithms(
+        :compression => true, :append_all_supported_algorithms => true)[:compression]
     end
 
     def test_constructor_with_unrecognized_compression_should_return_whats_supported
-      assert_equal %w(none zlib zlib@openssh.com), algorithms(:compression => %w(bogus none zlib))[:compression]
+      assert_equal %w(none zlib zlib@openssh.com), algorithms(:compression => %w(bogus none zlib), :append_all_supported_algorithms => true)[:compression]
     end
 
     def test_initial_state_should_be_neither_pending_nor_initialized
@@ -185,7 +189,7 @@ module Transport
     end
 
     def test_exchange_with_zlib_compression_enabled_sets_compression_to_standard
-      algorithms :compression => "zlib"
+      algorithms :compression => "zlib", :append_all_supported_algorithms => true
 
       transport.expect do |t, buffer|
         assert_kexinit(buffer, :compression_client => "zlib,none,zlib@openssh.com", :compression_server => "zlib,none,zlib@openssh.com")
@@ -200,7 +204,7 @@ module Transport
     end
 
     def test_exchange_with_zlib_at_openssh_dot_com_compression_enabled_sets_compression_to_delayed
-      algorithms :compression => "zlib@openssh.com"
+      algorithms :compression => "zlib@openssh.com", :append_all_supported_algorithms => true
 
       transport.expect do |t, buffer|
         assert_kexinit(buffer, :compression_client => "zlib@openssh.com,none,zlib", :compression_server => "zlib@openssh.com,none,zlib")

data/test/transport/test_packet_stream.rb

@@ -1,6 +1,7 @@
 # encoding: ASCII-8BIT
 
 require 'common'
+require 'timeout'
 require 'net/ssh/transport/packet_stream'
 
 module Transport

data/test/transport/test_session.rb

@@ -315,7 +315,7 @@ module Transport
       def session(options={})
         @session ||= begin
           host = options.delete(:host) || "net.ssh.test"
-          TCPSocket.stubs(:open).with(host, options[:port] || 22).returns(socket)
+          Socket.stubs(:tcp).with(host, options[:port] || 22, nil, nil, { connect_timeout: options[:timeout] }).returns(socket)
           Net::SSH::Transport::ServerVersion.stubs(:new).returns(server_version)
           Net::SSH::Transport::Algorithms.stubs(:new).returns(algorithms)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh
 version: !ruby/object:Gem::Version
-  version: 2.9.4
+  version: 3.0.1
 platform: ruby
 authors:
 - Jamis Buck
@@ -14,24 +14,24 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDODCCAiCgAwIBAgIBADANBgkqhkiG9w0BAQUFADBCMRAwDgYDVQQDDAduZXQt
   c3NoMRkwFwYKCZImiZPyLGQBGRYJc29sdXRpb3VzMRMwEQYKCZImiZPyLGQBGRYD
-  Y29tMB4XDTE1MTIwNjIxMDYyNFoXDTE2MTIwNTIxMDYyNFowQjEQMA4GA1UEAwwH
+  Y29tMB4XDTE0MTIwMjE3MzkyMFoXDTE1MTIwMjE3MzkyMFowQjEQMA4GA1UEAwwH
   bmV0LXNzaDEZMBcGCgmSJomT8ixkARkWCXNvbHV0aW91czETMBEGCgmSJomT8ixk
-  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
+  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
   -----END CERTIFICATE-----
-date: 2016-01-30 00:00:00.000000000 Z
+date: 2015-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -77,7 +77,6 @@ files:
 - Manifest
 - README.rdoc
 - Rakefile
-- Rudyfile
 - THANKS.txt
 - lib/net/ssh.rb
 - lib/net/ssh/authentication/agent.rb
@@ -186,12 +185,19 @@ files:
 - test/configs/negative_match
 - test/configs/nohost
 - test/configs/numeric_host
+- test/configs/proxy_remote_user
 - test/configs/send_env
 - test/configs/substitutes
 - test/configs/wild_cards
 - test/connection/test_channel.rb
 - test/connection/test_session.rb
+- test/integration/README.txt
+- test/integration/Vagrantfile
+- test/integration/common.rb
+- test/integration/playbook.yml
+- test/integration/test_id_rsa_keys.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
@@ -240,7 +246,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/Rudyfile

@@ -1,96 +0,0 @@
-# Rudyfile
-#
-# This configuration is used to test installing
-# and running net-ssh on a clean machine. 
-#
-# Usage:
-#
-#     $ rudy -vv startup
-#     $ rudy -vv testsuite
-#     $ rudy -vv shutdown
-#
-# Requires: Rudy 0.9 (http://code.google.com/p/rudy/)
-#
-
-defaults do
-  color true
-  environment :test
-  role :netssh
-end
-
-machines do
-  region :'us-east-1' do
-    ami 'ami-e348af8a'               # Alestic Debian 5.0, 32-bit (US)
-  end
-  env :test do
-    role :netssh do
-      user :root
-    end
-  end
-end
-
-commands do
-  allow :apt_get, "apt-get", :y, :q
-  allow :gem_install, "/usr/bin/gem", "install", :n, '/usr/bin', :y, :V, "--no-rdoc", "--no-ri"
-  allow :gem_sources, "/usr/bin/gem", "sources"
-  allow :gem_uninstall, "/usr/bin/gem", "uninstall", :V
-  allow :update_rubygems
-  allow :rm
-end
-
-routines do
-  
-  testsuite do
-    before :sysupdate, :installdeps, :install_gem
-    
-    remote :root do
-      directory_upload 'test', '/tmp/'
-      cd '/tmp'
-      ruby :I, 'lib/', :I, 'test/', :r, 'rubygems', 'test/test_all.rb'
-    end
-    
-    after :install_rubyforge, :install_github
-  end
-  
-  install_gem do
-    before :package_gem
-    remote :root do
-      disable_safe_mode
-      file_upload "pkg/net-ssh-*.gem", "/tmp/"
-      gem_install "/tmp/net-ssh-*.gem"
-    end
-  end
-  
-  package_gem do
-    local do
-      rm :r, :f, 'pkg'
-      rake 'package'
-    end
-  end
-  
-  remove do
-    remote :root do
-      gem_uninstall 'net-ssh'
-    end
-  end
-  
-  installdeps do
-    remote :root do
-      gem_install "rye", "test-unit", "mocha"
-      rye 'authorize-local'
-    end
-  end
-  
-  sysupdate do
-    remote :root do                  
-      apt_get "update"               
-      apt_get "install", "build-essential", "git-core"
-      apt_get "install", "ruby1.8-dev", "rdoc", "libzlib-ruby", "rubygems"
-      mkdir :p, "/var/lib/gems/1.8/bin" # Doesn't get created, but causes Rubygems to fail
-      gem_install "builder", "session"
-      gem_install 'rubygems-update', "-v=1.3.4"  # circular issue with 1.3.5 and hoe
-      update_rubygems
-    end
-  end
-end
-