Repository: jclouds Updated Branches: refs/heads/master bc97afc0c -> edbb2c0e6
Log information according to the auth precedence Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/edbb2c0e Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/edbb2c0e Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/edbb2c0e Branch: refs/heads/master Commit: edbb2c0e6f4a6c644e333b247175773572077602 Parents: bc97afc Author: Ignasi Barrera <[email protected]> Authored: Tue Oct 18 18:31:22 2016 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Wed Oct 19 10:45:50 2016 +0200 ---------------------------------------------------------------------- .../src/main/java/org/jclouds/ssh/jsch/JschSshClient.java | 10 +++++----- .../src/main/java/org/jclouds/sshj/SshjSshClient.java | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/edbb2c0e/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java ---------------------------------------------------------------------- diff --git a/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java b/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java index 6983f29..c378649 100644 --- a/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java +++ b/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java @@ -131,15 +131,15 @@ public class JschSshClient implements SshClient { checkArgument(loginCredentials.getOptionalPassword().isPresent() || loginCredentials.hasUnencryptedPrivateKey() || agentConnector.isPresent(), "you must specify a password, a key or an SSH agent needs to be available"); this.backoffLimitedRetryHandler = checkNotNull(backoffLimitedRetryHandler, "backoffLimitedRetryHandler"); - if (loginCredentials.getOptionalPassword().isPresent()) { - this.toString = String.format("%s:pw[%s]@%s:%d", loginCredentials.getUser(), - base16().lowerCase().encode(md5().hashString(loginCredentials.getOptionalPassword().get(), UTF_8).asBytes()), host, - socket.getPort()); - } else if (loginCredentials.hasUnencryptedPrivateKey()) { + if (loginCredentials.hasUnencryptedPrivateKey()) { String fingerPrint = fingerprintPrivateKey(loginCredentials.getOptionalPrivateKey().get()); String sha1 = sha1PrivateKey(loginCredentials.getOptionalPrivateKey().get()); this.toString = String.format("%s:rsa[fingerprint(%s),sha1(%s)]@%s:%d", loginCredentials.getUser(), fingerPrint, sha1, host, socket.getPort()); + } else if (loginCredentials.getOptionalPassword().isPresent()) { + this.toString = String.format("%s:pw[%s]@%s:%d", loginCredentials.getUser(), + base16().lowerCase().encode(md5().hashString(loginCredentials.getOptionalPassword().get(), UTF_8).asBytes()), host, + socket.getPort()); } else { this.toString = String.format("%s:rsa[ssh-agent]@%s:%d", loginCredentials.getUser(), host, socket.getPort()); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/edbb2c0e/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java ---------------------------------------------------------------------- diff --git a/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java b/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java index 4611382..bdb60d0 100644 --- a/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java +++ b/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java @@ -149,15 +149,15 @@ public class SshjSshClient implements SshClient { checkArgument(loginCredentials.getOptionalPassword().isPresent() || loginCredentials.hasUnencryptedPrivateKey() || agentConnector.isPresent(), "you must specify a password, a key or an SSH agent needs to be available"); this.backoffLimitedRetryHandler = checkNotNull(backoffLimitedRetryHandler, "backoffLimitedRetryHandler"); - if (loginCredentials.getOptionalPassword().isPresent()) { - this.toString = String.format("%s:pw[%s]@%s:%d", loginCredentials.getUser(), - base16().lowerCase().encode(md5().hashString(loginCredentials.getOptionalPassword().get(), UTF_8).asBytes()), host, - socket.getPort()); - } else if (loginCredentials.hasUnencryptedPrivateKey()) { + if (loginCredentials.hasUnencryptedPrivateKey()) { String fingerPrint = fingerprintPrivateKey(loginCredentials.getOptionalPrivateKey().get()); String sha1 = sha1PrivateKey(loginCredentials.getOptionalPrivateKey().get()); this.toString = String.format("%s:rsa[fingerprint(%s),sha1(%s)]@%s:%d", loginCredentials.getUser(), fingerPrint, sha1, host, socket.getPort()); + } else if (loginCredentials.getOptionalPassword().isPresent()) { + this.toString = String.format("%s:pw[%s]@%s:%d", loginCredentials.getUser(), + base16().lowerCase().encode(md5().hashString(loginCredentials.getOptionalPassword().get(), UTF_8).asBytes()), host, + socket.getPort()); } else { this.toString = String.format("%s:rsa[ssh-agent]@%s:%d", loginCredentials.getUser(), host, socket.getPort());
