Merge pull request #187 from mfazekas/password_auth_ask

Password auth will ask for password up to number_of_password_prompts tim...

2 files changed, 46 insertions, 1 deletions

diff --git a/test/authentication/methods/test_password.rb b/test/authentication/methods/test_password.rb
index 4ba8207..3448b5a 100644
--- a/test/authentication/methods/test_password.rb
+++ b/test/authentication/methods/test_password.rb
@@ -1,7 +1,9 @@
 require 'common'
 require 'net/ssh/authentication/methods/password'
+require 'net/ssh/authentication/session'
 require 'authentication/methods/common'
 
+
 module Authentication; module Methods
 
   class TestPassword < Test::Unit::TestCase
@@ -24,6 +26,47 @@ module Authentication; module Methods
       end
     end
 
+    def test_authenticate_ask_for_password_for_second_time_when_password_is_incorrect
+      transport.expect do |t,packet|
+        assert_equal USERAUTH_REQUEST, packet.type
+        assert_equal "jamis", packet.read_string
+        assert_equal "ssh-connection", packet.read_string
+        assert_equal "password", packet.read_string
+        assert_equal false, packet.read_bool
+        assert_equal "the-password", packet.read_string
+        t.return(USERAUTH_FAILURE, :string, "publickey,password")
+
+        t.expect do |t2, packet2|
+          assert_equal USERAUTH_REQUEST, packet2.type
+          assert_equal "jamis", packet2.read_string
+          assert_equal "ssh-connection", packet2.read_string
+          assert_equal "password", packet2.read_string
+          assert_equal false, packet2.read_bool
+          assert_equal "the-password-2", packet2.read_string
+          t.return(USERAUTH_SUCCESS)
+        end
+      end
+
+      subject.expects(:prompt).with("jamis@'s password:", false).returns("the-password-2")
+      subject.authenticate("ssh-connection", "jamis", "the-password")
+    end
+
+    def test_authenticate_ask_for_password_if_not_given
+      transport.expect do |t,packet|
+        assert_equal USERAUTH_REQUEST, packet.type
+        assert_equal "bill", packet.read_string
+        assert_equal "ssh-connection", packet.read_string
+        assert_equal "password", packet.read_string
+        assert_equal false, packet.read_bool
+        assert_equal "good-password", packet.read_string
+        t.return(USERAUTH_SUCCESS)
+      end
+
+      transport.instance_eval { @host='testhost' }
+      subject.expects(:prompt).with("bill@testhost's password:", false).returns("good-password")
+      subject.authenticate("ssh-connection", "bill", nil)
+    end
+
     def test_authenticate_when_password_is_acceptible_should_return_true
       transport.expect do |t,packet|
         assert_equal USERAUTH_REQUEST, packet.type
diff --git a/test/test_config.rb b/test/test_config.rb
index 623281e..9b3eeb8 100644
--- a/test/test_config.rb
+++ b/test/test_config.rb
@@ -93,7 +93,8 @@ class TestConfig < Test::Unit::TestCase
       'port'                    => 1234,
       'pubkeyauthentication'    => true,
       'rekeylimit'              => 1024,
-      'sendenv'                 => "LC_*"
+      'sendenv'                 => "LC_*",
+      'numberofpasswordprompts' => '123'
     }
 
     net_ssh = Net::SSH::Config.translate(open_ssh)
@@ -111,6 +112,7 @@ class TestConfig < Test::Unit::TestCase
     assert_equal 1024,      net_ssh[:rekey_limit]
     assert_equal "127.0.0.1", net_ssh[:bind_address]
     assert_equal [/^LC_.*$/], net_ssh[:send_env]
+    assert_equal 123,       net_ssh[:number_of_password_prompts]
   end
 
   def test_translate_should_turn_off_authentication_methods