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 SessionConnection

This commit is contained in:
Ignasi Barrera 2015-06-11 13:29:23 +02:00
parent f88acd67c0
commit 7e1838afbb
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/jsch/.gitignore vendored
View File

@ -1,9 +0,0 @@
# use glob syntax.
syntax: glob
target
.settings
.classpath
.project
jclouds-jsch.iml
jclouds-jsch.ipr
jclouds-jsch.iws

6
drivers/jsch/src/main/java/org/jclouds/ssh/jsch/SessionConnection.java
View File

@ -169,11 +169,11 @@ public final class SessionConnection implements Connection<Session> {
.getSession(loginCredentials.getUser(), hostAndPort.getHostText(), hostAndPort.getPortOrDefault(22)); .getSession(loginCredentials.getUser(), hostAndPort.getHostText(), hostAndPort.getPortOrDefault(22));
if (sessionTimeout != 0) if (sessionTimeout != 0)
session.setTimeout(sessionTimeout); session.setTimeout(sessionTimeout);
if (loginCredentials.getOptionalPassword().isPresent()) { if (loginCredentials.hasUnencryptedPrivateKey()) {
session.setPassword(loginCredentials.getOptionalPassword().orNull());
} else if (loginCredentials.hasUnencryptedPrivateKey()) {
byte[] privateKey = loginCredentials.getOptionalPrivateKey().get().getBytes(); byte[] privateKey = loginCredentials.getOptionalPrivateKey().get().getBytes();
jsch.addIdentity(loginCredentials.getUser(), privateKey, null, emptyPassPhrase); jsch.addIdentity(loginCredentials.getUser(), privateKey, null, emptyPassPhrase);
} else if (loginCredentials.getOptionalPassword().isPresent()) {
session.setPassword(loginCredentials.getOptionalPassword().orNull());
} else if (agentConnector.isPresent()) { } else if (agentConnector.isPresent()) {
JSch.setConfig("PreferredAuthentications", "publickey"); JSch.setConfig("PreferredAuthentications", "publickey");
jsch.setIdentityRepository(new RemoteIdentityRepository(agentConnector.get())); jsch.setIdentityRepository(new RemoteIdentityRepository(agentConnector.get()));