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/07 04:55:37 UTC

jclouds git commit: Using a custom ConnectorFactory for ssh-agent that only tries netcat

Repository: jclouds
Updated Branches:
  refs/heads/netcat-sshagent-only [created] 8c6ae6ff7


Using a custom ConnectorFactory for ssh-agent that only tries netcat

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/8c6ae6ff
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/8c6ae6ff
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/8c6ae6ff

Branch: refs/heads/netcat-sshagent-only
Commit: 8c6ae6ff7fbe323fe9564b7195547280897bebde
Parents: d8f48c4
Author: Andrew Phillips <an...@apache.org>
Authored: Mon Apr 6 22:33:23 2015 -0400
Committer: Andrew Phillips <an...@apache.org>
Committed: Mon Apr 6 22:45:34 2015 -0400

----------------------------------------------------------------------
 .../java/org/jclouds/sshj/config/SshjSshClientModule.java   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds/blob/8c6ae6ff/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();
          }