From 36bb5bd205b2747d44a2fddf94dbee560ea080a3 Mon Sep 17 00:00:00 2001 From: Yuzuki616 Date: Fri, 13 Oct 2023 15:32:06 +0800 Subject: [PATCH] add conn clear for sing --- conf/sing.go | 9 ++-- core/sing/hook.go | 99 ++++++++++++++++++++++++++++++++++------ core/sing/sing.go | 15 +++--- core/sing/user.go | 1 + example/config_full.json | 4 +- 5 files changed, 103 insertions(+), 25 deletions(-) diff --git a/conf/sing.go b/conf/sing.go index a334190..ce6fb98 100644 --- a/conf/sing.go +++ b/conf/sing.go @@ -5,10 +5,11 @@ import ( ) type SingConfig struct { - LogConfig SingLogConfig `json:"Log"` - NtpConfig SingNtpConfig `json:"NTP"` - DnsConfigPath string `json:"DnsConfigPath"` - OriginalPath string `json:"OriginalPath"` + LogConfig SingLogConfig `json:"Log"` + NtpConfig SingNtpConfig `json:"NTP"` + EnableConnClear bool `json:"EnableConnClear"` + DnsConfigPath string `json:"DnsConfigPath"` + OriginalPath string `json:"OriginalPath"` } type SingLogConfig struct { diff --git a/core/sing/hook.go b/core/sing/hook.go index 3da31f3..699a08e 100644 --- a/core/sing/hook.go +++ b/core/sing/hook.go @@ -2,6 +2,7 @@ package sing import ( "context" + "io" "net" "sync" @@ -18,18 +19,49 @@ import ( ) type HookServer struct { - logger log.Logger - counter sync.Map + EnableConnClear bool + logger log.Logger + counter sync.Map + connClears sync.Map +} + +type ConnClear struct { + lock sync.RWMutex + conns map[int]io.Closer +} + +func (c *ConnClear) AddConn(cn io.Closer) (key int) { + c.lock.Lock() + defer c.lock.Unlock() + key = len(c.conns) + c.conns[key] = cn + return +} + +func (c *ConnClear) DelConn(key int) { + c.lock.Lock() + defer c.lock.Unlock() + delete(c.conns, key) +} + +func (c *ConnClear) ClearConn() { + c.lock.Lock() + defer c.lock.Unlock() + for _, c := range c.conns { + c.Close() + } } func (h *HookServer) ModeList() []string { return nil } -func NewHookServer(logger log.Logger) *HookServer { +func NewHookServer(logger log.Logger, enableClear bool) *HookServer { return &HookServer{ - logger: logger, - counter: sync.Map{}, + EnableConnClear: enableClear, + logger: logger, + counter: sync.Map{}, + connClears: sync.Map{}, } } @@ -46,7 +78,7 @@ func (h *HookServer) PreStart() error { } func (h *HookServer) RoutedConnection(_ context.Context, conn net.Conn, m adapter.InboundContext, _ adapter.Rule) (net.Conn, adapter.Tracker) { - t := &Tracker{l: func() {}} + t := &Tracker{} l, err := limiter.GetLimiter(m.Inbound) if err != nil { log.Error("get limiter for ", m.Inbound, " error: ", err) @@ -71,8 +103,23 @@ func (h *HookServer) RoutedConnection(_ context.Context, conn net.Conn, m adapte } else if b != nil { conn = rate.NewConnRateLimiter(conn, b) } - t.l = func() { + t.AddLeave(func() { l.ConnLimiter.DelConnCount(m.User, ip) + }) + if h.EnableConnClear { + var key int + cc := &ConnClear{ + conns: map[int]io.Closer{ + 0: conn, + }, + } + if v, ok := h.connClears.LoadOrStore(m.Inbound+m.User, cc); ok { + cc = v.(*ConnClear) + key = cc.AddConn(conn) + } + t.AddLeave(func() { + cc.DelConn(key) + }) } if c, ok := h.counter.Load(m.Inbound); ok { return counter.NewConnCounter(conn, c.(*counter.TrafficCounter).GetCounter(m.User)), t @@ -84,9 +131,7 @@ func (h *HookServer) RoutedConnection(_ context.Context, conn net.Conn, m adapte } func (h *HookServer) RoutedPacketConnection(_ context.Context, conn N.PacketConn, m adapter.InboundContext, _ adapter.Rule) (N.PacketConn, adapter.Tracker) { - t := &Tracker{ - l: func() {}, - } + t := &Tracker{} l, err := limiter.GetLimiter(m.Inbound) if err != nil { log.Error("get limiter for ", m.Inbound, " error: ", err) @@ -107,10 +152,25 @@ func (h *HookServer) RoutedPacketConnection(_ context.Context, conn N.PacketConn if b, r := l.CheckLimit(m.User, ip, true); r { conn.Close() h.logger.Error("[", m.Inbound, "] ", "Limited ", m.User, " by ip or conn") - return conn, &Tracker{l: func() {}} + return conn, t } else if b != nil { conn = rate.NewPacketConnCounter(conn, b) } + if h.EnableConnClear { + var key int + cc := &ConnClear{ + conns: map[int]io.Closer{ + 0: conn, + }, + } + if v, ok := h.connClears.LoadOrStore(m.Inbound+m.User, cc); ok { + cc = v.(*ConnClear) + key = cc.AddConn(conn) + } + t.AddLeave(func() { + cc.DelConn(key) + }) + } if c, ok := h.counter.Load(m.Inbound); ok { return counter.NewPacketConnCounter(conn, c.(*counter.TrafficCounter).GetCounter(m.User)), t } else { @@ -139,10 +199,23 @@ func (h *HookServer) StoreFakeIP() bool { return false } +func (h *HookServer) ClearConn(inbound string, user string) { + if v, ok := h.connClears.Load(inbound + user); ok { + v.(*ConnClear).ClearConn() + h.connClears.Delete(inbound + user) + } +} + type Tracker struct { - l func() + l []func() +} + +func (t *Tracker) AddLeave(f func()) { + t.l = append(t.l, f) } func (t *Tracker) Leave() { - t.l() + for i := range t.l { + t.l[i]() + } } diff --git a/core/sing/sing.go b/core/sing/sing.go index ec76b7f..c382df7 100644 --- a/core/sing/sing.go +++ b/core/sing/sing.go @@ -3,6 +3,11 @@ package sing import ( "context" "fmt" + "io" + "os" + "runtime/debug" + "time" + "github.com/InazumaV/V2bX/conf" vCore "github.com/InazumaV/V2bX/core" "github.com/goccy/go-json" @@ -17,10 +22,6 @@ import ( F "github.com/sagernet/sing/common/format" "github.com/sagernet/sing/service" "github.com/sagernet/sing/service/pause" - "io" - "os" - "runtime/debug" - "time" ) var _ adapter.Service = (*Box)(nil) @@ -31,7 +32,7 @@ type DNSConfig struct { } type Box struct { - ctx context.Context + ctx context.Context createdAt time.Time router adapter.Router inbounds map[string]adapter.Inbound @@ -164,13 +165,13 @@ func New(c *conf.CoreConfig) (vCore.Core, error) { if err != nil { return nil, err } - server := NewHookServer(logFactory.NewLogger("Hook-Server")) + server := NewHookServer(logFactory.NewLogger("Hook-Server"), c.SingConfig.EnableConnClear) if err != nil { return nil, E.Cause(err, "create v2ray api server") } router.SetClashServer(server) return &Box{ - ctx: ctx, + ctx: ctx, router: router, inbounds: inMap, outbounds: outbounds, diff --git a/core/sing/user.go b/core/sing/user.go index 23e7eea..ecd718e 100644 --- a/core/sing/user.go +++ b/core/sing/user.go @@ -112,6 +112,7 @@ func (b *Box) DelUsers(users []panel.UserInfo, tag string) error { } uuids := make([]string, len(users)) for i := range users { + b.hookServer.ClearConn(tag, users[i].Uuid) uuids[i] = users[i].Uuid } err := del.DelUsers(uuids) diff --git a/example/config_full.json b/example/config_full.json index a188bd7..44b4769 100644 --- a/example/config_full.json +++ b/example/config_full.json @@ -28,7 +28,9 @@ }, "DnsConfigPath": "/etc/V2bX/dns.json", // SingBox源配置文件目录，用于引用标准SingBox配置文件 - "OriginalPath": "/etc/V2bX/sing_origin.json" + "OriginalPath": "/etc/V2bX/sing_origin.json", + // 在删除用户时清理已建立的连接 + "EnableConnClear": false, }, { "Type": "sing",