mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-10-04 13:12:07 +03:00
MHSanaei
ed31ee432c
The node gate assumed a node-assigned sidecar row would never converge,
because the master's reconcile loops only read node_id IS NULL rows. But
a pushed row is local on the node's own panel, whose AmneziaWG, TUIC and
mtg loops run it like any other; node-adopted rows of these protocols
already worked. Only creating or cloning them from the master was blocked.
Open the three protocols on both lists and fix what assumed the master's
host for a node row:
- A node older than the release that introduced the protocol (MTProto
v3.5.0, AmneziaWG v3.7.0, TUIC v3.8.0) would hand it to Xray as-is, so
add and protocol-changing update refuse it, and a node that has not
reported its version yet. Dev builds ("dev+<sha>") track main and pass.
- MTProto's routeXrayPort is a loopback port on the host running mtg.
The master no longer allocates one, nor forwards a cloned source's, for
a node row; the node allocates its own and node sync adopts it back.
- AmneziaWG forwardedPorts were checked against the master's inbounds,
web port and id-derived relay ports. A node row is now checked against
its own node's inbounds; the node re-checks what only it knows.
UpdateInbound restores the stored nodeId before that check.
Verified on a docker master+node pair: AWG, routed MTProto and TUIC
created and cloned from the master start on the node (interface, mtg,
tuic-server); an AWG client added and an MTProto client edited on the
master apply on the node; the node-chosen egress port survives edits.
Closes #6306
84 lines
3.1 KiB
Go
84 lines
3.1 KiB
Go
package service
|
|
|
|
import (
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
|
)
|
|
|
|
// A node-managed inbound arrives by adoption, so its protocol can be one the
|
|
// master never assigns itself. Editing its share metadata must still work.
|
|
func TestUpdateInbound_NodeMtprotoShareAddrIsEditable(t *testing.T) {
|
|
setupConflictDB(t)
|
|
nodeID := 5
|
|
seedNodeRow(t, database.GetDB(), &model.Node{Id: nodeID, Name: "n5", Address: "127.0.0.1", Port: 2096, ApiToken: "tok", Enable: true})
|
|
seedInboundConflictNode(t, "mt-node", "127.0.0.1", 4063, model.MTProto, `{}`,
|
|
`{"clients":[{"email":"mt-node-c","enable":true,"secret":"ee0123456789abcdef0123456789abcdef"}]}`, &nodeID)
|
|
|
|
var existing model.Inbound
|
|
if err := database.GetDB().Where("tag = ?", "mt-node").First(&existing).Error; err != nil {
|
|
t.Fatalf("read seeded row: %v", err)
|
|
}
|
|
|
|
update := existing
|
|
update.ShareAddrStrategy = "custom"
|
|
update.ShareAddr = "new-share.example.com"
|
|
updated, _, err := (&InboundService{}).UpdateInbound(&update)
|
|
if err != nil {
|
|
t.Fatalf("UpdateInbound on a node-managed mtproto inbound: %v", err)
|
|
}
|
|
if updated.NodeID == nil || *updated.NodeID != nodeID {
|
|
t.Fatalf("nodeID = %v, want %d preserved", updated.NodeID, nodeID)
|
|
}
|
|
|
|
var hosts []model.Host
|
|
if err := database.GetDB().Where("inbound_id = ?", existing.Id).Find(&hosts).Error; err != nil {
|
|
t.Fatalf("load hosts: %v", err)
|
|
}
|
|
if len(hosts) != 1 || hosts[0].Address != "new-share.example.com" {
|
|
t.Fatalf("hosts = %+v, want one new-share.example.com host", hosts)
|
|
}
|
|
}
|
|
|
|
// Converting a node inbound to a protocol that never lives on a node is still
|
|
// refused, and so is one the node's panel is too old to run.
|
|
func TestUpdateInbound_RejectsProtocolChangeToNodeIneligible(t *testing.T) {
|
|
setupConflictDB(t)
|
|
nodeID := 6
|
|
seedNodeRow(t, database.GetDB(), &model.Node{Id: nodeID, Name: "n6", Address: "127.0.0.1", Port: 2096, ApiToken: "tok", Enable: true, PanelVersion: "v3.4.1"})
|
|
seedInboundConflictNode(t, "vless-node", "127.0.0.1", 4064, model.VLESS,
|
|
`{"network":"tcp","security":"none"}`,
|
|
`{"clients":[{"id":"11111111-2222-4333-8444-555555555555","email":"vn-c","enable":true}],"decryption":"none"}`, &nodeID)
|
|
|
|
var existing model.Inbound
|
|
if err := database.GetDB().Where("tag = ?", "vless-node").First(&existing).Error; err != nil {
|
|
t.Fatalf("read seeded row: %v", err)
|
|
}
|
|
|
|
cases := []struct {
|
|
name string
|
|
protocol model.Protocol
|
|
settings string
|
|
wantErr string
|
|
}{
|
|
{"panel-local protocol", model.HTTP, `{"accounts":[]}`, "cannot be assigned to a node"},
|
|
{
|
|
"protocol newer than the node", model.MTProto,
|
|
`{"clients":[{"email":"vn-c","enable":true,"secret":"ee0123456789abcdef0123456789abcdef"}]}`, "need v3.5.0 or newer",
|
|
},
|
|
}
|
|
for _, tc := range cases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
update := existing
|
|
update.Protocol = tc.protocol
|
|
update.Settings = tc.settings
|
|
if _, _, err := (&InboundService{}).UpdateInbound(&update); err == nil ||
|
|
!strings.Contains(err.Error(), tc.wantErr) {
|
|
t.Fatalf("err = %v, want a refusal mentioning %q", err, tc.wantErr)
|
|
}
|
|
})
|
|
}
|
|
}
|