mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-11-16 01:55:01 +03:00
fix(inbounds): keep the stored client list and enable on inbound save
Invariant: saving an inbound's configuration never changes which clients it holds nor whether it is enabled; both have their own endpoints. The edit modal posts back the clients and the enable flag it loaded when it opened. A client added meanwhile (another admin, the bot, the API, LDAP) was detached and its stats deleted; a client deleted meanwhile came back with its credentials, restoring access that had been revoked; an inbound switched off meanwhile was switched back on. For every save but a master's node-sync push, UpdateInbound now takes the client list and enable from the row it re-reads inside the writer; this replaces the lifecycle-only carry from the previous commit. Client validation (renewal schedule, Hysteria auth, TUIC credentials) moves after that swap so it judges the clients actually saved: a protocol switch keeps the stored clients, and #6268's refusal must apply to them. The edit form no longer loads or sends clients, so neither the JSON editor nor validation sees a copy the server ignores, and the enable switch shows only when adding; the list toggle (/setEnable) covers existing inbounds. Tests that added or re-keyed clients through a panel inbound save pinned the old rule; they now drive the master-push path, where payload clients still apply.
This commit is contained in:
@@ -5,6 +5,7 @@ import (
|
||||
"time"
|
||||
|
||||
"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"
|
||||
|
||||
"gorm.io/gorm"
|
||||
@@ -92,3 +93,78 @@ func TestInboundUpdateKeepsTrafficAddedMidEdit(t *testing.T) {
|
||||
t.Fatalf("inbound after edit: up=%d down=%d remark=%q, want 100/50/edited", saved.Up, saved.Down, saved.Remark)
|
||||
}
|
||||
}
|
||||
|
||||
func inboundLinksEmail(t *testing.T, inboundId int, email string) bool {
|
||||
t.Helper()
|
||||
var n int64
|
||||
if err := database.GetDB().Table("client_inbounds").
|
||||
Joins("JOIN clients ON clients.id = client_inbounds.client_id").
|
||||
Where("client_inbounds.inbound_id = ? AND clients.email = ?", inboundId, email).
|
||||
Count(&n).Error; err != nil {
|
||||
t.Fatalf("count links: %v", err)
|
||||
}
|
||||
return n > 0
|
||||
}
|
||||
|
||||
// A client added while the modal was open is not in the list it posts back;
|
||||
// saving the inbound must not detach it.
|
||||
func TestInboundFormSaveKeepsClientAddedWhileOpen(t *testing.T) {
|
||||
setupBulkDB(t)
|
||||
ib := seedRenewableNeighbour(t, 23204, nil)
|
||||
form := *ib
|
||||
|
||||
if _, err := (&ClientService{}).AddInboundClient(&InboundService{}, &model.Inbound{
|
||||
Id: ib.Id, Settings: clientsSettings(t, []model.Client{{Email: "z@stale", ID: "aaaaaaaa-0000-0000-0000-00000000000c", Enable: true}}),
|
||||
}); err != nil {
|
||||
t.Fatalf("AddInboundClient: %v", err)
|
||||
}
|
||||
form.Remark = "edited"
|
||||
if _, _, err := (&InboundService{}).UpdateInbound(&form); err != nil {
|
||||
t.Fatalf("UpdateInbound: %v", err)
|
||||
}
|
||||
if _, ok := settingsClient(t, ib.Id, "z@stale"); !ok || !inboundLinksEmail(t, ib.Id, "z@stale") {
|
||||
t.Fatalf("client added while the form was open was dropped: in settings=%v linked=%v", ok, inboundLinksEmail(t, ib.Id, "z@stale"))
|
||||
}
|
||||
}
|
||||
|
||||
// A client deleted while the modal was open is still in the list it posts
|
||||
// back; saving must not restore its access.
|
||||
func TestInboundFormSaveDoesNotResurrectDeletedClient(t *testing.T) {
|
||||
setupBulkDB(t)
|
||||
ib := seedRenewableNeighbour(t, 23205, nil)
|
||||
form := *ib
|
||||
|
||||
if _, err := (&ClientService{}).DelInboundClientByEmail(&InboundService{}, ib.Id, "x@stale", false, true); err != nil {
|
||||
t.Fatalf("DelInboundClientByEmail: %v", err)
|
||||
}
|
||||
form.Remark = "edited"
|
||||
if _, _, err := (&InboundService{}).UpdateInbound(&form); err != nil {
|
||||
t.Fatalf("UpdateInbound: %v", err)
|
||||
}
|
||||
if _, ok := settingsClient(t, ib.Id, "x@stale"); ok || inboundLinksEmail(t, ib.Id, "x@stale") {
|
||||
t.Fatalf("deleted client came back: in settings=%v linked=%v", ok, inboundLinksEmail(t, ib.Id, "x@stale"))
|
||||
}
|
||||
}
|
||||
|
||||
// An inbound switched off while the modal was open stays off when the form,
|
||||
// which still holds enable=true, is saved.
|
||||
func TestInboundFormSaveKeepsEnableToggledWhileOpen(t *testing.T) {
|
||||
setupBulkDB(t)
|
||||
ib := seedRenewableNeighbour(t, 23206, nil)
|
||||
form := *ib
|
||||
|
||||
if _, err := (&InboundService{}).SetInboundEnable(ib.Id, false); err != nil {
|
||||
t.Fatalf("SetInboundEnable: %v", err)
|
||||
}
|
||||
form.Remark = "edited"
|
||||
if _, _, err := (&InboundService{}).UpdateInbound(&form); err != nil {
|
||||
t.Fatalf("UpdateInbound: %v", err)
|
||||
}
|
||||
saved, err := (&InboundService{}).GetInbound(ib.Id)
|
||||
if err != nil {
|
||||
t.Fatalf("GetInbound: %v", err)
|
||||
}
|
||||
if saved.Enable || saved.Remark != "edited" {
|
||||
t.Fatalf("after save: enable=%v remark=%q, want disabled and edited", saved.Enable, saved.Remark)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user