lanhu/proxy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

重构代理解析流程，引入端口混合协议转发

Browse Source
This commit is contained in:
luorijun
2025-03-01 17:08:56 +08:00
parent b8a3dd93dc
commit 76139d28c4
24 changed files with 841 additions and 1042 deletions
Download Patch File Download Diff File Expand all files Collapse all files

261
server/fwd/fwd.go
View File

@@ -8,11 +8,11 @@ import (
"log/slog"
"net"
"proxy-server/pkg/utils"
"proxy-server/server/fwd/socks"
"proxy-server/server/fwd/core"
"proxy-server/server/fwd/dispatcher"
"proxy-server/server/pkg/env"
"strconv"
"sync"
"time"
"github.com/pkg/errors"
)
@@ -21,14 +21,17 @@ type Config struct {
}
type Service struct {
Config *Config
ctx context.Context
cancel context.CancelFunc
userConnMap sync.Map
Config *Config
ctx context.Context
cancel context.CancelFunc
userConnMap sync.Map
ctrlConnMap sync.Map
fwdLesWg utils.CountWaitGroup
ctrlConnWg utils.CountWaitGroup
dataConnWg utils.CountWaitGroup
fwdLesWg utils.CountWaitGroup
userConnWg utils.CountWaitGroup
}
func New(config *Config) *Service {
@@ -42,16 +45,17 @@ func New(config *Config) *Service {
ctx: ctx,
cancel: cancel,
userConnMap: sync.Map{},
ctrlConnWg: utils.CountWaitGroup{},
dataConnWg: utils.CountWaitGroup{},
fwdLesWg: utils.CountWaitGroup{},
ctrlConnMap: sync.Map{},
fwdLesWg: utils.CountWaitGroup{},
ctrlConnWg: utils.CountWaitGroup{},
dataConnWg: utils.CountWaitGroup{},
userConnWg: utils.CountWaitGroup{},
}
}
func (s *Service) Close() {
start := time.Now()
s.cancel()
slog.Debug("退出服务", "duration", time.Since(start))
}
func (s *Service) Run() {
@@ -95,15 +99,28 @@ func (s *Service) Run() {
s.Close()
}
wg.Wait()
// 协程建立有先后顺序，不能乱，否则会泄露
s.dataConnWg.Wait()
s.ctrlConnWg.Wait()
s.fwdLesWg.Wait()
s.userConnWg.Wait()
// 清理资源
s.userConnMap.Range(func(key, value any) bool {
conn := value.(socks.ProxyConn)
conn := value.(core.Conn)
utils.Close(conn)
s.userConnMap.Delete(key)
return true
})
s.userConnMap.Clear()
s.ctrlConnMap.Range(func(key, value any) bool {
conn := value.(net.Conn)
utils.Close(conn)
return true
})
s.ctrlConnMap.Clear()
s.ctrlConnWg.Wait()
slog.Debug("控制通道连接已关闭")
s.dataConnWg.Wait()
@@ -125,38 +142,33 @@ func (s *Service) startCtrlTun() error {
}
defer utils.Close(ls)
// 等待连接
connCh := utils.ChanConnAccept(s.ctx, ls)
defer close(connCh)
// 处理连接
connCh := utils.ChanConnAccept(s.ctx, ls)
for {
select {
case <-s.ctx.Done():
slog.Debug("服务关闭 startCtrlTun")
return nil
case conn, ok := <-connCh:
if !ok {
slog.Debug("结束处理连接，由于获取连接失败")
return errors.New("获取连接失败")
}
s.ctrlConnWg.Add(1)
go func() {
defer s.ctrlConnWg.Done()
defer utils.Close(conn)
err := s.processCtrlConn(conn)
if err != nil {
slog.Error("处理控制通道连接失败", "err", err)
utils.Close(conn)
}
}()
}
}
}
func (s *Service) processCtrlConn(controller net.Conn) error {
slog.Debug("客户端连入", "addr", controller.RemoteAddr().String())
func (s *Service) processCtrlConn(conn net.Conn) error {
slog.Debug("客户端连入", "addr", conn.RemoteAddr().String())
reader := bufio.NewReader(controller)
reader := bufio.NewReader(conn)
// 获取转发端口
portBuf, err := utils.ReadBuffer(reader, 2)
@@ -165,63 +177,19 @@ func (s *Service) processCtrlConn(controller net.Conn) error {
}
port := binary.BigEndian.Uint16(portBuf)
// 开放转发端口 todo 混合转发
slog.Debug("开放转发端口", "port", port)
proxy, err := socks.New(&socks.Config{
Name: strconv.Itoa(int(port)),
Port: port,
AuthMethods: []socks.Authenticator{
&UserPassAuthenticator{},
&NoAuthAuthenticator{},
},
})
if err != nil {
return errors.Wrap(err, "创建 socks 转发服务失败")
}
defer proxy.Close()
// 开放转发端口
s.fwdLesWg.Add(1)
go func() {
defer s.fwdLesWg.Done()
err := proxy.Run()
err := s.startFwdTun(port)
if err != nil {
slog.Error("代理服务启动失败", "err", err)
return
}
}()
// 等待用户连接
wg := sync.WaitGroup{}
for loop := true; loop; {
select {
case <-s.ctx.Done():
loop = false
case user, ok := <-proxy.Conn:
if !ok {
loop = false
err = errors.New("无法获取连接")
}
wg.Add(1)
go func() {
defer wg.Done()
tag := user.Tag()
tagLen := len(tag)
tagBuf := make([]byte, 1+tagLen)
tagBuf[0] = byte(tagLen)
copy(tagBuf[1:], tag)
_, err := controller.Write(tagBuf)
if err != nil {
utils.Close(user)
slog.Error("向客户端发送 tag 失败", "err", err)
return
}
s.userConnMap.Store(tag, user)
}()
}
}
wg.Wait()
// 记录控制连接
s.ctrlConnMap.Store(port, conn)
return nil
}
@@ -236,19 +204,14 @@ func (s *Service) startDataTun() error {
}
defer utils.Close(ls)
// 等待连接
connCh := utils.ChanConnAccept(s.ctx, ls)
defer close(connCh)
// 处理连接
connCh := utils.ChanConnAccept(s.ctx, ls)
for {
select {
case <-s.ctx.Done():
slog.Debug("服务关闭 startDataTun")
return nil
case conn, ok := <-connCh:
if !ok {
slog.Debug("结束处理连接，由于获取连接失败")
return errors.New("获取连接失败")
}
s.dataConnWg.Add(1)
@@ -268,67 +231,60 @@ func (s *Service) processDataConn(client net.Conn) error {
slog.Info("客户端准备接收数据 " + client.RemoteAddr().String())
// 读取 tag
tagLen, err := utils.ReadByte(client)
if err != nil {
return errors.Wrap(err, "从客户端获取 tag 失败")
}
tagBuf, err := utils.ReadBuffer(client, int(tagLen))
if err != nil {
return errors.Wrap(err, "从客户端获取 tag 失败")
}
tag := string(tagBuf)
// 找到用户连接
var data socks.ProxyConn
var tag string
select {
case <-s.ctx.Done():
return nil
default:
dataAny, ok := s.userConnMap.Load(tag)
if !ok {
return errors.New("查找用户连接失败")
tagLen, err := utils.ReadByte(client)
if err != nil {
return errors.Wrap(err, "从客户端获取 tag 失败")
}
data = dataAny.(socks.ProxyConn)
defer func() {
s.userConnMap.Delete(tag)
utils.Close(data)
}()
tagBuf, err := utils.ReadBuffer(client, int(tagLen))
if err != nil {
return errors.Wrap(err, "从客户端获取 tag 失败")
}
tag = string(tagBuf)
}
// 响应用户
user := data.Conn
err = socks.SendSuccess(user, client)
if err != nil {
// todo 考虑是否需要处理服务关闭后导致用户连接被关闭的情况
return errors.Wrap(err, "向用户发送成功消息失败")
// 找到用户连接
userAny, ok := s.userConnMap.Load(tag)
if !ok {
return errors.New("查找用户连接失败")
}
user := userAny.(*core.Conn)
defer utils.Close(user)
defer s.userConnMap.Delete(tag)
// 发送目标地址
dest := data.Dest
destLen := len(dest)
destBuf := make([]byte, 1+destLen)
destBuf[0] = byte(destLen)
copy(destBuf[1:], dest)
_, err = client.Write(destBuf)
if err != nil {
return errors.Wrap(err, "向客户端发送目标地址失败")
select {
case <-s.ctx.Done():
return nil
default:
dest := user.Dest.String()
destLen := len(dest)
destBuf := make([]byte, 1+destLen)
destBuf[0] = byte(destLen)
copy(destBuf[1:], dest)
_, err := client.Write(destBuf)
if err != nil {
return errors.Wrap(err, "向客户端发送目标地址失败")
}
}
// 数据转发
slog.Info("开始数据转发 " + client.RemoteAddr().String() + " <-> " + data.Dest)
userPipeReader, userPipeWriter := io.Pipe()
defer utils.Close(userPipeWriter)
teeUser := io.TeeReader(user, userPipeWriter)
go func() {
err := analysisAndLog(data, userPipeReader)
err := analysisAndLog(user, userPipeReader)
if err != nil {
slog.Error("数据解析失败", "err", err)
}
}()
wg := sync.WaitGroup{}
wg.Add(1)
wg.Add(2)
go func() {
defer wg.Done()
_, err := io.Copy(client, teeUser)
@@ -336,7 +292,6 @@ func (s *Service) processDataConn(client net.Conn) error {
slog.Error("数据转发失败 user->client", "err", err)
}
}()
wg.Add(1)
go func() {
defer wg.Done()
_, err := io.Copy(user, client)
@@ -348,8 +303,76 @@ func (s *Service) processDataConn(client net.Conn) error {
}
}
}()
wg.Wait()
slog.Info("数据转发结束 " + client.RemoteAddr().String() + " <-> " + data.Dest)
select {
case <-s.ctx.Done():
case <-utils.ChanWgWait(s.ctx, &wg):
}
return nil
}
func (s *Service) startFwdTun(port uint16) error {
slog.Debug("监听转发通道", "port", port)
proxy, err := dispatcher.New(port)
if err != nil {
return errors.Wrap(err, "创建 socks 转发服务失败")
}
defer proxy.Close()
go func() {
err := proxy.Run()
if err != nil {
slog.Error("代理服务异常退出", "err", err)
}
}()
for {
select {
case <-s.ctx.Done():
return nil
case conn := <-proxy.Conn:
s.userConnWg.Add(1)
go func() {
defer s.userConnWg.Done()
err := s.processUserConn(conn, port)
if err != nil {
slog.Error("处理用户连接失败", "err", err)
}
}()
}
}
}
func (s *Service) processUserConn(conn *core.Conn, port uint16) error {
// 记录用户连接
s.userConnMap.Store(conn.Tag, conn)
// 通知客户端建立数据通道
ctrlConnAny, ok := s.ctrlConnMap.Load(port)
if !ok {
return errors.New("查找控制连接失败")
}
ctrlConn := ctrlConnAny.(net.Conn)
// 发送 tag
select {
case <-s.ctx.Done():
return nil
default:
tag := conn.Tag
tagLen := len(tag)
tagBuf := make([]byte, 1+tagLen)
tagBuf[0] = byte(tagLen)
copy(tagBuf[1:], tag)
_, err := ctrlConn.Write(tagBuf)
if err != nil {
return errors.Wrap(err, "向控制通道发送 tag 失败")
}
}
return nil
}