summaryrefslogtreecommitdiffstats
path: root/adaptors
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2021-08-06 16:42:10 -0400
committerDan Timoney <dtimoney@att.com>2021-08-17 07:41:16 -0400
commit4e4aaa9aa7acd9f66222fb6a41321c18d0839812 (patch)
tree363d1234bbeb9b096e750419ab9ad46f2aeed1de /adaptors
parent6c419f4b9ab0bffff4b56d4c4115551b41199858 (diff)
Package upgrades for Istanbul
Code updates to support package upgrades in Istanbul Issue-ID: CCSDK-3415 Signed-off-by: Dan Timoney <dtimoney@att.com> Change-Id: I44efd0d335bc63cc627d6ba64df1d5e406deb72a
Diffstat (limited to 'adaptors')
-rw-r--r--adaptors/ssh-adaptor/ssh-adaptor-bundle/pom.xml10
-rw-r--r--adaptors/ssh-adaptor/ssh-adaptor-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ssh/sshd/SshConnectionSshd.java2
-rw-r--r--adaptors/ssh-adaptor/ssh-adaptor-bundle/src/test/java/org/onap/ccsdk/sli/adaptors/ssh/sshd/SshAdaptorTest.java4
3 files changed, 14 insertions, 2 deletions
diff --git a/adaptors/ssh-adaptor/ssh-adaptor-bundle/pom.xml b/adaptors/ssh-adaptor/ssh-adaptor-bundle/pom.xml
index 359ecade6..5661eed32 100644
--- a/adaptors/ssh-adaptor/ssh-adaptor-bundle/pom.xml
+++ b/adaptors/ssh-adaptor/ssh-adaptor-bundle/pom.xml
@@ -57,6 +57,16 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.sshd</groupId>
+ <artifactId>sshd-scp</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sshd</groupId>
+ <artifactId>sshd-sftp</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>dblib-provider</artifactId>
</dependency>
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);