Merge pull request #1822 from safing/fix/spn_stickedHub_logical_issue

stenya · web-flow · commit 4f3ebc7156d2 · 2025-03-17T16:15:45.000+02:00
[fix] SPN - Improve sticky domain handling in getStickiedHub function
diff --git a/spn/crew/sticky.go b/spn/crew/sticky.go
@@ -71,7 +71,8 @@ func getStickiedHub(conn *network.Connection) (sticksTo *stickyHub) {
 
 	// If the IP did not stick and we have a domain, check if that sticks.
 	if sticksTo == nil && conn.Entity.Domain != "" {
-		sticksTo, ok := stickyDomains[makeStickyDomainKey(conn)]
+		var ok bool
+		sticksTo, ok = stickyDomains[makeStickyDomainKey(conn)]
 		if ok && !sticksTo.isExpired() {
 			sticksTo.LastSeen = time.Now()
 		}
@@ -146,6 +147,8 @@ func (t *Tunnel) avoidDestinationHub() {
 		Avoid:    true,
 	}
 	log.Warningf("spn/crew: avoiding %s for %s", t.dstPin.Hub, ipKey)
+
+	// TODO: Question: Should we avoid the domain as well? (stickyDomains)
 }
 
 func cleanStickyHubs(ctx *mgr.WorkerCtx) error {

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,8 @@ func getStickiedHub(conn network.Connection) (sticksTo stickyHub) {`
`71`	`71`
`72`	`72`	`// If the IP did not stick and we have a domain, check if that sticks.`
`73`	`73`	`if sticksTo == nil && conn.Entity.Domain != "" {`
`74`		`- sticksTo, ok := stickyDomains[makeStickyDomainKey(conn)]`
	`74`	`+ var ok bool`
	`75`	`+ sticksTo, ok = stickyDomains[makeStickyDomainKey(conn)]`
`75`	`76`	`if ok && !sticksTo.isExpired() {`
`76`	`77`	`sticksTo.LastSeen = time.Now()`
`77`	`78`	`}`
`@@ -146,6 +147,8 @@ func (t *Tunnel) avoidDestinationHub() {`
`146`	`147`	`Avoid: true,`
`147`	`148`	`}`
`148`	`149`	`log.Warningf("spn/crew: avoiding %s for %s", t.dstPin.Hub, ipKey)`
	`150`	`+`
	`151`	`+ // TODO: Question: Should we avoid the domain as well? (stickyDomains)`
`149`	`152`	`}`
`150`	`153`
`151`	`154`	`func cleanStickyHubs(ctx *mgr.WorkerCtx) error {`