net-ssh 3.1.1 → 3.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a7137b024d13eff1d07bc383f9af459276cd6e6
-  data.tar.gz: b41b06db8a85bad4f82bd8e45b608f22d5fe5691
+  metadata.gz: 1477e274c366e8b51cf9112399b5c6b7854df2bd
+  data.tar.gz: 7e5884773d502b4dcde4013810e4be0369a77e9e
 SHA512:
-  metadata.gz: 79a6eabb6968b82c503586f8d6d7e2e97770092797a4111309055040bc76db7e49df2dd34122be103c40192c94a4848323a6d7c5c3cb42d93e534556e8cfc98e
-  data.tar.gz: 9c5abba527c9c1c6ecb97246ea31d23e31825f3a60f4de37a7c38362c04b2b0446f8591de49014781cefeac25d38db6df68295ef295aa5cb94efc46763c45d7b
+  metadata.gz: 9f28aa655c03f370327c4a016652f8c48b535b6a7649d401763e28183e7718620eee881dfb4e0f40f1cda6d57954cd31ecd741be281bb2aa066fd8debd2d6637
+  data.tar.gz: 1b46532ef715789b9a81e2128a11cebcf332b7c413514b0ae3657b4ecafe2f519b90a10f20837ac217e60f7d3344b8b995df46de83e47c44fbdb8fa677ee43bc

checksums.yaml.gz.sig

@@ -1 +1,2 @@
-����g=X?��?"7��{}�b+��FOyCY�,H'�F�����`<w.�ŠKݍ}�F��b�hN�\���r��$[	iY�|웊�rj�K�x!� ���<�o6�E{���<'l��
+?O���.-2~��}h��T�(����E1�JZ3�
��`�۷4RR�
[k����G>,}r�o
+;�|(��j���ã�:,nF����˶zn�XK�x�8^)1���Ȏo�q�ۃ�,�?��5���乨� '��٬�7�4������v�)�h�C�����ܰ\�%�!���1����7|�J�dmbˠ��~S̠�ˍV�-�Z�\]<�~��ܦ���J�4h�� ��f��������s �?lE�fT��

data/CHANGES.txt

@@ -1,3 +1,9 @@
+=== 3.2.0
+
+* Added agent_socket_factory option [Alon Goldboim]
+* Send KEXINIT asap don't wait for server [Miklos Fazekas]
+* Close channels in case server closed connection [Miklos Fazekas]
+
 === 3.1.1
 
 * added missing etc require

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

@@ -210,6 +210,9 @@ module Net; module SSH; module Connection
       readers, writers, = Net::SSH::Compat.io_select(r, w, nil, io_select_wait(wait))
 
       postprocess(readers, writers)
+    rescue
+      force_channel_cleanup_on_close if closed?
+      raise
     end
 
     # This is called internally as part of #process. It dispatches any
@@ -475,6 +478,9 @@ module Net; module SSH; module Connection
 
           send(MAP[packet.type], packet)
         end
+      rescue
+        force_channel_cleanup_on_close if closed?
+        raise
       end
 
       # Returns the next available channel id to be assigned, and increments
@@ -483,6 +489,16 @@ module Net; module SSH; module Connection
         @channel_id_counter += 1
       end
 
+      def force_channel_cleanup_on_close
+        channels.each do |id, channel|
+          channel.remote_closed!
+          channel.close
+
+          cleanup_channel(channel)
+          channel.do_close
+        end
+      end
+
       # Invoked when a global request is received. The registered global
       # request callback will be invoked, if one exists, and the necessary
       # reply returned.

data/lib/net/ssh/test/socket.rb

@@ -25,8 +25,8 @@ module Net; module SSH; module Test
 
       @script = Script.new
 
-      script.gets(:kexinit, 1, 2, 3, 4, "test", "ssh-rsa", "none", "none", "none", "none", "none", "none", "", "", false)
       script.sends(:kexinit)
+      script.gets(:kexinit, 1, 2, 3, 4, "test", "ssh-rsa", "none", "none", "none", "none", "none", "none", "", "", false)
       script.sends(:newkeys)
       script.gets(:newkeys)
     end

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

@@ -124,6 +124,12 @@ module Net; module SSH; module Transport
       prepare_preferred_algorithms!
     end
 
+    # Start the algorithm negotation
+    def start
+      raise ArgumentError, "Cannot call start if it's negoitation started or done" if @pending || @initialized
+      send_kexinit
+    end
+
     # Request a rekey operation. This will return immediately, and does not
     # actually perform the rekey operation. It does cause the session to change
     # state, however--until the key exchange finishes, no new packets will be

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

@@ -84,6 +84,7 @@ module Net; module SSH; module Transport
       @server_version = ServerVersion.new(socket, logger, options[:timeout])
 
       @algorithms = Algorithms.new(self, options)
+      @algorithms.start
       wait { algorithms.initialized? }
     rescue Errno::ETIMEDOUT
       raise Net::SSH::ConnectionTimeout

data/lib/net/ssh/version.rb

@@ -48,14 +48,14 @@ module Net; module SSH
     MAJOR = 3
 
     # The minor component of this version of the Net::SSH library
-    MINOR = 1
+    MINOR = 2
 
     # The tiny component of this version of the Net::SSH library
-    TINY  = 1
+    TINY  = 0
 
     # 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.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.1.1 ruby lib
+# stub: net-ssh 3.2.0.rc1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "net-ssh"
-  s.version = "3.1.1"
+  s.version = "3.2.0.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 = "2016-03-23"
+  s.date = "2016-05-27"
   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 = [
@@ -191,7 +191,7 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.required_ruby_version = Gem::Requirement.new(">= 2.0")
   s.rubyforge_project = "net-ssh"
-  s.rubygems_version = "2.4.6"
+  s.rubygems_version = "2.4.3"
   s.signing_key = "/mnt/gem/net-ssh-private_key.pem"
   s.summary = "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol."
 

data/test/common.rb

@@ -15,6 +15,18 @@ 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
@@ -71,6 +83,10 @@ class MockTransport < Net::SSH::Transport::Session
     end
   end
 
+  def closed?
+    false
+  end
+
   def poll_message
     @queue.shift
   end

data/test/connection/test_session.rb

@@ -182,6 +182,7 @@ 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/test_forward.rb

@@ -17,6 +17,7 @@
 require_relative './common'
 require 'net/ssh/buffer'
 require 'net/ssh'
+require 'net/ssh/proxy/command'
 require 'timeout'
 require 'tempfile'
 
@@ -31,8 +32,8 @@ class TestForward < Test::Unit::TestCase
     'net_ssh_1'
   end
 
-  def ssh_start_params
-    [localhost ,user , {:keys => @key_id_rsa, :verbose => :debug}]
+  def ssh_start_params(options = {})
+    [localhost ,user , {:keys => @key_id_rsa}.merge(options)]
   end
 
   def setup_ssh_env(&block)
@@ -338,6 +339,110 @@ class TestForward < Test::Unit::TestCase
     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

data/test/transport/test_session.rb

@@ -309,7 +309,7 @@ module Transport
       end
 
       def algorithms
-        @algorithms ||= stub("algorithms", :initialized? => true, :allow? => true)
+        @algorithms ||= stub("algorithms", :initialized? => true, :allow? => true, :start => true)
       end
 
       def session(options={})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0.rc1
 platform: ruby
 authors:
 - Jamis Buck
@@ -31,7 +31,7 @@ cert_chain:
   s/ZUKye79ELwFYKJOhjW5g725OL3hy+llhEleytwKRwgXFQBPTC4f5UkdxZVVWGH
   e2C9M1m/2odPZo8h
   -----END CERTIFICATE-----
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -252,12 +252,12 @@ 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
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: 'Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.'