Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JCLOUDS-921 prioritise key over password in SSHClientConnection 

From ticket:
If keyboard interactive login is not allowed on the box but the user also requires a sudo password the ssh fails as it prioritises the password.
If you remove the password then the sudo fails in the SudoAwareInitManager.
It would seem better to prioritise the key over the password in SSHClientConnection or possibly try both if they are both present, and the first fails.

This commit swaps the order of the if else check to use the ssh key if present.
This commit is contained in:
Stuart Hendren 2015-06-01 16:35:18 +01:00 committed by Ignasi Barrera
parent 522c080a4a
commit f88acd67c0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/sshj/src/main/java/org/jclouds/sshj/SSHClientConnection.java
View File

@ -157,12 +157,12 @@ public class SSHClientConnection implements Connection<SSHClient> {
ssh.setTimeout(sessionTimeout); ssh.setTimeout(sessionTimeout);
} }
ssh.connect(hostAndPort.getHostText(), hostAndPort.getPortOrDefault(22)); ssh.connect(hostAndPort.getHostText(), hostAndPort.getPortOrDefault(22));
if (loginCredentials.getOptionalPassword().isPresent()) { if (loginCredentials.hasUnencryptedPrivateKey()) {
ssh.authPassword(loginCredentials.getUser(), loginCredentials.getOptionalPassword().get());
} else if (loginCredentials.hasUnencryptedPrivateKey()) {
OpenSSHKeyFile key = new OpenSSHKeyFile(); OpenSSHKeyFile key = new OpenSSHKeyFile();
key.init(loginCredentials.getOptionalPrivateKey().get(), null); key.init(loginCredentials.getOptionalPrivateKey().get(), null);
ssh.authPublickey(loginCredentials.getUser(), key); ssh.authPublickey(loginCredentials.getUser(), key);
} else if (loginCredentials.getOptionalPassword().isPresent()) {
ssh.authPassword(loginCredentials.getUser(), loginCredentials.getOptionalPassword().get());
} else if (agentConnector.isPresent()) { } else if (agentConnector.isPresent()) {
AgentProxy proxy = new AgentProxy(agentConnector.get()); AgentProxy proxy = new AgentProxy(agentConnector.get());
ssh.auth(loginCredentials.getUser(), getAuthMethods(proxy)); ssh.auth(loginCredentials.getUser(), getAuthMethods(proxy));