Improve JSCH support

[gpl/argeo-slc.git] / runtime / org.argeo.slc.support.simple / src / main / java / org / argeo / slc / jsch / AbstractJschTask.java

diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/AbstractJschTask.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/AbstractJschTask.java
index 8f1e12ae50a9c6b89dc959e4014a510b2513d724..1fff474ee00ce1011935182a21eb07eee4cd356a 100644 (file)
--- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/AbstractJschTask.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/AbstractJschTask.java
@@ -3,6 +3,8 @@ package org.argeo.slc.jsch;
 import java.io.IOException;
 import java.io.InputStream;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
 
 import com.jcraft.jsch.JSch;
@@ -10,16 +12,40 @@ import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.Session;
 
 public abstract class AbstractJschTask implements Runnable {
+       private final static Log log = LogFactory.getLog(AbstractJschTask.class);
+
        private SshTarget sshTarget;
 
        protected Session openSession() {
+               if (sshTarget.getSession() != null) {
+                       Session session = sshTarget.getSession();
+                       if (session.isConnected()) {
+                               if (log.isDebugEnabled())
+                                       log.debug("Using cached sesison to " + getSshTarget()
+                                                       + " via SSH");
+                               return session;
+                       }
+               }
+
                try {
                        JSch jsch = new JSch();
+                       if (sshTarget.getUsePrivateKey()
+                                       && sshTarget.getLocalPrivateKey().exists())
+                               jsch.addIdentity(sshTarget.getLocalPrivateKey()
+                                               .getAbsolutePath());
                        Session session = jsch.getSession(getSshTarget().getUser(),
                                        getSshTarget().getHost(), getSshTarget().getPort());
 
                        session.setUserInfo(getSshTarget().getUserInfo());
                        session.connect();
+                       if (log.isDebugEnabled())
+                               log.debug("Connected to " + getSshTarget() + " via SSH");
+                       if (sshTarget.getSession() != null) {
+                               if (log.isDebugEnabled())
+                                       log.debug("The cached session to " + getSshTarget()
+                                                       + " was disconnected and was reste.");
+                               sshTarget.setSession(session);
+                       }
                        return session;
                } catch (JSchException e) {
                        throw new SlcException("Could not open session to "
@@ -32,22 +58,27 @@ public abstract class AbstractJschTask implements Runnable {
                try {
                        run(session);
                } finally {
-                       session.disconnect();
+                       if (sshTarget.getSession() == null) {
+                               session.disconnect();
+                               if (log.isDebugEnabled())
+                                       log.debug("Disconnected from " + getSshTarget()
+                                                       + " via SSH");
+                       }
                }
        }
 
        abstract void run(Session session);
 
-       protected void checkAck(InputStream in) throws IOException {
+       protected int checkAck(InputStream in) throws IOException {
                int b = in.read();
                // b may be 0 for success,
                // 1 for error,
                // 2 for fatal error,
                // -1
                if (b == 0)
-                       return;
+                       return b;
                else if (b == -1)
-                       throw new SlcException("SSH ack returned -1");
+                       return b;// throw new SlcException("SSH ack returned -1");
                else if (b == 1 || b == 2) {
                        StringBuffer sb = new StringBuffer();
                        int c;
@@ -62,9 +93,12 @@ public abstract class AbstractJschTask implements Runnable {
                                throw new SlcException("SSH fatal error: " + sb.toString());
                        }
                }
+               return b;
        }
 
        public SshTarget getSshTarget() {
+               if (sshTarget == null)
+                       throw new SlcException("No SSH target defined.");
                return sshTarget;
        }