updated tld

Author: randomlogin

cmd/sane/gen.go

@@ -10,6 +10,7 @@ import (
 	"log"
 	"net/http"
 	"os"
+	"path/filepath"
 	"strings"
 )
 
@@ -26,14 +27,14 @@ func main() {
 
 	h := fmt.Sprintf(`// source: %s
 
-var nameConstraints = map[string]struct{} {
+var NameConstraints = map[string]struct{} {
 `, source)
 
 	sc := bufio.NewScanner(resp.Body)
 	for sc.Scan() {
 		line := strings.ToLower(strings.TrimSpace(sc.Text()))
 		if line != "" && line[0] == '#' {
-			sb.WriteString("package main\n\n")
+			sb.WriteString("package tld\n\n")
 			sb.WriteString("// auto generated do not edit\n")
 			sb.WriteString("//" + line[1:] + "\n")
 			sb.WriteString(h)
@@ -47,7 +48,15 @@ var nameConstraints = map[string]struct{} {
 	}
 	sb.WriteString("}\n")
 
-	if err := os.WriteFile("tld.go", sb.Bytes(), 0600); err != nil {
+	path, _ := filepath.Abs("")
+	last := filepath.Base(path)
+	path = filepath.Dir(path)
+	prelast := filepath.Base(path)
+	if last != "sane" || prelast != "cmd" {
+		log.Fatal(fmt.Errorf("tld list must be generated in cmd/sane directory"))
+	}
+
+	if err := os.WriteFile("../../tld/tld.go", sb.Bytes(), 0600); err != nil {
 		log.Fatal(err)
 	}
 

cmd/sane/main.go

@@ -21,6 +21,7 @@ import (
 	"github.com/randomlogin/sane/debuglog"
 	rs "github.com/randomlogin/sane/resolver"
 	"github.com/randomlogin/sane/sync"
+	"github.com/randomlogin/sane/tld"
 )
 
 const KSK2017 = `. IN DS 20326 8 2 E06D44B80B8F1D39A95C0B0D7C65D08458E880409BBC683457104237C7F8EC8D`
@@ -77,7 +78,7 @@ func getOrCreateCA() (string, string) {
 
 	if _, err := os.Stat(certPath); err != nil {
 		if _, err := os.Stat(keyPath); err != nil {
-			ca, priv, err := sane.NewAuthority("Stateless DANE", "Stateless DANE", 365*24*time.Hour, nameConstraints)
+			ca, priv, err := sane.NewAuthority("Stateless DANE", "Stateless DANE", 365*24*time.Hour, tld.NameConstraints)
 			if err != nil {
 				log.Fatalf("couldn't generate CA: %v", err)
 			}
@@ -234,7 +235,7 @@ func main() {
 	}()
 
 	if !*skipICANN {
-		nameConstraints = nil
+		tld.NameConstraints = nil
 	}
 
 	ca, priv := loadCA()
@@ -273,7 +274,7 @@ func main() {
 		PrivateKey:      priv,
 		Validity:        *validity,
 		Resolver:        resolver,
-		Constraints:     nameConstraints,
+		Constraints:     tld.NameConstraints,
 		SkipNameChecks:  *skipNameChecks,
 		Verbose:         *verbose,
 		RootsPath:       path.Join(p, "roots.json"),