X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.simple%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fjsch%2FAbstractJschTask.java;h=2c4247f1a4b36abbfde25542a6a727f25d65b52d;hb=3581bc4795d047d7ad79270e249dd8f7e60c2cdf;hp=cc1ce57da5e1c2e7aa1ecfcdda758588111d9c7d;hpb=1c23cd8f757b8930cc88f5aa368b7a17ca082b85;p=gpl%2Fargeo-slc.git

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 cc1ce57da..2c4247f1a 100644
--- 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
@@ -1,8 +1,26 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 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,18 +28,44 @@ import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.Session;
 
 public abstract class AbstractJschTask implements Runnable {
+	private final Log log = LogFactory.getLog(getClass());
+
 	private SshTarget sshTarget;
 
 	protected Session openSession() {
+		if (sshTarget.getSession() != null) {
+			Session session = sshTarget.getSession();
+			if (session.isConnected()) {
+				if (log.isTraceEnabled())
+					log.debug("Using cached session 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 reset.");
+				sshTarget.setSession(session);
+			}
 			return session;
 		} catch (JSchException e) {
+			if (sshTarget.getUserInfo() instanceof SimpleUserInfo)
+				((SimpleUserInfo) sshTarget.getUserInfo()).reset();
 			throw new SlcException("Could not open session to "
 					+ getSshTarget(), e);
 		}
@@ -32,7 +76,12 @@ 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");
+			}
 		}
 	}
 
@@ -47,7 +96,7 @@ public abstract class AbstractJschTask implements Runnable {
 		if (b == 0)
 			return b;
 		else if (b == -1)
-			return b;//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;
@@ -66,6 +115,8 @@ public abstract class AbstractJschTask implements Runnable {
 	}
 
 	public SshTarget getSshTarget() {
+		if (sshTarget == null)
+			throw new SlcException("No SSH target defined.");
 		return sshTarget;
 	}