net-ssh 2.0.15 → 2.0.16

data/CHANGELOG.rdoc

@@ -1,4 +1,11 @@
 
+=== 2.0.16 / 28 Nov 2009
+
+* Fix for "multiple hosts are separated by whitespace" [Akinori MUSHA]
+* Add support for the ProxyCommand directive [Akinori MUSHA]
+* Do not put a command line twice in error messages [Akinori MUSHA]
+* Switched from #recv(1) to #readchar in lib/net/ssh/transport/server_version.rb, so that closed sockets are recognized [Alex Peuchert]
+
 
 === 2.0.15 / 03 Sep 2009
 

data/lib/net/ssh/config.rb

@@ -23,6 +23,7 @@ module Net; module SSH
   # * PasswordAuthentication => maps to the :auth_methods option
   # * Port => :port
   # * PreferredAuthentications => maps to the :auth_methods option
+  # * ProxyCommand => maps to the :proxy option
   # * RekeyLimit => :rekey_limit
   # * User => :user
   # * UserKnownHostsFile => :user_known_hosts_file
@@ -31,7 +32,7 @@ module Net; module SSH
   # whether the OpenSSH configuration files are read by passing the :config
   # option to Net::SSH.start. (They are, by default.)
   class Config
-    class <<self
+    class << self
       @@default_files = %w(~/.ssh/config /etc/ssh_config /etc/ssh/ssh_config)
 
       # Returns an array of locations of OpenSSH configuration files
@@ -83,9 +84,9 @@ module Net; module SSH
             end
 
           if key == 'host'
-            # Support "Host host1,host2,hostN".
+            # Support "Host host1 host2 hostN".
             # See http://github.com/net-ssh/net-ssh/issues#issue/6
-            multi_host = value.split(/,\s+/)
+            multi_host = value.split(/\s+/)
             matched_host = multi_host.select { |h| host =~ pattern2regex(h) }.first
           elsif !matched_host.nil?
             if key == 'identityfile'
@@ -143,6 +144,9 @@ module Net; module SSH
             hash[:port] = value
           when 'preferredauthentications'
             hash[:auth_methods] = value.split(/,/)
+          when 'proxycommand'
+            require 'net/ssh/proxy/command'
+            hash[:proxy] = Net::SSH::Proxy::Command.new(value)
           when 'pubkeyauthentication'
             if value
               hash[:auth_methods] ||= []
@@ -182,4 +186,4 @@ module Net; module SSH
     end
   end
 
-end; end
+end; end

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

@@ -0,0 +1,75 @@
+require 'socket'
+require 'net/ssh/proxy/errors'
+require 'net/ssh/ruby_compat'
+
+module Net; module SSH; module Proxy
+
+  # An implementation of a command proxy. To use it, instantiate it,
+  # then pass the instantiated object via the :proxy key to
+  # Net::SSH.start:
+  #
+  #   require 'net/ssh/proxy/command'
+  #
+  #   proxy = Net::SSH::Proxy::Command.new('ssh relay nc %h %p')
+  #   Net::SSH.start('host', 'user', :proxy => proxy) do |ssh|
+  #     ...
+  #   end
+  class Command
+
+    # The command line template
+    attr_reader :command_line_template
+
+    # The command line for the session
+    attr_reader :command_line
+
+    # Create a new socket factory that tunnels via a command executed
+    # with the user's shell, which is composed from the given command
+    # template.  In the command template, `%h' will be substituted by
+    # the host name to connect and `%p' by the port.
+    def initialize(command_line_template)
+      @command_line_template = command_line_template
+      @command_line = nil
+    end
+
+    # Return a new socket connected to the given host and port via the
+    # proxy that was requested when the socket factory was instantiated.
+    def open(host, port)
+      command_line = @command_line_template.gsub(/%(.)/) {
+        case $1
+        when 'h'
+          host
+        when 'p'
+          port.to_s
+        when '%'
+          '%'
+        else
+          raise ArgumentError, "unknown key: #{$1}"
+        end
+      }
+      begin
+        io = IO.popen(command_line, "r+")
+        if result = Net::SSH::Compat.io_select([io], nil, [io], 60)
+          if result.last.any?
+            raise "command failed"
+          end
+        else
+          raise "command timed out"
+        end
+      rescue => e
+        raise ConnectError, "#{e}: #{command_line}"
+      end
+      @command_line = command_line
+      class << io
+        def send(data, flag)
+          write_nonblock(data)
+        end
+
+        def recv(size)
+          read_nonblock(size)
+        end
+      end
+      io
+    end
+  end
+
+end; end; end

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

@@ -59,10 +59,13 @@ module Net; module SSH; module Transport
     # The IP address of the peer (remote) end of the socket, as reported by
     # the socket.
     def peer_ip
-      @peer_ip ||= begin
-        addr = getpeername
-        Socket.getnameinfo(addr, Socket::NI_NUMERICHOST | Socket::NI_NUMERICSERV).first
-      end
+      @peer_ip ||=
+        if respond_to?(:getpeername)
+          addr = getpeername
+          Socket.getnameinfo(addr, Socket::NI_NUMERICHOST | Socket::NI_NUMERICSERV).first
+        else
+          "<no hostip for proxy command>"
+        end
     end
     
     # Returns true if the IO is available for reading, and false otherwise.

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

@@ -43,9 +43,11 @@ module Net; module SSH; module Transport
         loop do
           @version = ""
           loop do
-            b = socket.recv(1)
-            
-            if b.nil?
+#            b = socket.recv(1)
+            begin
+              b = socket.readpartial(1)
+              raise Net::SSH::Disconnect, "connection closed by remote host" if b.nil?
+            rescue EOFError => e
               raise Net::SSH::Disconnect, "connection closed by remote host"
             end
             @version << b

data/lib/net/ssh/version.rb

@@ -51,7 +51,7 @@ module Net; module SSH
     MINOR = 0
 
     # The tiny component of this version of the Net::SSH library
-    TINY  = 15
+    TINY  = 16
 
     # 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.0.15"
+	s.version = "2.0.16"
 	s.summary = "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol."
 	s.description = s.summary
 	s.authors = ["Jamis Buck", "Delano Mandelbaum"]
@@ -48,6 +48,7 @@
   lib/net/ssh/loggable.rb
   lib/net/ssh/packet.rb
   lib/net/ssh/prompt.rb
+  lib/net/ssh/proxy/command.rb
   lib/net/ssh/proxy/errors.rb
   lib/net/ssh/proxy/http.rb
   lib/net/ssh/proxy/socks4.rb
@@ -89,6 +90,7 @@
   net-ssh.gemspec
   setup.rb
   support/arcfour_check.rb
+  support/ssh_tunnel_bug.rb
   test/authentication/methods/common.rb
   test/authentication/methods/test_abstract.rb
   test/authentication/methods/test_hostbased.rb

data/support/ssh_tunnel_bug.rb

@@ -0,0 +1,65 @@
+#!/usr/bin/ruby
+
+# SSH TUNNEL CONNECTION BUG
+# from: http://net-ssh.lighthouseapp.com/projects/36253/tickets/7-an-existing-connection-was-forcibly-closed-by-the-remote-host#ticket-7-3
+#
+# Steps to reproduce:
+#
+# * Start HTTP Proxy
+#   * If running debian in EC2:
+#     * apt-get install squid
+#     * Add the following to /etc/squid/squid.conf:
+#       acl localnet src 1.2.3.0/255.255.255.0
+#       http_access allow  localnet
+#       icp_access  allow  localnet
+#       visible_hostname netsshtest
+#     * Start squid squid -N -d 1 -D
+# * Run this script
+# * Configure browser proxy to use localhost with LOCAL_PORT. 
+# * Load any page, wait for it to load fully. If the page loads
+#   correctly, move on. If not, something needs to be corrected.
+# * Refresh the page several times. This should cause this
+#   script to failed with the error: "closed stream". You may
+#   need to try a few times. 
+#
+
+require 'highline/import'
+require 'net/ssh'
+
+LOCAL_PORT = 8080
+PROXY_PORT = 3128
+
+host, user = *ARGV
+abort "Usage: #{$0} host user" unless ARGV.size == 2
+
+puts "Connecting to #{user}@#{host}..."
+pass = ask("Password: ") { |q| q.echo = "*" }
+puts "Configure your browser proxy to localhost:#{LOCAL_PORT}"
+
+begin
+  session = Net::SSH.start(host, user, :password => pass)  
+  session.forward.local(LOCAL_PORT, host, PROXY_PORT)
+  session.loop{true}
+rescue => e
+  puts e.message
+  puts e.backtrace
+end
+
+
+__END__
+
+$ ruby support/ssh_tunnel.rb host user
+Connecting to user@host...
+Password: ******
+Configure your browser proxy to localhost:8080
+closed stream
+/usr/local/lib/ruby/gems/1.9.1/gems/net-ssh-2.0.15/lib/net/ssh/buffered_io.rb:99:in `send'
+/usr/local/lib/ruby/gems/1.9.1/gems/net-ssh-2.0.15/lib/net/ssh/buffered_io.rb:99:in `send_pending'
+/usr/local/lib/ruby/gems/1.9.1/gems/net-ssh-2.0.15/lib/net/ssh/connection/session.rb:236:in `block in postprocess'
+/usr/local/lib/ruby/gems/1.9.1/gems/net-ssh-2.0.15/lib/net/ssh/connection/session.rb:235:in `each'
+/usr/local/lib/ruby/gems/1.9.1/gems/net-ssh-2.0.15/lib/net/ssh/connection/session.rb:235:in `postprocess'
+/usr/local/lib/ruby/gems/1.9.1/gems/net-ssh-2.0.15/lib/net/ssh/connection/session.rb:203:in `process'
+/usr/local/lib/ruby/gems/1.9.1/gems/net-ssh-2.0.15/lib/net/ssh/connection/session.rb:161:in `block in loop'
+/usr/local/lib/ruby/gems/1.9.1/gems/net-ssh-2.0.15/lib/net/ssh/connection/session.rb:161:in `loop'
+/usr/local/lib/ruby/gems/1.9.1/gems/net-ssh-2.0.15/lib/net/ssh/connection/session.rb:161:in `loop'
+

data/test/configs/multihost

@@ -1,4 +1,4 @@
-Host other.host, test.host
+Host other.host test.host
   Compression yes
   Port 1980
   RekeyLimit 2G

data/test/transport/test_server_version.rb

@@ -28,6 +28,10 @@ module Transport
       assert_raises(Net::SSH::Exception) { subject(socket(false, "SSH-1.4-Testing_1.0\r\n")) }
     end
 
+    def test_unexpected_server_close_should_raise_exception
+      assert_raises(Net::SSH::Disconnect) { subject(socket(false, "\r\nDestination server does not have Ssh activated.\r\nContact Cisco Systems, Inc to purchase a\r\nlicense key to activate Ssh.\r\n", true)) }
+    end
+
     def test_header_lines_should_be_accumulated
       s = subject(socket(true, "Welcome\r\nAnother line\r\nSSH-2.0-Testing_1.0\r\n"))
       assert_equal "Welcome\r\nAnother line\r\n", s.header
@@ -40,15 +44,21 @@ module Transport
 
     private
 
-      def socket(good, version_header)
+      def socket(good, version_header, raise_eot=false)
         socket = mock("socket")
 
         data = version_header.split('')
         recv_times = data.length
-        if data[-1] != "\n"
-            recv_times += 1
+        recv_times += 1 if data[-1] != "\n"
+
+        unless raise_eot
+          
+#        socket.expects(:recv).with(1).times(recv_times).returns(*data).then.returns(nil)
+#        socket.expects(:readchar).times(recv_times).returns(*data).then.returns(nil)
+          socket.expects(:readpartial).with(1).times(recv_times).returns(*data).then.returns(nil)
+        else
+          socket.expects(:readpartial).with(1).times(recv_times+1).returns(*data).then.raises(EOFError, "end of file reached")
         end
-        socket.expects(:recv).with(1).times(recv_times).returns(*data).then.returns(nil)
 
         if good
           socket.expects(:write).with("#{Net::SSH::Transport::ServerVersion::PROTO_VERSION}\r\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: net-ssh
 version: !ruby/object:Gem::Version 
-  version: 2.0.15
+  version: 2.0.16
 platform: ruby
 authors: 
 - Jamis Buck
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-03 00:00:00 -04:00
+date: 2009-11-28 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -57,6 +57,7 @@ files:
 - lib/net/ssh/loggable.rb
 - lib/net/ssh/packet.rb
 - lib/net/ssh/prompt.rb
+- lib/net/ssh/proxy/command.rb
 - lib/net/ssh/proxy/errors.rb
 - lib/net/ssh/proxy/http.rb
 - lib/net/ssh/proxy/socks4.rb
@@ -98,6 +99,7 @@ files:
 - net-ssh.gemspec
 - setup.rb
 - support/arcfour_check.rb
+- support/ssh_tunnel_bug.rb
 - test/authentication/methods/common.rb
 - test/authentication/methods/test_abstract.rb
 - test/authentication/methods/test_hostbased.rb
@@ -162,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: net-ssh
-rubygems_version: 1.3.2
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol."