mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-07-16 01:26:07 +00:00
MHSanaei
e4ef8a54d4
In a mixed BulkAdjust (both a days delta and a bytes delta), a per-field planning skip such as "unlimited expiry" or "unlimited traffic" was recorded in the same map that gated the client_traffics write. The applied field was already written to the inbound JSON and the clients table, but the enforcement row was left untouched, so the depletion job cut the client on the old limit while the panel showed the new one. Gate the traffic-row write on an actual inbound-processing failure rather than on any planning-phase skip note.
334 lines
11 KiB
Go
334 lines
11 KiB
Go
package service
|
|
|
|
import (
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
|
)
|
|
|
|
const reenableDay = int64(24 * 60 * 60 * 1000)
|
|
|
|
func recordEnableOf(t *testing.T, svc *ClientService, email string) bool {
|
|
t.Helper()
|
|
rec, err := svc.GetRecordByEmail(nil, email)
|
|
if err != nil {
|
|
t.Fatalf("GetRecordByEmail(%q): %v", email, err)
|
|
}
|
|
return rec.Enable
|
|
}
|
|
|
|
func forceRecordDisabled(t *testing.T, svc *ClientService, email string) {
|
|
t.Helper()
|
|
if err := database.GetDB().Model(&model.ClientRecord{}).
|
|
Where("email = ?", email).
|
|
UpdateColumn("enable", false).Error; err != nil {
|
|
t.Fatalf("force record disabled %q: %v", email, err)
|
|
}
|
|
if recordEnableOf(t, svc, email) {
|
|
t.Fatalf("setup: record %q should start disabled", email)
|
|
}
|
|
}
|
|
|
|
func jsonClientEnable(t *testing.T, inboundSvc *InboundService, inboundId int, email string) bool {
|
|
t.Helper()
|
|
ib, err := inboundSvc.GetInbound(inboundId)
|
|
if err != nil {
|
|
t.Fatalf("GetInbound(%d): %v", inboundId, err)
|
|
}
|
|
clients, err := inboundSvc.GetClients(ib)
|
|
if err != nil {
|
|
t.Fatalf("GetClients(%d): %v", inboundId, err)
|
|
}
|
|
for _, c := range clients {
|
|
if c.Email == email {
|
|
return c.Enable
|
|
}
|
|
}
|
|
t.Fatalf("client %q not found in inbound %d settings JSON", email, inboundId)
|
|
return false
|
|
}
|
|
|
|
func assertEnableEverywhere(t *testing.T, svc *ClientService, inboundSvc *InboundService, inboundId int, email string, want bool) {
|
|
t.Helper()
|
|
if got := trafficOf(t, email).Enable; got != want {
|
|
t.Fatalf("%s: client_traffics.enable = %v, want %v", email, got, want)
|
|
}
|
|
if got := recordEnableOf(t, svc, email); got != want {
|
|
t.Fatalf("%s: client_records.enable = %v, want %v", email, got, want)
|
|
}
|
|
if got := jsonClientEnable(t, inboundSvc, inboundId, email); got != want {
|
|
t.Fatalf("%s: inbound JSON enable = %v, want %v", email, got, want)
|
|
}
|
|
}
|
|
|
|
func seedLocalDisabledClient(t *testing.T, svc *ClientService, port int, stream, email string, total, expiry, up, down int64) *model.Inbound {
|
|
t.Helper()
|
|
c := model.Client{
|
|
Email: email,
|
|
ID: "11111111-1111-1111-1111-111111111111",
|
|
SubID: email,
|
|
Enable: false,
|
|
TotalGB: total,
|
|
ExpiryTime: expiry,
|
|
}
|
|
var ib *model.Inbound
|
|
if stream == "" {
|
|
ib = mkInbound(t, port, model.VLESS, clientsSettings(t, []model.Client{c}))
|
|
} else {
|
|
ib = mkInboundStream(t, port, model.VLESS, clientsSettings(t, []model.Client{c}), stream)
|
|
}
|
|
if err := svc.SyncInbound(nil, ib.Id, []model.Client{c}); err != nil {
|
|
t.Fatalf("seed linkage: %v", err)
|
|
}
|
|
mkTraffic(t, ib.Id, email, up, down, total, expiry, false)
|
|
forceRecordDisabled(t, svc, email)
|
|
return ib
|
|
}
|
|
|
|
func TestBulkAdjust_ReenablesExpiredThenExtended_AllThreeLocations(t *testing.T) {
|
|
setupBulkDB(t)
|
|
svc := &ClientService{}
|
|
inboundSvc := &InboundService{}
|
|
|
|
now := time.Now().UnixMilli()
|
|
email := "exp@x"
|
|
ib := seedLocalDisabledClient(t, svc, 52001, "", email, 0, now-reenableDay, 0, 0)
|
|
|
|
res, _, err := svc.BulkAdjust(inboundSvc, []string{email}, 30, 0, "")
|
|
if err != nil {
|
|
t.Fatalf("BulkAdjust: %v", err)
|
|
}
|
|
if res.Adjusted != 1 {
|
|
t.Fatalf("expected 1 adjusted, got %d (skipped=%v)", res.Adjusted, res.Skipped)
|
|
}
|
|
assertEnableEverywhere(t, svc, inboundSvc, ib.Id, email, true)
|
|
if got := trafficOf(t, email).ExpiryTime; got != now-reenableDay+30*reenableDay {
|
|
t.Fatalf("%s: expiry = %d, want %d", email, got, now-reenableDay+30*reenableDay)
|
|
}
|
|
}
|
|
|
|
func TestBulkAdjust_DoesNotReenable_ManuallyDisabledNotDepleted(t *testing.T) {
|
|
setupBulkDB(t)
|
|
svc := &ClientService{}
|
|
inboundSvc := &InboundService{}
|
|
|
|
now := time.Now().UnixMilli()
|
|
email := "man@x"
|
|
ib := seedLocalDisabledClient(t, svc, 52002, "", email, 0, now+30*reenableDay, 0, 0)
|
|
|
|
res, _, err := svc.BulkAdjust(inboundSvc, []string{email}, 30, 0, "")
|
|
if err != nil {
|
|
t.Fatalf("BulkAdjust: %v", err)
|
|
}
|
|
if res.Adjusted != 1 {
|
|
t.Fatalf("expected 1 adjusted, got %d (skipped=%v)", res.Adjusted, res.Skipped)
|
|
}
|
|
assertEnableEverywhere(t, svc, inboundSvc, ib.Id, email, false)
|
|
}
|
|
|
|
func TestBulkAdjust_StaysDisabled_ExtensionTooSmall(t *testing.T) {
|
|
setupBulkDB(t)
|
|
svc := &ClientService{}
|
|
inboundSvc := &InboundService{}
|
|
|
|
now := time.Now().UnixMilli()
|
|
email := "sml@x"
|
|
ib := seedLocalDisabledClient(t, svc, 52003, "", email, 0, now-10*reenableDay, 0, 0)
|
|
|
|
if _, _, err := svc.BulkAdjust(inboundSvc, []string{email}, 5, 0, ""); err != nil {
|
|
t.Fatalf("BulkAdjust: %v", err)
|
|
}
|
|
assertEnableEverywhere(t, svc, inboundSvc, ib.Id, email, false)
|
|
}
|
|
|
|
func TestBulkAdjust_ReenablesOverQuota_WhenAddBytesClearsQuota(t *testing.T) {
|
|
setupBulkDB(t)
|
|
svc := &ClientService{}
|
|
inboundSvc := &InboundService{}
|
|
|
|
email := "q@x"
|
|
ib := seedLocalDisabledClient(t, svc, 52004, "", email, 100, 0, 60, 40)
|
|
|
|
res, _, err := svc.BulkAdjust(inboundSvc, []string{email}, 0, 200, "")
|
|
if err != nil {
|
|
t.Fatalf("BulkAdjust: %v", err)
|
|
}
|
|
if res.Adjusted != 1 {
|
|
t.Fatalf("expected 1 adjusted, got %d (skipped=%v)", res.Adjusted, res.Skipped)
|
|
}
|
|
assertEnableEverywhere(t, svc, inboundSvc, ib.Id, email, true)
|
|
if got := trafficOf(t, email).Total; got != 300 {
|
|
t.Fatalf("%s: total = %d, want 300", email, got)
|
|
}
|
|
}
|
|
|
|
func TestBulkAdjust_QuotaReductionBelowZeroSkipsInsteadOfUnlimited(t *testing.T) {
|
|
setupBulkDB(t)
|
|
svc := &ClientService{}
|
|
inboundSvc := &InboundService{}
|
|
|
|
email := "qr@x"
|
|
c := model.Client{Email: email, ID: "11111111-1111-1111-1111-111111111111", SubID: email, Enable: true, TotalGB: 10}
|
|
ib := mkInbound(t, 52020, model.VLESS, clientsSettings(t, []model.Client{c}))
|
|
if err := svc.SyncInbound(nil, ib.Id, []model.Client{c}); err != nil {
|
|
t.Fatalf("seed linkage: %v", err)
|
|
}
|
|
mkTraffic(t, ib.Id, email, 0, 0, 10, 0, true)
|
|
|
|
res, _, err := svc.BulkAdjust(inboundSvc, []string{email}, 0, -20, "")
|
|
if err != nil {
|
|
t.Fatalf("BulkAdjust: %v", err)
|
|
}
|
|
if res.Adjusted != 0 {
|
|
t.Fatalf("over-reduction should not adjust, got Adjusted=%d skipped=%v", res.Adjusted, res.Skipped)
|
|
}
|
|
if got := trafficOf(t, email).Total; got != 10 {
|
|
t.Fatalf("quota reduced past zero was written as %d (0 means unlimited); want it left at 10", got)
|
|
}
|
|
}
|
|
|
|
func TestBulkAdjust_AppliedFieldReachesTrafficRowDespiteOtherFieldSkip(t *testing.T) {
|
|
setupBulkDB(t)
|
|
svc := &ClientService{}
|
|
inboundSvc := &InboundService{}
|
|
|
|
email := "mix2@x"
|
|
c := model.Client{Email: email, ID: "11111111-1111-1111-1111-111111111111", SubID: email, Enable: true, TotalGB: 100, ExpiryTime: 0}
|
|
ib := mkInbound(t, 52021, model.VLESS, clientsSettings(t, []model.Client{c}))
|
|
if err := svc.SyncInbound(nil, ib.Id, []model.Client{c}); err != nil {
|
|
t.Fatalf("seed linkage: %v", err)
|
|
}
|
|
mkTraffic(t, ib.Id, email, 0, 0, 100, 0, true)
|
|
|
|
if _, _, err := svc.BulkAdjust(inboundSvc, []string{email}, 30, 50, ""); err != nil {
|
|
t.Fatalf("BulkAdjust: %v", err)
|
|
}
|
|
if got := trafficOf(t, email).Total; got != 150 {
|
|
t.Fatalf("client_traffics.total = %d, want 150: the applied quota adjustment must reach the enforcement row even though the unlimited-expiry field was skipped", got)
|
|
}
|
|
}
|
|
|
|
func TestBulkAdjust_OverQuota_DaysOnly_StaysDisabled(t *testing.T) {
|
|
setupBulkDB(t)
|
|
svc := &ClientService{}
|
|
inboundSvc := &InboundService{}
|
|
|
|
now := time.Now().UnixMilli()
|
|
email := "qd@x"
|
|
ib := seedLocalDisabledClient(t, svc, 52005, "", email, 100, now-reenableDay, 60, 40)
|
|
|
|
if _, _, err := svc.BulkAdjust(inboundSvc, []string{email}, 60, 0, ""); err != nil {
|
|
t.Fatalf("BulkAdjust: %v", err)
|
|
}
|
|
assertEnableEverywhere(t, svc, inboundSvc, ib.Id, email, false)
|
|
}
|
|
|
|
func TestBulkAdjust_NegativeReduction_DoesNotFlipEnable(t *testing.T) {
|
|
setupBulkDB(t)
|
|
svc := &ClientService{}
|
|
inboundSvc := &InboundService{}
|
|
|
|
now := time.Now().UnixMilli()
|
|
email := "neg@x"
|
|
c := model.Client{Email: email, ID: "11111111-1111-1111-1111-111111111111", SubID: email, Enable: true, ExpiryTime: now + 5*reenableDay}
|
|
ib := mkInbound(t, 52006, model.VLESS, clientsSettings(t, []model.Client{c}))
|
|
if err := svc.SyncInbound(nil, ib.Id, []model.Client{c}); err != nil {
|
|
t.Fatalf("seed linkage: %v", err)
|
|
}
|
|
mkTraffic(t, ib.Id, email, 0, 0, 0, now+5*reenableDay, true)
|
|
|
|
if _, _, err := svc.BulkAdjust(inboundSvc, []string{email}, -10, 0, ""); err != nil {
|
|
t.Fatalf("BulkAdjust: %v", err)
|
|
}
|
|
assertEnableEverywhere(t, svc, inboundSvc, ib.Id, email, true)
|
|
}
|
|
|
|
func TestBulkAdjust_FlowOnly_NoEnableChange(t *testing.T) {
|
|
setupBulkDB(t)
|
|
svc := &ClientService{}
|
|
inboundSvc := &InboundService{}
|
|
|
|
now := time.Now().UnixMilli()
|
|
email := "flow@x"
|
|
ib := seedLocalDisabledClient(t, svc, 52007, realityStream, email, 0, now-reenableDay, 0, 0)
|
|
|
|
if _, _, err := svc.BulkAdjust(inboundSvc, []string{email}, 0, 0, "xtls-rprx-vision-udp443"); err != nil {
|
|
t.Fatalf("BulkAdjust: %v", err)
|
|
}
|
|
assertEnableEverywhere(t, svc, inboundSvc, ib.Id, email, false)
|
|
if got := flowOf(t, svc, email); got != "xtls-rprx-vision-udp443" {
|
|
t.Fatalf("%s: flow = %q, want xtls-rprx-vision-udp443", email, got)
|
|
}
|
|
}
|
|
|
|
func TestBulkAdjust_UnlimitedExpiry_QuotaCleared_Reenables(t *testing.T) {
|
|
setupBulkDB(t)
|
|
svc := &ClientService{}
|
|
inboundSvc := &InboundService{}
|
|
|
|
email := "u@x"
|
|
ib := seedLocalDisabledClient(t, svc, 52008, "", email, 100, 0, 100, 0)
|
|
|
|
res, _, err := svc.BulkAdjust(inboundSvc, []string{email}, 0, 200, "")
|
|
if err != nil {
|
|
t.Fatalf("BulkAdjust: %v", err)
|
|
}
|
|
if res.Adjusted != 1 {
|
|
t.Fatalf("expected 1 adjusted, got %d (skipped=%v)", res.Adjusted, res.Skipped)
|
|
}
|
|
assertEnableEverywhere(t, svc, inboundSvc, ib.Id, email, true)
|
|
if got := trafficOf(t, email).Total; got != 300 {
|
|
t.Fatalf("%s: total = %d, want 300", email, got)
|
|
}
|
|
}
|
|
|
|
func TestBulkAdjust_NodeInbound_ReenablesDBLocations(t *testing.T) {
|
|
setupBulkDB(t)
|
|
svc := &ClientService{}
|
|
inboundSvc := &InboundService{}
|
|
|
|
node := &model.Node{Name: "n5619", Address: "127.0.0.1", Port: 2096, ApiToken: "tok", Enable: true, Status: "offline"}
|
|
if err := database.GetDB().Create(node).Error; err != nil {
|
|
t.Fatalf("create node: %v", err)
|
|
}
|
|
|
|
now := time.Now().UnixMilli()
|
|
email := "node@x"
|
|
c := model.Client{Email: email, ID: "11111111-1111-1111-1111-111111111111", SubID: email, Enable: false, ExpiryTime: now - reenableDay}
|
|
ib := &model.Inbound{
|
|
Tag: "node-in-5619",
|
|
Enable: true,
|
|
Port: 52900,
|
|
Protocol: model.VLESS,
|
|
Settings: clientsSettings(t, []model.Client{c}),
|
|
NodeID: &node.Id,
|
|
}
|
|
if err := database.GetDB().Create(ib).Error; err != nil {
|
|
t.Fatalf("create node inbound: %v", err)
|
|
}
|
|
if err := svc.SyncInbound(nil, ib.Id, []model.Client{c}); err != nil {
|
|
t.Fatalf("seed linkage: %v", err)
|
|
}
|
|
mkTraffic(t, ib.Id, email, 0, 0, 0, now-reenableDay, false)
|
|
forceRecordDisabled(t, svc, email)
|
|
|
|
res, _, err := svc.BulkAdjust(inboundSvc, []string{email}, 30, 0, "")
|
|
if err != nil {
|
|
t.Fatalf("BulkAdjust: %v", err)
|
|
}
|
|
if res.Adjusted != 1 {
|
|
t.Fatalf("expected 1 adjusted, got %d (skipped=%v)", res.Adjusted, res.Skipped)
|
|
}
|
|
if got := trafficOf(t, email).Enable; !got {
|
|
t.Fatalf("%s: client_traffics.enable = false, want true", email)
|
|
}
|
|
if got := recordEnableOf(t, svc, email); !got {
|
|
t.Fatalf("%s: client_records.enable = false, want true", email)
|
|
}
|
|
if got := jsonClientEnable(t, inboundSvc, ib.Id, email); !got {
|
|
t.Fatalf("%s: inbound JSON enable = false, want true", email)
|
|
}
|
|
}
|