Files
SimpleRemoter/server/2015Remote/proxy/ProxyConnectServer.h
T
yuanyuanxianganddeepseek-flash 5bff9df3fc Improve: Harden the self-implemented SOCKS5 proxy listener
Follow-up to the HP-Socket replacement: the four items the first pass
deliberately left out, plus two defects that the new tests turned up.

The listener now binds 127.0.0.1 instead of INADDR_ANY. The dialog only
ever points the user (and the Chrome shortcut) at 127.0.0.1, and an
unauthenticated SOCKS5 port open on every interface is an open proxy.

The SOCKS5 handshake is parsed as a byte stream. The previous code
assumed one callback carried exactly one message, which happens to hold
for curl and Chrome but not in general: a greeting split across segments
was answered twice, and a CONNECT request followed by tunnel data in the
same read dropped the trailing bytes. Each connection now keeps a pending
buffer and a four-state machine (greeting, request, connecting, tunnel),
and bytes that arrive before CONNECT_RESULT are replayed to the client
once the tunnel opens, after the SOCKS5 reply.

Flow control: the listener takes a PROXYCANRECVPROC callback that is
consulted before each recv. The dialog answers it from the main
connection's send queue, so a download that outruns the client link
pauses the local read instead of growing the server's buffer. A 300MB
transfer through the tunnel peaks 150KB above the idle working set.

Handshake watchdog: sessions that stall in greeting/request/connecting
are dropped after 30 seconds; established tunnels are left alone.

Two defects in the log path, both surfaced by the watchdog test. Logging
every 32KB chunk produced roughly 9000 posted messages for a 300MB
transfer, which starved the UI thread's timers (the first watchdog run
never fired) and could overflow the message queue; and every line re-set
the whole 256KB text into the read-only edit. Transfers now log
cumulative progress once per second and a per-connection total at
teardown, panes are refreshed at most every 100ms from a dirty flag, and
a failed PostMessage no longer leaks its CString.

Localization: the new session-log strings were also added to en_US.ini,
zh_TW.ini and de_DE.ini (16 keys each, GBK, kept in the existing
FormatL section). Two of the lines were reworded instead of translated
as-is: the close notice now says what happened (the client asked to
close, or the downlink send failed) rather than printing the protocol
token name, and the throughput arrows are now << and >> because
CIniParser splits an entry at the first '=', so the old <== and ==>
could never have served as keys.

Testing: curl IPv4 and hostname tunnels, 4MB and 300MB transfers
byte-identical, byte-at-a-time and pipelined handshakes, refused target
(REP=5), SOCKS client killed mid-transfer, client process killed
mid-transfer (dialog closes, port released), 20 parallel connections,
five open/close cycles with no handle or thread growth, and the 30s
handshake timeout. The dialog log was checked at runtime with
Language=en_US and renders in English only.

Co-Authored-By: deepseek-flash
2026-10-29 16:12:14 +01:00

110 lines
4.7 KiB
C++
Raw Blame History

This file contains ambiguous Unicode characters
This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.
#pragma once
// 本机 SOCKS5 监听器(代理映射的「本地侧」)。
//
// 原实现建立在 HP-Socket(https://github.com/ldcsaa/HP-Socket)之上,为这一个功能
// 引入整套 SDK(库 + DLL)并不划算,且 HP-Socket 版一直以 ENABLE_HPSOCKET=0 关闭,
// 从未真正跑过。这里用阻塞 socket + select 自实现,接口面按原对话框的实际用法裁剪:
// 端口监听、每连接收发、按连接 id 断开、连接计数。
//
// 线程模型(对齐 server/2015Remote/SimpleWebSocket.h 与客户端 ProxyManager 的既有做法):
// * 1 个 accept 线程,select 200ms 轮询,便于在 Shutdown 时自然退出;
// * 每连接 1 个中继线程,select 200ms 轮询 socket 可读后 recv,只做字节转发;
// * 回调(PROXYNOTIFYPROC)在 accept 线程 / 中继线程内同步调用,回调里可以调
// Send/Disconnect,但不要等待本对象 Shutdown(会自锁)。
// socket 的关闭权归中继线程独有:Disconnect 只置停止位并 shutdown(),由中继线程在
// 退出前 closesocket,避免多线程同时关闭同一个句柄。
#include "stdafx.h"
#include <WinSock2.h>
#include <WS2tcpip.h>
#include <atomic>
#include <cstdint>
#include <map>
#include <memory>
#include <mutex>
#include <thread>
#include <vector>
// 连接 id。42 亿个够用,且与代理报文里那 4 字节 id 字段同宽(磁盘/线缆格式不变)。
typedef uint32_t CONNID;
#define NC_CLIENT_CONNECT 0x0001
#define NC_CLIENT_DISCONNECT 0x0002
#define NC_TRANSMIT 0x0003
#define NC_RECEIVE 0x0004
// nCode == NC_RECEIVE 时 pData/nLen 是本机连接上刚收到的字节(TCP 流的一片段,
// 不保证对齐 SOCKS5 消息边界);其余 nCode 下 pData == nullptr、nLen == 0。
typedef void (CALLBACK* PROXYNOTIFYPROC)(void* pUser, CONNID id, const BYTE* pData, UINT nLen, UINT nCode);
// 流控回调:中继线程每轮 recv 之前问一次「现在还能不能收」。返回 FALSE 时暂停
// 读取(不 recv),让本机连接的对端按 TCP 窗口自行减速;返回 TRUE 后恢复。
// 在本机连接的中继线程上调用,要求实现足够轻量、线程安全。
typedef BOOL (CALLBACK* PROXYCANRECVPROC)(void* pUser, CONNID id);
class CProxyConnectServer
{
public:
CProxyConnectServer();
~CProxyConnectServer();
// 绑定 127.0.0.1:nPort 并开始 accept。nMaxConnections <= 0 表示不限制。
// 只监听回环:这是个无认证的 SOCKS5 入口,绑 0.0.0.0 等于对局域网/公网开放代理;
// 对话框里给用户的提示也是「代理服务器填 127.0.0.1」。
BOOL Initialize(PROXYNOTIFYPROC pNotifyProc, PROXYCANRECVPROC pCanRecvProc,
void* pUser, int nMaxConnections, int nPort);
// 停止监听、断开全部连接、等待所有线程退出。可重复调用。
void Shutdown();
// 向本机连接发数据。全部字节发出返回 TRUE;连接不存在或出错返回 FALSE。
BOOL Send(CONNID id, const BYTE* pData, UINT nSize);
// 主动断开某个本机连接(中继线程会在 200ms 内退出并回调 NC_CLIENT_DISCONNECT)。
BOOL Disconnect(CONNID id);
BOOL HasStarted() const
{
return m_bRunning.load(std::memory_order_acquire);
}
int GetConnectionCount();
USHORT GetPort() const
{
return m_nPort;
}
private:
struct Conn {
CONNID id = 0;
SOCKET sock = INVALID_SOCKET;
std::atomic<bool> stop{ false };
std::atomic<bool> finished{ false }; // 中继线程已走完(可以 join)
std::mutex sendLock; // 串行化 Send 与中继线程的 closesocket
std::thread thread;
};
void AcceptLoop();
void RelayLoop(std::shared_ptr<Conn> pConn);
void ReapFinished();
BOOL SetSocketOptions(SOCKET s) const;
USHORT m_nPort = 0;
int m_nMaxConnection = 0;
SOCKET m_listenSocket = INVALID_SOCKET;
std::thread m_acceptThread;
std::atomic<bool> m_bRunning{ false };
PROXYNOTIFYPROC m_pNotifyProc = nullptr;
PROXYCANRECVPROC m_pCanRecvProc = nullptr; // 可为空,表示不限流
void* m_pUser = nullptr;
std::mutex m_connLock;
std::map<CONNID, std::shared_ptr<Conn>> m_conns;
CONNID m_nextId = 1;
// 已退出、等待 join 的连接。由 accept 线程与 Shutdown 收割,避免线程句柄越积越多。
std::vector<std::shared_ptr<Conn>> m_graveyard;
std::mutex m_graveLock;
};