eclipse-ditto#985 set supported client side user auth method

Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch.io>
bosch-io · Mar 24, 2021 · 685e9df · 685e9df
1 parent a534c07
commit 685e9df
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/...rc/main/java/org/eclipse/ditto/services/connectivity/messaging/tunnel/SshTunnelActor.java b/...rc/main/java/org/eclipse/ditto/services/connectivity/messaging/tunnel/SshTunnelActor.java
@@ -72,7 +72,7 @@ public final class SshTunnelActor extends AbstractActorWithTimers implements Cre
     private final String sshHost;
     private final int sshPort;
     private String sshUser = null;
-    private String sshUserMethod = null;
+    private String sshUserAuthMethod = null;
     private final ServerKeyVerifier serverKeyVerifier;
 
     @Nullable private ClientSession sshSession = null;
@@ -161,6 +161,7 @@ private void handleConnectResult(final ConnectFuture connectFuture) throws IOExc
             sshSession.addSessionListener(new TunnelSessionListener(getSelf(), logger));
             sshSession.addChannelListener(new TunnelChannelListener(getSelf()));
             sshSession.setServerKeyVerifier(serverKeyVerifier);
+            sshSession.setUserAuthFactoriesNames(sshUserAuthMethod);
             connection.getSshTunnel()
                     .map(SshTunnel::getCredentials)
                     .ifPresent(c -> c.accept(new ClientSessionCredentialsVisitor(sshSession, logger)));
@@ -299,16 +300,16 @@ public Void clientCertificate(final ClientCertificateCredentials credentials) {
     @Override
     public Void usernamePassword(final UserPasswordCredentials credentials) {
         sshUser = credentials.getUsername();
-        sshUserMethod = UserAuthMethodFactory.PASSWORD;
-        logger.debug("Username ({}) for ssh session is '{}'.", sshUserMethod, sshUser);
+        sshUserAuthMethod = UserAuthMethodFactory.PASSWORD;
+        logger.debug("Username ({}) for ssh session is '{}'.", sshUserAuthMethod, sshUser);
         return null;
     }
 
     @Override
     public Void sshPublicKeyAuthentication(final SshPublicKeyAuthentication credentials) {
         sshUser = credentials.getUsername();
-        sshUserMethod = UserAuthMethodFactory.PUBLIC_KEY;
-        logger.debug("Username ({}) for ssh session is '{}'.", sshUserMethod, sshUser);
+        sshUserAuthMethod = UserAuthMethodFactory.PUBLIC_KEY;
+        logger.debug("Username ({}) for ssh session is '{}'.", sshUserAuthMethod, sshUser);
         return null;
     }