Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-02-02 02:54:01 +01:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

[socks] changes

Browse source 
Signed-off-by: R4SAS <r4sas@i2pmail.org>
This commit is contained in:
R4SAS 2021-12-25 02:20:01 +03:00
parent cb54a50dc5
commit ab5c966fdf
2 changed files with 42 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libi2pd_client/ClientContext.cpp
View file

@ -634,7 +634,8 @@ namespace client
{ {
// socks proxy // socks proxy
std::string outproxy = section.second.get("outproxy", ""); std::string outproxy = section.second.get("outproxy", "");
auto tun = std::make_shared<i2p::proxy::SOCKSProxy>(name, address, port, !outproxy.empty(), outproxy, destinationPort, localDestination); uint32_t outproxyport = section.second.get("outproxyport", 0);
auto tun = std::make_shared<i2p::proxy::SOCKSProxy>(name, address, port, !outproxy.empty(), outproxy, outproxyport, localDestination);
clientTunnel = tun; clientTunnel = tun;
clientEndpoint = tun->GetLocalEndpoint (); clientEndpoint = tun->GetLocalEndpoint ();
} }

66
libi2pd_client/SOCKS.cpp
View file

@ -31,7 +31,6 @@ namespace proxy
static const size_t SOCKS_UPSTREAM_SOCKS4A_REPLY_SIZE = 8; static const size_t SOCKS_UPSTREAM_SOCKS4A_REPLY_SIZE = 8;
static const size_t SOCKS_UPSTREAM_SOCKS5_INIT_REPLY_SIZE = 2; static const size_t SOCKS_UPSTREAM_SOCKS5_INIT_REPLY_SIZE = 2;
static const size_t SOCKS_UPSTREAM_SOCKS5_CONNECT_REPLY_MIN_SIZE = 10;
struct SOCKSDnsAddress struct SOCKSDnsAddress
{ {
@ -258,19 +257,19 @@ namespace proxy
break; break;
case ADDR_DNS: case ADDR_DNS:
std::string address(addr.dns.value, addr.dns.size); std::string address(addr.dns.value, addr.dns.size);
if(address.substr(addr.dns.size - 4, 4) == ".i2p") // overwrite if requested address inside I2P //if(address.substr(addr.dns.size - 4, 4) == ".i2p") // overwrite if requested address inside I2P
{ {
m_response[3] = ADDR_IPV4; m_response[3] = ADDR_IPV4;
size += 4; size += 4;
memset(m_response + 4, 0, 6); // six HEX zeros memset(m_response + 4, 0, 6); // six HEX zeros
} }
else /*else
{ {
size += (1 + addr.dns.size); /* name length + resolved address */ size += (1 + addr.dns.size); // name length + resolved address
m_response[4] = addr.dns.size; m_response[4] = addr.dns.size;
memcpy(m_response + 5, addr.dns.value, addr.dns.size); memcpy(m_response + 5, addr.dns.value, addr.dns.size); // 4 - header + 1 - record size
htobe16buf(m_response + size - 2, port); htobe16buf(m_response + size - 2, port);
} }*/
break; break;
} }
return boost::asio::const_buffers_1(m_response, size); return boost::asio::const_buffers_1(m_response, size);
@ -738,32 +737,43 @@ namespace proxy
void SOCKSHandler::HandleUpstreamData(uint8_t * dataptr, std::size_t len) void SOCKSHandler::HandleUpstreamData(uint8_t * dataptr, std::size_t len)
{ {
if (m_state == UPSTREAM_HANDSHAKE) { if (m_state == UPSTREAM_HANDSHAKE)
{
m_upstream_response_len += len; m_upstream_response_len += len;
// handle handshake data // handle handshake data
if (m_upstream_response_len == SOCKS_UPSTREAM_SOCKS5_INIT_REPLY_SIZE) { if (m_upstream_response_len == SOCKS_UPSTREAM_SOCKS5_INIT_REPLY_SIZE)
if (m_upstream_response[0] == '\x05' && m_upstream_response[1] != AUTH_UNACCEPTABLE) {
LogPrint(eLogInfo, "SOCKS: upstream proxy: success greeting");
SendUpstreamRequest(m_socksv, false);
} else {
LogPrint(eLogError, "SOCKS: upstream proxy failure: no acceptable methods were offered");
SocksRequestFailed(SOCKS5_GEN_FAIL);
}
}
else if (m_upstream_response[0] == '\x05' && m_upstream_response_len >= SOCKS_UPSTREAM_SOCKS5_CONNECT_REPLY_MIN_SIZE)
{ {
uint8_t resp = m_upstream_response[1]; if (m_upstream_response[0] == '\x05' && m_upstream_response[1] != AUTH_UNACCEPTABLE)
if (resp == SOCKS5_OK) { {
SocksUpstreamSuccess(); LogPrint(eLogInfo, "SOCKS: upstream SOCKS5 proxy: success greeting");
} else { SendUpstreamRequest(m_socksv, false);
LogPrint(eLogError, "SOCKS: upstream proxy failure: ", (int) resp); }
else
{
LogPrint(eLogError, "SOCKS: upstream SOCKS5 proxy failure: no acceptable methods were offered");
SocksRequestFailed(SOCKS5_GEN_FAIL); SocksRequestFailed(SOCKS5_GEN_FAIL);
} }
} }
else if (m_upstream_response_len < SOCKS_UPSTREAM_SOCKS4A_REPLY_SIZE) { else if (m_upstream_response[0] == '\x05')
{
if (m_upstream_response[1] == SOCKS5_OK)
{
LogPrint(eLogInfo, "SOCKS: upstream SOCKS5 proxy: successully established");
SocksUpstreamSuccess();
}
else
{
LogPrint(eLogError, "SOCKS: upstream proxy failure: ", (int) m_upstream_response[1]);
SocksRequestFailed(SOCKS5_GEN_FAIL);
}
}
else if (m_upstream_response_len < SOCKS_UPSTREAM_SOCKS4A_REPLY_SIZE)
{
// too small, continue reading // too small, continue reading
AsyncUpstreamSockRead(); AsyncUpstreamSockRead();
} else if (len == SOCKS_UPSTREAM_SOCKS4A_REPLY_SIZE) { }
else if (len == SOCKS_UPSTREAM_SOCKS4A_REPLY_SIZE)
{
// just right // just right
uint8_t resp = m_upstream_response[1]; uint8_t resp = m_upstream_response[1];
if (resp == SOCKS4_OK) { if (resp == SOCKS4_OK) {
@ -775,11 +785,15 @@ namespace proxy
// TODO: runtime error? // TODO: runtime error?
SocksRequestFailed(SOCKS5_GEN_FAIL); SocksRequestFailed(SOCKS5_GEN_FAIL);
} }
} else { }
else
{
// too big // too big
SocksRequestFailed(SOCKS5_GEN_FAIL); SocksRequestFailed(SOCKS5_GEN_FAIL);
} }
} else { }
else
{
// invalid state // invalid state
LogPrint(eLogError, "SOCKS: Invalid state reading from upstream: ", (int) m_state); LogPrint(eLogError, "SOCKS: Invalid state reading from upstream: ", (int) m_state);
} }