X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.support%2Fsrc%2Forg%2Fargeo%2Fslc%2Fjsch%2FAbstractJschTask.java;h=59c0acfae4866f12e953efc523aedc88e5b22785;hb=58b35f147f3c1c1a12a07c303105618f679c7161;hp=ed37069ef3a14288230ff9abffc03109f49de3d2;hpb=b9505fef5ba8186433e903e9de3c73c17bdf6562;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.support/src/org/argeo/slc/jsch/AbstractJschTask.java b/org.argeo.slc.support/src/org/argeo/slc/jsch/AbstractJschTask.java
index ed37069ef..59c0acfae 100644
--- a/org.argeo.slc.support/src/org/argeo/slc/jsch/AbstractJschTask.java
+++ b/org.argeo.slc.support/src/org/argeo/slc/jsch/AbstractJschTask.java
@@ -1,22 +1,8 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * 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 java.security.PrivilegedAction;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -24,7 +10,9 @@ import org.argeo.slc.SlcException;
 
 import com.jcraft.jsch.JSch;
 import com.jcraft.jsch.JSchException;
+import com.jcraft.jsch.Logger;
 import com.jcraft.jsch.Session;
+import com.jcraft.jsch.UserAuthGSSAPIWithMIC;
 
 public abstract class AbstractJschTask implements Runnable {
 	private final Log log = LogFactory.getLog(getClass());
@@ -36,38 +24,34 @@ public abstract class AbstractJschTask implements Runnable {
 			Session session = sshTarget.getSession();
 			if (session.isConnected()) {
 				if (log.isTraceEnabled())
-					log.debug("Using cached session to " + getSshTarget()
-							+ " via SSH");
+					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());
+			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.setConfig("userauth.gssapi-with-mic", UserAuthGSSAPIWithMIC.class.getName());
 			session.setServerAliveInterval(1000);
 			session.connect();
 			if (log.isTraceEnabled())
 				log.trace("Connected to " + getSshTarget() + " via SSH");
 			if (sshTarget.getSession() != null) {
 				if (log.isTraceEnabled())
-					log.trace("The cached session to " + getSshTarget()
-							+ " was disconnected and was reset.");
+					log.trace("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);
+			throw new SlcException("Could not open session to " + getSshTarget(), e);
 		}
 	}
 
@@ -79,8 +63,7 @@ public abstract class AbstractJschTask implements Runnable {
 			if (sshTarget != null && sshTarget.getSession() == null) {
 				session.disconnect();
 				if (log.isTraceEnabled())
-					log.trace("Disconnected from " + getSshTarget()
-							+ " via SSH");
+					log.trace("Disconnected from " + getSshTarget() + " via SSH");
 			}
 		}
 	}
@@ -124,4 +107,34 @@ public abstract class AbstractJschTask implements Runnable {
 		this.sshTarget = sshTarget;
 	}
 
+	PrivilegedAction<Void> asPrivilegedAction() {
+		return new PrivilegedAction<Void>() {
+			public Void run() {
+				AbstractJschTask.this.run();
+				return null;
+			}
+		};
+	}
+
+	static {
+		JSch.setLogger(new JschLogger());
+	}
+
+	private static class JschLogger implements Logger {
+		private final Log log = LogFactory.getLog(JschLogger.class);
+
+		// TODO better support levels
+		@Override
+		public boolean isEnabled(int level) {
+			if (log.isTraceEnabled())
+				return true;
+			return false;
+		}
+
+		@Override
+		public void log(int level, String message) {
+			log.trace(message);
+		}
+
+	}
 }