Skip to content

Commit

Permalink
Merge branch 'socks' into 'master'
Browse files Browse the repository at this point in the history 
Socks -> Master

See merge request research/streamdivert!2
  • Loading branch information
@jellever
jellever committed Aug 15, 2020
2 parents d37e606 + b38503f commit 67c76b8
Show file tree
Hide file tree
Showing 15 changed files with 1,005 additions and 71 deletions.
9 changes: 0 additions & 9 deletions StreamDivert/InboundDivertProxy.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,3 @@ struct ProxyConnectionWorkerData
sockaddr_in6 clientAddr;
};

struct ProxyTunnelWorkerData
{
SOCKET sockA;
IpAddr sockAAddr;
UINT16 sockAPort;
SOCKET sockB;
IpAddr sockBAddr;
UINT16 sockBPort;
};
108 changes: 48 additions & 60 deletions StreamDivert/InboundTCPDivertProxy.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,18 @@
#include "utils.h"
#include "windivert.h"
#include <ws2tcpip.h>
#include "sockutils.h"


InboundTCPDivertProxy::InboundTCPDivertProxy(const UINT16 localPort, const std::vector<InboundRelayEntry>& proxyRecords)
: socksServer(0)
{
this->localPort = localPort;
this->localProxyPort = 0;
this->proxyRecords = proxyRecords;
this->proxySock = NULL;
this->selfDescStr = this->getStringDesc();
this->containsSocksRecords = false;
}

InboundTCPDivertProxy::~InboundTCPDivertProxy()
Expand Down Expand Up @@ -76,7 +79,17 @@ bool InboundTCPDivertProxy::Start()
{
error("%s: failed to listen socket (%d)", this->selfDescStr.c_str(), WSAGetLastError());
goto failure;
}
}

for each (auto record in this->proxyRecords)
{
if (record.type == InboundRelayEntryType::Socks)
{
this->socksServer.Start();
containsSocksRecords = true;
break;
}
}

BaseProxy::Start();
}//lock scope
Expand Down Expand Up @@ -115,23 +128,38 @@ void InboundTCPDivertProxy::ProcessTCPPacket(unsigned char* packet, UINT& packet
tcp_hdr->DstPort == htons(this->localPort))
{
std::string dstAddrStr = dstAddr.to_string();
info("%s: Modify packet dst -> %s:%hu", this->selfDescStr.c_str(), dstAddrStr.c_str(), this->localProxyPort);
tcp_hdr->DstPort = htons(this->localProxyPort);
break;
if (record->type == InboundRelayEntryType::Divert)
{
info("%s: Modify packet dst -> %s:%hu", this->selfDescStr.c_str(), dstAddrStr.c_str(), this->localProxyPort);
tcp_hdr->DstPort = htons(this->localProxyPort);
break;
}
else if (record->type == InboundRelayEntryType::Socks)
{
int socksPort = this->socksServer.GetPort();
info("%s: Modify packet dst -> %s:%hu", this->selfDescStr.c_str(), dstAddrStr.c_str(), socksPort);
tcp_hdr->DstPort = htons(socksPort);
break;
}
}
}
}
}
else
{
for (auto record = this->proxyRecords.begin(); record != this->proxyRecords.end(); ++record)
{
if ((dstAddr == record->srcAddr || record->srcAddr == anyIpAddr) &&
tcp_hdr->SrcPort == htons(this->localProxyPort))
if ((dstAddr == record->srcAddr || record->srcAddr == anyIpAddr))
{
std::string srcAddrStr = srcAddr.to_string();
info("%s: Modify packet src -> %s:%hu", this->selfDescStr.c_str(), srcAddrStr.c_str(), this->localPort);
tcp_hdr->SrcPort = htons(this->localPort);
break;
if (
(record->type == InboundRelayEntryType::Divert && tcp_hdr->SrcPort == htons(this->localProxyPort) ) ||
(record->type == InboundRelayEntryType::Socks && tcp_hdr->SrcPort == htons(this->socksServer.GetPort()))
)
{
std::string srcAddrStr = srcAddr.to_string();
info("%s: Modify packet src -> %s:%hu", this->selfDescStr.c_str(), srcAddrStr.c_str(), this->localPort);
tcp_hdr->SrcPort = htons(this->localPort);
break;
}
}
}
}
Expand Down Expand Up @@ -229,8 +257,8 @@ void InboundTCPDivertProxy::ProxyConnectionWorker(ProxyConnectionWorkerData* pro
tunnelDataB->sockB = clientSock;
tunnelDataB->sockBAddr = clientSockIp;
tunnelDataB->sockBPort = clientSrcPort;
std::thread tunnelThread(&InboundTCPDivertProxy::ProxyTunnelWorker, this, tunnelDataA);
this->ProxyTunnelWorker(tunnelDataB);
std::thread tunnelThread(&ProxyTunnelWorker, tunnelDataA, this->selfDescStr);
ProxyTunnelWorker(tunnelDataB, this->selfDescStr);
tunnelThread.join();
}

Expand All @@ -244,59 +272,19 @@ void InboundTCPDivertProxy::ProxyConnectionWorker(ProxyConnectionWorkerData* pro
return;
}

void InboundTCPDivertProxy::ProxyTunnelWorker(ProxyTunnelWorkerData* proxyTunnelWorkerData)
{
SOCKET sockA = proxyTunnelWorkerData->sockA;
std::string sockAAddrStr = proxyTunnelWorkerData->sockAAddr.to_string();
UINT16 sockAPort = proxyTunnelWorkerData->sockAPort;
SOCKET sockB = proxyTunnelWorkerData->sockB;
std::string sockBAddrStr = proxyTunnelWorkerData->sockBAddr.to_string();
UINT16 sockBPort = proxyTunnelWorkerData->sockBPort;
delete proxyTunnelWorkerData;
char buf[8192];
int recvLen;
std::string selfDesc = this->getStringDesc();
while (true)
{
recvLen = recv(sockA, buf, sizeof(buf), 0);
if (recvLen == SOCKET_ERROR)
{
warning("%s: failed to recv from socket A(%s:%hu): %d", selfDesc.c_str(), sockAAddrStr.c_str(), sockAPort, WSAGetLastError());
goto failure;
}
if (recvLen == 0)
{
shutdown(sockA, SD_RECEIVE);
shutdown(sockB, SD_SEND);
goto end; //return
}

for (int i = 0; i < recvLen; )
{
int sendLen = send(sockB, buf + i, recvLen - i, 0);
if (sendLen == SOCKET_ERROR)
{
warning("%s: failed to send to socket B(%s:%hu): %d", selfDesc.c_str(), sockBAddrStr.c_str(), sockBPort, WSAGetLastError());
goto failure; //return
}
i += sendLen;
}
}

failure:
shutdown(sockA, SD_BOTH);
shutdown(sockB, SD_BOTH);
end:
info("%s: ProxyTunnelWorker(%s:%hu -> %s:%hu) exiting", selfDesc.c_str(), sockAAddrStr.c_str(), sockAPort, sockBAddrStr.c_str(), sockBPort);
}

std::string InboundTCPDivertProxy::generateDivertFilterString()
{
std::string result = "tcp";
std::vector<std::string> orExpressions;
std::string proxyFilterStr = "(tcp.SrcPort == " + std::to_string(this->localProxyPort) + ")";
orExpressions.push_back(proxyFilterStr);

if (this->containsSocksRecords)
{
proxyFilterStr = "(tcp.SrcPort == " + std::to_string(this->socksServer.GetPort()) + ")";
orExpressions.push_back(proxyFilterStr);
}

//check for wildcard address
bool containsWildcard = false;
for (auto record = this->proxyRecords.begin(); record != this->proxyRecords.end(); ++record)
Expand All @@ -307,7 +295,7 @@ std::string InboundTCPDivertProxy::generateDivertFilterString()
orExpressions.push_back(recordFilterStr);
containsWildcard = true;
break;
}
}
}

if (!containsWildcard)
Expand Down
4 changes: 3 additions & 1 deletion StreamDivert/InboundTCPDivertProxy.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include "config.h"
#include"ipaddr.h"
#include "InboundDivertProxy.h"
#include "SocksProxyServer.h"


class InboundTCPDivertProxy : public BaseProxy
Expand All @@ -20,14 +21,15 @@ class InboundTCPDivertProxy : public BaseProxy
UINT16 localPort;
UINT16 localProxyPort;
std::vector<InboundRelayEntry> proxyRecords;
SocksProxyServer socksServer;
bool containsSocksRecords;

std::string getStringDesc();
void ProcessTCPPacket(unsigned char* packet, UINT& packet_len, PWINDIVERT_ADDRESS addr, PWINDIVERT_IPHDR ip_hdr, PWINDIVERT_IPV6HDR ip6_hdr, PWINDIVERT_TCPHDR tcp_hdr, IpAddr& srcAddr, IpAddr& dstAddr);
void ProcessICMPPacket(unsigned char * packet, UINT & packet_len, PWINDIVERT_ADDRESS addr, PWINDIVERT_IPHDR ip_hdr, PWINDIVERT_IPV6HDR ip6_hdr, PWINDIVERT_ICMPHDR icmp_hdr, PWINDIVERT_ICMPV6HDR icmp6_hdr, IpAddr & srcAddr, IpAddr & dstAddr);
void ProcessUDPPacket(unsigned char * packet, UINT & packet_len, PWINDIVERT_ADDRESS addr, PWINDIVERT_IPHDR ip_hdr, PWINDIVERT_IPV6HDR ip6_hdr, PWINDIVERT_UDPHDR udp_header, IpAddr & srcAddr, IpAddr & dstAddr);
void ProxyWorker();
void ProxyConnectionWorker(ProxyConnectionWorkerData* proxyConnectionWorkerData);
void ProxyTunnelWorker(ProxyTunnelWorkerData* proxyTunnelWorkerData);
std::string generateDivertFilterString();
bool findProxyRecordBySrcAddr(IpAddr& srcIp, InboundRelayEntry& proxyRecord);
public:
Expand Down
Loading

0 comments on commit 67c76b8

Please sign in to comment.