Skip to content

Socks client support #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dido wants to merge 5 commits into
base: stable
Choose a base branch
from
Open

Socks client support #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6a51c46
SOCKS proxy data object
Mar 20, 2014
fef7e68
comment out duplicate entries causing error
Mar 20, 2014
9b95a80
merge some upstream changes to jsocks
Mar 20, 2014
ce67e8c
handle SocksProxyData when connecting
Mar 20, 2014
603baef
modify parsing of HTTP proxy to include socks5 URLs
Mar 20, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions res/values-hu/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,8 +321,8 @@
<string name="pref_ctrl_string">CTRL ablak tartalma</string>
<string name="pref_ctrl_string_summary">Karakterek sorozata a CTRL+? kombinációkhoz.</string>
<string name="fullscreen">Teljes képernyő</string>
<string name="hostpref_wantsession_title">"Héj indítása"</string>
<string name="hostpref_wantsession_summary">"Kapcsoljuk ki, ha csak port átirányításra van szükségünk"</string>
<!-- <string name="hostpref_wantsession_title">"Héj indítása"</string>
<string name="hostpref_wantsession_summary">"Kapcsoljuk ki, ha csak port átirányításra van szükségünk"</string> -->
<string name="hostpref_x11_forwarding">"X11 átirányítás"</string>
<string name="hostpref_wantx11forward_title">"X11 átirányítás bekapcsolása"</string>
<string name="hostpref_wantx11forward_summary">"X11 munkamenetek átirányítása a lentebb megadott kiszolgálóra és portra"</string>
Expand Down
25 changes: 25 additions & 0 deletions src/com/trilead/ssh2/SocksProxyData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/**
*
*/
package com.trilead.ssh2;

import java.net.UnknownHostException;

import net.sourceforge.jsocks.Proxy;
import net.sourceforge.jsocks.Socks5Proxy;

/**
* @author dido
*
*/
public class SocksProxyData implements ProxyData
{
public final Proxy proxy;

public SocksProxyData(String proxyhost, int proxyport) throws UnknownHostException
{
Socks5Proxy p = new Socks5Proxy(proxyhost, proxyport);
p.resolveAddrLocally(false);
proxy = p;
}
}
24 changes: 18 additions & 6 deletions src/com/trilead/ssh2/transport/TransportManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,16 @@
import java.security.SecureRandom;
import java.util.Vector;

import net.sourceforge.jsocks.SocksSocket;

import com.trilead.ssh2.ConnectionInfo;
import com.trilead.ssh2.ConnectionMonitor;
import com.trilead.ssh2.DHGexParameters;
import com.trilead.ssh2.HTTPProxyData;
import com.trilead.ssh2.HTTPProxyException;
import com.trilead.ssh2.ProxyData;
import com.trilead.ssh2.ServerHostKeyVerifier;
import com.trilead.ssh2.SocksProxyData;
import com.trilead.ssh2.compression.ICompressor;
import com.trilead.ssh2.crypto.Base64;
import com.trilead.ssh2.crypto.CryptoWishList;
Expand All @@ -41,14 +44,14 @@
* other than KEX, they become horribly irritated and kill the connection. Since
* we are very likely going to communicate with OpenSSH servers, we have to play
* the same game - even though we could do better.
*
*
* btw: having stdout and stderr on the same channel, with a shared window, is
* also a VERY good idea... =(
*/

/**
* TransportManager.
*
*
* @author Christian Plattner, plattner@trilead.com
* @version $Id: TransportManager.java,v 1.2 2008/04/01 12:38:09 cplattne Exp $
*/
Expand All @@ -68,6 +71,7 @@ class HandlerEntry

class AsynchronousWorker extends Thread
{
@Override
public void run()
{
while (true)
Expand Down Expand Up @@ -125,7 +129,7 @@ public void run()

String hostname;
int port;
final Socket sock = new Socket();
Socket sock = new Socket();

Object connectionSemaphore = new Object();

Expand All @@ -149,7 +153,7 @@ public void run()
* the resolver even though one supplies a dotted IP
* address in the Socket constructor. That is why we
* try to generate the InetAdress "by hand".
*
*
* @param host
* @return the InetAddress
* @throws UnknownHostException
Expand Down Expand Up @@ -439,6 +443,14 @@ private void establishConnection(ProxyData proxyData, int connectTimeout) throws
return;
}

if (proxyData instanceof SocksProxyData)
{
SocksProxyData pd = (SocksProxyData) proxyData;
sock = new SocksSocket(pd.proxy, hostname, port);
sock.setSoTimeout(0);
return;
}

throw new IOException("Unsupported ProxyData");
}

Expand Down Expand Up @@ -602,7 +614,7 @@ public void changeSendCompression(ICompressor comp) {
}

/**
*
*
*/
public void startCompression() {
tc.startCompression();
Expand Down Expand Up @@ -780,7 +792,7 @@ public void receiveLoop() throws IOException
if (type == Packets.SSH_MSG_USERAUTH_SUCCESS) {
tc.startCompression();
}

MessageHandler mh = null;

for (int i = 0; i < messageHandlers.size(); i++)
Expand Down
Loading