From 6a0c983c8969bcb0af5b56883c0b322dcb1e8bdc Mon Sep 17 00:00:00 2001
From: MHSanaei <ho3ein.sanaei@gmail.com>
Date: Sun, 1 Nov 2026 00:47:46 +0100
Subject: [PATCH] fix(node): keep only the latest refused claims for the
 log-once state

The set that kept a refused node claim's warning to one line was keyed
by the reported email and never forgot one. Some refused emails, such
as a padded one or a new client holding a foreign subId, match no row
on the master, so a node rotating them grew the set without bound; a
snapshot made only of padded entries also skipped the warning.

Each node now keeps just the emails its latest snapshot was refused,
both return paths log, and the logged email is cut to 64 characters.
---
 internal/web/service/inbound_node_claims.go   | 24 +++++++++++++------
 .../web/service/node_foreign_client_test.go   | 17 +++++++++++++
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/internal/web/service/inbound_node_claims.go b/internal/web/service/inbound_node_claims.go
index b54ff91c5..29c21dc93 100644
--- a/internal/web/service/inbound_node_claims.go
+++ b/internal/web/service/inbound_node_claims.go
@@ -2,7 +2,6 @@ package service
 
 import (
 	"encoding/json"
-	"fmt"
 	"reflect"
 	"strings"
 	"sync"
@@ -14,7 +13,9 @@ import (
 	"gorm.io/gorm"
 )
 
-var reportedRefusedClientClaim sync.Map
+// reportedRefusedClaims holds, per node, the emails its last snapshot was refused: a
+// node chooses them, so only the latest set is kept and a claim logs once while it lasts.
+var reportedRefusedClaims sync.Map
 
 // nodeClientClaims is what one node snapshot may do to the master's client records: a node
 // changes only records linked solely to its own inbounds, plus the new ones it creates.
@@ -66,6 +67,7 @@ func loadNodeClientClaims(tx *gorm.DB, nodeID int, snap *runtime.TrafficSnapshot
 		}
 	}
 	if len(subIDByEmail) == 0 {
+		logRefusedClaims(nodeID, claims.refused)
 		return claims, nil
 	}
 
@@ -149,13 +151,21 @@ func loadNodeClientClaims(tx *gorm.DB, nodeID int, snap *runtime.TrafficSnapshot
 			claims.storedSubID[email] = rec.SubID
 		}
 	}
-	for email, reason := range claims.refused {
-		key := fmt.Sprintf("%d:%s", nodeID, email)
-		if _, seen := reportedRefusedClientClaim.LoadOrStore(key, struct{}{}); !seen {
-			logger.Warningf("setRemoteTraffic: node %d reported client %q, not adopting: %s", nodeID, email, reason)
+	logRefusedClaims(nodeID, claims.refused)
+	return claims, nil
+}
+
+func logRefusedClaims(nodeID int, refused map[string]string) {
+	prev, _ := reportedRefusedClaims.Load(nodeID)
+	logged, _ := prev.(map[string]struct{})
+	current := make(map[string]struct{}, len(refused))
+	for email, reason := range refused {
+		current[email] = struct{}{}
+		if _, seen := logged[email]; !seen {
+			logger.Warningf("setRemoteTraffic: node %d reported client %.64q, not adopting: %s", nodeID, email, reason)
 		}
 	}
-	return claims, nil
+	reportedRefusedClaims.Store(nodeID, current)
 }
 
 // clientLinkScopes reports, per client id, whether it is linked to an inbound of this node
diff --git a/internal/web/service/node_foreign_client_test.go b/internal/web/service/node_foreign_client_test.go
index 6f9d71c5e..097260625 100644
--- a/internal/web/service/node_foreign_client_test.go
+++ b/internal/web/service/node_foreign_client_test.go
@@ -366,3 +366,20 @@ func TestNodeSharedClientInAgreementIsNotRewritten(t *testing.T) {
 		t.Fatal("a node in agreement with the master was marked dirty for a re-push")
 	}
 }
+
+// The refused emails are the node's choice, so the state that keeps their warning to one
+// line must not keep every name a node ever sent.
+func TestNodeRefusedClaimLogStateIsBounded(t *testing.T) {
+	db := initTrafficTestDB(t)
+	svc := &InboundService{}
+	seedNodeRow(t, db, &model.Node{Id: 1, Name: "n1", Address: "127.0.0.1", Port: 2096, ApiToken: "tok", Enable: true})
+	createNodeInbound(t, db, 1, "n1-in", 41001)
+
+	for i := range 50 {
+		syncNodeWithSettings(t, svc, 1, "n1-in", fmt.Sprintf(`{"clients":[{"email":"rotating-%d@x ","enable":true}]}`, i))
+	}
+	held, _ := reportedRefusedClaims.Load(1)
+	if got := len(held.(map[string]struct{})); got != 1 {
+		t.Fatalf("refused-claim log state holds %d emails for one node, want 1", got)
+	}
+}