net-ssh 0.6.0 → 0.9.0

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

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004,2005 Jamis Buck (jamis_buck@byu.edu)
 # All rights reserved.
 #
 # This source file is distributed as part of the Net::SSH Secure Shell Client

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

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004,2005 Jamis Buck (jamis_buck@byu.edu)
 # All rights reserved.
 #
 # This source file is distributed as part of the Net::SSH Secure Shell Client

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

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004,2005 Jamis Buck (jamis_buck@byu.edu)
 # All rights reserved.
 #
 # This source file is distributed as part of the Net::SSH Secure Shell Client

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

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004,2005 Jamis Buck (jamis_buck@byu.edu)
 # All rights reserved.
 #
 # This source file is distributed as part of the Net::SSH Secure Shell Client

data/lib/net/ssh/userauth/methods/hostbased.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004,2005 Jamis Buck (jamis_buck@byu.edu)
 # All rights reserved.
 #
 # This source file is distributed as part of the Net::SSH Secure Shell Client

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

@@ -0,0 +1,104 @@
+#--
+# =============================================================================
+# Copyright (c) 2004,2005 Jamis Buck (jamis_buck@byu.edu)
+# All rights reserved.
+#
+# This source file is distributed as part of the Net::SSH Secure Shell Client
+# library for Ruby. This file (and the library as a whole) may be used only as
+# allowed by either the BSD license, or the Ruby license (or, by association
+# with the Ruby license, the GPL). See the "doc" subdirectory of the Net::SSH
+# distribution for the texts of these licenses.
+# -----------------------------------------------------------------------------
+# net-ssh website : http://net-ssh.rubyforge.org
+# project website: http://rubyforge.org/projects/net-ssh
+# =============================================================================
+#++
+
+require 'net/ssh/errors'
+require 'net/ssh/userauth/constants'
+
+module Net
+  module SSH
+    module UserAuth
+      module Methods
+
+        # Implements the "keyboard-interactive" SSH authentication method.
+        class KeyboardInteractive
+          include Net::SSH::UserAuth::Constants
+
+          # Represents an information request from the server
+          InfoRequest = Struct.new( :name, :instruction, :password, :prompts )
+
+          # Represents a single prompt in an InfoRequest.
+          Prompt = Struct.new( :prompt, :echo )
+
+          USERAUTH_INFO_REQUEST  = 60
+          USERAUTH_INFO_RESPONSE = 61
+
+          # The messenger to use when communicating.
+          attr_writer :messenger
+
+          # Create a new Password authenticator. It will use the given buffers
+          # factory to create new buffer instances. The +callback+ should be
+          # a proc object to use to specialize the behavior of this
+          # authentication method.
+          def initialize( buffers, callback )
+            @buffers = buffers
+            @callback = callback
+          end
+
+          # Attempt to authenticate the given user for the given service. The
+          # data hash must specify a <tt>:password</tt> value, otherwise this
+          # will always return false.
+          def authenticate( next_service, username, data={} )
+            password = data[:password]
+
+            msg = @buffers.writer
+            msg.write_byte USERAUTH_REQUEST
+            msg.write_string username
+            msg.write_string next_service
+            msg.write_string "keyboard-interactive"
+            msg.write_string ""
+            msg.write_string ""
+            @messenger.send_message msg
+
+            loop do
+              message = @messenger.wait_for_message
+
+              case message.message_type
+                when USERAUTH_SUCCESS
+                  return true
+                when USERAUTH_FAILURE
+                  return false
+                when USERAUTH_INFO_REQUEST
+                  name = message.buffer.read_string
+                  instruction = message.buffer.read_string
+                  req = InfoRequest.new( name, instruction, password, [] )
+                  password = nil # only use the given password once
+
+                  lang_tag = message.buffer.read_string
+                  message.buffer.read_long.times do
+                    prompt = message.buffer.read_string
+                    echo = message.buffer.read_bool
+                    req.prompts << Prompt.new( prompt, echo )
+                  end
+
+                  responses = @callback.call( req )
+                  msg = @buffers.writer
+                  msg.write_byte USERAUTH_INFO_RESPONSE
+                  msg.write_long responses.length
+                  msg.write_string *responses
+                  @messenger.send_message msg
+                else
+                  raise Net::SSH::Exception,
+                    "unexpected reply in keyboard interactive: " +
+                      message.inspect
+              end
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/net/ssh/userauth/methods/password.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004,2005 Jamis Buck (jamis_buck@byu.edu)
 # All rights reserved.
 #
 # This source file is distributed as part of the Net::SSH Secure Shell Client

data/lib/net/ssh/userauth/methods/publickey.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004,2005 Jamis Buck (jamis_buck@byu.edu)
 # All rights reserved.
 #
 # This source file is distributed as part of the Net::SSH Secure Shell Client

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

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004,2005 Jamis Buck (jamis_buck@byu.edu)
 # All rights reserved.
 #
 # This source file is distributed as part of the Net::SSH Secure Shell Client
@@ -29,11 +29,33 @@ module Net
               method
             end
 
-            # Just alias keyboard_interactive to password, for now
-            # TODO: keyboard_interactive should probably actually prompt
-            # for a password if one wasn't given...need to read up on this
-            # more.
-            b.keyboard_interactive { b.password }
+            b.keyboard_interactive do |c,p|
+              require 'net/ssh/userauth/methods/keyboard-interactive'
+              method = KeyboardInteractive.new( c[:transport][:buffers],
+                c[:keyboard_interactive_callback] )
+              method.messenger = c[:userauth][:driver]
+              method
+            end
+
+            b.keyboard_interactive_prompter do
+              require 'net/ssh/util/prompter'
+              Net::SSH::Util::Prompter.new
+            end
+
+            b.keyboard_interactive_callback do |c,p|
+              proc do |req|
+                responses = []
+                puts req.name unless req.name.empty?
+                puts req.instruction unless req.instruction.empty?
+                req.prompts.each do |prompt|
+                  response = prompt.echo ?
+                    gets.chomp :
+                    c[:keyboard_interactive_prompter].password( prompt.prompt )
+                  responses << response
+                end
+                responses
+              end
+            end
 
             b.publickey do |c,p|
               require 'net/ssh/userauth/methods/publickey'

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

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004,2005 Jamis Buck (jamis_buck@byu.edu)
 # All rights reserved.
 #
 # This source file is distributed as part of the Net::SSH Secure Shell Client
@@ -38,13 +38,16 @@ module Net
           b.default_agent_version { 2 }
           
           b.agent( :model => :prototype ) do |c,p|
-            if ( socket_factory = c[:agent_socket_factory] )
+            socket_factory = c[:agent_socket_factory]
+            socket_name = c[:default_agent_socket_name]
+
+            if socket_name && socket_factory
               require 'net/ssh/userauth/agent'
               require 'net/ssh/transport/services'
 
               agent = Agent.new
               agent.socket_factory = socket_factory
-              agent.socket_name = c[:default_agent_socket_name]
+              agent.socket_name = socket_name
               agent.version = c[:default_agent_version]
               agent.buffers = c[:transport][:buffers]
               agent.keys = c[:transport][:keys]
@@ -93,9 +96,9 @@ module Net
 
           b.authentication_method_order do
             [ "publickey",
-              "keyboard-interactive",
+              "hostbased",
               "password",
-              "hostbased" ]
+              "keyboard-interactive" ]
           end
 
           b.driver do |c,p|

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

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004,2005 Jamis Buck (jamis_buck@byu.edu)
 # All rights reserved.
 #
 # This source file is distributed as part of the Net::SSH Secure Shell Client

data/lib/net/ssh/util/buffer.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004,2005 Jamis Buck (jamis_buck@byu.edu)
 # All rights reserved.
 #
 # This source file is distributed as part of the Net::SSH Secure Shell Client

data/lib/net/ssh/util/openssl.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004,2005 Jamis Buck (jamis_buck@byu.edu)
 # All rights reserved.
 #
 # This source file is distributed as part of the Net::SSH Secure Shell Client

data/lib/net/ssh/util/prompter.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004,2005 Jamis Buck (jamis_buck@byu.edu)
 # All rights reserved.
 #
 # This source file is distributed as part of the Net::SSH Secure Shell Client

data/lib/net/ssh/version.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004,2005 Jamis Buck (jamis_buck@byu.edu)
 # All rights reserved.
 #
 # This source file is distributed as part of the Net::SSH Secure Shell Client
@@ -19,7 +19,7 @@ module Net
     module Version
 
       MAJOR = 0
-      MINOR = 6
+      MINOR = 9
       TINY  = 0
 
       STRING = [ MAJOR, MINOR, TINY ].join( "." )

data/test/ALL-TESTS.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004,2005 Jamis Buck (jamis_buck@byu.edu)
 # All rights reserved.
 #
 # This source file is distributed as part of the Net::SSH Secure Shell Client

data/test/connection/tc_channel.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004,2005 Jamis Buck (jamis_buck@byu.edu)
 # All rights reserved.
 #
 # This source file is distributed as part of the Net::SSH Secure Shell Client

data/test/connection/tc_driver.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004,2005 Jamis Buck (jamis_buck@byu.edu)
 # All rights reserved.
 #
 # This source file is distributed as part of the Net::SSH Secure Shell Client

data/test/connection/tc_integration.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004,2005 Jamis Buck (jamis_buck@byu.edu)
 # All rights reserved.
 #
 # This source file is distributed as part of the Net::SSH Secure Shell Client

data/test/proxy/tc_http.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004,2005 Jamis Buck (jamis_buck@byu.edu)
 # All rights reserved.
 #
 # This source file is distributed as part of the Net::SSH Secure Shell Client

data/test/proxy/tc_socks4.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004,2005 Jamis Buck (jamis_buck@byu.edu)
 # All rights reserved.
 #
 # This source file is distributed as part of the Net::SSH Secure Shell Client

data/test/proxy/tc_socks5.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004,2005 Jamis Buck (jamis_buck@byu.edu)
 # All rights reserved.
 #
 # This source file is distributed as part of the Net::SSH Secure Shell Client

data/test/service/forward/tc_driver.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004,2005 Jamis Buck (jamis_buck@byu.edu)
 # All rights reserved.
 #
 # This source file is distributed as part of the Net::SSH Secure Shell Client

data/test/service/forward/tc_local_network_handler.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004,2005 Jamis Buck (jamis_buck@byu.edu)
 # All rights reserved.
 #
 # This source file is distributed as part of the Net::SSH Secure Shell Client

data/test/service/forward/tc_remote_network_handler.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004,2005 Jamis Buck (jamis_buck@byu.edu)
 # All rights reserved.
 #
 # This source file is distributed as part of the Net::SSH Secure Shell Client

data/test/service/process/tc_driver.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004,2005 Jamis Buck (jamis_buck@byu.edu)
 # All rights reserved.
 #
 # This source file is distributed as part of the Net::SSH Secure Shell Client

data/test/service/process/tc_integration.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004,2005 Jamis Buck (jamis_buck@byu.edu)
 # All rights reserved.
 #
 # This source file is distributed as part of the Net::SSH Secure Shell Client

data/test/service/process/tc_open.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004,2005 Jamis Buck (jamis_buck@byu.edu)
 # All rights reserved.
 #
 # This source file is distributed as part of the Net::SSH Secure Shell Client

data/test/service/process/tc_popen3.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004,2005 Jamis Buck (jamis_buck@byu.edu)
 # All rights reserved.
 #
 # This source file is distributed as part of the Net::SSH Secure Shell Client
@@ -47,7 +47,7 @@ class TC_Process_POpen3 < Test::Unit::TestCase
 
   class TC_SSHStdinPipe < Test::Unit::TestCase
     def setup
-      @channel = MockObject.new
+      @channel = Channel.new
       @pipe = Net::SSH::Service::Process::POpen3Manager::SSHStdinPipe.new(
         @channel )
     end
@@ -76,9 +76,11 @@ class TC_Process_POpen3 < Test::Unit::TestCase
     end
 
     def test_read_empty
+      klass = class << @channel.connection; self; end
+      pipe = @pipe
+      klass.send(:define_method,:process) { pipe.instance_variable_set( :@data, "foo" ) }
       s = @pipe.read
-      assert_equal "", s
-      assert_equal [ [ :loop, :with_block ] ], @channel.connection.events
+      assert_equal "foo", s
     end
 
     def test_read_full
@@ -97,16 +99,14 @@ class TC_Process_POpen3 < Test::Unit::TestCase
     end
 
     def test_read_empty
+      klass = class << @channel.connection; self; end
+      pipe = @pipe
+      klass.send(:define_method,:process) do
+        data = pipe.instance_variable_get( :@data )
+        pipe.instance_variable_set( :@data, (data||"") + "foo" )
+      end
       s = @pipe.read
-      assert_equal "", s
-      assert_equal [ [ :loop, :with_block ] ], @channel.connection.events
-    end
-
-    def test_read_non_stderr
-      @pipe.do_data @channel, 0, "foo"
-      s = @pipe.read
-      assert_equal "", s
-      assert_equal [ [ :loop, :with_block ] ], @channel.connection.events
+      assert_equal "foo", s
     end
 
     def test_read_stderr