You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by an...@apache.org on 2015/04/09 15:50:42 UTC
jclouds git commit: JCLOUDS-884: Only try netcat over ssh-agent as an
agentproxy
Repository: jclouds
Updated Branches:
refs/heads/master 0c6052f80 -> 7f3852031
JCLOUDS-884: Only try netcat over ssh-agent as an agentproxy
See http://markmail.org/thread/oto47qk2kzcdtebb
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/7f385203
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/7f385203
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/7f385203
Branch: refs/heads/master
Commit: 7f38520314b4605b032e3a6622c5755f008eb7fc
Parents: 0c6052f
Author: Andrew Phillips <an...@apache.org>
Authored: Mon Apr 6 22:33:23 2015 -0400
Committer: Andrew Phillips <an...@apache.org>
Committed: Thu Apr 9 09:48:40 2015 -0400
----------------------------------------------------------------------
.../org/jclouds/ssh/jsch/config/JschSshClientModule.java | 8 +++++++-
.../java/org/jclouds/sshj/config/SshjSshClientModule.java | 9 +++++++--
2 files changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/7f385203/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/config/JschSshClientModule.java
----------------------------------------------------------------------
diff --git a/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/config/JschSshClientModule.java b/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/config/JschSshClientModule.java
index 3f30091..d51788a 100644
--- a/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/config/JschSshClientModule.java
+++ b/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/config/JschSshClientModule.java
@@ -53,8 +53,14 @@ public class JschSshClientModule extends AbstractModule {
Optional<Connector> agentConnector = getAgentConnector();
Optional<Connector> getAgentConnector() {
+ ConnectorFactory sshAgentOverNetcatOnly = new ConnectorFactory() {
+ {
+ setPreferredConnectors("ssh-agent");
+ setPreferredUSocketFactories("nc");
+ }
+ };
try {
- return Optional.of(ConnectorFactory.getDefault().createConnector());
+ return Optional.of(sshAgentOverNetcatOnly.createConnector());
} catch (final AgentProxyException e) {
return Optional.absent();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/7f385203/drivers/sshj/src/main/java/org/jclouds/sshj/config/SshjSshClientModule.java
----------------------------------------------------------------------
diff --git a/drivers/sshj/src/main/java/org/jclouds/sshj/config/SshjSshClientModule.java b/drivers/sshj/src/main/java/org/jclouds/sshj/config/SshjSshClientModule.java
index 20b0767..4daae8e 100644
--- a/drivers/sshj/src/main/java/org/jclouds/sshj/config/SshjSshClientModule.java
+++ b/drivers/sshj/src/main/java/org/jclouds/sshj/config/SshjSshClientModule.java
@@ -42,7 +42,6 @@ public class SshjSshClientModule extends AbstractModule {
bind(SshClient.Factory.class).to(Factory.class).in(Scopes.SINGLETON);
}
-
private static class Factory implements SshClient.Factory {
@Named(Constants.PROPERTY_CONNECTION_TIMEOUT)
@Inject(optional = true)
@@ -51,8 +50,14 @@ public class SshjSshClientModule extends AbstractModule {
Optional<Connector> agentConnector = getAgentConnector();
Optional<Connector> getAgentConnector() {
+ ConnectorFactory sshAgentOverNetcatOnly = new ConnectorFactory() {
+ {
+ setPreferredConnectors("ssh-agent");
+ setPreferredUSocketFactories("nc");
+ }
+ };
try {
- return Optional.of(ConnectorFactory.getDefault().createConnector());
+ return Optional.of(sshAgentOverNetcatOnly.createConnector());
} catch (final AgentProxyException e) {
return Optional.absent();
}