You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/06/18 11:47:48 UTC

svn commit: r1494088 - /karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshAction.java

Author: jbonofre
Date: Tue Jun 18 09:47:47 2013
New Revision: 1494088

URL: http://svn.apache.org/r1494088
Log:
[KARAF-2360] Add -P option in ssh command to provide the password

Modified:
    karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshAction.java

Modified: karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshAction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshAction.java?rev=1494088&r1=1494087&r2=1494088&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshAction.java (original)
+++ karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshAction.java Tue Jun 18 09:47:47 2013
@@ -47,6 +47,9 @@ public class SshAction extends OsgiComma
     @Option(name="-l", aliases={"--username"}, description = "The user name for remote login", required = false, multiValued = false)
     private String username;
 
+    @Option(name="-P", aliases={"--password"}, description = "The password for remote login", required = false, multiValued = false)
+    private String password;
+
     @Option(name="-p", aliases={"--port"}, description = "The port to use for SSH connection", required = false, multiValued = false)
     private int port = 22;
     
@@ -123,8 +126,12 @@ public class SshAction extends OsgiComma
                     }
                 }
                 if (!authed) {
-                    log.debug("Prompting user for password");
-                    String password = readLine("Password: ");
+                    if (password == null) {
+                        log.debug("Prompting user for password");
+                        password = readLine("Password: ");
+                    } else {
+                        log.debug("Password provided using command line option");
+                    }
                     sshSession.authPassword(username, password);
                     int ret = sshSession.waitFor(ClientSession.WAIT_AUTH | ClientSession.CLOSED | ClientSession.AUTHED, 0);
                     if ((ret & ClientSession.AUTHED) == 0) {