net-ssh 3.3.0.beta1 → 4.0.0.alpha1

data/test/common.rb

@@ -15,18 +15,6 @@ require 'ostruct'
 $original_config_default_files = Net::SSH::Config.default_files.dup
 Net::SSH::Config.default_files.clear
 
-def with_restored_default_files(&block)
-  act_default_files = Net::SSH::Config.default_files.dup
-  begin
-    Net::SSH::Config.default_files.clear
-    Net::SSH::Config.default_files.concat($_original_config_default_files) # rubocop:disable Style/GlobalVars
-    yield
-  ensure
-    Net::SSH::Config.default_files.clear
-    Net::SSH::Config.default_files.concat(act_default_files)
-  end
-end
-
 def P(*args)
   Net::SSH::Packet.new(Net::SSH::Buffer.from(*args))
 end
@@ -83,10 +71,6 @@ class MockTransport < Net::SSH::Transport::Session
     end
   end
 
-  def closed?
-    false
-  end
-
   def poll_message
     @queue.shift
   end

data/test/connection/test_channel.rb

@@ -429,14 +429,14 @@ module Connection
 
     def test_data_should_precede_eof
       channel.do_open_confirmation(0, 1000, 1000)
-      connection.expect do |t,p|
+      connection.expect do |_t,p|
         assert_equal CHANNEL_DATA, p.type
-        connection.expect { |t,p| assert_equal CHANNEL_EOF, p.type }
+        connection.expect { |_t,p2| assert_equal CHANNEL_EOF, p2.type }
       end
       channel.send_data "foo"
       channel.eof!
       channel.process
-   end
+    end
 
     private
 

data/test/connection/test_session.rb

@@ -182,7 +182,6 @@ module Connection
     end
 
     def test_global_request_handler_returning_other_value_should_raise_error
-      transport.expects(:closed?).at_least_once.returns(false)
       session.on_global_request("testing") { "bug" }
       transport.return(GLOBAL_REQUEST, :string, "testing", :bool, true)
       assert_raises(RuntimeError) { process_times(2) }

data/test/integration/{README.txt → README.md}

@@ -9,7 +9,8 @@ Setup:
 
     ansible-galaxy install rvm_io.rvm1-ruby
     vagrant up ; vagrant ssh
-    rake test
+    rvm all do bundle
+    rvm all do rake test
 
 # TODO
 

data/test/integration/common.rb

@@ -7,8 +7,9 @@ require 'pty'
 require 'expect'
 
 module IntegrationTestHelpers
+  VERBOSE = false
   def sh command
-    puts "$ #{command}"
+    puts "$ #{command}" if VERBOSE
     res = system(command)
     status = $?
     raise "Command: #{command} failed:#{status.exitstatus}" unless res
@@ -28,18 +29,18 @@ module IntegrationTestHelpers
   end
 
   def with_agent(&block)
-    puts "/usr/bin/ssh-agent -c"
+    puts "/usr/bin/ssh-agent -c" if VERBOSE
     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}"
+        puts "ENV[#{$1}]=#{$2}" if VERBOSE
       end
     end
     begin
       yield
     ensure
-      sh "/usr/bin/ssh-agent -k"
+      sh "/usr/bin/ssh-agent -k > /dev/null"
     end
   end
 
@@ -51,9 +52,10 @@ module IntegrationTestHelpers
         reader.expect(/Enter passphrase for .*:/) { |data| puts data }
         writer.puts(password)
         until reader.eof? do
-          puts reader.readline
+          line = reader.readline
+          puts line if VERBOSE
         end
-      rescue Errno::EIO => e
+      rescue Errno::EIO => _e
       end
       pid, status = Process.wait2 pid
     end

data/test/integration/playbook.yml

@@ -3,6 +3,9 @@
   sudo: yes
   vars:
     ruby_version: '2.0.0-p598'
+    ruby_versions:
+      - '2.0.0-p598'
+      - '2.3.0'
     rvm_install_path: '/usr/local/rvm'
     foopwd: "$6$mhOzf/yapZwS$3RwDl4GfWZ5VcfcsHrK9xNNTxyzLOJBsmMttDNaegIbXxMahV86.v/5HsNtit16MEl0EFf5CSW8Dz2yXV.8GB0"
     foo2pwd: "$6$JiB7y7.M0yI$Abt.ZGIc4DwkRWeI6nKxzzPUZcux7hLRXSdpoKoZvswJz1SZyg5GRQWn9pGID0dgC6e4wFglfW6ev/qZoTqGk/"
@@ -42,13 +45,11 @@
     - 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
-        - jeweler
-        - mocha
-        - rbnacl
-        - rbnacl-libsodium
+        - libgmp3-dev
+    - gem: name="{{ item[1] }}" state=present user_install=no executable=/usr/local/rvm/wrappers/ruby-{{ item[0] }}/gem
+      with_nested:
+        - "{{ruby_versions}}"
+        - [ '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

data/test/integration/test_ed25519_pkeys.rb

@@ -0,0 +1,70 @@
+require_relative '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 TestED25519PKeys < Test::Unit::TestCase
+  include IntegrationTestHelpers
+
+  def test_in_file_no_password
+    Dir.mktmpdir do |dir|
+      sh "rm -rf #{dir}/id_rsa_ed25519 #{dir}/id_rsa_ed25519.pub"
+      sh "ssh-keygen -q -f #{dir}/id_rsa_ed25519 -t ed25519 -N ''"
+      set_authorized_key('net_ssh_1',"#{dir}/id_rsa_ed25519.pub")
+
+      # TODO: fix bug in net ssh which reads public key even if private key is there
+      sh "mv #{dir}/id_rsa_ed25519.pub #{dir}/id_rsa_ed25519.pub.hidden"
+      
+      #sshopts = '-vvvv -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no'
+      #sh "ssh -i #{dir}/id_rsa_ed25519 #{sshopts} net_ssh_1@localhost echo 'hello'"
+
+      ret = Net::SSH.start("localhost", "net_ssh_1", {keys: "#{dir}/id_rsa_ed25519"}) do |ssh|
+        ssh.exec! 'echo "hello from:$USER"'
+      end
+      assert_equal "hello from:net_ssh_1\n", ret
+    end
+  end
+
+
+  def test_ssh_agent
+    Dir.mktmpdir do |dir|
+      with_agent do
+        sh "rm -rf #{dir}/id_rsa_ed25519 #{dir}/id_rsa_ed25519.pub"
+        sh "ssh-keygen -q -f #{dir}/id_rsa_ed25519 -t ed25519 -N 'pwd'"
+        set_authorized_key('net_ssh_1',"#{dir}/id_rsa_ed25519.pub")
+        ssh_add("#{dir}/id_rsa_ed25519","pwd")
+
+        # TODO: fix bug in net ssh which reads public key even if private key is there
+        sh "mv #{dir}/id_rsa_ed25519.pub #{dir}/id_rsa_ed25519.pub.hidden"
+
+        ret = Net::SSH.start("localhost", "net_ssh_1") 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
+    Dir.mktmpdir do |dir|
+      sh "rm -rf #{dir}/id_rsa_ed25519 #{dir}/id_rsa_ed25519.pub"
+      sh "ssh-keygen -q -f #{dir}/id_rsa_ed25519 -t ed25519 -N 'pwd'"
+      set_authorized_key('net_ssh_1',"#{dir}/id_rsa_ed25519.pub")
+
+      # TODO: fix bug in net ssh which reads public key even if private key is there
+      sh "mv #{dir}/id_rsa_ed25519.pub #{dir}/id_rsa_ed25519.pub.hidden"
+
+      #sshopts = '-vvvv -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no'
+      #sh "ssh -i #{dir}/id_rsa_ed25519 #{sshopts} net_ssh_1@localhost echo 'hello'"
+
+      ret = Net::SSH.start("localhost", "net_ssh_1", {keys: "#{dir}/id_rsa_ed25519", passphrase:'pwd'}) do |ssh|
+        ssh.exec! 'echo "hello from:$USER"'
+      end
+      assert_equal "hello from:net_ssh_1\n", ret
+    end
+  end
+end

data/test/integration/test_forward.rb

@@ -17,7 +17,6 @@
 require_relative './common'
 require 'net/ssh/buffer'
 require 'net/ssh'
-require 'net/ssh/proxy/command'
 require 'timeout'
 require 'tempfile'
 
@@ -32,15 +31,15 @@ class TestForward < Test::Unit::TestCase
     'net_ssh_1'
   end
 
-  def ssh_start_params(options = {})
-    [localhost ,user , {:keys => @key_id_rsa}.merge(options)]
+  def ssh_start_params
+    [localhost ,user , {:keys => @key_id_rsa}]
   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 ''"
+      sh "ssh-keygen -q -f #{@key_id_rsa} -t rsa -N ''"
       set_authorized_key(user,"#{@key_id_rsa}.pub")
       yield
     end
@@ -332,117 +331,13 @@ class TestForward < Test::Unit::TestCase
           client_done << $!
         end
       end
-      timeout(5) do
+      Timeout.timeout(5) do
         session.loop(0.1) { server_done.empty? }
         assert_equal message, server_done.pop
       end
     end
   end
 
-  class TCPProxy
-    def initialize()
-      @sockets = []
-    end
-    attr_reader :sockets
-
-    def open(host, port, connection_options = nil)
-      socket = TCPSocket.new(host,port)
-      @sockets << socket
-      socket
-    end
-
-    def close_all
-      sockets.each do |socket|
-        socket.close
-      end
-    end
-  end
-
-  def test_transport_close_should_closes_channels_with_tcps
-    setup_ssh_env do
-      server = start_server do |client|
-        client.puts "Hello"
-        sleep(100)
-        client.puts "Hallo"
-      end
-      proxy = TCPProxy.new()
-      session = Net::SSH.start(*ssh_start_params(proxy: proxy))
-      remote_port = server.addr[1]
-      local_port = session.forward.local(0, localhost, remote_port)
-
-      # read on forwarded port
-      client_done = Queue.new
-      Thread.start do
-        begin
-          client = TCPSocket.new(localhost, local_port)
-          client.read(6)
-          proxy.close_all
-          client.read(7)
-          client.close
-          client_done << true
-        rescue
-          client_done << $!
-        end
-      end
-      Timeout.timeout(5) do
-        begin
-          session.loop(0.1) { true }
-        rescue EOFError, IOError
-          #puts "Error: #{$!} #{$!.backtrace.join("\n")}"
-        end
-      end
-      begin
-        Timeout.timeout(5) do
-          assert_equal true, client_done.pop
-        end
-      rescue
-        puts "Server error: #{server_error.class} #{server_error} bt:#{server_error.backtrace.join("\n")}"
-        raise
-      end
-    end
-  end
-
-  def todo_test_transport_close_should_closes_channels_with_proxy
-    setup_ssh_env do
-      server = start_server do |client|
-        client.puts "Hello"
-        sleep(100)
-        client.puts "Hallo"
-      end
-      proxy = Net::SSH::Proxy::Command.new("/bin/nc localhost 22")
-      session = Net::SSH.start(*ssh_start_params(proxy: proxy))
-      remote_port = server.addr[1]
-      local_port = session.forward.local(0, localhost, remote_port)
-
-      # read on forwarded port
-      client_done = Queue.new
-      Thread.start do
-        begin
-          client = TCPSocket.new(localhost, local_port)
-          client.read(6)
-          system("killall /bin/nc")
-          client.read(7)
-          client.close
-          client_done << true
-        rescue
-          client_done << $!
-        end
-      end
-      Timeout.timeout(5) do
-        begin
-          session.loop(0.1) { true }
-        rescue EOFError
-          begin
-            session.close
-          rescue
-          end
-          #puts "Error: #{$!} #{$!.backtrace.join("\n")}"
-        end
-        assert_equal true, client_done.pop
-      end
-    end
-  end
-
   def test_client_close_should_be_handled
     setup_ssh_env do
       message = "This is a small message!"*1000
@@ -470,7 +365,7 @@ class TestForward < Test::Unit::TestCase
           client_done << $!
         end
       end
-      timeout(5) do
+      Timeout.timeout(5) do
         session.loop(0.1) { server_done.empty? }
         assert_equal message, server_done.pop
       end
@@ -503,7 +398,7 @@ class TestForward < Test::Unit::TestCase
           client_done << $!
         end
       end
-      timeout(5) do
+      Timeout.timeout(5) do
         session.loop(0.1) { client_done.empty? }
         assert_equal message, client_done.pop
       end
@@ -531,7 +426,7 @@ class TestForward < Test::Unit::TestCase
           client_done << $!
         end
       end
-      timeout(5) do
+      Timeout.timeout(5) do
         session.loop(0.1) { client_done.empty? }
         assert_equal message, client_done.pop
       end
@@ -555,7 +450,7 @@ class TestForward < Test::Unit::TestCase
     setup_ssh_env do
       session = Net::SSH.start(*ssh_start_params)
       server = start_server do |client|
-        data = client.write "hello"
+        _data = client.write "hello"
         client.close
       end
       # Forward to a non existing port
@@ -564,7 +459,7 @@ class TestForward < Test::Unit::TestCase
       # should return connection refused
       client_done = Queue.new
       _run_reading_client(client_done, local_port)
-      timeout(5) do
+      Timeout.timeout(5) do
         session.loop(0.1) { client_done.empty? }
       end
       assert_equal nil, client_done.pop
@@ -573,7 +468,7 @@ class TestForward < Test::Unit::TestCase
       remote_port = server.addr[1]
       local_port = session.forward.local(0, localhost, remote_port)
       _run_reading_client(client_done, local_port)
-      timeout(5) do
+      Timeout.timeout(5) do
         session.loop(0.1) { client_done.empty? }
       end
       assert_equal "hello", client_done.pop
@@ -592,7 +487,7 @@ class TestForward < Test::Unit::TestCase
       # should return connection refused
       client_done = Queue.new
       _run_reading_client(client_done, local_port)
-      timeout(5) do
+      Timeout.timeout(5) do
         session.loop(0.1) { client_done.empty? }
       end
       assert_equal nil, client_done.pop
@@ -600,11 +495,11 @@ class TestForward < Test::Unit::TestCase
       # start server
       server = TCPServer.open(remote_port)
       server = start_server(server) do |client|
-        data = client.write "hello"
+        _data = client.write "hello"
         client.close
       end
       _run_reading_client(client_done, local_port)
-      timeout(5) do
+      Timeout.timeout(5) do
         session.loop(0.1) { client_done.empty? }
       end
       assert_equal "hello", client_done.pop
@@ -616,7 +511,7 @@ class TestForward < Test::Unit::TestCase
     setup_ssh_env do
       session = Net::SSH.start(*ssh_start_params)
       server = start_server(server) do |client|
-        data = client.write "hello"
+        _data = client.write "hello"
         client.close
       end
       remote_port = server.addr[1]
@@ -624,7 +519,7 @@ class TestForward < Test::Unit::TestCase
       # run client
       client_done = Queue.new
       _run_reading_client(client_done, local_port)
-      timeout(5) do
+      Timeout.timeout(5) do
         session.loop(0.1) { client_done.empty? }
       end
       assert_equal "hello", client_done.pop

data/test/integration/test_id_rsa_keys.rb

@@ -13,10 +13,10 @@ class TestIDRSAPKeys < Test::Unit::TestCase
   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 ''"
+      sh "ssh-keygen -q -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'
+      #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|
@@ -31,11 +31,11 @@ class TestIDRSAPKeys < Test::Unit::TestCase
     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'"
+        sh "ssh-keygen -q -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|
+        ret = Net::SSH.start("localhost", "net_ssh_1") do |ssh|
           ssh.exec! 'echo "hello from:$USER"'
         end
         assert_equal "hello from:net_ssh_1\n", ret
@@ -47,11 +47,11 @@ class TestIDRSAPKeys < Test::Unit::TestCase
     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'"
+        sh "ssh-keygen -q -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|
+        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
@@ -62,14 +62,14 @@ class TestIDRSAPKeys < Test::Unit::TestCase
   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'"
+      sh "ssh-keygen -q -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'
+      #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|
+        passphrase: 'pwd12'}) do |ssh|
         ssh.exec! 'echo "hello from:$USER"'
       end
       assert_equal "hello from:net_ssh_1\n", ret
@@ -79,13 +79,13 @@ class TestIDRSAPKeys < Test::Unit::TestCase
   def test_asks_for_passwords_when_read_from_memory
     tmpdir do |dir|
       sh "rm -rf #{dir}/id_rsa #{dir}/id_rsa.pub"
-      sh "ssh-keygen -f #{dir}/id_rsa -t rsa -N 'pwd12'"
+      sh "ssh-keygen -q -f #{dir}/id_rsa -t rsa -N 'pwd12'"
       set_authorized_key('net_ssh_1',"#{dir}/id_rsa.pub")
       private_key = File.read("#{dir}/id_rsa")
 
       options = {keys: [], key_data: [private_key]}
 
-      key_manager = Net::SSH::Authentication::KeyManager.new(nil, options)
+      #key_manager = Net::SSH::Authentication::KeyManager.new(nil, options)
 
       Net::SSH::KeyFactory.expects(:prompt).with('Enter passphrase for :', false).returns('pwd12')
       Net::SSH.start("localhost", "net_ssh_1", options) do |ssh|