package org.argeo.ssh;
+import java.io.Console;
import java.io.IOException;
import java.net.URI;
import java.security.GeneralSecurityException;
import java.security.KeyPair;
+import java.util.Arrays;
+import java.util.Scanner;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.sshd.client.config.keys.ClientIdentityLoader;
import org.apache.sshd.client.future.ConnectFuture;
import org.apache.sshd.client.session.ClientSession;
-import org.apache.sshd.client.subsystem.sftp.SftpFileSystemProvider;
+import org.apache.sshd.client.subsystem.sftp.fs.SftpFileSystemProvider;
import org.apache.sshd.common.config.keys.FilePasswordProvider;
abstract class AbstractSsh {
}
return sshClient;
}
-
+
synchronized SftpFileSystemProvider getSftpFileSystemProvider() {
- if(sftpFileSystemProvider==null) {
+ if (sftpFileSystemProvider == null) {
sftpFileSystemProvider = new SftpFileSystemProvider(sshClient);
}
return sftpFileSystemProvider;
void authenticate() {
try {
+ if (!passwordSet) {
+ String password;
+ Console console = System.console();
+ if (console == null) {// IDE
+ System.out.print("Password: ");
+ Scanner s = new Scanner(System.in);
+ password = s.next();
+ } else {
+ console.printf("Password: ");
+ char[] pwd = console.readPassword();
+ password = new String(pwd);
+ Arrays.fill(pwd, ' ');
+ }
+ session.addPasswordIdentity(password);
+ passwordSet = true;
+ }
session.auth().verify(1000l);
} catch (IOException e) {
throw new IllegalStateException(e);
}
void loadKey(String password, String keyPath) {
- try {
- KeyPair keyPair = ClientIdentityLoader.DEFAULT.loadClientIdentity(keyPath,
- FilePasswordProvider.of(password));
- session.addPublicKeyIdentity(keyPair);
- } catch (IOException | GeneralSecurityException e) {
- throw new IllegalStateException(e);
- }
+// try {
+// KeyPair keyPair = ClientIdentityLoader.DEFAULT.loadClientIdentity(keyPath,
+// FilePasswordProvider.of(password));
+// session.addPublicKeyIdentity(keyPair);
+// } catch (IOException | GeneralSecurityException e) {
+// throw new IllegalStateException(e);
+// }
}
void openSession(URI uri) {
}
void closeSession() {
- if (session != null)
+ if (session == null)
throw new IllegalStateException("No session is open");
try {
session.close();