X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.core%2Fsrc%2Forg%2Fargeo%2Fssh%2FAbstractSsh.java;h=261ac246028bab5707dd9df4c99cfbaec610f1e4;hb=4835aba6de0e6e2f7ef2da9e3bd19adca661c8bc;hp=88b28b525290a113f94250b90458df06ef94bade;hpb=2604d709c4554fecdf54a7d4e03cfb4d3c29d987;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.core/src/org/argeo/ssh/AbstractSsh.java b/org.argeo.core/src/org/argeo/ssh/AbstractSsh.java
index 88b28b525..261ac2460 100644
--- a/org.argeo.core/src/org/argeo/ssh/AbstractSsh.java
+++ b/org.argeo.core/src/org/argeo/ssh/AbstractSsh.java
@@ -3,20 +3,24 @@ 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.net.URISyntaxException;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.Scanner;
+import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sshd.client.SshClient;
-import org.apache.sshd.client.config.keys.ClientIdentityLoader;
+import org.apache.sshd.client.channel.ClientChannel;
+import org.apache.sshd.client.channel.ClientChannelEvent;
 import org.apache.sshd.client.future.ConnectFuture;
 import org.apache.sshd.client.session.ClientSession;
 import org.apache.sshd.client.subsystem.sftp.fs.SftpFileSystemProvider;
-import org.apache.sshd.common.config.keys.FilePasswordProvider;
+import org.apache.sshd.common.util.io.NoCloseInputStream;
+import org.apache.sshd.common.util.io.NoCloseOutputStream;
 
+@SuppressWarnings("restriction")
 abstract class AbstractSsh {
 	private final static Log log = LogFactory.getLog(AbstractSsh.class);
 
@@ -59,8 +63,9 @@ abstract class AbstractSsh {
 					Console console = System.console();
 					if (console == null) {// IDE
 						System.out.print("Password: ");
-						Scanner s = new Scanner(System.in);
-						password = s.next();
+						try (Scanner s = new Scanner(System.in)) {
+							password = s.next();
+						}
 					} else {
 						console.printf("Password: ");
 						char[] pwd = console.readPassword();
@@ -148,4 +153,37 @@ abstract class AbstractSsh {
 		return session;
 	}
 
+	public void setSshKeyPair(SshKeyPair sshKeyPair) {
+		this.sshKeyPair = sshKeyPair;
+	}
+
+	public static void openShell(ClientSession session) {
+		try (ClientChannel channel = session.createChannel(ClientChannel.CHANNEL_SHELL)) {
+			channel.setIn(new NoCloseInputStream(System.in));
+			channel.setOut(new NoCloseOutputStream(System.out));
+			channel.setErr(new NoCloseOutputStream(System.err));
+			channel.open();
+
+			Set<ClientChannelEvent> events = new HashSet<>();
+			events.add(ClientChannelEvent.CLOSED);
+			channel.waitFor(events, 0);
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} finally {
+			session.close(false);
+		}
+	}
+
+	static URI toUri(String username, String host, int port) {
+		try {
+			if (username == null)
+				username = "root";
+			return new URI("ssh://" + username + "@" + host + ":" + port);
+		} catch (URISyntaxException e) {
+			throw new IllegalArgumentException("Cannot generate SSH URI to " + host + ":" + port + " for " + username,
+					e);
+		}
+	}
+
 }