Added configuration for Server Alive Interval

skavanagh · skavanagh · commit 0be6f7c4e6c2 · 2015-10-03T08:06:14.000-04:00
Added configuration for Server Alive Interval. Fixes bastillion-io#110
diff --git a/src/main/java/com/keybox/manage/util/SSHUtil.java b/src/main/java/com/keybox/manage/util/SSHUtil.java
@@ -60,6 +60,7 @@ public class SSHUtil {
 	public static final String PUB_KEY = PVT_KEY + ".pub";
 
 
+	public static final int SERVER_ALIVE_INTERVAL = StringUtils.isNumeric(AppConfig.getProperty("serverAliveInterval")) ? Integer.parseInt(AppConfig.getProperty("serverAliveInterval")) * 1000 : 60 * 1000;
 	public static final int SESSION_TIMEOUT = 60000;
 	public static final int CHANNEL_TIMEOUT = 60000;
 
@@ -231,9 +232,8 @@ public static HostSystem authAndAddPubKey(HostSystem hostSystem, String passphra
 			if (password != null && !password.equals("")) {
 				session.setPassword(password);
 			}
-			java.util.Properties config = new java.util.Properties();
-			config.put("StrictHostKeyChecking", "no");
-			session.setConfig(config);
+			session.setConfig("StrictHostKeyChecking", "no");
+			session.setServerAliveInterval(SERVER_ALIVE_INTERVAL);
 			session.connect(SESSION_TIMEOUT);
 
 
@@ -464,6 +464,7 @@ public static HostSystem openSSHTermOnSystem(String passphrase, String password,
 				session.setPassword(password);
 			}
 			session.setConfig("StrictHostKeyChecking", "no");
+			session.setServerAliveInterval(SERVER_ALIVE_INTERVAL);
 			session.connect(SESSION_TIMEOUT);
 			Channel channel = session.openChannel("shell");
 			if ("true".equals(AppConfig.getProperty("agentForwarding"))) {
diff --git a/src/main/resources/KeyBoxConfig.properties b/src/main/resources/KeyBoxConfig.properties
@@ -20,6 +20,8 @@ enableInternalAudit=false
 deleteAuditLogAfter=90
 #set an audit log server using log4j (ex: logstash). Edit the log4j.xml to configure appender.
 auditLogAppender=
+#The number of seconds that the client will wait before sending a null packet to the server to keep the connection alive
+serverAliveInterval=60
 #default timeout in minutes for websocket connection (no timeout for <=0)
 websocketTimeout=0
 #enable SSH agent forwarding
