net-ssh 2.2.2 → 2.3.0

metadata

@@ -2,7 +2,7 @@
 name: net-ssh
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors: 
 - Jamis Buck
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-05 00:00:00 Z
+date: 2012-01-11 00:00:00 Z
 dependencies: []
 
 description: "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol."
@@ -82,10 +82,16 @@ files:
 - lib/net/ssh/transport/hmac/none.rb
 - lib/net/ssh/transport/hmac/sha1.rb
 - lib/net/ssh/transport/hmac/sha1_96.rb
+- lib/net/ssh/transport/hmac/sha2_256.rb
+- lib/net/ssh/transport/hmac/sha2_256_96.rb
+- lib/net/ssh/transport/hmac/sha2_512.rb
+- lib/net/ssh/transport/hmac/sha2_512_96.rb
 - lib/net/ssh/transport/identity_cipher.rb
+- lib/net/ssh/transport/key_expander.rb
 - lib/net/ssh/transport/kex.rb
 - lib/net/ssh/transport/kex/diffie_hellman_group1_sha1.rb
 - lib/net/ssh/transport/kex/diffie_hellman_group_exchange_sha1.rb
+- lib/net/ssh/transport/kex/diffie_hellman_group_exchange_sha256.rb
 - lib/net/ssh/transport/openssl.rb
 - lib/net/ssh/transport/packet_stream.rb
 - lib/net/ssh/transport/server_version.rb
@@ -99,7 +105,6 @@ files:
 - setup.rb
 - support/arcfour_check.rb
 - support/ssh_tunnel_bug.rb
-- test/README.txt
 - test/authentication/methods/common.rb
 - test/authentication/methods/test_abstract.rb
 - test/authentication/methods/test_hostbased.rb
@@ -114,12 +119,9 @@ files:
 - test/configs/exact_match
 - test/configs/host_plus
 - test/configs/multihost
-- test/configs/nohost
-- test/configs/numeric_host
 - test/configs/wild_cards
 - test/connection/test_channel.rb
 - test/connection/test_session.rb
-- test/manual/test_forward.rb
 - test/test_all.rb
 - test/test_buffer.rb
 - test/test_buffered_io.rb
@@ -130,8 +132,13 @@ files:
 - test/transport/hmac/test_none.rb
 - test/transport/hmac/test_sha1.rb
 - test/transport/hmac/test_sha1_96.rb
+- test/transport/hmac/test_sha2_256.rb
+- test/transport/hmac/test_sha2_256_96.rb
+- test/transport/hmac/test_sha2_512.rb
+- test/transport/hmac/test_sha2_512_96.rb
 - test/transport/kex/test_diffie_hellman_group1_sha1.rb
 - test/transport/kex/test_diffie_hellman_group_exchange_sha1.rb
+- test/transport/kex/test_diffie_hellman_group_exchange_sha256.rb
 - test/transport/test_algorithms.rb
 - test/transport/test_cipher_factory.rb
 - test/transport/test_hmac.rb

data/test/README.txt

@@ -1,43 +0,0 @@
-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
-
-Run a single test file like this:
-
-     ruby -Ilib -Itest -rrubygems test/transport/test_server_version.rb
-
-
-EXPECTED RESULTS
-
-* Ruby 1.8: all tests pass
-
-* Ruby 1.9: all tests pass
-
-* JRuby 1.5: 99% tests pass (448 tests, 1846 assertions, 1 failures)
-
-
-PORT FORWARDING TESTS
-
-     ruby -Ilib -Itest -rrubygems test/manual/test_forward.rb
-
-test_forward.rb must be run separately from the test suite because
-it requires authorizing your public SSH keys on you localhost.
-
-If you already have keys you can do this:
-
-     cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
-
-If you don't have keys see:
-
-     http://kimmo.suominen.com/docs/ssh/#ssh-keygen
-
-You should now be able to login to your localhost with out
-bring prompted for a password:
-
-     ssh localhost
-
--Delano

data/test/configs/nohost

@@ -1,19 +0,0 @@
-
-IdentityFile ~/.ssh/id_dsa
-IdentityFile ~/.ssh/id_rsa
-Port 1980
-
-Host test.host
-  Port 1985
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    

data/test/configs/numeric_host

@@ -1,4 +0,0 @@
-Host 1234
-  Compression yes
-  Port 1980
-  RekeyLimit 2G

data/test/manual/test_forward.rb

@@ -1,223 +0,0 @@
-#     $ ruby -Ilib -Itest -rrubygems test/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']] #:verbose => :debug
-  end
-  
-  def find_free_port 
-    server = TCPServer.open(0)
-    server.setsockopt(Socket::SOL_SOCKET,Socket::SO_REUSEADDR,true)
-    port = server.addr[1]
-    server.close
-    port
-  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_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 = find_free_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 = find_free_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
-  
-  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
-
-  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 = find_free_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 = find_free_port
-    session.forward.local(local_port, 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