mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-07-16 17:46:08 +00:00
fix(nodes): block node delete while inbounds are still attached (#5394)
NodeService.Delete dropped the node row (and its per-node child rows) without checking for inbounds still referencing it via node_id, leaving orphaned inbounds with a dangling node_id that confuse node sync, subscriptions and cleanup. Refuse the delete with a clear error when inbounds are still attached, and remove the per-node child rows before the node row inside one transaction. Delete stays tolerant of a missing node row so it can still clean up orphaned rows. Regression test covers the blocked and clean-delete paths.
This commit is contained in:
@@ -0,0 +1,51 @@
|
||||
package service
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
||||
)
|
||||
|
||||
// TestNodeDelete_BlocksWhenInboundsAttached guards DB-002: a node that still
|
||||
// owns inbounds must not be deletable (which would orphan those inbounds with a
|
||||
// dangling node_id), while a node with none deletes cleanly together with its
|
||||
// traffic baselines.
|
||||
func TestNodeDelete_BlocksWhenInboundsAttached(t *testing.T) {
|
||||
db := initTrafficTestDB(t)
|
||||
svc := &NodeService{}
|
||||
|
||||
node := &model.Node{Name: "n1"}
|
||||
if err := db.Create(node).Error; err != nil {
|
||||
t.Fatalf("create node: %v", err)
|
||||
}
|
||||
createNodeInbound(t, db, node.Id, "n1-in-443", 443)
|
||||
|
||||
// With an inbound attached, Delete must fail and leave node + inbound intact.
|
||||
if err := svc.Delete(node.Id); err == nil {
|
||||
t.Fatal("Delete should fail while an inbound is still attached")
|
||||
}
|
||||
var nodeCnt, ibCnt int64
|
||||
db.Model(&model.Node{}).Where("id = ?", node.Id).Count(&nodeCnt)
|
||||
db.Model(&model.Inbound{}).Where("node_id = ?", node.Id).Count(&ibCnt)
|
||||
if nodeCnt != 1 || ibCnt != 1 {
|
||||
t.Fatalf("after blocked delete: node=%d inbound=%d, want 1/1", nodeCnt, ibCnt)
|
||||
}
|
||||
|
||||
// Detach the inbound and seed a traffic baseline; Delete now succeeds and
|
||||
// cleans the baseline.
|
||||
if err := db.Where("node_id = ?", node.Id).Delete(&model.Inbound{}).Error; err != nil {
|
||||
t.Fatalf("detach inbound: %v", err)
|
||||
}
|
||||
if err := db.Create(&model.NodeClientTraffic{NodeId: node.Id, Email: "gone"}).Error; err != nil {
|
||||
t.Fatalf("seed baseline: %v", err)
|
||||
}
|
||||
if err := svc.Delete(node.Id); err != nil {
|
||||
t.Fatalf("Delete (no inbounds attached): %v", err)
|
||||
}
|
||||
var baseCnt int64
|
||||
db.Model(&model.Node{}).Where("id = ?", node.Id).Count(&nodeCnt)
|
||||
db.Model(&model.NodeClientTraffic{}).Where("node_id = ?", node.Id).Count(&baseCnt)
|
||||
if nodeCnt != 0 || baseCnt != 0 {
|
||||
t.Fatalf("after delete: node=%d baseline=%d, want 0/0", nodeCnt, baseCnt)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user