net-ssh 2.9.4 → 2.10.0.beta1

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

@@ -1,4 +1,5 @@
 require 'socket'
+require 'rubygems'
 require 'net/ssh/proxy/errors'
 require 'net/ssh/ruby_compat'
 
@@ -66,12 +67,22 @@ module Net; module SSH; module Proxy
         raise ConnectError, "#{e}: #{command_line}"
       end
       @command_line = command_line
-      class << io
-        def send(data, flag)
+      if Gem.win_platform?
+        # read_nonblock and write_nonblock are not available on Windows
+        # pipe. Use sysread and syswrite as a replacement works.
+        def io.send(data, flag)
+          syswrite(data)
+        end
+
+        def io.recv(size)
+          sysread(size)
+        end
+      else
+        def io.send(data, flag)
           write_nonblock(data)
         end
 
-        def recv(size)
+        def io.recv(size)
           read_nonblock(size)
         end
       end

data/lib/net/ssh/ruby_compat.rb

@@ -9,11 +9,6 @@ class String
       self[index] = c
     end
   end
-  if RUBY_VERSION < "1.8.7"
-    def bytesize
-      self.size
-    end
-  end
 end
 
 module Net; module SSH

data/lib/net/ssh/transport/algorithms.rb

@@ -224,10 +224,9 @@ module Net; module SSH; module Transport
             end
             lwarn { "unsupported #{algorithm} algorithm: `#{unsupported}'" } unless unsupported.empty?
 
-            # make sure all of our supported algorithms are tacked onto the
-            # end, so that if the user tries to give a list of which none are
-            # supported, we can still proceed.
-            list.each { |name| algorithms[algorithm] << name unless algorithms[algorithm].include?(name) }
+            if options[:append_all_supported_algorithms]
+              list.each { |name| algorithms[algorithm] << name unless algorithms[algorithm].include?(name) }
+            end
           end
         end
 

data/lib/net/ssh/transport/cipher_factory.rb

@@ -76,7 +76,6 @@ module Net; module SSH; module Transport
       cipher.padding = 0
 
       cipher.extend(Net::SSH::Transport::CTR) if (name =~ /-ctr(@openssh.org)?$/)
-
       cipher.iv      = Net::SSH::Transport::KeyExpander.expand_key(cipher.iv_len, options[:iv], options) if ossl_name != "rc4"
 
       key_len = KEY_LEN_OVERRIDE[name] || cipher.key_len

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

@@ -63,14 +63,15 @@ module Net; module SSH; module Transport
       @options = options
 
       debug { "establishing connection to #{@host}:#{@port}" }
-      factory = options[:proxy] || TCPSocket
-      @socket = timeout(options[:timeout] || 0) {
-        case
-        when options[:proxy] then factory.open(@host, @port, options)
-        when @bind_address.nil? then factory.open(@host, @port)
-        else factory.open(@host, @port, @bind_address)
+
+      @socket = timeout(options[:timeout] || 0) do
+        if (factory = options[:proxy])
+          factory.open(@host, @port, options)
+        else
+          TCPSocket.open(@host, @port, @bind_address)
         end
-      }
+      end
+
       @socket.extend(PacketStream)
       @socket.logger = @logger
 

data/lib/net/ssh/version.rb

@@ -48,14 +48,14 @@ module Net; module SSH
     MAJOR = 2
 
     # The minor component of this version of the Net::SSH library
-    MINOR = 9
+    MINOR = 10
 
     # The tiny component of this version of the Net::SSH library
-    TINY  = 4
+    TINY  = 0
 
-    # The prerelease component of this version of the Net::SSH library
+    # The prerelease component of this version of the Net::SSH library 
     # nil allowed
-    PRE   = nil
+    PRE   = 'beta1'
 
     # 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
-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-----

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 2.9.4 ruby lib
+# stub: net-ssh 2.10.0.beta1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "net-ssh"
-  s.version = "2.9.4"
+  s.version = "2.10.0.beta1"
 
-  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 = "2016-01-30"
+  s.date = "2015-05-21"
   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 = [
@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
     "Manifest",
     "README.rdoc",
     "Rakefile",
-    "Rudyfile",
     "THANKS.txt",
     "lib/net/ssh.rb",
     "lib/net/ssh/authentication/agent.rb",
@@ -140,6 +139,11 @@ Gem::Specification.new do |s|
     "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/manual/test_forward.rb",
     "test/manual/test_pageant.rb",

data/setup.rb

@@ -1460,7 +1460,7 @@ class Installer
     begin
       require 'test/unit'
     rescue LoadError
-      setup_rb_error 'test/unit cannot loaded.  You need Ruby 1.8 or later to invoke this task.'
+      setup_rb_error 'test/unit cannot loaded.  You need Ruby 1.9 or later to invoke this task.'
     end
     runner = Test::Unit::AutoRunner.new(true)
     runner.to_run << TESTDIR

data/test/README.txt

@@ -1,28 +1,21 @@
-2011-01-19
-
 RUNNING TESTS
 
 Run the test suite from the net-ssh directory with the following command:
 
-     ruby -Ilib -Itest -rrubygems test/test_all.rb
+     ruby -Ilib -Itest test/test_all.rb
 
 Run a single test file like this:
 
-     ruby -Ilib -Itest -rrubygems test/transport/test_server_version.rb
-
+     ruby -Ilib -Itest test/transport/test_server_version.rb
 
 EXPECTED RESULTS
 
-* Ruby 1.9: all tests pass
-
-* Ruby 1.8: all tests pass (up until version 2.5)
-
-* JRuby 1.7: 98% test pass (510 tests, 1914 assertions, 2 failures, 9 errors)
-
-* JRuby 1.6: 98% test pass (510 tests, 1914 assertions, 4 failures, 5 errors)
+     https://travis-ci.org/net-ssh/net-ssh/
 
-* JRuby 1.5: 98% tests pass (510 tests, 1914 assertions, 5 failures, 5 errors)
+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
 

data/test/authentication/methods/test_keyboard_interactive.rb

@@ -71,6 +71,27 @@ module Authentication; module Methods
       assert subject.authenticate("ssh-connection", "jamis", "the-password")
     end
 
+    def test_authenticate_should_not_prompt_for_input_when_in_non_interactive_mode
+
+      def transport.options
+        {non_interactive: true}
+      end
+      transport.expect do |t,packet|
+        assert_equal USERAUTH_REQUEST, packet.type
+        t.return(USERAUTH_INFO_REQUEST, :string, "", :string, "", :string, "", :long, 2, :string, "Name:", :bool, true, :string, "Password:", :bool, false)
+        t.expect do |t2,packet2|
+          assert_equal USERAUTH_INFO_RESPONSE, packet2.type
+          assert_equal 2, packet2.read_long
+          assert_equal "", packet2.read_string
+          assert_equal "", packet2.read_string
+          t2.return(USERAUTH_SUCCESS)
+        end
+      end
+
+      assert subject.authenticate("ssh-connection", "jamis", nil)
+    end
+
+
     def test_authenticate_should_prompt_for_input_when_password_is_not_given
       subject.expects(:prompt).with("Name:", true).returns("name")
       subject.expects(:prompt).with("Password:", false).returns("password")

data/test/authentication/test_key_manager.rb

@@ -156,7 +156,9 @@ module Authentication
 
       def stub_file_private_key(name, key, options = {})
         manager.add(name)
+        File.stubs(:file?).with(name).returns(true)
         File.stubs(:readable?).with(name).returns(true)
+        File.stubs(:file?).with(name + ".pub").returns(true)
         File.stubs(:readable?).with(name + ".pub").returns(false)
 
         case options.fetch(:passphrase, :indifferently)
@@ -179,7 +181,9 @@ module Authentication
 
       def stub_file_public_key(name, key)
         manager.add(name)
-        File.stubs(:readable?).with(name).returns(false)
+        File.stubs(:file?).with(name).returns(true)
+        File.stubs(:readable?).with(name).returns(true)
+        File.stubs(:file?).with(name + ".pub").returns(true)
         File.stubs(:readable?).with(name + ".pub").returns(true)
 
         Net::SSH::KeyFactory.expects(:load_public_key).with(name + ".pub").returns(key).at_least_once

data/test/connection/test_channel.rb

@@ -74,11 +74,8 @@ 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", :local_closed? => false)
+      session.channels[0] = stub("channel", :closing? => 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", :local_closed? => true)
+      session.channels[0] = stub("channel", :closing? => true)
       session.channels[0].expects(:process).never
       IO.expects(:select).never
       process_times(2)
@@ -299,17 +299,8 @@ module Connection
     end
 
     def test_channel_close_packet_should_be_routed_to_corresponding_channel_and_channel_should_be_closed_and_removed
-      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
-
+      channel_at(14).expects(:do_close).with()
+      session.channels[14].expects(:close).with()
       transport.return(CHANNEL_CLOSE, :long, 14)
       process_times(2)
       assert session.channels.empty?
@@ -386,13 +377,13 @@ module Connection
       options = { :keepalive => true, :keepalive_interval => 300, :keepalive_maxcount => 3 }
       expected_packet = P(:byte, Net::SSH::Packet::GLOBAL_REQUEST, :string, "keepalive@openssh.com", :bool, true)
       [1,2,3].each do |i|
-        Time.stubs(:now).returns(i*300)
+        Time.stubs(:now).returns(Time.at(i*300))
         IO.stubs(:select).with([socket],[],nil,timeout).returns(nil)
-        transport.expects(:enqueue_message).with{ |msg| msg.content == expected_packet.content  }
+        transport.expects(:enqueue_message).with{ |msg| msg.content == expected_packet.content }
         session(options).process
       end
 
-      Time.stubs(:now).returns(4*300)
+      Time.stubs(:now).returns(Time.at(4*300))
       IO.stubs(:select).with([socket],[],nil,timeout).returns(nil)
       transport.expects(:enqueue_message).with{ |msg| msg.content == expected_packet.content }
       assert_raises(Net::SSH::Timeout) { session(options).process }
@@ -532,7 +523,7 @@ module Connection
       end
 
       def channel_at(local_id)
-        session.channels[local_id] = stub("channel", :process => true, :local_closed? => false)
+        session.channels[local_id] = stub("channel", :process => true, :closing? => false)
       end
 
       def transport(options={})

data/test/integration/README.txt

@@ -0,0 +1,19 @@
+# Integration tests with vagrant
+
+Requirements:
+
+* Vagrant (https://www.vagrantup.com/)
+* Ansible (http://docs.ansible.com/intro_installation.html)
+
+Setup:
+
+    ansible-galaxy install rvm_io.rvm1-ruby
+    vagrant up
+    vagrant ssh
+    cd /net-ssh
+    rake integration-test
+
+# TODO
+
+* get it running on ci (probalby needs docker)
+* could not get gem install jeweler to work

data/test/integration/Vagrantfile

@@ -0,0 +1,12 @@
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  config.vm.box = "ubuntu/trusty64"
+  config.vm.provision "ansible" do |ansible|
+    ansible.playbook = "./playbook.yml"
+    ansible.sudo = true
+    ansible.verbose ='vvvv'
+  end
+
+  config.vm.synced_folder "../..", "/net-ssh"
+end

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