FIXED: Authentication would never succeed if the first password attem…

…pt failed.
delano · Jun 19, 2010 · afdb85a · afdb85a
1 parent c55dab5
commit afdb85a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,5 +1,9 @@
 RYE, CHANGES
 
+#### 0.8.18 (2010-06-19) #############################
+
+* FIXED: Authentication would never succeed if the first password attempt failed.
+
 #### 0.8.17 (2010-05-19) #############################
 
 * FIXED: authorize_keys_remote was using incorrect home directory

diff --git a/lib/rye/box.rb b/lib/rye/box.rb
@@ -650,9 +650,9 @@ def connect(reconnect=true)
         retried += 1
         if STDIN.tty? && retried <= 3
           STDERR.puts "Passwordless login failed for #{@rye_user}"
-          @rye_opts[:password] = highline.ask("Password: ") { |q| q.echo = '' }
+          @rye_opts[:password] = highline.ask("Password: ") { |q| q.echo = '' }.strip
           @rye_opts[:auth_methods] ||= []
-          @rye_opts[:auth_methods] << 'password'
+          @rye_opts[:auth_methods].push *['keyboard-interactive', 'password']
           retry
         else
           raise Net::SSH::AuthenticationFailed