diff options
Diffstat (limited to 'adaptors/ssh-adaptor/ssh-adaptor-bundle/src')
2 files changed, 4 insertions, 2 deletions
diff --git a/adaptors/ssh-adaptor/ssh-adaptor-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ssh/sshd/SshConnectionSshd.java b/adaptors/ssh-adaptor/ssh-adaptor-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ssh/sshd/SshConnectionSshd.java index 4194159fe..34b2aa8f5 100644 --- a/adaptors/ssh-adaptor/ssh-adaptor-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ssh/sshd/SshConnectionSshd.java +++ b/adaptors/ssh-adaptor/ssh-adaptor-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ssh/sshd/SshConnectionSshd.java @@ -93,7 +93,7 @@ class SshConnectionSshd implements SshConnection { } if (keyFile != null) { KeyPairProvider keyPairProvider = new FileKeyPairProvider(Paths.get(keyFile)); - KeyPair keyPair = keyPairProvider.loadKeys().iterator().next(); + KeyPair keyPair = keyPairProvider.loadKeys(clientSession).iterator().next(); clientSession.addPublicKeyIdentity(keyPair); } AuthFuture authFuture = clientSession.auth(); diff --git a/adaptors/ssh-adaptor/ssh-adaptor-bundle/src/test/java/org/onap/ccsdk/sli/adaptors/ssh/sshd/SshAdaptorTest.java b/adaptors/ssh-adaptor/ssh-adaptor-bundle/src/test/java/org/onap/ccsdk/sli/adaptors/ssh/sshd/SshAdaptorTest.java index 5067debd5..fecb42fc2 100644 --- a/adaptors/ssh-adaptor/ssh-adaptor-bundle/src/test/java/org/onap/ccsdk/sli/adaptors/ssh/sshd/SshAdaptorTest.java +++ b/adaptors/ssh-adaptor/ssh-adaptor-bundle/src/test/java/org/onap/ccsdk/sli/adaptors/ssh/sshd/SshAdaptorTest.java @@ -33,6 +33,7 @@ import java.nio.file.Paths; import java.util.Collections; import org.apache.sshd.common.util.OsUtils; import org.apache.sshd.server.SshServer; +import org.apache.sshd.server.ServerFactoryManager; import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider; import org.apache.sshd.server.scp.ScpCommandFactory; import org.apache.sshd.server.subsystem.sftp.SftpSubsystemFactory; @@ -216,7 +217,8 @@ public class SshAdaptorTest { sshd.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(Paths.get(System.getProperty("java.io.tmpdir") + "/key.ser"))); sshd.setPasswordAuthenticator((username, password, session) -> (SSH_USERNAME.equals(username) && SSH_PASSWORD.equals(password))); sshd.setPublickeyAuthenticator((username, key, session) -> false); - sshd.getProperties().put(SshServer.WELCOME_BANNER, "Welcome to SSHD\n"); + // SshServer.WELCOME_BANNER no longer exists in apache sshd 2.7.0 + // sshd.getProperties().put(SshServer.WELCOME_BANNER, "Welcome to SSHD\n"); startServer0(); try { Thread.sleep(1000); |