From 407d32ff42d21d91dd7ec035ce4dbeb107c3c856 Mon Sep 17 00:00:00 2001 From: Michael Ben-Ami Date: Tue, 15 Sep 2026 16:28:28 -0400 Subject: [PATCH] appc: detect cycles in CNAME chain Fixes tailscale/corp#48296 Updates tailscale/corp#48187 Signed-off-by: Michael Ben-Ami --- appc/appconnector.go | 7 +++++++ appc/appconnector_test.go | 10 ++++++++++ 2 files changed, 17 insertions(+) diff --git a/appc/appconnector.go b/appc/appconnector.go index ee495bd10..397d013ab 100644 --- a/appc/appconnector.go +++ b/appc/appconnector.go @@ -26,6 +26,7 @@ import ( "tailscale.com/util/dnsname" "tailscale.com/util/eventbus" "tailscale.com/util/execqueue" + "tailscale.com/util/set" "tailscale.com/util/slicesx" ) @@ -425,6 +426,7 @@ func (e *AppConnector) DomainRoutes() map[string][]netip.Addr { // e.mu must be held. func (e *AppConnector) findRoutedDomainLocked(domain string, cnameChain map[string]string) (string, bool) { var isRouted bool + var seen set.Set[string] for { _, isRouted = e.domains[domain] if isRouted { @@ -444,7 +446,12 @@ func (e *AppConnector) findRoutedDomainLocked(domain string, cnameChain map[stri if !ok { break } + if seen.Contains(next) { + break + } domain = next + seen.Make() + seen.Add(domain) } return domain, isRouted } diff --git a/appc/appconnector_test.go b/appc/appconnector_test.go index c58aa8041..e5ffa5678 100644 --- a/appc/appconnector_test.go +++ b/appc/appconnector_test.go @@ -255,6 +255,16 @@ func TestObserveDNSResponse(t *testing.T) { t.Errorf("got %v; want %v", got, want) } + // a CNAME record chain with a cycle terminates and does not + // add any new routes. + if err := a.ObserveDNSResponse(dnsCNAMEResponse("192.0.0.11", "a.example.org.", "b.example.org.", "a.example.org.")); err != nil { + t.Errorf("ObserveDNSResponse: %v", err) + } + a.Wait(ctx) + if got, want := rc.Routes(), wantRoutes; !slices.Equal(got, want) { + t.Errorf("got %v; want %v", got, want) + } + wantRoutes = append(wantRoutes, netip.MustParsePrefix("2001:db8::1/128")) if err := a.ObserveDNSResponse(dnsResponse("example.com.", "2001:db8::1")); err != nil {