svn commit: r666833 - in /ant/ivy/core/trunk: CHANGES.txt src/java/org/apache/ivy/plugins/repository/ssh/SshCache.java

[ma...@apache.org]

Author: maartenc
Date: Wed Jun 11 13:37:46 2008
New Revision: 666833

URL: http://svn.apache.org/viewvc?rev=666833&view=rev
Log:
IMPROVEMENT: SSH resolver doesn't support keyboard-interactive authentication (IVY-836) (thanks to Tobias Himstedt)

Modified:
    ant/ivy/core/trunk/CHANGES.txt
    ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/ssh/SshCache.java

Modified: ant/ivy/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=666833&r1=666832&r2=666833&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Wed Jun 11 13:37:46 2008
@@ -28,6 +28,7 @@
 	Jacob Grydholt Jensen
 	Scott Goldstein
 	Pierre Hägnestrand
+	Tobias Himstedt
 	Ben Hale
 	Peter Hayes
 	Matt Inger
@@ -71,6 +72,7 @@
 - NEW: Add a new resolve mode (optionally per module) to utilize dynamic constraint rule metadata (IVY-740)
 - NEW: Add transitive dependency version and branch override mechanism (IVY-784)
 
+- IMPROVEMENT: SSH resolver doesn't support keyboard-interactive authentication (IVY-836) (thanks to Tobias Himstedt)
 - IMPROVEMENT: declare source and javadoc artifacts in maven2 modules (IVY-325)
 - IMPROVEMENT: Set the last modified attribute of files downloaded from repositories (IVY-823)
 - IMPROVEMENT: If DNS is playing up, Ivy takes a lot longer to sort project dependencies (IVY-817)

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/ssh/SshCache.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/ssh/SshCache.java?rev=666833&r1=666832&r2=666833&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/ssh/SshCache.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/ssh/SshCache.java Wed Jun 11 13:37:46 2008
@@ -36,6 +36,7 @@
 import com.jcraft.jsch.JSch;
 import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.Session;
+import com.jcraft.jsch.UIKeyboardInteractive;
 import com.jcraft.jsch.UserInfo;
 
 /**
@@ -344,7 +345,7 @@
     /**
      * feeds in password silently into JSch
      */
-    private static class CfUserInfo implements UserInfo {
+    private static class CfUserInfo implements UserInfo, UIKeyboardInteractive {
 
         private String userPassword;
 
@@ -407,5 +408,10 @@
             }
             return pemPassword;
         }
+
+        public String[] promptKeyboardInteractive(String destination, String name, 
+                String instruction, String[] prompt, boolean[] echo) {
+            return new String[] {getPassword()};
+        }
     }
 }