Added support for default identity file.

roti · Oct 14, 2016 · 1a5edff · 1a5edff
1 parent 7323a73
commit 1a5edff
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/...mons-file/src/main/java/com/mucommander/commons/file/impl/sftp/SFTPConnectionHandler.java b/...mons-file/src/main/java/com/mucommander/commons/file/impl/sftp/SFTPConnectionHandler.java
@@ -19,6 +19,7 @@
 
 package com.mucommander.commons.file.impl.sftp;
 
+import java.io.File;
 import java.io.IOException;
 
 import org.slf4j.Logger;
@@ -41,6 +42,8 @@
 class SFTPConnectionHandler extends ConnectionHandler {
     private static final Logger LOGGER = LoggerFactory.getLogger(SFTPConnectionHandler.class);
 
+    private static final String DEFAULT_IDENTITY_FILE = System.getProperty("user.home")+"/.ssh/id_rsa";
+
     Session session;
     ChannelSftp channelSftp;
 
@@ -85,6 +88,16 @@ public void startConnection() throws IOException {
                 jsch.addIdentity(privateKeyPath);
             }
 
+            if (new File(DEFAULT_IDENTITY_FILE).exists()) {
+                try {
+                    jsch.addIdentity(DEFAULT_IDENTITY_FILE);
+                    LOGGER.info("Using {} authentication method", PUBLIC_KEY_AUTH_METHOD);
+                }
+                catch (JSchException e) {
+                    LOGGER.debug("Unable to load key {}", DEFAULT_IDENTITY_FILE);
+                }
+            }
+
             session = jsch.getSession(credentials.getLogin(), realm.getHost(), port);
             session.setUserInfo(new PasswordAuthentication());