fix(node): keep a node's online and IP reports to its own clients

A node's online tree and both client-IP reports were stored as sent:
they could name any client of the master or another node, under any
panel's GUID, dated into the future, and in any number. That marked
master clients online, fed source addresses for clients the node does
not serve into the IP limit and its fail2ban log, and planted rows the
retention sweep never removed.

Each report is now cut to the clients linked to the node's inbounds and
to the node's own key and its sub-nodes' origins (never this panel's or
another node's GUID); timestamps are capped at now, and one client's
list from a node keeps at most its 256 newest entries.
This commit is contained in:
MHSanaei
2026-10-31 14:14:01 +01:00
parent 4d27313c5e
commit a69f2dee13
6 changed files with 233 additions and 3 deletions
@@ -3,7 +3,10 @@ package service
import (
"fmt"
"reflect"
"strconv"
"strings"
"testing"
"time"
"github.com/mhsanaei/3x-ui/v3/internal/database"
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
@@ -67,3 +70,65 @@ func TestSetRemoteTrafficFailureClearsNodeOnlineClients(t *testing.T) {
t.Errorf("online by guid after a failed merge = %v, want none", got)
}
}
// A node may report only the clients linked to its own inbounds, under its own GUID: an
// unscoped report marked any master client online and grew without bound.
func TestSetRemoteTrafficKeepsOnlyTheNodesOwnClientsOnline(t *testing.T) {
db := initTrafficTestDB(t)
useOnlineTestProcess(t)
svc := &InboundService{}
seedNodeRow(t, db, &model.Node{Id: 1, Name: "n1", Address: "127.0.0.1", Port: 2096, ApiToken: "tok", Enable: true, Guid: "node-guid"})
createNodeInboundWithClient(t, db, 1, "keep", 41401, "kept@x")
settings := `{"clients":[{"email":"kept@x","enable":true}]}`
snap := snapshotWithClients(t, "keep", settings, xray.ClientTraffic{Email: "kept@x", Enable: true})
if _, err := svc.setRemoteTrafficLocked(1, snap, false, false); err != nil {
t.Fatalf("seed sync: %v", err)
}
snap = snapshotWithClients(t, "keep", settings, xray.ClientTraffic{Email: "kept@x", Enable: true})
snap.OnlineTree = map[string][]string{"node-guid": {"kept@x", "master-only@x", "kept@x"}, "someone-else": {"kept@x"}}
if _, err := svc.setRemoteTrafficLocked(1, snap, false, false); err != nil {
t.Fatalf("sync: %v", err)
}
if got, want := svc.GetOnlineClientsByGuid(), map[string][]string{"node-guid": {"kept@x"}}; !reflect.DeepEqual(got, want) {
t.Fatalf("online by guid = %v, want %v", got, want)
}
}
// The client-IP reports feed the IP limit and fail2ban; a node must not plant rows for
// clients it does not serve, under other panels' GUIDs, or dated into the future.
func TestNodeClientIpReportsAreScopedToTheNode(t *testing.T) {
db := initTrafficTestDB(t)
svc := &InboundService{}
node := &model.Node{Id: 1, Name: "n1", Address: "127.0.0.1", Port: 2096, ApiToken: "tok", Enable: true, Guid: "node-guid"}
seedNodeRow(t, db, node)
createNodeInboundWithClient(t, db, 1, "keep", 41402, "kept@x")
settings := `{"clients":[{"email":"kept@x","enable":true}]}`
if _, err := svc.setRemoteTrafficLocked(1, snapshotWithClients(t, "keep", settings, xray.ClientTraffic{Email: "kept@x", Enable: true}), false, false); err != nil {
t.Fatalf("seed sync: %v", err)
}
future := time.Now().Add(240 * time.Hour).Unix()
entries := func(ip string) string { return fmt.Sprintf(`[{"ip":%q,"timestamp":%d}]`, ip, future) }
if err := svc.MergeNodeClientIps(1, []model.InboundClientIps{
{ClientEmail: "kept@x", Ips: entries("198.51.100.1")},
{ClientEmail: "master-only@x", Ips: entries("198.51.100.2")},
}); err != nil {
t.Fatalf("MergeNodeClientIps: %v", err)
}
var flat []model.InboundClientIps
db.Find(&flat)
if len(flat) != 1 || flat[0].ClientEmail != "kept@x" || strings.Contains(flat[0].Ips, strconv.FormatInt(future, 10)) {
t.Fatalf("stored client IPs = %+v, want only kept@x, dated no later than now", flat)
}
tree := map[string]map[string][]model.ClientIpEntry{
"node-guid": {"kept@x": {{IP: "198.51.100.3", Timestamp: future}}, "master-only@x": {{IP: "198.51.100.4", Timestamp: future}}},
"someone-else": {"kept@x": {{IP: "198.51.100.5", Timestamp: future}}},
}
if err := svc.MergeClientIpsByGuid(node, tree); err != nil {
t.Fatalf("MergeClientIpsByGuid: %v", err)
}
var rows []model.NodeClientIp
db.Find(&rows)
if len(rows) != 1 || rows[0].NodeGuid != "node-guid" || rows[0].Email != "kept@x" || strings.Contains(rows[0].Ips, strconv.FormatInt(future, 10)) {
t.Fatalf("stored per-node IPs = %+v, want only kept@x under node-guid, dated no later than now", rows)
}
}