net-ssh 2.5.1 → 2.5.2

data/CHANGELOG.rdoc

@@ -1,4 +1,8 @@
 
+=== 2.5.2 / 25 May 2012
+
+* Fix for Net::SSH::KnownHosts::SUPPORTED_TYPE [Marco Sandrini] 
+
 === 2.5.1 / 24 May 2012
 
 * Added missing file to manifest [Marco Sandrini]

data/LICENSE.rdoc

@@ -0,0 +1,19 @@
+Copyright © 2008 Jamis Buck
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the ‘Software’), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED ‘AS IS’, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/Rakefile

@@ -19,6 +19,7 @@ task :default => :package
 README = "README.rdoc"
 CHANGES = "CHANGELOG.rdoc"
 THANKS = 'THANKS.rdoc'
+LICENSE = "LICENSE.rdoc"
 
 # Files and directories to be deleted when you run "rake clean"
 CLEAN.include [ 'pkg', '*.gem', '.config', 'doc']
@@ -81,6 +82,7 @@ Rake::RDocTask.new do |t|
 	t.rdoc_files.include(README)
 	t.rdoc_files.include(CHANGES)
 	t.rdoc_files.include(THANKS)
+ 	t.rdoc_files.include(LICENSE)
 	t.rdoc_files.include('lib/**/*.rb')
 end
 

data/lib/net/ssh/known_hosts.rb

@@ -10,16 +10,18 @@ module Net; module SSH
   # This is used internally by Net::SSH, and will never need to be used directly
   # by consumers of the library.
   class KnownHosts
-    class <<self
 
-      if defined?(OpenSSL::PKey::EC)
-        SUPPORTED_TYPE = %w(ssh-rsa ssh-dss
-                            ecdsa-sha2-nistp256
-                            ecdsa-sha2-nistp384
-                            ecdsa-sha2-nistp521)
-      else
-        SUPPORTED_TYPE = %w(ssh-rsa ssh-dss)
-      end
+    if defined?(OpenSSL::PKey::EC)
+      SUPPORTED_TYPE = %w(ssh-rsa ssh-dss
+                          ecdsa-sha2-nistp256
+                          ecdsa-sha2-nistp384
+                          ecdsa-sha2-nistp521)
+    else
+      SUPPORTED_TYPE = %w(ssh-rsa ssh-dss)
+    end
+
+
+    class <<self
 
       # Searches all known host files (see KnownHosts.hostfiles) for all keys
       # of the given host. Returns an array of keys found.

data/lib/net/ssh/version.rb

@@ -51,7 +51,7 @@ module Net; module SSH
     MINOR = 5
 
     # The tiny component of this version of the Net::SSH library
-    TINY  = 1
+    TINY  = 2 
 
     # The current version of the Net::SSH library as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

data/net-ssh.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "net-ssh"
   s.rubyforge_project = 'net-ssh'
-  s.version = "2.5.1"
+  s.version = "2.5.2"
   s.summary = "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol."
   s.description = s.summary + " It allows you to write programs that invoke and interact with processes on remote servers, via SSH2."
   s.authors = ["Jamis Buck", "Delano Mandelbaum"]
@@ -14,10 +14,12 @@
   s.require_paths = %w[lib]
   s.rubygems_version = '1.3.2'
 
-  # This has two flavours with java one actually doing something and other
-  # one just raising error. This is a workaround for no ability to specify
-  # platform specific dependencies in gemspecs.
-  s.add_dependency 'jruby-pageant', ">=1.0.2"
+  if RUBY_PLATFORM == "java"
+    # This has two flavours with java one actually doing something and other
+    # one just raising error. This is a workaround for no ability to specify
+    # platform specific dependencies in gemspecs.
+    s.add_dependency 'jruby-pageant', ">=1.0.2"
+  end
 
   s.executables = %w[]
 
@@ -26,11 +28,14 @@
   CHANGELOG.rdoc
   Manifest
   README.rdoc
+  LICENSE.rdoc
   Rakefile
   Rudyfile
   THANKS.rdoc
   lib/net/ssh.rb
   lib/net/ssh/authentication/agent.rb
+  lib/net/ssh/authentication/agent/java_pageant.rb
+  lib/net/ssh/authentication/agent/socket.rb
   lib/net/ssh/authentication/constants.rb
   lib/net/ssh/authentication/key_manager.rb
   lib/net/ssh/authentication/methods/abstract.rb
@@ -40,8 +45,6 @@
   lib/net/ssh/authentication/methods/publickey.rb
   lib/net/ssh/authentication/pageant.rb
   lib/net/ssh/authentication/session.rb
-  lib/net/ssh/authentication/agent/java_pageant.rb
-  lib/net/ssh/authentication/agent/socket.rb
   lib/net/ssh/buffer.rb
   lib/net/ssh/buffered_io.rb
   lib/net/ssh/config.rb
@@ -88,15 +91,15 @@
   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_group14_sha1.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/kex/ecdh_sha2_nistp256.rb
   lib/net/ssh/transport/kex/ecdh_sha2_nistp384.rb
   lib/net/ssh/transport/kex/ecdh_sha2_nistp521.rb
+  lib/net/ssh/transport/key_expander.rb
   lib/net/ssh/transport/openssl.rb
   lib/net/ssh/transport/packet_stream.rb
   lib/net/ssh/transport/server_version.rb
@@ -110,6 +113,7 @@
   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
@@ -124,14 +128,20 @@
   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/start/test_transport.rb
+  test/known_hosts/github
   test/test_all.rb
   test/test_buffer.rb
   test/test_buffered_io.rb
   test/test_config.rb
   test/test_key_factory.rb
+  test/test_known_hosts.rb
   test/transport/hmac/test_md5.rb
   test/transport/hmac/test_md5_96.rb
   test/transport/hmac/test_none.rb
@@ -142,8 +152,8 @@
   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_group14_sha1.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/kex/test_ecdh_sha2_nistp256.rb

data/test/README.txt

@@ -0,0 +1,43 @@
+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

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

data/test/configs/numeric_host

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

data/test/known_hosts/github

@@ -0,0 +1 @@
+github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==

data/test/manual/test_forward.rb

@@ -0,0 +1,223 @@
+#     $ 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'], {:keys => "~/.ssh/id_rsa", :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

data/test/start/test_transport.rb

@@ -0,0 +1,28 @@
+require 'common'
+require 'net/ssh'
+
+module NetSSH
+  class TestStart < Test::Unit::TestCase
+    attr_reader :transport_session
+    attr_reader :authentication_session
+    
+    def setup
+      @transport_session = mock('transport_session')
+      @authentication_session = mock('authentication_session')
+      Net::SSH::Transport::Session.expects(:new => transport_session)
+      Net::SSH::Authentication::Session.expects(:new => authentication_session)
+    end
+    
+    def test_close_transport_when_authentication_fails
+      authentication_session.expects(:authenticate => false)
+      
+      transport_session.expects(:close).at_least_once
+      
+      begin
+        Net::SSH.start('localhost', 'testuser') {}
+      rescue Net::SSH::AuthenticationFailed
+        # Authentication should fail, as it is part of the context
+      end
+    end
+  end
+end

data/test/test_known_hosts.rb

@@ -0,0 +1,13 @@
+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")
+    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

metadata

@@ -2,7 +2,7 @@
 name: net-ssh
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.5.1
+  version: 2.5.2
 platform: ruby
 authors: 
 - Jamis Buck
@@ -11,19 +11,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-24 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: jruby-pageant
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.2
-  type: :runtime
-  version_requirements: *id001
+date: 2012-05-25 00:00:00 Z
+dependencies: []
+
 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."
 email: 
 - net-ssh@solutious.com
@@ -39,11 +29,14 @@ files:
 - CHANGELOG.rdoc
 - Manifest
 - README.rdoc
+- LICENSE.rdoc
 - Rakefile
 - Rudyfile
 - THANKS.rdoc
 - lib/net/ssh.rb
 - lib/net/ssh/authentication/agent.rb
+- lib/net/ssh/authentication/agent/java_pageant.rb
+- lib/net/ssh/authentication/agent/socket.rb
 - lib/net/ssh/authentication/constants.rb
 - lib/net/ssh/authentication/key_manager.rb
 - lib/net/ssh/authentication/methods/abstract.rb
@@ -53,8 +46,6 @@ files:
 - lib/net/ssh/authentication/methods/publickey.rb
 - lib/net/ssh/authentication/pageant.rb
 - lib/net/ssh/authentication/session.rb
-- lib/net/ssh/authentication/agent/java_pageant.rb
-- lib/net/ssh/authentication/agent/socket.rb
 - lib/net/ssh/buffer.rb
 - lib/net/ssh/buffered_io.rb
 - lib/net/ssh/config.rb
@@ -101,15 +92,15 @@ files:
 - 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_group14_sha1.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/kex/ecdh_sha2_nistp256.rb
 - lib/net/ssh/transport/kex/ecdh_sha2_nistp384.rb
 - lib/net/ssh/transport/kex/ecdh_sha2_nistp521.rb
+- lib/net/ssh/transport/key_expander.rb
 - lib/net/ssh/transport/openssl.rb
 - lib/net/ssh/transport/packet_stream.rb
 - lib/net/ssh/transport/server_version.rb
@@ -123,6 +114,7 @@ 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
@@ -137,14 +129,20 @@ 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/start/test_transport.rb
+- test/known_hosts/github
 - test/test_all.rb
 - test/test_buffer.rb
 - test/test_buffered_io.rb
 - test/test_config.rb
 - test/test_key_factory.rb
+- test/test_known_hosts.rb
 - test/transport/hmac/test_md5.rb
 - test/transport/hmac/test_md5_96.rb
 - test/transport/hmac/test_none.rb
@@ -155,8 +153,8 @@ files:
 - 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_group14_sha1.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/kex/test_ecdh_sha2_nistp256.rb