net-ssh 1.1.1 → 1.1.2

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

@@ -122,7 +122,7 @@ module Net
           user = proxy_user
           passwd = proxy_password
 
-          packet = [ SOCKS_VERSION,
+          packet = [ 0x01,
                      user.length, user,
                      passwd.length, passwd ].pack( "CCA*CA*" )
 

data/lib/net/ssh/service/agentforward/driver.rb

@@ -38,7 +38,7 @@ module Net
           end
 
           def do_open_channel( connection, channel, data )
-            channel.on_data &method(:do_data)
+            channel.on_data(&method(:do_data))
           end
 
           # handle CHANNEL_DATA packets received on the agent-forward

data/lib/net/ssh/service/process/open.rb

@@ -127,8 +127,8 @@ module Net
           # server. This is where the command to execute will be sent to the
           # server.
           def do_confirm( channel )
-            channel.on_success &method(:do_exec_success)
-            channel.on_failure &method(:do_exec_failure)
+            channel.on_success(&method(:do_exec_success))
+            channel.on_failure(&method(:do_exec_failure))
             channel.exec @command, true
           end
 
@@ -136,10 +136,10 @@ module Net
           # This registers various callbacks, and then calls the +on_success+
           # callback (if registered).
           def do_exec_success( channel )
-            channel.on_data &method(:do_data)
-            channel.on_extended_data &method(:do_extended_data)
-            channel.on_close &method(:do_close)
-            channel.on_request &method(:do_request)
+            channel.on_data(&method(:do_data))
+            channel.on_extended_data(&method(:do_extended_data))
+            channel.on_close(&method(:do_close))
+            channel.on_request(&method(:do_request))
             @on_success.call( self ) if @on_success
           end
 

data/lib/net/ssh/service/process/popen3.rb

@@ -140,7 +140,7 @@ module Net
             # pipe should ever be associated with a channel.
             def initialize( channel )
               super( channel )
-              channel.on_data &method(:do_data)
+              channel.on_data(&method(:do_data))
             end
 
             # Invoked when data is recieved from the channel. It simply
@@ -159,7 +159,7 @@ module Net
             # pipe should ever be associated with a channel.
             def initialize( channel )
               super( channel )
-              channel.on_extended_data &method(:do_data)
+              channel.on_extended_data(&method(:do_data))
             end
 
             # Invoked when data is recieved from the channel. It simply

data/lib/net/ssh/service/shell/shell.rb

@@ -15,12 +15,15 @@
 #++
 
 require 'stringio'
+require 'net/ssh/errors'
 
 module Net
   module SSH
     module Service
       module Shell
 
+        class OpenFailed < Net::SSH::Exception; end
+
         # A service class for interacting with a user's shell on a remote
         # machine. The shell may be interacted with either with or without a
         # pty.
@@ -128,6 +131,7 @@ module Net
             def on_confirm( channel )
               @channel = channel
 
+              @channel.on_confirm_failed( &method( :on_confirm_failed ) )
               @channel.on_close( &method( :on_close ) )
               @channel.on_data( &method( :on_data ) )
               @channel.on_eof( &method( :on_eof ) )
@@ -156,6 +160,11 @@ module Net
               @channel.send_request "shell", nil, true
             end
 
+            # Called when the channel could not be opened for some reason.
+            def on_confirm_failed( channel, reason, description, *args )
+              raise OpenFailed, "#{reason} (#{description})"
+            end
+
             # Invoked when the channel closes. Changes the shell's state to
             # closed.
             def on_close( channel )

data/lib/net/ssh/session.rb

@@ -282,7 +282,7 @@ module Net
           Net::SSH::NullHostKeyVerifier.new
         when :very then
           require 'net/ssh/host-key-verifier'
-          Net::SS::HostKeyVerifier.new
+          Net::SSH::HostKeyVerifier.new
         else
           if paranoia.respond_to?(:verify)
             paranoia

data/lib/net/ssh/transport/algorithm-negotiator.rb

@@ -16,6 +16,7 @@
 
 require 'net/ssh/errors'
 require 'net/ssh/transport/constants'
+require 'net/ssh/known-hosts'
 
 module Net
   module SSH
@@ -68,9 +69,16 @@ module Net
 
         # Builds the @algorithms hash from the values specified in the
         # +options+ hash.
-        def prepare_preferred_algorithms( options )
+        def prepare_preferred_algorithms( session, options )
           @algorithms = Hash.new
 
+          if !options.key?(:host_key)
+            keys = Net::SSH::KnownHosts.search_for(Net::SSH::KnownHosts.canonize(session.host, session.port))
+            preferred_order = []
+            preferred_order << keys.first.ssh_type if keys.any?
+            options = options.merge(:host_key => preferred_order)
+          end
+
           prepare_preferred_algorithm options, :host_key
           prepare_preferred_algorithm options, :kex
           prepare_preferred_algorithm options, :encryption
@@ -99,7 +107,7 @@ module Net
         # cannot be reached between what the client wants and what the server
         # can provide, this will fail.
         def negotiate( session, options )
-          prepare_preferred_algorithms options
+          prepare_preferred_algorithms session, options
 
           # first, discover what the server can do
           type, buffer = session.wait_for_message

data/lib/net/ssh/transport/packet-stream.rb

@@ -170,7 +170,7 @@ module Net
             # then validate it.
             hmac = @hmac.mac_length > 0 ? read( @hmac.mac_length ) : ""
 
-            reader.append @cipher.update( data )
+            reader.append @cipher.update( data ) unless data.empty?
             reader.append @cipher.final
 
             padding_length = reader.read_byte

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

@@ -36,6 +36,12 @@ module Net
         # the collection of algorithms currently being used
         attr_reader :algorithms
 
+        # the hostname that was requested
+        attr_reader :host
+
+        # the port that was requested
+        attr_reader :port
+
         attr_writer :logger
         attr_writer :default_port
         attr_writer :version_negotiator

data/lib/net/ssh/userauth/methods/keyboard-interactive.rb

@@ -87,7 +87,7 @@ module Net
                   msg = @buffers.writer
                   msg.write_byte USERAUTH_INFO_RESPONSE
                   msg.write_long responses.length
-                  msg.write_string *responses
+                  msg.write_string(*responses)
                   @messenger.send_message msg
                 else
                   raise Net::SSH::Exception,

data/lib/net/ssh/userauth/services.rb

@@ -126,7 +126,7 @@ module Net
               driver.set_host_key_files c[:userauth_host_keys]
             end
             if c.knows_key?(:userauth_method_order) && c[:userauth_method_order]
-              driver.set_auth_method_order *c[:userauth_method_order]
+              driver.set_auth_method_order(*c[:userauth_method_order])
             end
 
             driver

data/lib/net/ssh/version.rb

@@ -20,7 +20,7 @@ module Net
 
       MAJOR = 1
       MINOR = 1
-      TINY  = 1
+      TINY  = 2
 
       STRING = [ MAJOR, MINOR, TINY ].join( "." )
 

data/test/proxy/tc_socks5.rb

@@ -181,7 +181,7 @@ class TC_Proxy_SOCKS5 < Test::Unit::TestCase
 
     @server.wait
 
-    assert_equal [ "\5\2\0\2", "\5\3foo\3bar" ], @server.events
+    assert_equal [ "\5\2\0\2", "\1\3foo\3bar" ], @server.events
   end
 
   [ 
@@ -206,7 +206,7 @@ class TC_Proxy_SOCKS5 < Test::Unit::TestCase
 
       @server.wait
 
-      assert_equal [ "\5\2\0\2", "\5\3foo\3bar",
+      assert_equal [ "\5\2\0\2", "\1\3foo\3bar",
         "\5\1\0\3\11test.host\4\322" ], @server.events
     end
   end

data/test/service/forward/tc_driver.rb

@@ -126,7 +126,7 @@ class TC_Forward_Driver < Test::Unit::TestCase
       assert_equal 0, @driver.open_direct_channel_count
       assert @driver.active_locals.empty?
 
-      @driver.local *args
+      @driver.local(*args)
 
       address = '127.0.0.1'
       address = args.shift if args.first.is_a? String

data/test/transport/tc_algorithm_negotiator.rb

@@ -34,6 +34,7 @@ class TC_AlgorithmNegotiator < Test::Unit::TestCase
 
   class ScriptedSession
     attr_reader :messages
+    attr_reader :host, :port
 
     def initialize( *script )
       @script = script

data/test/transport/tc_session.rb

@@ -98,7 +98,7 @@ class TC_Session < Test::Unit::TestCase
       @on_new_algos = block
     end
     def set_algorithms( *args )
-      @on_new_algos.call *args if @on_new_algos
+      @on_new_algos.call(*args) if @on_new_algos
     end
   end
 

data/test/userauth/tc_driver.rb

@@ -130,7 +130,7 @@ class TC_UserAuth_Driver < Test::Unit::TestCase
     @driver.order << "four"
     assert_equal [ "one", "two", "three" ], original
     assert_equal [ "one", "two", "three", "four" ], @driver.order
-    @driver.set_auth_method_order *original
+    @driver.set_auth_method_order(*original)
     assert_equal [ "one", "two", "three" ], @driver.order
   end
 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: net-ssh
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
-date: 2007-05-09 00:00:00 -06:00
+  version: 1.1.2
+date: 2007-06-18 00:00:00 -06:00
 summary: Net::SSH is a pure-Ruby implementation of the SSH2 client protocol.
 require_paths: 
 - lib
@@ -99,6 +99,7 @@ files:
 - lib/net/ssh/connection/term.rb
 - lib/net/ssh/errors.rb
 - lib/net/ssh/host-key-verifier.rb
+- lib/net/ssh/known-hosts.rb
 - lib/net/ssh/lenient-host-key-verifier.rb
 - lib/net/ssh/null-host-key-verifier.rb
 - lib/net/ssh/proxy
@@ -268,6 +269,11 @@ files:
 - test/userauth/tc_userkeys.rb
 - test/util
 - test/util/tc_buffer.rb
+- README
+- LICENSE
+- NEWS
+- THANKS
+- ChangeLog
 test_files: 
 - test/ALL-TESTS.rb
 rdoc_options: []