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

tstest/integration/testcontrol: fix unguarded read of DNS config

Browse Source 
Fixes #18498

Signed-off-by: James Tucker <james@tailscale.com>
This commit is contained in:
James Tucker
2026-01-23 15:07:50 -08:00
committed by James Tucker
parent 76839587eb
commit 1183f7a191
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tstest/integration/testcontrol/testcontrol.go
+7 -4
View File
@@ -1327,16 +1327,19 @@ func (s *Server) MapResponse(req *tailcfg.MapRequest) (res *tailcfg.MapResponse,
s.mu.Lock() s.mu.Lock()
nodeCapMap := maps.Clone(s.nodeCapMaps[nk]) nodeCapMap := maps.Clone(s.nodeCapMaps[nk])
var dns *tailcfg.DNSConfig
if s.DNSConfig != nil {
dns = s.DNSConfig.Clone()
}
magicDNSDomain := s.MagicDNSDomain
s.mu.Unlock() s.mu.Unlock()
node.CapMap = nodeCapMap node.CapMap = nodeCapMap
node.Capabilities = append(node.Capabilities, tailcfg.NodeAttrDisableUPnP) node.Capabilities = append(node.Capabilities, tailcfg.NodeAttrDisableUPnP)
t := time.Date(2020, 8, 3, 0, 0, 0, 1, time.UTC) t := time.Date(2020, 8, 3, 0, 0, 0, 1, time.UTC)
dns := s.DNSConfig if dns != nil && magicDNSDomain != "" {
if dns != nil && s.MagicDNSDomain != "" { dns.CertDomains = append(dns.CertDomains, node.Hostinfo.Hostname()+"."+magicDNSDomain)
dns = dns.Clone()
dns.CertDomains = append(dns.CertDomains, node.Hostinfo.Hostname()+"."+s.MagicDNSDomain)
} }
res = &tailcfg.MapResponse{ res = &tailcfg.MapResponse{