xinyin025/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-08-20 10:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(sub): honor per-inbound share address strategy in subscription output (#5208)

Browse Source 
Subscriptions resolved a node-managed inbound's address to the node's
panel address unconditionally, so an inbound bound to a specific public
IP advertised an endpoint clients could not reach. The shareAddrStrategy
field added in #5162 only applied to panel share/QR links by design.

resolveInboundAddress now follows the same order as the panel's link
builder: 'listen' prefers a routable bind, 'custom' prefers shareAddr,
and the default 'node' keeps the existing node-first behavior, so output
is unchanged for inbounds that never set the field. Applies to raw,
JSON, and Clash subscriptions, which all resolve through this path.
Help text in all locales updated to drop the 'subscriptions are not
affected' caveat.
This commit is contained in:
MHSanaei
2026-06-11 21:31:27 +02:00
parent 21143a6d72
commit cc65f37164
15 changed files with 105 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/sub/service_test.go
+62
View File
@@ -127,6 +127,68 @@ func TestResolveInboundAddress(t *testing.T) {
t.Fatalf("unknown-node address = %q, want subscriber host %q", got, reqHost)
}
})
// Per-inbound share address strategy (#5208): subscriptions follow the
// same order as the panel's share/QR links.
t.Run("listen strategy prefers the bind over the node address", func(t *testing.T) {
id := 7
s := &SubService{
address: reqHost,
nodesByID: map[int]*model.Node{7: {Id: 7, Address: "node7.example.com"}},
}
ib := &model.Inbound{NodeID: &id, Listen: "203.0.113.7", ShareAddrStrategy: "listen"}
if got := s.resolveInboundAddress(ib); got != "203.0.113.7" {
t.Fatalf("listen-strategy address = %q, want the bind 203.0.113.7", got)
}
})
t.Run("listen strategy falls back to node address on a wildcard bind", func(t *testing.T) {
id := 7
s := &SubService{
address: reqHost,
nodesByID: map[int]*model.Node{7: {Id: 7, Address: "node7.example.com"}},
}
ib := &model.Inbound{NodeID: &id, Listen: "0.0.0.0", ShareAddrStrategy: "listen"}
if got := s.resolveInboundAddress(ib); got != "node7.example.com" {
t.Fatalf("listen-strategy wildcard address = %q, want node7.example.com", got)
}
})
t.Run("custom strategy uses the share address", func(t *testing.T) {
id := 7
s := &SubService{
address: reqHost,
nodesByID: map[int]*model.Node{7: {Id: 7, Address: "node7.example.com"}},
}
ib := &model.Inbound{NodeID: &id, Listen: "203.0.113.7", ShareAddrStrategy: "custom", ShareAddr: "edge.example.com"}
if got := s.resolveInboundAddress(ib); got != "edge.example.com" {
t.Fatalf("custom-strategy address = %q, want edge.example.com", got)
}
})
t.Run("custom strategy with empty share address falls back to node", func(t *testing.T) {
id := 7
s := &SubService{
address: reqHost,
nodesByID: map[int]*model.Node{7: {Id: 7, Address: "node7.example.com"}},
}
ib := &model.Inbound{NodeID: &id, ShareAddrStrategy: "custom"}
if got := s.resolveInboundAddress(ib); got != "node7.example.com" {
t.Fatalf("custom-strategy fallback address = %q, want node7.example.com", got)
}
})
t.Run("node strategy keeps the pre-strategy order", func(t *testing.T) {
id := 7
s := &SubService{
address: reqHost,
nodesByID: map[int]*model.Node{7: {Id: 7, Address: "node7.example.com"}},
}
ib := &model.Inbound{NodeID: &id, Listen: "203.0.113.7", ShareAddrStrategy: "node"}
if got := s.resolveInboundAddress(ib); got != "node7.example.com" {
t.Fatalf("node-strategy address = %q, want node7.example.com", got)
}
})
}
func TestUnmarshalStreamSettings(t *testing.T) {