From 4e63d4c2b7bcf42b9a72a2d92e60d8534610d116 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel <lkundrak@v3.sk> Date: Tue, 23 Feb 2010 22:13:32 +0100 Subject: [PATCH 11/15] Chop out proxy support for CVS plugin It requires patching trilead-ssh2. IDEA's patches were sent to orion-ssh2 upstream, which is not in Fedora yet. http://github.com/lkundrak/orion-ssh2 --- .../connections/ssh/SocksProxyData.java | 5 +++-- .../connections/ssh/SshConnectionUtils.java | 5 +++-- .../connections/ssh/SshProxyFactory.java | 11 ++++++----- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SocksProxyData.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SocksProxyData.java index af0bd4b..eb6172b 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SocksProxyData.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SocksProxyData.java @@ -15,7 +15,7 @@ */ package com.intellij.cvsSupport2.connections.ssh; -import com.trilead.ssh2.SelfConnectionProxyData; +//import com.trilead.ssh2.SelfConnectionProxyData; import org.netbeans.lib.cvsclient.connection.ConnectionSettings; import java.io.IOException; @@ -23,6 +23,7 @@ import java.net.InetSocketAddress; import java.net.Proxy; import java.net.Socket; +/* public class SocksProxyData implements SelfConnectionProxyData { private final ConnectionSettings mySettings; @@ -39,4 +40,4 @@ public class SocksProxyData implements SelfConnectionProxyData { socket.setSoTimeout(0); return socket; } -} +}*/ diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshConnectionUtils.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshConnectionUtils.java index 4e966b2..526b305 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshConnectionUtils.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshConnectionUtils.java @@ -46,7 +46,8 @@ public class SshConnectionUtils { } public static boolean connectionSupportsPing(final Connection connection) { - final ClientServerHello csh = connection.getClientServerHello(); - return (csh != null) && (csh.getServerString() != null) && (new String(csh.getServerString()).contains("OpenSSH")); + return (false); +// final ClientServerHello csh = connection.getClientServerHello(); +// return (csh != null) && (csh.getServerString() != null) && (new String(csh.getServerString()).contains("OpenSSH")); } } diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshProxyFactory.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshProxyFactory.java index 02611b0..e40282c 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshProxyFactory.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshProxyFactory.java @@ -18,7 +18,7 @@ package com.intellij.cvsSupport2.connections.ssh; import com.intellij.cvsSupport2.config.ProxySettings; import com.trilead.ssh2.HTTPProxyData; import com.trilead.ssh2.ProxyData; -import com.trilead.ssh2.transport.SocketFactory; +//import com.trilead.ssh2.transport.SocketFactory; import org.jetbrains.annotations.Nullable; import org.netbeans.lib.cvsclient.connection.ConnectionSettings; @@ -35,8 +35,8 @@ public class SshProxyFactory { if (! connectionSettings.isUseProxy()) return null; final int type = connectionSettings.getProxyType(); if ((ProxySettings.SOCKS4 == type) || (ProxySettings.SOCKS5 == type)) { - result = new SocksProxyData(connectionSettings); - SocksAuthenticatorManager.getInstance().register(connectionSettings); + //result = new SocksProxyData(connectionSettings); + //SocksAuthenticatorManager.getInstance().register(connectionSettings); } else if (ProxySettings.HTTP == type) { /*String proxyHost, int proxyPort, String proxyUser, String proxyPass*/ result = new HTTPProxyData(connectionSettings.getProxyHostName(), connectionSettings.getProxyPort(), @@ -46,7 +46,8 @@ public class SshProxyFactory { } public static Socket createSocket(final ConnectionSettings connectionSettings) throws IOException { - return SocketFactory.open(connectionSettings.getHostName(), connectionSettings.getPort(), createAndRegister(connectionSettings), - connectionSettings.getConnectionTimeout()); + return null; +// return SocketFactory.open(connectionSettings.getHostName(), connectionSettings.getPort(), createAndRegister(connectionSettings), +// connectionSettings.getConnectionTimeout()); } } -- 1.7.0.1