mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-07-15 17:16:07 +00:00
f7cae8d1cf
ToggleClientEnableByEmail (Telegram bot) and SetClientEnableByEmail (LDAP sync) resolved a single inbound via the legacy client_traffics pointer and flipped enable only there. A client attached to several inbounds kept connecting through the siblings' running Xray after being disabled, and the next edit could re-enable it everywhere from a stale sibling. Route both through the applyClientFieldByEmail fan-out (the #5039 fix path) so the whole multi-inbound identity is toggled at once, dropping the circular Set/Toggle dependency.
155 lines
5.1 KiB
Go
155 lines
5.1 KiB
Go
package service
|
|
|
|
import (
|
|
"encoding/json"
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/xray"
|
|
)
|
|
|
|
// TestResetClientExpiryTimeByEmail_MultiInbound reproduces #5039: a client
|
|
// attached to several inbounds had its expiry patched only on the first
|
|
// inbound's JSON, so the stale siblings reverted the change on the next sync.
|
|
func TestResetClientExpiryTimeByEmail_MultiInbound(t *testing.T) {
|
|
dbDir := t.TempDir()
|
|
t.Setenv("XUI_DB_FOLDER", dbDir)
|
|
if err := database.InitDB(filepath.Join(dbDir, "x-ui.db")); err != nil {
|
|
t.Fatalf("InitDB: %v", err)
|
|
}
|
|
t.Cleanup(func() { _ = database.CloseDB() })
|
|
|
|
db := database.GetDB()
|
|
|
|
const email = "multi@example.com"
|
|
const uid = "ce8d33df-3a64-4f10-8f9b-91c3a8e0c111"
|
|
const oldExpiry = int64(1700000000000)
|
|
const newExpiry = int64(1800000000000)
|
|
|
|
clientJSON := func(expiry int64) string {
|
|
b, _ := json.Marshal(map[string]any{"clients": []map[string]any{{
|
|
"email": email, "id": uid, "enable": true, "expiryTime": expiry, "subId": "sub-multi-1",
|
|
}}})
|
|
return string(b)
|
|
}
|
|
|
|
first := &model.Inbound{
|
|
Tag: "vless-a", Enable: true, Port: 50001, Protocol: model.VLESS,
|
|
StreamSettings: `{"network":"tcp","security":"reality"}`, Settings: clientJSON(oldExpiry),
|
|
}
|
|
second := &model.Inbound{
|
|
Tag: "vless-b", Enable: true, Port: 50002, Protocol: model.VLESS,
|
|
StreamSettings: `{"network":"ws","security":"tls"}`, Settings: clientJSON(oldExpiry),
|
|
}
|
|
for _, ib := range []*model.Inbound{first, second} {
|
|
if err := db.Create(ib).Error; err != nil {
|
|
t.Fatalf("create inbound %s: %v", ib.Tag, err)
|
|
}
|
|
}
|
|
|
|
clientSvc := ClientService{}
|
|
inboundSvc := InboundService{}
|
|
for _, ib := range []*model.Inbound{first, second} {
|
|
clients, err := inboundSvc.GetClients(ib)
|
|
if err != nil {
|
|
t.Fatalf("GetClients(%s): %v", ib.Tag, err)
|
|
}
|
|
if err := clientSvc.SyncInbound(nil, ib.Id, clients); err != nil {
|
|
t.Fatalf("SyncInbound(%s): %v", ib.Tag, err)
|
|
}
|
|
}
|
|
|
|
if _, err := clientSvc.ResetClientExpiryTimeByEmail(&inboundSvc, email, newExpiry); err != nil {
|
|
t.Fatalf("ResetClientExpiryTimeByEmail: %v", err)
|
|
}
|
|
|
|
for _, ib := range []*model.Inbound{first, second} {
|
|
fresh, err := inboundSvc.GetInbound(ib.Id)
|
|
if err != nil {
|
|
t.Fatalf("GetInbound(%s): %v", ib.Tag, err)
|
|
}
|
|
clients, err := inboundSvc.GetClients(fresh)
|
|
if err != nil {
|
|
t.Fatalf("GetClients(%s): %v", ib.Tag, err)
|
|
}
|
|
if len(clients) != 1 || clients[0].ExpiryTime != newExpiry {
|
|
t.Errorf("inbound %s settings expiry = %d, want %d (#5039)", ib.Tag, clients[0].ExpiryTime, newExpiry)
|
|
}
|
|
}
|
|
|
|
rec, err := clientSvc.GetRecordByEmail(nil, email)
|
|
if err != nil {
|
|
t.Fatalf("GetRecordByEmail: %v", err)
|
|
}
|
|
if rec.ExpiryTime != newExpiry {
|
|
t.Errorf("client record expiry = %d, want %d", rec.ExpiryTime, newExpiry)
|
|
}
|
|
}
|
|
|
|
// A disable-by-email (Telegram bot / LDAP sync) must flip enable on every
|
|
// inbound the client is attached to. Patching only the first inbound left the
|
|
// client connecting through its siblings' running Xray.
|
|
func TestSetClientEnableByEmail_MultiInbound(t *testing.T) {
|
|
dbDir := t.TempDir()
|
|
t.Setenv("XUI_DB_FOLDER", dbDir)
|
|
if err := database.InitDB(filepath.Join(dbDir, "x-ui.db")); err != nil {
|
|
t.Fatalf("InitDB: %v", err)
|
|
}
|
|
t.Cleanup(func() { _ = database.CloseDB() })
|
|
|
|
db := database.GetDB()
|
|
|
|
const email = "multienable@example.com"
|
|
const uid = "ce8d33df-3a64-4f10-8f9b-91c3a8e0c222"
|
|
clientJSON := `{"clients":[{"email":"` + email + `","id":"` + uid + `","enable":true,"subId":"sub-en-1"}]}`
|
|
|
|
first := &model.Inbound{
|
|
Tag: "vless-en-a", Enable: true, Port: 50011, Protocol: model.VLESS,
|
|
StreamSettings: `{"network":"tcp","security":"reality"}`, Settings: clientJSON,
|
|
}
|
|
second := &model.Inbound{
|
|
Tag: "vless-en-b", Enable: true, Port: 50012, Protocol: model.VLESS,
|
|
StreamSettings: `{"network":"ws","security":"tls"}`, Settings: clientJSON,
|
|
}
|
|
for _, ib := range []*model.Inbound{first, second} {
|
|
if err := db.Create(ib).Error; err != nil {
|
|
t.Fatalf("create inbound %s: %v", ib.Tag, err)
|
|
}
|
|
}
|
|
|
|
clientSvc := ClientService{}
|
|
inboundSvc := InboundService{}
|
|
for _, ib := range []*model.Inbound{first, second} {
|
|
clients, err := inboundSvc.GetClients(ib)
|
|
if err != nil {
|
|
t.Fatalf("GetClients(%s): %v", ib.Tag, err)
|
|
}
|
|
if err := clientSvc.SyncInbound(nil, ib.Id, clients); err != nil {
|
|
t.Fatalf("SyncInbound(%s): %v", ib.Tag, err)
|
|
}
|
|
}
|
|
if err := db.Create(&xray.ClientTraffic{InboundId: first.Id, Email: email, Enable: true}).Error; err != nil {
|
|
t.Fatalf("seed traffic: %v", err)
|
|
}
|
|
|
|
if _, _, err := clientSvc.SetClientEnableByEmail(&inboundSvc, email, false); err != nil {
|
|
t.Fatalf("SetClientEnableByEmail: %v", err)
|
|
}
|
|
|
|
for _, ib := range []*model.Inbound{first, second} {
|
|
fresh, err := inboundSvc.GetInbound(ib.Id)
|
|
if err != nil {
|
|
t.Fatalf("GetInbound(%s): %v", ib.Tag, err)
|
|
}
|
|
clients, err := inboundSvc.GetClients(fresh)
|
|
if err != nil {
|
|
t.Fatalf("GetClients(%s): %v", ib.Tag, err)
|
|
}
|
|
if len(clients) != 1 || clients[0].Enable {
|
|
t.Errorf("inbound %s: client still enabled after disable-by-email; a sibling inbound kept access", ib.Tag)
|
|
}
|
|
}
|
|
}
|