golink: check for CertDomains before enabling HTTPS (#103)

patrickod · web-flow · commit 311ede68efe8 · 2023-12-20T09:59:06.000-08:00
Fixes #102 Ensure that we have CertDomains for the HTTPS listener before asking tsnet to create one. Signed-off-by: Patrick O'Doherty <patrick@tailscale.com>
diff --git a/golink.go b/golink.go
@@ -189,7 +189,7 @@ out:
 	if err != nil {
 		return err
 	}
-	enableTLS := status.Self.HasCap(tailcfg.CapabilityHTTPS)
+	enableTLS := status.Self.HasCap(tailcfg.CapabilityHTTPS) && len(srv.CertDomains()) > 0
 	fqdn := strings.TrimSuffix(status.Self.DNSName, ".")
 
 	httpHandler := serveHandler()

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ out:`
`189`	`189`	`if err != nil {`
`190`	`190`	`return err`
`191`	`191`	`}`
`192`		`- enableTLS := status.Self.HasCap(tailcfg.CapabilityHTTPS)`
	`192`	`+ enableTLS := status.Self.HasCap(tailcfg.CapabilityHTTPS) && len(srv.CertDomains()) > 0`
`193`	`193`	`fqdn := strings.TrimSuffix(status.Self.DNSName, ".")`
`194`	`194`
`195`	`195`	`httpHandler := serveHandler()`