pjandro/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-11-02 11:15:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(hwid): keep a subscription's device limit while its client is disabled

Browse Source 
effectiveHwidLimitForSubID took the limit over enabled clients only. A
client switched off for expiry, quota or by hand therefore had no limit
at all, while the subscription body is still served for disabled
clients, so any number of devices registered and stayed past the
renewal.

The limit now follows the subId whatever the enable flag, and the gate,
the slot status and the trim keep sharing that one query.
This commit is contained in:
MHSanaei
2026-11-01 08:39:50 +01:00
parent bd36053356
commit f8ceede46f
2 changed files with 46 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/web/service/client_hwid_test.go
+42
View File
@@ -288,6 +288,48 @@ func TestClientHwidGateSharedSubIdUsesMaxLimit(t *testing.T) {
}
}
func TestClientHwidGateHoldsWhileClientDisabled(t *testing.T) {
initClientHwidTestDB(t)
svc := &ClientService{}
db := database.GetDB()
rec := seedHwidClient(t, 1)
if res, err := svc.EnforceHwidForSubID(rec.SubID, HwidRequest{Hwid: "device-one"}); err != nil || !res.Allowed {
t.Fatalf("register first device = %+v, %v", res, err)
}
if err := db.Model(&model.ClientRecord{}).Where("id = ?", rec.Id).UpdateColumn("enable", false).Error; err != nil {
t.Fatalf("disable client: %v", err)
}
assertStillLimited := func(stage string) {
t.Helper()
res, err := svc.EnforceHwidForSubID(rec.SubID, HwidRequest{Hwid: "device-two"})
if err != nil {
t.Fatalf("%s: second device: %v", stage, err)
}
if res.Allowed || !res.MaxDevicesReached || res.Limit != 1 {
t.Fatalf("%s: disabled client must keep its device limit: %+v", stage, res)
}
if res, err = svc.EnforceHwidForSubID(rec.SubID, HwidRequest{Hwid: "device-one"}); err != nil || !res.Allowed {
t.Fatalf("%s: registered device = %+v, %v", stage, res, err)
}
var count int64
if err := db.Model(&model.ClientHwid{}).Where("sub_id = ?", rec.SubID).Count(&count).Error; err != nil {
t.Fatalf("%s: count HWIDs: %v", stage, err)
}
if count != 1 {
t.Fatalf("%s: stored HWIDs = %d, want 1", stage, count)
}
}
assertStillLimited("only client disabled")
// An enabled sibling without a limit must not lift it either.
if err := db.Create(&model.ClientRecord{Email: "second@example.com", SubID: rec.SubID, UUID: "22222222-2222-4333-8444-555555555555", Enable: true, LimitHwid: 0}).Error; err != nil {
t.Fatalf("seed second client: %v", err)
}
assertStillLimited("unlimited sibling enabled")
}
func TestClientHwidSlotStatus(t *testing.T) {
initClientHwidTestDB(t)
svc := &ClientService{}