webnet/tailscale
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

feature/conn25: disallow addrs assignment overwriting.

Browse Source 
We don't want addr assignments to be lost from the collection before
they can be returned to the IP pools, otherwise we will get orphan
addresses marked inUse in the pools that will never be returned.

Fixes tailscale/corp#39975

Signed-off-by: Fran Bull <fran@tailscale.com>
This commit is contained in:
Fran Bull
2026-05-27 13:54:40 -07:00
committed by franbull
parent 8501be1990
commit 80dc7a8d07
2 changed files with 10 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
feature/conn25/addrAssignments.go
+7 -13
View File
@@ -58,22 +58,16 @@ func (a *addrAssignments) insertWithExpiry(as *addrs, d time.Duration) error {
if !as.expiresAt.IsZero() && !as.expiresAt.Before(now) { if !as.expiresAt.IsZero() && !as.expiresAt.Before(now) {
return errors.New("expiresAt already set") return errors.New("expiresAt already set")
} }
// we don't expect for addresses to be reused before expiry // addresses must be removed (eg by popExpired) before they can be reused
if existing, ok := a.byMagicIP[as.magic]; ok { if _, ok := a.byMagicIP[as.magic]; ok {
if !existing.expiresAt.Before(now) { return errors.New("byMagicIP key exists")
return errors.New("byMagicIP key exists")
}
} }
ddst := domainDst{domain: as.domain, dst: as.dst} ddst := domainDst{domain: as.domain, dst: as.dst}
if existing, ok := a.byDomainDst[ddst]; ok { if _, ok := a.byDomainDst[ddst]; ok {
if !existing.expiresAt.Before(now) { return errors.New("byDomainDst key exists")
return errors.New("byDomainDst key exists")
}
} }
if existing, ok := a.byTransitIP[as.transit]; ok { if _, ok := a.byTransitIP[as.transit]; ok {
if !existing.expiresAt.Before(now) { return errors.New("byTransitIP key exists")
return errors.New("byTransitIP key exists")
}
} }
as.expiresAt = now.Add(d) as.expiresAt = now.Add(d)
mak.Set(&a.byMagicIP, as.magic, as) mak.Set(&a.byMagicIP, as.magic, as)
feature/conn25/addrAssignments_test.go
+3 -13
View File
@@ -51,20 +51,10 @@ func TestAssignmentsExpire(t *testing.T) {
if foundAsAfter.isValid() { if foundAsAfter.isValid() {
t.Fatal("expected zero val") t.Fatal("expected zero val")
} }
// Now we can reuse the addresses // We should only be able to write old addresses again if they've been removed from the maps (eg with popExpired).
err = assignments.insert(as) err = assignments.insert(as)
if err != nil { if err == nil {
t.Fatal(err) t.Fatal("expected an error but got nil")
}
foundAs, ok = assignments.lookupByMagicIP(as.magic)
if !ok {
t.Fatal("expected to find")
}
if foundAs.dst != as.dst {
t.Fatalf("want %v; got %v", as.dst, foundAs.dst)
}
if !foundAs.expiresAt.After(clock.Now()) {
t.Fatalf("expected foundAs to expire after now")
} }
} }