Merge pull request #47 from embulk/support_open_ssh

support for openssh

Author: luongnhattruong

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.3.5 - 2021-02-02
+* [maintenance] Support OpenSsh key
+
 ## 0.3.4 - 2020-10-09
 * [maintenance] Update commons vfs2 latest version (2.6.0) to fix timeout setting not working
 

build.gradle

@@ -13,7 +13,7 @@ repositories {
 }
 
 group = "org.embulk.input.sftp"
-version = "0.3.3"
+version = "0.3.5"
 description = "Reads files stored on remote server using SFTP."
 
 sourceCompatibility = 1.8
@@ -27,7 +27,7 @@ dependencies {
     compileOnly "org.embulk:embulk-core:0.9.23"
     compile "org.apache.commons:commons-vfs2:2.2"
     compile "commons-io:commons-io:2.6"
-    compile "com.jcraft:jsch:0.1.55"
+    compile "com.github.mwiede:jsch:0.1.60"
 
     testCompile "junit:junit:4.13"
     testCompile "org.embulk:embulk-core:0.9.23:tests"

gradle/dependency-locks/embulkPluginRuntime.lockfile

@@ -1,7 +1,7 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-com.jcraft:jsch:0.1.55
+com.github.mwiede:jsch:0.1.60
 commons-io:commons-io:2.6
 commons-logging:commons-logging:1.2
 org.apache.commons:commons-vfs2:2.2

src/test/java/org/embulk/input/sftp/TestSftpFileInputPlugin.java

@@ -17,6 +17,7 @@
 import org.apache.sshd.server.SshServer;
 import org.apache.sshd.server.auth.password.PasswordAuthenticator;
 import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator;
+import org.apache.sshd.server.keyprovider.AbstractGeneratorHostKeyProvider;
 import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
 import org.apache.sshd.server.scp.ScpCommandFactory;
 import org.apache.sshd.server.session.ServerSession;
@@ -46,8 +47,10 @@
 import org.littleshoot.proxy.impl.DefaultHttpProxyServer;
 import org.slf4j.Logger;
 
+import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Method;
+import java.nio.file.Paths;
 import java.security.PublicKey;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -514,7 +517,10 @@ private SshServer createSshServer(String host, int port, final String sshUsernam
         sshServer.setPort(port);
         sshServer.setSubsystemFactories(Collections.<NamedFactory<Command>>singletonList(new SftpSubsystemFactory()));
         sshServer.setCommandFactory(new ScpCommandFactory());
-        sshServer.setKeyPairProvider(new SimpleGeneratorHostKeyProvider());
+        File file = new File(SECRET_KEY_FILE);
+        AbstractGeneratorHostKeyProvider hostKeyProvider = new SimpleGeneratorHostKeyProvider(file);
+        hostKeyProvider.setAlgorithm("RSA");
+        sshServer.setKeyPairProvider(hostKeyProvider);
         sshServer.setPasswordAuthenticator(new PasswordAuthenticator()
         {
             @Override