AGentooCat/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SOCKS: Move constants and client code from i2ptunnel to

Browse Source 
a new package in core, in prep for use by SSLEepGet (ticket #1130)
Make SOCKSException extend IOException, which allows some cleanups.
Untested.
This commit is contained in:
zzz
2017-11-17 20:14:10 +00:00
parent 80cb62b777
commit d04050e6b0
12 changed files with 433 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
core/java/src/net/i2p/socks/SOCKS4Client.java Normal file
View File

@@ -0,0 +1,109 @@
/* I2PSOCKSTunnel is released under the terms of the GNU GPL,
* with an additional exception. For further details, see the
* licensing terms in I2PTunnel.java.
*
* Copyright (c) 2004 by human
*/
package net.i2p.socks;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.InetAddress;
import java.net.Socket;
import org.apache.http.conn.util.InetAddressUtils;
import static net.i2p.socks.SOCKS4Constants.*;
/**
* A simple SOCKS 4/4a client.
* Note: Caller is advised to setSoTimeout on the socket. Not done here.
*
* @since 0.9.33 adapted from net.i2p.i2ptunnel.socks.SOCKS5Server
*/
public class SOCKS4Client {
private SOCKS4Client() {}
/**
* Act as a SOCKS 4 client to connect to a proxy
*
* Will throw and close sock on all errors.
* Caller must close sock on success.
*
* @param sock socket to the proxy
* @param connHostName hostname for the proxy to connect to
* @param connPort port for the proxy to connect to
*/
public static void connect(Socket sock, String connHostName, int connPort) throws IOException {
InputStream in = null;
OutputStream out = null;
try {
in = sock.getInputStream();
out = sock.getOutputStream();
connect(in, out, connHostName, connPort);
} catch (IOException e) {
try { sock.close(); } catch (IOException ioe) {}
if (in != null) try { in.close(); } catch (IOException ioe) {}
if (out != null) try { out.close(); } catch (IOException ioe) {}
throw e;
}
}
/**
* Act as a SOCKS 4 client to connect to a proxy
*
* Will throw and close pin and pout on all errors.
* Caller must close pin and pout on success.
*
* @param connHostName hostname for the proxy to connect to
* @param connPort port for the proxy to connect to
*/
public static void connect(InputStream pin, OutputStream pout, String connHostName, int connPort) throws IOException {
DataOutputStream out = null;
DataInputStream in = null;
try {
out = new DataOutputStream(pout);
// send the init
out.writeByte(SOCKS_VERSION_4);
out.writeByte(Command.CONNECT);
out.writeShort(connPort);
boolean isIPv4;
if (InetAddressUtils.isIPv4Address(connHostName)) {
isIPv4 = true;
out.write(InetAddress.getByName(connHostName).getAddress());
} else if (InetAddressUtils.isIPv6Address(connHostName)) {
throw new SOCKSException("IPv6 not supported in SOCKS 4");
} else {
isIPv4 = false;
out.writeInt(1); // 0.0.0.1
}
out.writeByte(0); // empty username
if (!isIPv4) {
byte[] d = connHostName.getBytes("ISO-8859-1");
out.write(d);
out.writeByte(0);
}
out.flush();
// read init reply
in = new DataInputStream(pin);
in.readByte(); // dummy
int reply = in.readByte();
if (reply != Reply.SUCCEEDED)
throw new SOCKSException("Proxy rejected request, response = " + reply);
// throw away the address in the response
// todo pass the response through?
in.readShort(); // port
in.readInt(); // IP
} catch (IOException e) {
if (in != null) try { in.close(); } catch (IOException ioe) {}
if (out != null) try { out.close(); } catch (IOException ioe) {}
throw e;
}
}
}

30
core/java/src/net/i2p/socks/SOCKS4Constants.java Normal file
View File

@@ -0,0 +1,30 @@
/* I2PSOCKSTunnel is released under the terms of the GNU GPL,
* with an additional exception. For further details, see the
* licensing terms in I2PTunnel.java.
*
* Copyright (c) 2004 by human
*/
package net.i2p.socks;
/**
* @since 0.9.33 Moved out of net.i2p.i2ptunnel.socks.SOCKS4aServer
*/
public class SOCKS4Constants {
private SOCKS4Constants() {}
public static final int SOCKS_VERSION_4 = 0x04;
/*
* Some namespaces to enclose SOCKS protocol codes
*/
public static class Command {
public static final int CONNECT = 0x01;
public static final int BIND = 0x02;
}
public static class Reply {
public static final int SUCCEEDED = 0x5a;
public static final int CONNECTION_REFUSED = 0x5b;
}
}

207
core/java/src/net/i2p/socks/SOCKS5Client.java Normal file
View File

@@ -0,0 +1,207 @@
/* I2PSOCKSTunnel is released under the terms of the GNU GPL,
* with an additional exception. For further details, see the
* licensing terms in I2PTunnel.java.
*
* Copyright (c) 2004 by human
*/
package net.i2p.socks;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.InetAddress;
import java.net.Socket;
import org.apache.http.conn.util.InetAddressUtils;
import static net.i2p.socks.SOCKS5Constants.*;
/**
* A simple SOCKS 5 client.
* Note: Caller is advised to setSoTimeout on the socket. Not done here.
*
* @since 0.9.33 adapted from net.i2p.i2ptunnel.socks.SOCKS5Server
*/
public class SOCKS5Client {
private SOCKS5Client() {}
/**
* Act as a SOCKS 5 client to connect to a proxy
*
* Will throw and close sock on all errors.
* Caller must close sock on success.
*
* @param sock socket to the proxy
* @param connHostName hostname for the proxy to connect to
* @param connPort port for the proxy to connect to
*/
public static void connect(Socket sock, String connHostName, int connPort) throws IOException {
connect(sock, connHostName, connPort, null, null);
}
/**
* Act as a SOCKS 5 client to connect to a proxy
*
* Will throw and close sock on all errors.
* Caller must close sock on success.
*
* @param sock socket to the proxy
* @param connHostName hostname for the proxy to connect to
* @param connPort port for the proxy to connect to
* @param configUser username for proxy authentication or null
* @param configPW password for proxy authentication or null
*/
public static void connect(Socket sock, String connHostName, int connPort, String configUser, String configPW) throws IOException {
InputStream in = null;
OutputStream out = null;
try {
in = sock.getInputStream();
out = sock.getOutputStream();
connect(in, out, connHostName, connPort, configUser, configPW);
} catch (IOException e) {
try { sock.close(); } catch (IOException ioe) {}
if (in != null) try { in.close(); } catch (IOException ioe) {}
if (out != null) try { out.close(); } catch (IOException ioe) {}
throw e;
}
}
/**
* Act as a SOCKS 5 client to connect to a proxy
*
* Will throw and close pin and pout on all errors.
* Caller must close pin and pout on success.
*
* @param pin input stream from the proxy
* @param pout output stream to the proxy
* @param connHostName hostname for the proxy to connect to
* @param connPort port for the proxy to connect to
*/
public static void connect(InputStream pin, OutputStream pout, String connHostName, int connPort) throws IOException {
connect(pin, pout, connHostName, connPort, null, null);
}
/**
* Act as a SOCKS 5 client to connect to a proxy
*
* Will throw and close pin and pout on all errors.
* Caller must close pin and pout on success.
*
* @param pin input stream from the proxy
* @param pout output stream to the proxy
* @param connHostName hostname for the proxy to connect to
* @param connPort port for the proxy to connect to
* @param configUser username for proxy authentication or null
* @param configPW password for proxy authentication or null
*/
public static void connect(InputStream pin, OutputStream pout, String connHostName, int connPort, String configUser, String configPW) throws IOException {
DataOutputStream out = null;
DataInputStream in = null;
try {
out = new DataOutputStream(pout);
boolean authAvail = configUser != null && configPW != null;
// send the init
out.writeByte(SOCKS_VERSION_5);
if (authAvail) {
out.writeByte(2);
out.writeByte(Method.NO_AUTH_REQUIRED);
out.writeByte(Method.USERNAME_PASSWORD);
} else {
out.writeByte(1);
out.writeByte(Method.NO_AUTH_REQUIRED);
}
out.flush();
// read init reply
in = new DataInputStream(pin);
// is this right or should we not try to do 5-to-4 conversion?
int hisVersion = in.readByte();
if (hisVersion != SOCKS_VERSION_5 /* && addrtype == AddressType.DOMAINNAME */ )
throw new SOCKSException("SOCKS proxy is not Version 5");
//else if (hisVersion != 4)
// throw new SOCKSException("Unsupported SOCKS Proxy Version");
int method = in.readByte();
if (method == Method.NO_AUTH_REQUIRED) {
// good
} else if (method == Method.USERNAME_PASSWORD) {
if (authAvail) {
// send the auth
out.writeByte(AUTH_VERSION);
byte[] user = configUser.getBytes("UTF-8");
byte[] pw = configPW.getBytes("UTF-8");
out.writeByte(user.length);
out.write(user);
out.writeByte(pw.length);
out.write(pw);
out.flush();
// read the auth reply
if (in.readByte() != AUTH_VERSION)
throw new SOCKSException("Bad auth version from proxy");
if (in.readByte() != AUTH_SUCCESS)
throw new SOCKSException("Proxy authorization failure");
} else {
throw new SOCKSException("Proxy requires authorization, please configure username/password");
}
} else {
throw new SOCKSException("Proxy authorization failure");
}
int addressType;
if (InetAddressUtils.isIPv4Address(connHostName))
addressType = AddressType.IPV4;
else if (InetAddressUtils.isIPv6Address(connHostName))
addressType = AddressType.IPV6;
else
addressType = AddressType.DOMAINNAME;
// send the connect command
out.writeByte(SOCKS_VERSION_5);
out.writeByte(Command.CONNECT);
out.writeByte(0); // reserved
out.writeByte(addressType);
if (addressType == AddressType.IPV4 || addressType == AddressType.IPV6) {
out.write(InetAddress.getByName(connHostName).getAddress());
} else {
byte[] d = connHostName.getBytes("ISO-8859-1");
out.writeByte(d.length);
out.write(d);
}
out.writeShort(connPort);
out.flush();
// read the connect reply
hisVersion = in.readByte();
if (hisVersion != SOCKS_VERSION_5)
throw new SOCKSException("Proxy response is not Version 5");
int reply = in.readByte();
in.readByte(); // reserved
int type = in.readByte();
int count = 0;
if (type == AddressType.IPV4) {
count = 4;
} else if (type == AddressType.DOMAINNAME) {
count = in.readUnsignedByte();
} else if (type == AddressType.IPV6) {
count = 16;
} else {
throw new SOCKSException("Unsupported address type in proxy response");
}
byte[] addr = new byte[count];
in.readFully(addr); // address
in.readUnsignedShort(); // port
if (reply != Reply.SUCCEEDED)
throw new SOCKSException("Proxy rejected request, response = " + reply);
// throw away the address in the response
// todo pass the response through?
} catch (IOException e) {
if (in != null) try { in.close(); } catch (IOException ioe) {}
if (out != null) try { out.close(); } catch (IOException ioe) {}
throw e;
}
}
}

54
core/java/src/net/i2p/socks/SOCKS5Constants.java Normal file
View File

@@ -0,0 +1,54 @@
/* I2PSOCKSTunnel is released under the terms of the GNU GPL,
* with an additional exception. For further details, see the
* licensing terms in I2PTunnel.java.
*
* Copyright (c) 2004 by human
*/
package net.i2p.socks;
/**
* @since 0.9.33 Moved out of net.i2p.i2ptunnel.socks.SOCKS5Server
*/
public class SOCKS5Constants {
private SOCKS5Constants() {}
public static final int SOCKS_VERSION_5 = 0x05;
/*
* Some namespaces to enclose SOCKS protocol codes
*/
public static class Method {
public static final int NO_AUTH_REQUIRED = 0x00;
public static final int USERNAME_PASSWORD = 0x02;
public static final int NO_ACCEPTABLE_METHODS = 0xff;
}
public static class AddressType {
public static final int IPV4 = 0x01;
public static final int DOMAINNAME = 0x03;
public static final int IPV6 = 0x04;
}
public static class Command {
public static final int CONNECT = 0x01;
public static final int BIND = 0x02;
public static final int UDP_ASSOCIATE = 0x03;
}
public static class Reply {
public static final int SUCCEEDED = 0x00;
public static final int GENERAL_SOCKS_SERVER_FAILURE = 0x01;
public static final int CONNECTION_NOT_ALLOWED_BY_RULESET = 0x02;
public static final int NETWORK_UNREACHABLE = 0x03;
public static final int HOST_UNREACHABLE = 0x04;
public static final int CONNECTION_REFUSED = 0x05;
public static final int TTL_EXPIRED = 0x06;
public static final int COMMAND_NOT_SUPPORTED = 0x07;
public static final int ADDRESS_TYPE_NOT_SUPPORTED = 0x08;
}
public static final int AUTH_VERSION = 1;
public static final int AUTH_SUCCESS = 0;
public static final int AUTH_FAILURE = 1;
}

31
core/java/src/net/i2p/socks/SOCKSException.java Normal file
View File

@@ -0,0 +1,31 @@
/* I2PSOCKSTunnel is released under the terms of the GNU GPL,
* with an additional exception. For further details, see the
* licensing terms in I2PTunnel.java.
*
* Copyright (c) 2004 by human
*/
package net.i2p.socks;
import java.io.IOException;
/**
* Exception thrown by socket methods
*
* @author human
* @since 0.9.33 moved from net.i2p.i2ptunnel.socks, and changed to extend IOException
*/
public class SOCKSException extends IOException {
public SOCKSException() {
super();
}
public SOCKSException(String s) {
super(s);
}
/** @since 0.9.27 */
public SOCKSException(String s, Throwable t) {
super(s, t);
}
}

8
core/java/src/net/i2p/socks/package.html Normal file
View File

@@ -0,0 +1,8 @@
<html>
<body>
<p>
Constants and clients for SOCKS.
Pulled out of net.i2p.i2ptunnel.socks for use by SSLEepGet as of 0.9.33.
</p>
</body>
</html>