Add global bin tests along with testdata

.dockerignore

@@ -1,2 +0,0 @@
-tmp
-dist

.gitignore

@@ -1,8 +1,2 @@
 *.sw[po]
 modd-local.conf
-/tmp
-/test-dir2config
-/config.yaml
-/dist
-/go.work
-/go.work.sum

Dockerfile

@@ -1,33 +1,23 @@
 # ------------------------------------------------------------------------
-from golang:1.22.2-bookworm as build
+from mcluseau/golang-builder:1.17.3 as build
-
-run apt-get update && apt-get install -y git
-
-workdir /src
-
-copy go.mod go.sum ./
-run \
-  --mount=type=cache,id=gomod,target=/go/pkg/mod \
-  --mount=type=cache,id=gobuild,target=/root/.cache/go-build \
-  go mod download
-
-arg GIT_TAG
-
-copy . ./
-run \
-  --mount=type=cache,id=gomod,target=/go/pkg/mod \
-  --mount=type=cache,id=gobuild,target=/root/.cache/go-build \
- go test ./... && \
- hack/build ./...
 
 # ------------------------------------------------------------------------
-from debian:bookworm
+from debian:stretch
 entrypoint ["/bin/dkl-local-server"]
 
-env _uncache=1
+env _uncache 1
 run apt-get update \
- && yes |apt-get install -y genisoimage gdisk dosfstools util-linux udev binutils systemd \
+ && apt-get install -y genisoimage gdisk dosfstools util-linux udev \
- grub2 grub-pc-bin grub-efi-amd64-bin ca-certificates curl openssh-client \
  && apt-get clean
 
-copy --from=build /src/dist/ /bin/
+run yes |apt-get install -y grub2 grub-pc-bin grub-efi-amd64-bin \
+ && apt-get clean
+
+run apt-get install -y ca-certificates curl openssh-client \
+ && apt-get clean
+
+run curl -L https://github.com/vmware/govmomi/releases/download/v0.21.0/govc_linux_amd64.gz | gunzip > /bin/govc && chmod +x /bin/govc
+
+copy upload-vmware.sh govc.env /var/lib/direktil/
+
+copy --from=build /go/bin/ /bin/

cmd/dkl-dir2config/assemble.go

@@ -1,155 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"log"
-	"os"
-	"os/exec"
-	"strings"
-
-	"gopkg.in/yaml.v2"
-)
-
-func mergeIn(tgt, add map[any]any) {
-mergeLoop:
-	for k, v := range add {
-		switch v := v.(type) {
-		case map[any]any:
-			if tgtV, ok := tgt[k]; ok {
-				switch tgtV := tgtV.(type) {
-				case map[any]any:
-					mergeIn(tgtV, v)
-					continue mergeLoop
-				}
-			}
-		}
-
-		tgt[k] = v
-	}
-}
-
-func assemble(path string) (yamlBytes []byte, err error) {
-	obj := map[any]any{}
-
-	if Debug {
-		log.Printf("assemble %q", path)
-	}
-
-	err = eachFragment(path, searchList, func(r io.Reader) (err error) {
-		m := map[any]any{}
-		err = yaml.NewDecoder(r).Decode(&m)
-		if err != nil {
-			return
-		}
-
-		mergeIn(obj, m)
-		return
-	})
-	if err != nil {
-		err = fmt.Errorf("failed to assemble %q: %w", path, err)
-		return
-	}
-
-	yamlBytes, err = yaml.Marshal(obj)
-	if err != nil {
-		return
-	}
-
-	if Debug {
-		log.Printf("assemble %q result:\n%s", path, yamlBytes)
-	}
-
-	return
-}
-
-func eachFragment(path string, searchList []FS, walk func(io.Reader) error) (err error) {
-	var r io.ReadCloser
-
-	for len(searchList) != 0 {
-		fs := searchList[0]
-
-		r, err = fs.Open(path + ".yaml")
-		if os.IsNotExist(err) {
-			searchList = searchList[1:]
-			continue
-		}
-
-		if err != nil {
-			return
-		}
-
-		// found and open
-		break
-	}
-
-	if r == nil {
-		err = fmt.Errorf("%s: %w", path, os.ErrNotExist)
-		return
-	}
-
-	ba, err := io.ReadAll(r)
-	r.Close()
-
-	if err != nil {
-		return
-	}
-
-	if Debug {
-		log.Print("fragment:\n", string(ba))
-	}
-
-	in := bytes.NewBuffer(ba)
-
-	for {
-		var line string
-		line, err = in.ReadString('\n')
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return
-		}
-
-		line = strings.TrimSpace(line)
-		if len(line) == 0 {
-			continue
-		}
-
-		genCmd, found := strings.CutPrefix(line, "#!gen ")
-		if found {
-			cmdArgs := strings.Fields(genCmd)
-			if Debug {
-				log.Print("#!gen ", cmdArgs)
-			}
-
-			cmd := "gen/" + cmdArgs[0]
-			args := cmdArgs[1:]
-			genOutput, err := exec.Command(cmd, args...).Output()
-			if err != nil {
-				return fmt.Errorf("gen %v: %w", cmdArgs, err)
-			}
-			walk(bytes.NewBuffer(genOutput))
-			continue
-		}
-
-		includePath, found := strings.CutPrefix(line, "#!include ")
-		if !found {
-			continue
-		}
-
-		includePath = strings.TrimSpace(includePath)
-		if Debug {
-			log.Print("#!include ", includePath)
-		}
-		err = eachFragment(includePath, searchList, walk)
-		if err != nil {
-			return fmt.Errorf("include %q: %w", includePath, err)
-		}
-	}
-
-	in = bytes.NewBuffer(ba)
-	err = walk(in)
-	return
-}

cmd/dkl-dir2config/fs.go

@@ -1,34 +0,0 @@
-package main
-
-import (
-	"io"
-	iofs "io/fs"
-)
-
-type FS interface {
-	Open(path string) (io.ReadCloser, error)
-	List(path string) ([]string, error)
-}
-
-type fsFS struct{ iofs.FS }
-
-func (fs fsFS) Open(path string) (io.ReadCloser, error) {
-	return fs.FS.Open(path)
-}
-
-func (fs fsFS) List(path string) (entries []string, err error) {
-	dirEnts, err := iofs.ReadDir(fs.FS, path)
-	if err != nil {
-		return
-	}
-
-	entries = make([]string, 0, len(dirEnts))
-	for _, ent := range dirEnts {
-		if ent.IsDir() {
-			continue
-		}
-		entries = append(entries, ent.Name())
-	}
-
-	return
-}

cmd/dkl-dir2config/git.go

@@ -1,38 +0,0 @@
-package main
-
-import (
-	"io"
-	"sort"
-
-	"github.com/go-git/go-git/v5/plumbing/object"
-)
-
-type gitFS struct{ *object.Tree }
-
-func (fs gitFS) Open(path string) (r io.ReadCloser, err error) {
-	f, err := fs.Tree.File(path)
-	if err != nil {
-		return
-	}
-	return f.Reader()
-}
-
-func (fs gitFS) List(path string) (entries []string, err error) {
-	tree, err := fs.Tree.Tree(path)
-	if err != nil {
-		return
-	}
-
-	entries = make([]string, 0, len(tree.Entries))
-
-	for _, ent := range tree.Entries {
-		if !ent.Mode.IsFile() {
-			continue
-		}
-
-		entries = append(entries, ent.Name)
-	}
-
-	sort.Strings(entries)
-	return
-}

cmd/dkl-dir2config/main.go

@@ -2,41 +2,27 @@ package main
 
 import (
 	"flag"
-	"io/fs"
 	"log"
 	"os"
-	"path/filepath"
 
-	"github.com/go-git/go-git/v5"
-	"github.com/go-git/go-git/v5/plumbing"
 	yaml "gopkg.in/yaml.v2"
+	"novit.nc/direktil/pkg/localconfig"
 
-	"novit.tech/direktil/pkg/localconfig"
+	"novit.nc/direktil/local-server/pkg/clustersconfig"
-
-	"novit.tech/direktil/local-server/pkg/clustersconfig"
 )
 
-var Version = "dev"
-
 var (
-	Debug = false
-
 	dir          = flag.String("in", ".", "Source directory")
 	outPath      = flag.String("out", "config.yaml", "Output file")
-
+	defaultsPath = flag.String("defaults", "defaults", "Path to the defaults")
-	base fs.FS
 
 	src *clustersconfig.Config
 	dst *localconfig.Config
 )
 
-func init() {
-	flag.BoolVar(&Debug, "debug", Debug, "debug")
-}
-
 func loadSrc() {
 	var err error
-	src, err = clustersconfig.FromDir(read, assemble, listBase, listMerged)
+	src, err = clustersconfig.FromDir(*dir, *defaultsPath)
 	if err != nil {
 		log.Fatal("failed to load config from dir: ", err)
 	}
@@ -47,11 +33,6 @@ func main() {
 
 	log.SetFlags(log.Ltime | log.Lmicroseconds | log.Lshortfile)
 
-	base = os.DirFS(*dir)
-	searchList = append(searchList, fsFS{base})
-
-	openIncludes()
-
 	loadSrc()
 
 	dst = &localconfig.Config{
@@ -63,11 +44,14 @@ func main() {
 		dst.Clusters = append(dst.Clusters, &localconfig.Cluster{
 			Name:          cluster.Name,
 			Addons:        renderAddons(cluster),
+			BootstrapPods: renderBootstrapPodsDS(cluster),
 		})
 	}
 
 	// ----------------------------------------------------------------------
 	for _, host := range src.Hosts {
+		loadSrc() // FIXME ugly fix of some template caching or something
+
 		log.Print("rendering host ", host.Name)
 		ctx, err := newRenderContext(host, src)
 
@@ -86,12 +70,12 @@ func main() {
 		}
 		ips = append(ips, host.IPs...)
 
-		if ctx.Host.Versions["modules"] == "" {
+		if ctx.Group.Versions["modules"] == "" {
 			// default modules' version to kernel's version
-			ctx.Host.Versions["modules"] = ctx.Host.Kernel
+			ctx.Group.Versions["modules"] = ctx.Group.Kernel
 		}
 
-		renderedHost := &localconfig.Host{
+		dst.Hosts = append(dst.Hosts, &localconfig.Host{
 			Name: host.Name,
 
 			ClusterName: ctx.Cluster.Name,
@@ -102,21 +86,14 @@ func main() {
 			MACs: macs,
 			IPs:  ips,
 
-			IPXE: ctx.Host.IPXE, // TODO render
+			IPXE: ctx.Group.IPXE, // TODO render
 
-			Kernel:   ctx.Host.Kernel,
+			Kernel:   ctx.Group.Kernel,
-			Initrd:   ctx.Host.Initrd,
+			Initrd:   ctx.Group.Initrd,
-			Versions: ctx.Host.Versions,
+			Versions: ctx.Group.Versions,
 
-			BootstrapConfig: ctx.BootstrapConfig(),
 			Config: ctx.Config(),
-		}
+		})
-
-		if host.Template {
-			dst.HostTemplates = append(dst.HostTemplates, renderedHost)
-		} else {
-			dst.Hosts = append(dst.Hosts, renderedHost)
-		}
 	}
 
 	// ----------------------------------------------------------------------
@@ -127,83 +104,8 @@ func main() {
 
 	defer out.Close()
 
-	out.Write([]byte("# dkl-dir2config " + Version + "\n"))
-
 	if err = yaml.NewEncoder(out).Encode(dst); err != nil {
 		log.Fatal("failed to render output: ", err)
 	}
 
 }
-
-func cfgPath(subPath string) string { return filepath.Join(*dir, subPath) }
-
-func openIncludes() {
-	includesFile, err := base.Open("includes.yaml")
-
-	if os.IsNotExist(err) {
-		return
-	}
-	if err != nil {
-		log.Fatal("failed to open includes: ", err)
-	}
-
-	includes := make([]struct {
-		Path   string
-		Branch string
-		Tag    string
-	}, 0)
-
-	err = yaml.NewDecoder(includesFile).Decode(&includes)
-	if err != nil {
-		log.Fatal("failed to parse includes: ", err)
-	}
-
-	for _, include := range includes {
-		switch {
-		case include.Branch != "" || include.Tag != "":
-			p := cfgPath(include.Path) // FIXME parse git path to allow remote repos
-
-			var rev plumbing.Revision
-
-			switch {
-			case include.Branch != "":
-				log.Printf("opening include path %q as git, branch %q", p, include.Branch)
-				rev = plumbing.Revision(plumbing.NewBranchReferenceName(include.Branch))
-
-			case include.Tag != "":
-				log.Printf("opening include path %q as git, tag %q", p, include.Branch)
-				rev = plumbing.Revision(plumbing.NewTagReferenceName(include.Branch))
-			}
-
-			repo, err := git.PlainOpen(p)
-			if err != nil {
-				log.Fatal("failed to open: ", err)
-			}
-
-			revH, err := repo.ResolveRevision(rev)
-			if err != nil {
-				log.Fatalf("failed to resolve revision %s: %v", rev, err)
-			}
-
-			log.Print("  -> resolved to commit ", *revH)
-
-			commit, err := repo.CommitObject(*revH)
-			if err != nil {
-				log.Fatal("failed to get commit object: ", err)
-			}
-
-			tree, err := commit.Tree()
-			if err != nil {
-				log.Fatal("failed to open git tree: ", err)
-			}
-
-			searchList = append(searchList, gitFS{tree})
-
-		default:
-			p := cfgPath(include.Path)
-			log.Printf("opening include path %q as raw dir", p)
-
-			searchList = append(searchList, fsFS{os.DirFS(p)})
-		}
-	}
-}

cmd/dkl-dir2config/main_test.go

@@ -0,0 +1,76 @@
+package main
+
+import (
+	"bytes"
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"runtime"
+	"testing"
+)
+
+var (
+	testDir    = "testdata"
+	goldenFile = "config.yaml.golden"
+	outFile    = "config.yaml"
+
+	binName = "dkl-dir2config"
+)
+
+/*
+Build and run the code with default parameters and testdata
+*/
+func TestMain(m *testing.M) {
+	fmt.Println("Building...")
+	if runtime.GOOS == "windows" {
+		binName += ".exe"
+	}
+
+	build := exec.Command("go", "build", "-o", filepath.Join(testDir, binName))
+	if err := build.Run(); err != nil {
+		fmt.Fprintf(os.Stderr, "Cannot build : %v", err)
+		os.Exit(1)
+	}
+
+	fmt.Println("Running Tests...")
+	result := m.Run()
+
+	fmt.Println("Cleaning Up ... ")
+	os.Remove(binName)
+	os.Exit(result)
+}
+
+func TestRunMain(t *testing.T) {
+	err := os.Chdir(testDir)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	t.Run("RunWithNoArgument", func(t *testing.T) {
+		cmd := exec.Command("./" + binName)
+
+		if err := cmd.Run(); err != nil {
+			t.Fatal(err)
+		}
+	})
+	t.Run("CompareOutputs", func(t *testing.T) {
+		cmd := exec.Command("./"+binName, "-out", outFile)
+
+		if err := cmd.Run(); err != nil {
+			t.Fatal(err)
+		}
+
+		output, err := os.ReadFile(outFile)
+		if err != nil {
+			t.Fatal(err)
+		}
+		expected, err := os.ReadFile(goldenFile)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if ret := bytes.Compare(output, expected); ret != 0 {
+			t.Fatalf("Output (%v) of length %d is different than expected (%v) of length %d", outFile, len(output), goldenFile, len(expected))
+		}
+	})
+}

cmd/dkl-dir2config/render-cluster.go

@@ -3,18 +3,21 @@ package main
 import (
 	"bytes"
 	"fmt"
+	"io"
 	"log"
 	"path"
 
-	"novit.tech/direktil/local-server/pkg/clustersconfig"
+	yaml "gopkg.in/yaml.v2"
+
+	"novit.nc/direktil/local-server/pkg/clustersconfig"
 )
 
-func clusterFuncs(clusterSpec *clustersconfig.Cluster) map[string]any {
+func clusterFuncs(clusterSpec *clustersconfig.Cluster) map[string]interface{} {
 	cluster := clusterSpec.Name
 
-	return map[string]any{
+	return map[string]interface{}{
-		"password": func(name, hash string) (s string) {
+		"password": func(name string) (s string) {
-			return fmt.Sprintf("{{ password %q %q %q | quote }}", cluster, name, hash)
+			return fmt.Sprintf("{{ password %q %q }}", cluster, name)
 		},
 
 		"token": func(name string) (s string) {
@@ -36,7 +39,7 @@ func clusterFuncs(clusterSpec *clustersconfig.Cluster) map[string]any {
 			return fmt.Sprintf("{{ ca_dir %q %q }}", cluster, name), nil
 		},
 
-		"hosts_by_cluster": func(cluster string) (hosts []any) {
+		"hosts_by_cluster": func(cluster string) (hosts []interface{}) {
 			for _, host := range src.Hosts {
 				if host.Cluster == cluster {
 					hosts = append(hosts, asMap(host))
@@ -50,9 +53,9 @@ func clusterFuncs(clusterSpec *clustersconfig.Cluster) map[string]any {
 			return
 		},
 
-		"hosts_by_group": func(group string) (hosts []any) {
+		"hosts_by_group": func(group string) (hosts []interface{}) {
 			for _, host := range src.Hosts {
-				if host.Cluster == cluster && host.Group == group {
+				if host.Group == group {
 					hosts = append(hosts, asMap(host))
 				}
 			}
@@ -63,26 +66,6 @@ func clusterFuncs(clusterSpec *clustersconfig.Cluster) map[string]any {
 
 			return
 		},
-
-		"host_ip_from": func(hostName, net string) string {
-			host := src.Host(hostName)
-			if host == nil {
-				log.Printf("WARNING: no host named %q", hostName)
-				return "<no value>"
-			}
-
-			ipFrom := host.IPFrom
-			if ipFrom == nil {
-				ipFrom = map[string]string{}
-			}
-
-			ip, ok := ipFrom[net]
-			if !ok {
-				ip = host.IP
-			}
-
-			return ip
-		},
 	}
 }
 
@@ -121,18 +104,12 @@ func renderAddons(cluster *clustersconfig.Cluster) string {
 		return ""
 	}
 
-	buf := new(bytes.Buffer)
+	addons := src.Addons[cluster.Addons]
-
-	for _, addonSet := range cluster.Addons {
-		addons := src.Addons[addonSet]
 	if addons == nil {
-			log.Fatalf("cluster %q: no addons with name %q", cluster.Name, addonSet)
+		log.Fatalf("cluster %q: no addons with name %q", cluster.Name, cluster.Addons)
 	}
 
-		buf.Write(renderClusterTemplates(cluster, "addons", addons))
+	return string(renderClusterTemplates(cluster, "addons", addons))
-	}
-
-	return buf.String()
 }
 
 type namePod struct {
@@ -140,3 +117,106 @@ type namePod struct {
 	Name      string
 	Pod       map[string]interface{}
 }
+
+func renderBootstrapPods(cluster *clustersconfig.Cluster) (pods []namePod) {
+	if cluster.BootstrapPods == "" {
+		return nil
+	}
+
+	bootstrapPods := src.BootstrapPods[cluster.BootstrapPods]
+	if bootstrapPods == nil {
+		log.Fatalf("no bootstrap pods template named %q", cluster.BootstrapPods)
+	}
+
+	// render bootstrap pods
+	parts := bytes.Split(renderClusterTemplates(cluster, "bootstrap-pods", bootstrapPods), []byte("\n---\n"))
+	for _, part := range parts {
+		buf := bytes.NewBuffer(part)
+		dec := yaml.NewDecoder(buf)
+
+		for n := 0; ; n++ {
+			str := buf.String()
+
+			podMap := map[string]interface{}{}
+			err := dec.Decode(podMap)
+
+			if err == io.EOF {
+				break
+			} else if err != nil {
+				log.Fatalf("bootstrap pod %d: failed to parse: %v\n%s", n, err, str)
+			}
+
+			if len(podMap) == 0 {
+				continue
+			}
+
+			if podMap["metadata"] == nil {
+				log.Fatalf("bootstrap pod %d: no metadata\n%s", n, buf.String())
+			}
+
+			md := podMap["metadata"].(map[interface{}]interface{})
+
+			namespace := md["namespace"].(string)
+			name := md["name"].(string)
+
+			pods = append(pods, namePod{namespace, name, podMap})
+		}
+	}
+
+	return
+}
+
+func renderBootstrapPodsDS(cluster *clustersconfig.Cluster) string {
+	buf := &bytes.Buffer{}
+	enc := yaml.NewEncoder(buf)
+	for _, namePod := range renderBootstrapPods(cluster) {
+		pod := namePod.Pod
+
+		md := pod["metadata"].(map[interface{}]interface{})
+		labels := md["labels"]
+
+		if labels == nil {
+			labels = map[string]interface{}{
+				"app": namePod.Name,
+			}
+			md["labels"] = labels
+		}
+
+		ann := md["annotations"]
+		annotations := map[interface{}]interface{}{}
+		if ann != nil {
+			annotations = ann.(map[interface{}]interface{})
+		}
+		annotations["node.kubernetes.io/bootstrap-checkpoint"] = "true"
+
+		md["annotations"] = annotations
+
+		delete(md, "name")
+		delete(md, "namespace")
+
+		err := enc.Encode(map[string]interface{}{
+			"apiVersion": "apps/v1",
+			"kind":       "DaemonSet",
+			"metadata": map[string]interface{}{
+				"namespace": namePod.Namespace,
+				"name":      namePod.Name,
+				"labels":    labels,
+			},
+			"spec": map[string]interface{}{
+				"minReadySeconds": 60,
+				"selector": map[string]interface{}{
+					"matchLabels": labels,
+				},
+				"template": map[string]interface{}{
+					"metadata": pod["metadata"],
+					"spec":     pod["spec"],
+				},
+			},
+		})
+
+		if err != nil {
+			panic(err)
+		}
+	}
+	return buf.String()
+}

cmd/dkl-dir2config/render-context.go

@@ -2,20 +2,17 @@ package main
 
 import (
 	"bytes"
+	"crypto/sha1"
+	"encoding/hex"
 	"fmt"
-	"io"
 	"log"
-	"math/rand"
 	"path"
 	"reflect"
-	"strings"
 
-	"github.com/cespare/xxhash"
 	yaml "gopkg.in/yaml.v2"
 
-	"novit.tech/direktil/pkg/config"
+	"novit.nc/direktil/local-server/pkg/clustersconfig"
-
+	"novit.nc/direktil/pkg/config"
-	"novit.tech/direktil/local-server/pkg/clustersconfig"
 )
 
 type renderContext struct {
@@ -23,10 +20,9 @@ type renderContext struct {
 	Annotations map[string]string
 
 	Host               *clustersconfig.Host
+	Group              *clustersconfig.Group
 	Cluster            *clustersconfig.Cluster
-	Vars    map[string]any
+	Vars               map[string]interface{}
-
-	BootstrapConfigTemplate *clustersconfig.Template
 	ConfigTemplate     *clustersconfig.Template
 	StaticPodsTemplate *clustersconfig.Template
 
@@ -40,25 +36,32 @@ func newRenderContext(host *clustersconfig.Host, cfg *clustersconfig.Config) (ct
 		return
 	}
 
-	vars := make(map[string]any)
+	group := cfg.Group(host.Group)
+	if group == nil {
+		err = fmt.Errorf("no group named %q", host.Group)
+		return
+	}
 
-	for _, oVars := range []map[string]any{
+	vars := make(map[string]interface{})
+
+	for _, oVars := range []map[string]interface{}{
 		cluster.Vars,
+		group.Vars,
 		host.Vars,
 	} {
 		mapMerge(vars, oVars)
 	}
 
 	return &renderContext{
-		Labels:      mergeLabels(cluster.Labels, host.Labels),
+		Labels:      mergeLabels(cluster.Labels, group.Labels, host.Labels),
-		Annotations: mergeLabels(cluster.Annotations, host.Annotations),
+		Annotations: mergeLabels(cluster.Annotations, group.Annotations, host.Annotations),
 
 		Host:               host,
+		Group:              group,
 		Cluster:            cluster,
 		Vars:               vars,
-
+		ConfigTemplate:     cfg.ConfigTemplate(group.Config),
-		BootstrapConfigTemplate: cfg.ConfigTemplate(host.BootstrapConfig),
+		StaticPodsTemplate: cfg.StaticPodsTemplate(group.StaticPods),
-		ConfigTemplate:          cfg.ConfigTemplate(host.Config),
 
 		clusterConfig: cfg,
 	}, nil
@@ -122,6 +125,8 @@ func (ctx *renderContext) Name() string {
 	switch {
 	case ctx.Host != nil:
 		return "host:" + ctx.Host.Name
+	case ctx.Group != nil:
+		return "group:" + ctx.Group.Name
 	case ctx.Cluster != nil:
 		return "cluster:" + ctx.Cluster.Name
 	default:
@@ -129,35 +134,47 @@ func (ctx *renderContext) Name() string {
 	}
 }
 
-func (ctx *renderContext) BootstrapConfig() string {
-	if ctx.BootstrapConfigTemplate == nil {
-		log.Fatalf("no such (bootstrap) config: %q", ctx.Host.BootstrapConfig)
-	}
-	return ctx.renderConfig(ctx.BootstrapConfigTemplate)
-}
-
 func (ctx *renderContext) Config() string {
 	if ctx.ConfigTemplate == nil {
-		log.Fatalf("no such config: %q", ctx.Host.Config)
+		log.Fatalf("no such config: %q", ctx.Group.Config)
 	}
-	return ctx.renderConfig(ctx.ConfigTemplate)
-}
 
-func (ctx *renderContext) renderConfig(configTemplate *clustersconfig.Template) string {
-	buf := new(strings.Builder)
-	ctx.renderConfigTo(buf, configTemplate)
-	return buf.String()
-}
-
-func (ctx *renderContext) renderConfigTo(buf io.Writer, configTemplate *clustersconfig.Template) {
 	ctxName := ctx.Name()
 
 	ctxMap := ctx.asMap()
 
+	templateFuncs := ctx.templateFuncs(ctxMap)
+
+	render := func(what string, t *clustersconfig.Template) (s string, err error) {
+		buf := &bytes.Buffer{}
+		err = t.Execute(ctxName, what, buf, ctxMap, templateFuncs)
+		if err != nil {
+			log.Printf("host %s: failed to render %s [%q]: %v", ctx.Host.Name, what, t.Name, err)
+			return
+		}
+
+		s = buf.String()
+		return
+	}
+
 	extraFuncs := ctx.templateFuncs(ctxMap)
 
-	extraFuncs["static_pods_files"] = func(dir string) (string, error) {
+	extraFuncs["static_pods"] = func() (string, error) {
-		namePods := ctx.renderStaticPods()
+		name := ctx.Group.StaticPods
+		if len(name) == 0 {
+			return "", fmt.Errorf("group %q has no static pods defined", ctx.Group.Name)
+		}
+
+		t := ctx.clusterConfig.StaticPodsTemplate(name)
+		if t == nil {
+			return "", fmt.Errorf("no static pods template named %q", name)
+		}
+
+		return render("static-pods", t)
+	}
+
+	extraFuncs["bootstrap_pods_files"] = func(dir string) (string, error) {
+		namePods := renderBootstrapPods(ctx.Cluster)
 
 		defs := make([]config.FileDef, 0)
 
@@ -166,7 +183,7 @@ func (ctx *renderContext) renderConfigTo(buf io.Writer, configTemplate *clusters
 
 			ba, err := yaml.Marshal(namePod.Pod)
 			if err != nil {
-				return "", fmt.Errorf("static pod %s: failed to render: %v", name, err)
+				return "", fmt.Errorf("bootstrap pod %s: failed to render: %v", name, err)
 			}
 
 			defs = append(defs, config.FileDef{
@@ -180,30 +197,36 @@ func (ctx *renderContext) renderConfigTo(buf io.Writer, configTemplate *clusters
 		return string(ba), err
 	}
 
-	extraFuncs["host_ip"] = func() string {
-		if ctx.Host.Template {
-			return "{{ host_ip }}"
-		}
-		return ctx.Host.IP
-	}
-	extraFuncs["host_name"] = func() string {
-		if ctx.Host.Template {
-			return "{{ host_name }}"
-		}
-		return ctx.Host.Name
-	}
 	extraFuncs["machine_id"] = func() string {
-		return "{{ machine_id }}"
+		ba := sha1.Sum([]byte(ctx.Cluster.Name + "/" + ctx.Host.Name)) // TODO: check semantics of machine-id
+		return hex.EncodeToString(ba[:])
 	}
 
-	extraFuncs["version"] = func() string { return Version }
+	buf := bytes.NewBuffer(make([]byte, 0, 4096))
-
+	if err := ctx.ConfigTemplate.Execute(ctxName, "config", buf, ctxMap, extraFuncs); err != nil {
-	if err := configTemplate.Execute(ctxName, "config", buf, ctxMap, extraFuncs); err != nil {
+		log.Fatalf("failed to render config %q for host %q: %v", ctx.Group.Config, ctx.Host.Name, err)
-		log.Fatalf("failed to render config %q for host %q: %v", ctx.Host.Config, ctx.Host.Name, err)
 	}
+
+	return buf.String()
 }
 
-func (ctx *renderContext) templateFuncs(ctxMap map[string]any) map[string]interface{} {
+func (ctx *renderContext) StaticPods() (ba []byte, err error) {
+	if ctx.StaticPodsTemplate == nil {
+		log.Fatalf("no such static-pods: %q", ctx.Group.StaticPods)
+	}
+
+	ctxMap := ctx.asMap()
+
+	buf := bytes.NewBuffer(make([]byte, 0, 4096))
+	if err = ctx.StaticPodsTemplate.Execute(ctx.Name(), "static-pods", buf, ctxMap, ctx.templateFuncs(ctxMap)); err != nil {
+		return
+	}
+
+	ba = buf.Bytes()
+	return
+}
+
+func (ctx *renderContext) templateFuncs(ctxMap map[string]interface{}) map[string]interface{} {
 	cluster := ctx.Cluster.Name
 
 	getKeyCert := func(name, funcName string) (s string, err error) {
@@ -244,25 +267,7 @@ func (ctx *renderContext) templateFuncs(ctxMap map[string]any) map[string]interf
 	}
 
 	funcs := clusterFuncs(ctx.Cluster)
-	for k, v := range map[string]any{
+	for k, v := range map[string]interface{}{
-		"default": func(value, defaultValue any) any {
-			switch v := value.(type) {
-			case string:
-				if v != "" {
-					return v
-				}
-			case int, int8, int16, int32, int64, uint, uint8, uint16, uint32, float32, float64:
-				if v != 0 {
-					return v
-				}
-
-			default:
-				if v != nil {
-					return v
-				}
-			}
-			return defaultValue
-		},
 		"tls_key": func(name string) (string, error) {
 			return getKeyCert(name, "tls_key")
 		},
@@ -276,18 +281,15 @@ func (ctx *renderContext) templateFuncs(ctxMap map[string]any) map[string]interf
 		},
 
 		"ssh_host_keys": func(dir string) (s string) {
-			return fmt.Sprintf("{{ ssh_host_keys %q %q \"\"}}",
+			return fmt.Sprintf("{{ ssh_host_keys %q %q %q}}",
-				dir, cluster)
+				dir, cluster, ctx.Host.Name)
-		},
-		"host_download_token": func() (s string) {
-			return "{{ host_download_token }}"
 		},
 
-		"hosts_of_group": func() (hosts []any) {
+		"hosts_of_group": func() (hosts []interface{}) {
-			hosts = make([]any, 0)
+			hosts = make([]interface{}, 0)
 
 			for _, host := range ctx.clusterConfig.Hosts {
-				if host.Cluster == ctx.Cluster.Name && host.Group != ctx.Host.Group {
+				if host.Group != ctx.Host.Group {
 					continue
 				}
 
@@ -299,31 +301,12 @@ func (ctx *renderContext) templateFuncs(ctxMap map[string]any) map[string]interf
 
 		"hosts_of_group_count": func() (count int) {
 			for _, host := range ctx.clusterConfig.Hosts {
-				if host.Cluster == ctx.Cluster.Name && host.Group == ctx.Host.Group {
+				if host.Group == ctx.Host.Group {
 					count++
 				}
 			}
 			return
 		},
-
-		"shuffled_hosts_by_group": func(group string) (hosts []any) {
-			for _, host := range src.Hosts {
-				if host.Cluster == ctx.Cluster.Name && host.Group == group {
-					hosts = append(hosts, asMap(host))
-				}
-			}
-
-			if len(hosts) == 0 {
-				log.Printf("WARNING: no hosts in group %q", group)
-				return
-			}
-
-			seed := xxhash.Sum64String(ctx.Host.Name)
-			rng := rand.New(rand.NewSource(int64(seed)))
-			rng.Shuffle(len(hosts), func(i, j int) { hosts[i], hosts[j] = hosts[j], hosts[i] })
-
-			return
-		},
 	} {
 		funcs[k] = v
 	}

cmd/dkl-dir2config/render-host.go

@@ -1,77 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"log"
-
-	yaml "gopkg.in/yaml.v2"
-	"novit.tech/direktil/local-server/pkg/clustersconfig"
-)
-
-func (ctx *renderContext) renderStaticPods() (pods []namePod) {
-	if ctx.Host.StaticPods == "" {
-		return
-	}
-
-	staticPods, ok := src.StaticPods[ctx.Host.StaticPods]
-	if !ok {
-		log.Fatalf("no static pods template named %q", ctx.Host.StaticPods)
-	}
-
-	// render static pods
-	parts := bytes.Split(ctx.renderHostTemplates("static-pods", staticPods), []byte("\n---\n"))
-	for _, part := range parts {
-		buf := bytes.NewBuffer(part)
-		dec := yaml.NewDecoder(buf)
-
-		for n := 0; ; n++ {
-			str := buf.String()
-
-			podMap := map[string]interface{}{}
-			err := dec.Decode(podMap)
-
-			if err == io.EOF {
-				break
-			} else if err != nil {
-				log.Fatalf("static pod %d: failed to parse: %v\n%s", n, err, str)
-			}
-
-			if len(podMap) == 0 {
-				continue
-			}
-
-			if podMap["metadata"] == nil {
-				log.Fatalf("static pod %d: no metadata\n%s", n, buf.String())
-			}
-
-			md := podMap["metadata"].(map[interface{}]interface{})
-
-			namespace := md["namespace"].(string)
-			name := md["name"].(string)
-
-			pods = append(pods, namePod{namespace, name, podMap})
-		}
-	}
-
-	return
-}
-
-func (ctx *renderContext) renderHostTemplates(setName string,
-	templates []*clustersconfig.Template) []byte {
-
-	log.Print("rendering host templates in ", setName)
-
-	buf := bytes.NewBuffer(make([]byte, 0, 16<<10))
-
-	for _, t := range templates {
-		log.Print("- template: ", setName, ": ", t.Name)
-		fmt.Fprintf(buf, "---\n# %s: %s\n", setName, t.Name)
-
-		ctx.renderConfigTo(buf, t)
-		fmt.Fprintln(buf)
-	}
-
-	return buf.Bytes()
-}

cmd/dkl-dir2config/search-list.go

@@ -1,60 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"sort"
-)
-
-var searchList = make([]FS, 0)
-
-// read the first file matching path in the search list
-func read(path string) (ba []byte, err error) {
-	for _, fs := range searchList {
-		var r io.ReadCloser
-		r, err = fs.Open(path)
-		if os.IsNotExist(err) {
-			continue
-		}
-		if err != nil {
-			return
-		}
-
-		defer r.Close()
-		return ioutil.ReadAll(r)
-	}
-
-	err = fmt.Errorf("%s: %w", path, os.ErrNotExist)
-	return
-}
-
-func listBase(path string) ([]string, error) {
-	return fsFS{base}.List(path)
-}
-
-func listMerged(path string) (entries []string, err error) {
-	seen := map[string]bool{}
-	for _, fs := range searchList {
-		var fsEnts []string
-		fsEnts, err = fs.List(path)
-		if os.IsNotExist(err) {
-			err = nil
-			continue
-		}
-		if err != nil {
-			return
-		}
-
-		for _, ent := range fsEnts {
-			if !seen[ent] {
-				entries = append(entries, ent)
-				seen[ent] = true
-			}
-		}
-	}
-
-	sort.Strings(entries)
-	return
-}

cmd/dkl-dir2config/testdata/cert-requests.yaml

@@ -0,0 +1,39 @@
+- name: etcd-server
+  ca: etcd
+  profile: server
+  per_host: true
+  template: |
+    {"CN":"{{.host.name}}","hosts":["127.0.0.1","{{.host.ip}}"],"key":{"algo":"ecdsa","size":256}}
+- name: etcd-peer
+  ca: etcd
+  profile: peer
+  per_host: true
+  template: |
+    {"CN":"{{.host.name}}","hosts":["127.0.0.1","{{.host.ip}}"],"key":{"algo":"ecdsa","size":256}}
+- name: etcd-client
+  ca: etcd
+  profile: client
+  template: |
+    {"CN":"client","hosts":["*"],"key":{"algo":"ecdsa","size":256}}
+
+- name: apiserver
+  ca: cluster
+  profile: server
+  per_host: true
+  template: |
+    {"CN":"{{.host.name}}","hosts":[
+        "kubernetes", "kubernetes.default", "kubernetes.default.svc.{{.cluster.domain}}","{{.host.name}}",
+        "127.0.0.1","{{.cluster.kubernetes_svc_ip}}","{{.vars.public_vip}}",
+        {{- if .vars.apiserver_vip }}"{{.vars.apiserver_vip}}",{{ end }}
+        "{{.host.ip}}"
+    ],"key":{"algo":"ecdsa","size":521}}
+- name: cluster-client
+  ca: cluster
+  profile: client
+  template: |
+    {"CN":"client","hosts":["*"],"key":{"algo":"ecdsa","size":256}}
+- name: kubelet-client
+  ca: cluster
+  profile: client
+  template: |
+    {"CN":"kubelet-client","names":[{"O":"system:masters"}],"hosts":["*"],"key":{"algo":"ecdsa","size":256}}

cmd/dkl-dir2config/testdata/clusters/test.yaml

@@ -0,0 +1 @@
+from: v1.19:test

cmd/dkl-dir2config/testdata/defaults

@@ -0,0 +1 @@
+Subproject commit be8c8592fbc39267755978860a095cbf297e924d

cmd/dkl-dir2config/testdata/groups/test-master.yaml

@@ -0,0 +1 @@
+from: v1.19:master

cmd/dkl-dir2config/testdata/hosts/test1.yaml

@@ -0,0 +1,3 @@
+ip: 172.16.0.1
+cluster: test
+group: test-master

cmd/dkl-dir2config/testdata/hosts/test2.yaml

@@ -0,0 +1,3 @@
+ip: 172.16.0.2
+cluster: test
+group: test-master

cmd/dkl-dir2config/testdata/hosts/test3.yaml

@@ -0,0 +1,3 @@
+ip: 172.16.0.3
+cluster: test
+group: test-master

cmd/dkl-dir2config/testdata/ssl-config.json

@@ -0,0 +1,34 @@
+{
+    "signing": {
+        "default": {
+            "expiry": "43800h"
+        },
+        "profiles": {
+            "server": {
+                "expiry": "43800h",
+                "usages": [
+                    "signing",
+                    "key encipherment",
+                    "server auth"
+                ]
+            },
+            "client": {
+                "expiry": "43800h",
+                "usages": [
+                    "signing",
+                    "key encipherment",
+                    "client auth"
+                ]
+            },
+            "peer": {
+                "expiry": "43800h",
+                "usages": [
+                    "signing",
+                    "key encipherment",
+                    "server auth",
+                    "client auth"
+                ]
+            }
+        }
+    }
+}

cmd/dkl-local-server/auth.go

@@ -1,44 +1,36 @@
 package main
 
 import (
+	"flag"
 	"log"
 	"net/http"
 )
 
-var adminToken string
+var (
+	hostsToken = flag.String("hosts-token", "", "Token to give to access /hosts (open is none)")
+	adminToken = flag.String("admin-token", "", "Token to give to access to admin actions (open is none)")
+)
+
+func authorizeHosts(r *http.Request) bool {
+	return authorizeToken(r, *hostsToken)
+}
 
 func authorizeAdmin(r *http.Request) bool {
-	return authorizeToken(r, adminToken)
+	return authorizeToken(r, *adminToken)
 }
 
 func authorizeToken(r *http.Request, token string) bool {
 	if token == "" {
-		return false
+		// access is open
+		return true
 	}
 
 	reqToken := r.Header.Get("Authorization")
-	if reqToken != "" {
-		return reqToken == "Bearer "+token
-	}
 
-	return r.URL.Query().Get("token") == token
+	return reqToken == "Bearer "+token
 }
 
 func forbidden(w http.ResponseWriter, r *http.Request) {
-	log.Printf("denied access to %s from %s", r.URL.Path, r.RemoteAddr)
+	log.Printf("denied access to %s from %s", r.RequestURI, r.RemoteAddr)
 	http.Error(w, "Forbidden", http.StatusForbidden)
 }
-
-func requireToken(token *string, handler http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-		if !authorizeToken(req, *token) {
-			forbidden(w, req)
-			return
-		}
-		handler.ServeHTTP(w, req)
-	})
-}
-
-func requireAdmin(handler http.Handler) http.Handler {
-	return requireToken(&adminToken, handler)
-}

cmd/dkl-local-server/boot-img.go

@@ -3,7 +3,6 @@ package main
 import (
 	"archive/tar"
 	"compress/gzip"
-	"flag"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -57,10 +56,8 @@ func buildBootImgGZ(out io.Writer, ctx *renderContext) (err error) {
 	return
 }
 
-var grubSupportVersion = flag.String("grub-support", "1.1.0", "GRUB support version")
-
 func setupBootImage(bootImg *os.File, ctx *renderContext) (err error) {
-	path, err := ctx.distFetch("grub-support", *grubSupportVersion)
+	path, err := ctx.distFetch("grub-support", "1.0.0")
 	if err != nil {
 		return
 	}

cmd/dkl-local-server/boot-iso.go

@@ -8,25 +8,28 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"strconv"
-
-	"github.com/cespare/xxhash"
 )
 
-func buildBootISO(out io.Writer, ctx *renderContext) (err error) {
+func buildBootISO(out io.Writer, ctx *renderContext) error {
-	tempDir, err := ioutil.TempDir("/tmp", "iso-v2-")
+	tempDir, err := ioutil.TempDir("/tmp", "iso-")
 	if err != nil {
-		return
+		return err
 	}
 
 	defer os.RemoveAll(tempDir)
 
-	buildRes := func(build func(out io.Writer, ctx *renderContext) error, dst string) (err error) {
+	cp := func(src, dst string) error {
-		log.Printf("iso-v2: building %s", dst)
+		log.Printf("iso: adding %s as %s", src, dst)
+		in, err := os.Open(src)
+		if err != nil {
+			return err
+		}
+
+		defer in.Close()
 
 		outPath := filepath.Join(tempDir, dst)
 
-		if err = os.MkdirAll(filepath.Dir(outPath), 0755); err != nil {
+		if err := os.MkdirAll(filepath.Dir(outPath), 0755); err != nil {
 			return err
 		}
 
@@ -34,55 +37,32 @@ func buildBootISO(out io.Writer, ctx *renderContext) (err error) {
 		if err != nil {
 			return err
 		}
+
 		defer out.Close()
 
-		err = build(out, ctx)
+		_, err = io.Copy(out, in)
-		if err != nil {
-			return
-		}
-
 		return err
 	}
 
-	err = func() (err error) {
+	err = func() error {
 		// grub
 
-		if err = os.MkdirAll(filepath.Join(tempDir, "grub"), 0755); err != nil {
+		if err := os.MkdirAll(filepath.Join(tempDir, "grub"), 0755); err != nil {
-			return
+			return err
 		}
-
-		// create a tag file
-		bootstrapBytes, _, err := ctx.BootstrapConfig()
-		if err != nil {
-			return
-		}
-
-		h := xxhash.New()
-		fmt.Fprintln(h, ctx.Host.Kernel)
-		h.Write(bootstrapBytes)
-
-		tag := "dkl-" + strconv.FormatUint(h.Sum64(), 32) + ".tag"
-
-		f, err := os.Create(filepath.Join(tempDir, tag))
-		if err != nil {
-			return
-		}
-		f.Write([]byte("direktil marker file\n"))
-		f.Close()
-
 		err = ioutil.WriteFile(filepath.Join(tempDir, "grub", "grub.cfg"), []byte(`
-search --set=root --file /`+tag+`
+search --set=root --file /config.yaml
 
 insmod all_video
 set timeout=3
 
 menuentry "Direktil" {
-    linux  /vmlinuz `+ctx.CmdLine+`
+    linux  /vmlinuz direktil.boot=DEVNAME=sr0 direktil.boot.fs=iso9660 `+ctx.CmdLine+`
     initrd /initrd
 }
 `), 0644)
 		if err != nil {
-			return
+			return err
 		}
 
 		coreImgPath := filepath.Join(tempDir, "grub", "core.img")
@@ -137,9 +117,50 @@ menuentry "Direktil" {
 		return err
 	}
 
+	// config
+	cfgBytes, cfg, err := ctx.Config()
+	if err != nil {
+		return err
+	}
+
+	ioutil.WriteFile(filepath.Join(tempDir, "config.yaml"), cfgBytes, 0600)
+
 	// kernel and initrd
-	buildRes(fetchKernel, "vmlinuz")
+	type distCopy struct {
-	buildRes(buildInitrd, "initrd")
+		Src []string
+		Dst string
+	}
+
+	copies := []distCopy{
+		{Src: []string{"kernels", ctx.Host.Kernel}, Dst: "vmlinuz"},
+		{Src: []string{"initrd", ctx.Host.Initrd}, Dst: "initrd"},
+	}
+
+	// layers
+	for _, layer := range cfg.Layers {
+		layerVersion := ctx.Host.Versions[layer]
+		if layerVersion == "" {
+			return fmt.Errorf("layer %q not mapped to a version", layer)
+		}
+
+		copies = append(copies,
+			distCopy{
+				Src: []string{"layers", layer, layerVersion},
+				Dst: filepath.Join("current", "layers", layer+".fs"),
+			})
+	}
+
+	for _, copy := range copies {
+		outPath, err := ctx.distFetch(copy.Src...)
+		if err != nil {
+			return err
+		}
+
+		err = cp(outPath, copy.Dst)
+		if err != nil {
+			return err
+		}
+	}
 
 	// build the ISO
 	mkisofs, err := exec.LookPath("genisoimage")

cmd/dkl-local-server/boot-tar.go

@@ -2,13 +2,11 @@ package main
 
 import (
 	"archive/tar"
-	"bytes"
+	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"os"
-
+	"path/filepath"
-	"novit.tech/direktil/local-server/pkg/utf16"
 )
 
 func rmTempFile(f *os.File) {
@@ -23,7 +21,7 @@ func buildBootTar(out io.Writer, ctx *renderContext) (err error) {
 	defer arch.Close()
 
 	archAdd := func(path string, ba []byte) (err error) {
-		err = arch.WriteHeader(&tar.Header{Name: path, Mode: 0640, Size: int64(len(ba))})
+		err = arch.WriteHeader(&tar.Header{Name: path, Size: int64(len(ba))})
 		if err != nil {
 			return
 		}
@@ -31,95 +29,70 @@ func buildBootTar(out io.Writer, ctx *renderContext) (err error) {
 		return
 	}
 
-	// kernel
+	// config
-	kernelPath, err := ctx.distFetch("kernels", ctx.Host.Kernel)
+	cfgBytes, cfg, err := ctx.Config()
 	if err != nil {
-		return
+		return err
 	}
 
-	kernelBytes, err := ioutil.ReadFile(kernelPath)
+	archAdd("config.yaml", cfgBytes)
-	if err != nil {
+
-		return
+	// add "current" elements
+	type distCopy struct {
+		Src []string
+		Dst string
 	}
 
-	err = archAdd("current/vmlinuz", kernelBytes)
+	// kernel and initrd
-	if err != nil {
+	copies := []distCopy{
-		return
+		{Src: []string{"kernels", ctx.Host.Kernel}, Dst: "current/vmlinuz"},
+		{Src: []string{"initrd", ctx.Host.Initrd}, Dst: "current/initrd"},
 	}
 
-	// initrd
+	// layers
-	initrd := new(bytes.Buffer)
+	for _, layer := range cfg.Layers {
-	err = buildInitrd(initrd, ctx)
+		layerVersion := ctx.Host.Versions[layer]
-	if err != nil {
+		if layerVersion == "" {
-		return
+			return fmt.Errorf("layer %q not mapped to a version", layer)
 		}
 
-	err = archAdd("current/initrd", initrd.Bytes())
+		copies = append(copies,
-	if err != nil {
+			distCopy{
-		return
+				Src: []string{"layers", layer, layerVersion},
+				Dst: filepath.Join("current", "layers", layer+".fs"),
+			})
+	}
+
+	for _, copy := range copies {
+		outPath, err := ctx.distFetch(copy.Src...)
+		if err != nil {
+			return err
+		}
+
+		f, err := os.Open(outPath)
+		if err != nil {
+			return err
+		}
+
+		defer f.Close()
+
+		stat, err := f.Stat()
+		if err != nil {
+			return err
+		}
+
+		if err = arch.WriteHeader(&tar.Header{
+			Name: copy.Dst,
+			Size: stat.Size(),
+		}); err != nil {
+			return err
+		}
+
+		_, err = io.Copy(arch, f)
+		if err != nil {
+			return err
+		}
 	}
 
-	// done
-	return nil
-}
-
-func buildBootEFITar(out io.Writer, ctx *renderContext) (err error) {
-	arch := tar.NewWriter(out)
-	defer arch.Close()
-
-	archAdd := func(path string, ba []byte) (err error) {
-		err = arch.WriteHeader(&tar.Header{Name: path, Mode: 0640, Size: int64(len(ba))})
-		if err != nil {
-			return
-		}
-		_, err = arch.Write(ba)
-		return
-	}
-
-	const (
-		prefix    = "EFI/dkl/"
-		efiPrefix = "\\EFI\\dkl\\"
-	)
-
-	// boot.csv
-	// -> annoyingly it's UTF-16...
-	bootCsvBytes := utf16.FromUTF8([]byte("" +
-		"current_kernel.efi,dkl current,initrd=" + efiPrefix + "current_initrd.img,Direktil current\n" +
-		"previous_kernel.efi,dkl previous,initrd=" + efiPrefix + "previous_initrd.img,Direktil previous\n"))
-
-	err = archAdd(prefix+"BOOT.CSV", []byte(bootCsvBytes))
-	if err != nil {
-		return
-	}
-
-	// kernel
-	kernelPath, err := ctx.distFetch("kernels", ctx.Host.Kernel)
-	if err != nil {
-		return
-	}
-
-	kernelBytes, err := ioutil.ReadFile(kernelPath)
-	if err != nil {
-		return
-	}
-
-	err = archAdd(prefix+"current_kernel.efi", kernelBytes)
-	if err != nil {
-		return
-	}
-
-	// initrd
-	initrd := new(bytes.Buffer)
-	err = buildInitrd(initrd, ctx)
-	if err != nil {
-		return
-	}
-
-	err = archAdd(prefix+"current_initrd.img", initrd.Bytes())
-	if err != nil {
-		return
-	}
-
-	// done
 	return nil
 }

cmd/dkl-local-server/bootv2.go

@@ -1,142 +0,0 @@
-package main
-
-import (
-	"archive/tar"
-	"encoding/json"
-	"fmt"
-	"io"
-	"log"
-	"net/http"
-	"os"
-
-	yaml "gopkg.in/yaml.v2"
-
-	"novit.tech/direktil/pkg/cpiocat"
-)
-
-func renderBootstrapConfig(w http.ResponseWriter, r *http.Request, ctx *renderContext, asJson bool) (err error) {
-	log.Printf("sending bootstrap config for %q", ctx.Host.Name)
-
-	_, cfg, err := ctx.BootstrapConfig()
-	if err != nil {
-		return err
-	}
-
-	if asJson {
-		err = json.NewEncoder(w).Encode(cfg)
-	} else {
-		err = yaml.NewEncoder(w).Encode(cfg)
-	}
-
-	return nil
-}
-
-func buildInitrd(out io.Writer, ctx *renderContext) (err error) {
-	_, cfg, err := ctx.Config()
-	if err != nil {
-		return
-	}
-
-	cat := cpiocat.New(out)
-
-	// initrd
-	initrdPath, err := ctx.distFetch("initrd", ctx.Host.Initrd)
-	if err != nil {
-		return
-	}
-	cat.AppendArchFile(initrdPath)
-
-	// embedded layers (modules)
-	for _, layer := range cfg.Layers {
-		switch layer {
-		case "modules":
-
-			layerVersion := ctx.Host.Versions[layer]
-			modulesPath, err := ctx.distFetch("layers", layer, layerVersion)
-			if err != nil {
-				return err
-			}
-
-			cat.AppendFile(modulesPath, "modules.sqfs")
-		}
-	}
-
-	// config
-	cfgBytes, _, err := ctx.BootstrapConfig()
-	if err != nil {
-		return
-	}
-	cat.AppendBytes(cfgBytes, "config.yaml", 0600)
-
-	// ssh keys
-	// FIXME we want a bootstrap-stage key instead of the real host key
-	for _, format := range []string{"rsa", "dsa", "ecdsa", "ed25519"} {
-		cat.AppendBytes(cfg.FileContent("/etc/ssh/ssh_host_"+format+"_key"), "id_"+format, 0600)
-	}
-
-	return cat.Close()
-}
-
-func buildBootstrap(out io.Writer, ctx *renderContext) (err error) {
-	arch := tar.NewWriter(out)
-	defer arch.Close()
-
-	// config
-	cfgBytes, cfg, err := ctx.Config()
-	if err != nil {
-		return err
-	}
-
-	err = arch.WriteHeader(&tar.Header{Name: "config.yaml", Size: int64(len(cfgBytes))})
-	if err != nil {
-		return
-	}
-
-	_, err = arch.Write(cfgBytes)
-	if err != nil {
-		return
-	}
-
-	// layers
-	for _, layer := range cfg.Layers {
-		if layer == "modules" {
-			continue // modules are with the kernel in boot v2
-		}
-
-		layerVersion := ctx.Host.Versions[layer]
-		if layerVersion == "" {
-			return fmt.Errorf("layer %q not mapped to a version", layer)
-		}
-
-		outPath, err := ctx.distFetch("layers", layer, layerVersion)
-		if err != nil {
-			return err
-		}
-
-		f, err := os.Open(outPath)
-		if err != nil {
-			return err
-		}
-
-		defer f.Close()
-
-		stat, err := f.Stat()
-		if err != nil {
-			return err
-		}
-
-		if err = arch.WriteHeader(&tar.Header{
-			Name: layer + ".fs",
-			Size: stat.Size(),
-		}); err != nil {
-			return err
-		}
-
-		_, err = io.Copy(arch, f)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}

cmd/dkl-local-server/cas-cleaner.go

@@ -12,15 +12,13 @@ var (
 )
 
 func casCleaner() {
-	for range time.Tick(*cacheCleanDelay) {
+	for {
-		if !wPublicState.Get().Store.Open {
-			continue
-		}
-
 		err := cleanCAS()
 		if err != nil {
 			log.Print("warn: couldn't clean cache: ", err)
 		}
+
+		time.Sleep(*cacheCleanDelay)
 	}
 }
 

cmd/dkl-local-server/cluster-render-context.go

@@ -1,88 +1,31 @@
 package main
 
 import (
-	"crypto/rand"
-	"encoding/base32"
 	"encoding/json"
 	"fmt"
 	"log"
 	"path"
-	"strconv"
-	"strings"
 
-	cfsslconfig "github.com/cloudflare/cfssl/config"
 	"github.com/cloudflare/cfssl/csr"
 	yaml "gopkg.in/yaml.v2"
-
+	"novit.nc/direktil/pkg/config"
-	"novit.tech/direktil/pkg/bootstrapconfig"
-	"novit.tech/direktil/pkg/config"
 )
 
-func templateFuncs(sslCfg *cfsslconfig.Config) map[string]any {
+var templateFuncs = map[string]interface{}{
-	getKeyCert := func(cluster, caName, name, profile, label, reqJson string) (kc KeyCert, err error) {
+	"password": func(cluster, name string) (password string, err error) {
-		certReq := &csr.CertificateRequest{
+		password = secretData.Password(cluster, name)
-			KeyRequest: csr.NewKeyRequest(),
+		if len(password) == 0 {
+			err = fmt.Errorf("password %q not defined for cluster %q", name, cluster)
 		}
-
-		err = json.Unmarshal([]byte(reqJson), certReq)
-		if err != nil {
-			log.Print("CSR unmarshal failed on: ", reqJson)
 		return
-		}
-
-		return getUsableKeyCert(cluster, caName, name, profile, label, certReq, sslCfg)
-	}
-
-	hash := func(plain, seed []byte, hashAlg string) (hashed string, err error) {
-		switch hashAlg {
-		case "sha512crypt":
-			return sha512crypt(plain, seed)
-
-		case "bootstrap":
-			return bootstrapconfig.JoinSeedAndHash(seed, bootstrapconfig.PasswordHashFromSeed(seed, plain)), nil
-
-		default:
-			return "", fmt.Errorf("unknown hash alg: %q", hashAlg)
-		}
-	}
-
-	return map[string]any{
-		"quote": strconv.Quote,
-
-		"password": func(cluster, name, hashAlg string) (password string, err error) {
-			key := cluster + "/" + name
-
-			seed, err := seeds.GetOrCreate(key, func() (seed []byte, err error) {
-				seed = make([]byte, 16)
-				_, err = rand.Read(seed)
-				return
-			})
-
-			if err != nil {
-				return "", fmt.Errorf("failed to get seed: %w", err)
-			}
-
-			password, err = clusterPasswords.GetOrCreate(key, func() (password string, err error) {
-				raw := make([]byte, 10)
-				_, err = rand.Read(raw)
-				if err != nil {
-					return "", fmt.Errorf("failed to generate password: %w", err)
-				}
-
-				password = strings.ToLower(base32.StdEncoding.WithPadding(base32.NoPadding).EncodeToString(raw))
-				return
-			})
-			if err != nil {
-				return
-			}
-
-			return hash([]byte(password), seed, hashAlg)
 	},
 
-		"token": getOrCreateClusterToken,
+	"token": func(cluster, name string) (s string, err error) {
+		return secretData.Token(cluster, name)
+	},
 
 	"ca_key": func(cluster, name string) (s string, err error) {
-			ca, err := getUsableClusterCA(cluster, name)
+		ca, err := secretData.CA(cluster, name)
 		if err != nil {
 			return
 		}
@@ -92,7 +35,7 @@ func templateFuncs(sslCfg *cfsslconfig.Config) map[string]any {
 	},
 
 	"ca_crt": func(cluster, name string) (s string, err error) {
-			ca, err := getUsableClusterCA(cluster, name)
+		ca, err := secretData.CA(cluster, name)
 		if err != nil {
 			return
 		}
@@ -102,7 +45,7 @@ func templateFuncs(sslCfg *cfsslconfig.Config) map[string]any {
 	},
 
 	"ca_dir": func(cluster, name string) (s string, err error) {
-			ca, err := getUsableClusterCA(cluster, name)
+		ca, err := secretData.CA(cluster, name)
 		if err != nil {
 			return
 		}
@@ -144,7 +87,7 @@ func templateFuncs(sslCfg *cfsslconfig.Config) map[string]any {
 	},
 
 	"tls_dir": func(dir, cluster, caName, name, profile, label, reqJson string) (s string, err error) {
-			ca, err := getUsableClusterCA(cluster, caName)
+		ca, err := secretData.CA(cluster, caName)
 		if err != nil {
 			return
 		}
@@ -172,7 +115,47 @@ func templateFuncs(sslCfg *cfsslconfig.Config) map[string]any {
 			},
 		})
 	},
+
+	"ssh_host_keys": func(dir, cluster, host string) (s string, err error) {
+		pairs, err := secretData.SSHKeyPairs(cluster, host)
+		if err != nil {
+			return
 		}
+
+		files := make([]config.FileDef, 0, len(pairs)*2)
+
+		for _, pair := range pairs {
+			basePath := path.Join(dir, "ssh_host_"+pair.Type+"_key")
+			files = append(files, []config.FileDef{
+				{
+					Path:    basePath,
+					Mode:    0600,
+					Content: pair.Private,
+				},
+				{
+					Path:    basePath + ".pub",
+					Mode:    0644,
+					Content: pair.Public,
+				},
+			}...)
+		}
+
+		return asYaml(files)
+	},
+}
+
+func getKeyCert(cluster, caName, name, profile, label, reqJson string) (kc *KeyCert, err error) {
+	certReq := &csr.CertificateRequest{
+		KeyRequest: csr.NewBasicKeyRequest(),
+	}
+
+	err = json.Unmarshal([]byte(reqJson), certReq)
+	if err != nil {
+		log.Print("CSR unmarshal failed on: ", reqJson)
+		return
+	}
+
+	return secretData.KeyCert(cluster, caName, name, profile, label, certReq)
 }
 
 func asYaml(v interface{}) (string, error) {

cmd/dkl-local-server/data.go

@@ -4,7 +4,7 @@ import (
 	"flag"
 	"path/filepath"
 
-	"novit.tech/direktil/pkg/localconfig"
+	"novit.nc/direktil/pkg/localconfig"
 )
 
 var (

cmd/dkl-local-server/host-download-tokens.go

@@ -1,3 +0,0 @@
-package main
-
-var hostDownloadTokens = KVSecrets[string]{"hosts/download-tokens"}

cmd/dkl-local-server/httperr.go

@@ -1,16 +0,0 @@
-package main
-
-import (
-	"net/http"
-
-	"m.cluseau.fr/go/httperr"
-)
-
-var (
-	ErrNotFound     = httperr.NotFound
-	ErrUnauthorized = httperr.StdStatus(http.StatusUnauthorized)
-	ErrForbidden    = httperr.StdStatus(http.StatusForbidden)
-	ErrInternal     = httperr.StdStatus(http.StatusInternalServerError)
-	ErrInvalidToken = httperr.NewStd(1000, http.StatusForbidden, "invalid token")
-	ErrStoreLocked  = httperr.NewStd(1001, http.StatusServiceUnavailable, "store is locked")
-)

cmd/dkl-local-server/initrd.go

@@ -2,9 +2,13 @@ package main
 
 import (
 	"encoding/json"
+	"fmt"
+	"io"
 	"log"
 	"net/http"
+	"os"
 
+	cpio "github.com/cavaliercoder/go-cpio"
 	yaml "gopkg.in/yaml.v2"
 )
 
@@ -24,3 +28,84 @@ func renderConfig(w http.ResponseWriter, r *http.Request, ctx *renderContext, as
 
 	return nil
 }
+
+func buildInitrd(out io.Writer, ctx *renderContext) error {
+	_, cfg, err := ctx.Config()
+
+	if err != nil {
+		return err
+	}
+
+	// send initrd basis
+	initrdPath, err := ctx.distFetch("initrd", ctx.Host.Initrd)
+	if err != nil {
+		return err
+	}
+
+	err = writeFile(out, initrdPath)
+	if err != nil {
+		return err
+	}
+
+	// and our extra archive
+	archive := cpio.NewWriter(out)
+
+	// - required dirs
+	for _, dir := range []string{
+		"boot",
+		"boot/current",
+		"boot/current/layers",
+	} {
+		archive.WriteHeader(&cpio.Header{
+			Name: dir,
+			Mode: 0600 | cpio.ModeDir,
+		})
+	}
+
+	// - the layers
+	for _, layer := range cfg.Layers {
+		layerVersion := ctx.Host.Versions[layer]
+		if layerVersion == "" {
+			return fmt.Errorf("layer %q not mapped to a version", layer)
+		}
+
+		path, err := ctx.distFetch("layers", layer, layerVersion)
+		if err != nil {
+			return err
+		}
+
+		stat, err := os.Stat(path)
+		if err != nil {
+			return err
+		}
+
+		archive.WriteHeader(&cpio.Header{
+			Name: "boot/current/layers/" + layer + ".fs",
+			Mode: 0600,
+			Size: stat.Size(),
+		})
+
+		if err = writeFile(archive, path); err != nil {
+			return err
+		}
+	}
+
+	// - the configuration
+	ba, err := yaml.Marshal(cfg)
+	if err != nil {
+		return err
+	}
+
+	archive.WriteHeader(&cpio.Header{
+		Name: "boot/config.yaml",
+		Mode: 0600,
+		Size: int64(len(ba)),
+	})
+
+	archive.Write(ba)
+
+	// finalize the archive
+	archive.Flush()
+	archive.Close()
+	return nil
+}

cmd/dkl-local-server/kernel.go

@@ -1,10 +1,8 @@
 package main
 
 import (
-	"io"
 	"log"
 	"net/http"
-	"os"
 )
 
 func renderKernel(w http.ResponseWriter, r *http.Request, ctx *renderContext) error {
@@ -17,19 +15,3 @@ func renderKernel(w http.ResponseWriter, r *http.Request, ctx *renderContext) er
 	http.ServeFile(w, r, path)
 	return nil
 }
-
-func fetchKernel(out io.Writer, ctx *renderContext) (err error) {
-	path, err := ctx.distFetch("kernels", ctx.Host.Kernel)
-	if err != nil {
-		return err
-	}
-
-	in, err := os.Open(path)
-	if err != nil {
-		return
-	}
-	defer in.Close()
-
-	_, err = io.Copy(out, in)
-	return
-}

cmd/dkl-local-server/main.go

@@ -4,33 +4,25 @@ import (
 	"flag"
 	"log"
 	"net/http"
-	"os"
 	"path/filepath"
 
 	restful "github.com/emicklei/go-restful"
 	swaggerui "github.com/mcluseau/go-swagger-ui"
-	"m.cluseau.fr/go/watchable/streamsse"
+	"novit.nc/direktil/pkg/cas"
 
-	"novit.tech/direktil/pkg/cas"
+	"novit.nc/direktil/local-server/pkg/apiutils"
-
-	dlshtml "novit.tech/direktil/local-server/html"
-	"novit.tech/direktil/local-server/pkg/apiutils"
 )
 
 const (
 	etcDir = "/etc/direktil"
 )
 
-var Version = "dev"
-
 var (
 	address    = flag.String("address", ":7606", "HTTP listen address")
 	tlsAddress = flag.String("tls-address", "", "HTTPS listen address")
 	certFile   = flag.String("tls-cert", etcDir+"/server.crt", "Server TLS certificate")
 	keyFile    = flag.String("tls-key", etcDir+"/server.key", "Server TLS key")
 
-	autoUnlock = flag.String("auto-unlock", "", "Auto-unlock store (testing only!) env: DLS_AUTO_UNLOCK")
-
 	casStore cas.Store
 )
 
@@ -43,31 +35,6 @@ func main() {
 		log.Fatal("no listen address given")
 	}
 
-	log.Print("Direktil local-server version ", Version)
-	wPublicState.Change(func(s *PublicState) { s.ServerVersion = Version })
-
-	computeUIHash()
-
-	openSecretStore()
-
-	{
-		autoUnlock := *autoUnlock
-		if autoUnlock == "" {
-			autoUnlock = os.Getenv("DLS_AUTO_UNLOCK")
-		}
-		if autoUnlock != "" {
-			log.Printf("auto-unlocking the store")
-			err := unlockSecretStore("test", []byte(autoUnlock))
-			if err.Any() {
-				log.Fatal(err)
-			}
-
-			log.Print("store auto-unlocked")
-		}
-
-		os.Setenv("DLS_AUTO_UNLOCK", "")
-	}
-
 	casStore = cas.NewDir(filepath.Join(*dataDir, "cache"))
 	go casCleaner()
 
@@ -77,13 +44,6 @@ func main() {
 
 	swaggerui.HandleAt("/swagger-ui/")
 
-	staticHandler := http.FileServer(http.FS(dlshtml.FS))
-	http.Handle("/favicon.ico", staticHandler)
-	http.Handle("/ui/", staticHandler)
-
-	http.Handle("/public-state", streamsse.StreamHandler(wPublicState))
-	http.Handle("/state", requireAdmin(streamsse.StreamHandler(wState)))
-
 	if *address != "" {
 		log.Print("HTTP listening on ", *address)
 		go log.Fatal(http.ListenAndServe(*address, nil))

cmd/dkl-local-server/render-context.go

@@ -2,15 +2,12 @@ package main
 
 import (
 	"bytes"
-	"crypto/sha1"
 	"crypto/sha256"
 	"encoding/hex"
-	"fmt"
 	"io"
 	"log"
 	"net/http"
 	"net/url"
-	"path"
 	"path/filepath"
 	"text/template"
 
@@ -18,17 +15,15 @@ import (
 	restful "github.com/emicklei/go-restful"
 	yaml "gopkg.in/yaml.v2"
 
-	"novit.tech/direktil/pkg/config"
+	"novit.nc/direktil/pkg/config"
-	"novit.tech/direktil/pkg/localconfig"
+	"novit.nc/direktil/pkg/localconfig"
-
-	bsconfig "novit.tech/direktil/pkg/bootstrapconfig"
 )
 
 var cmdlineParam = restful.QueryParameter("cmdline", "Linux kernel cmdline addition")
 
 type renderContext struct {
 	Host      *localconfig.Host
-	SSLConfig *cfsslconfig.Config
+	SSLConfig string
 
 	// Linux kernel extra cmdline
 	CmdLine string `yaml:"-"`
@@ -64,7 +59,12 @@ func renderCtx(w http.ResponseWriter, r *http.Request, ctx *renderContext, what
 	return nil
 }
 
-func sslConfigFromLocalConfig(cfg *localconfig.Config) (sslCfg *cfsslconfig.Config, err error) {
+var prevSSLConfig = "-"
+
+func newRenderContext(host *localconfig.Host, cfg *localconfig.Config) (ctx *renderContext, err error) {
+	if prevSSLConfig != cfg.SSLConfig {
+		var sslCfg *cfsslconfig.Config
+
 		if len(cfg.SSLConfig) == 0 {
 			sslCfg = &cfsslconfig.Config{}
 		} else {
@@ -73,53 +73,25 @@ func sslConfigFromLocalConfig(cfg *localconfig.Config) (sslCfg *cfsslconfig.Conf
 				return
 			}
 		}
-	return
-}
 
-func newRenderContext(host *localconfig.Host, cfg *localconfig.Config) (ctx *renderContext, err error) {
+		err = loadSecretData(sslCfg)
-	sslCfg, err := sslConfigFromLocalConfig(cfg)
 		if err != nil {
 			return
 		}
 
+		prevSSLConfig = cfg.SSLConfig
+	}
+
 	return &renderContext{
+		SSLConfig: cfg.SSLConfig,
 		Host:      host,
-		SSLConfig: sslCfg,
 	}, nil
 }
 
 func (ctx *renderContext) Config() (ba []byte, cfg *config.Config, err error) {
-	ba, err = ctx.render(ctx.Host.Config)
-	if err != nil {
-		return
-	}
-
-	cfg = &config.Config{}
-	if err = yaml.Unmarshal(ba, cfg); err != nil {
-		return
-	}
-
-	return
-}
-
-func (ctx *renderContext) BootstrapConfig() (ba []byte, cfg *bsconfig.Config, err error) {
-	ba, err = ctx.render(ctx.Host.BootstrapConfig)
-	if err != nil {
-		return
-	}
-
-	cfg = &bsconfig.Config{}
-	if err = yaml.Unmarshal(ba, cfg); err != nil {
-		return
-	}
-
-	return
-}
-
-func (ctx *renderContext) render(templateText string) (ba []byte, err error) {
 	tmpl, err := template.New(ctx.Host.Name + "/config").
-		Funcs(ctx.TemplateFuncs()).
+		Funcs(templateFuncs).
-		Parse(templateText)
+		Parse(ctx.Host.Config)
 
 	if err != nil {
 		return
@@ -130,7 +102,21 @@ func (ctx *renderContext) render(templateText string) (ba []byte, err error) {
 		return
 	}
 
+	if secretData.Changed() {
+		err = secretData.Save()
+		if err != nil {
+			return
+		}
+	}
+
 	ba = buf.Bytes()
+
+	cfg = &config.Config{}
+
+	if err = yaml.Unmarshal(buf.Bytes(), cfg); err != nil {
+		return
+	}
+
 	return
 }
 
@@ -171,80 +157,3 @@ func asMap(v interface{}) map[string]interface{} {
 
 	return result
 }
-
-func (ctx *renderContext) TemplateFuncs() map[string]any {
-	funcs := templateFuncs(ctx.SSLConfig)
-
-	for name, method := range map[string]any{
-		"host_ip": func() (s string) {
-			return ctx.Host.IPs[0]
-		},
-		"host_name": func() (s string) {
-			return ctx.Host.Name
-		},
-		"machine_id": func() (s string) {
-			ba := sha1.Sum([]byte(ctx.Host.ClusterName + "/" + ctx.Host.Name))
-			return hex.EncodeToString(ba[:])
-		},
-
-		"ssh_host_keys": func(dir, cluster, host string) (s string, err error) {
-			if host == "" {
-				host = ctx.Host.Name
-			}
-			if host != ctx.Host.Name {
-				err = fmt.Errorf("wrong host name")
-				return
-			}
-
-			pairs, err := getSSHKeyPairs(host)
-			if err != nil {
-				return
-			}
-
-			files := make([]config.FileDef, 0, len(pairs)*2)
-
-			for _, pair := range pairs {
-				basePath := path.Join(dir, "ssh_host_"+pair.Type+"_key")
-				files = append(files, []config.FileDef{
-					{
-						Path:    basePath,
-						Mode:    0600,
-						Content: pair.Private,
-					},
-					{
-						Path:    basePath + ".pub",
-						Mode:    0644,
-						Content: pair.Public,
-					},
-				}...)
-			}
-
-			return asYaml(files)
-		},
-		"host_download_token": func() (token string, err error) {
-			key := ctx.Host.Name
-			token, found, err := hostDownloadTokens.Get(key)
-			if err != nil {
-				return
-			}
-
-			if !found {
-				token, err = newToken(32)
-				if err != nil {
-					return
-				}
-
-				err = hostDownloadTokens.Put(key, token)
-				if err != nil {
-					return
-				}
-			}
-
-			return
-		},
-	} {
-		funcs[name] = method
-	}
-
-	return funcs
-}

cmd/dkl-local-server/secret-store.go

@@ -1,397 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"log"
-	"net/http"
-	"os"
-	"path/filepath"
-	"sort"
-	"strings"
-	"sync"
-
-	restful "github.com/emicklei/go-restful"
-	"m.cluseau.fr/go/httperr"
-
-	"novit.tech/direktil/local-server/secretstore"
-)
-
-var secStore *secretstore.Store
-
-func secStoreRoot() string            { return filepath.Join(*dataDir, "secrets") }
-func secStorePath(name string) string { return filepath.Join(secStoreRoot(), name) }
-func secKeysStorePath() string        { return secStorePath(".keys") }
-
-func openSecretStore() {
-	var err error
-
-	keysPath := secKeysStorePath()
-
-	if err := os.MkdirAll(filepath.Dir(filepath.Dir(keysPath)), 0755); err != nil {
-		log.Fatal("failed to create dirs: ", err)
-	}
-
-	if err := os.MkdirAll(filepath.Dir(keysPath), 0700); err != nil {
-		log.Fatal("failed to secret store dir: ", err)
-	}
-
-	secStore, err = secretstore.Open(keysPath)
-
-	switch {
-	case err == nil:
-		wPublicState.Change(func(v *PublicState) {
-			v.Store.New = false
-			v.Store.Open = false
-		})
-
-	case os.IsNotExist(err):
-		secStore = secretstore.New()
-		wPublicState.Change(func(v *PublicState) {
-			v.Store.New = true
-			v.Store.Open = false
-		})
-
-	default:
-		log.Fatal("failed to open keys store: ", err)
-	}
-}
-
-var (
-	unlockMutex = sync.Mutex{}
-
-	ErrStoreAlreadyUnlocked = httperr.NewStd(1, http.StatusConflict, "store already unlocked")
-	ErrInvalidPassphrase    = httperr.NewStd(2, http.StatusBadRequest, "invalid passphrase")
-)
-
-func unlockSecretStore(name string, passphrase []byte) (err httperr.Error) {
-	unlockMutex.Lock()
-	defer unlockMutex.Unlock()
-
-	if secStore.Unlocked() {
-		return ErrStoreAlreadyUnlocked
-	}
-
-	if secStore.IsNew() {
-		err := secStore.Init(name, passphrase)
-		if err != nil {
-			return httperr.Internal(err)
-		}
-
-		err = secStore.SaveTo(secKeysStorePath())
-		if err != nil {
-			log.Print("secret store save error: ", err)
-			secStore.Close()
-
-			return httperr.Internal(err)
-		}
-
-	} else {
-		if !secStore.Unlock([]byte(passphrase)) {
-			return ErrInvalidPassphrase
-		}
-	}
-
-	token := ""
-	if err := readSecret("admin-token", &token); err != nil {
-		if !os.IsNotExist(err) {
-			log.Print("failed to read admin token: ", err)
-			secStore.Close()
-
-			return httperr.Internal(err)
-		}
-
-		token, err = newToken(32)
-		if err != nil {
-			secStore.Close()
-			return httperr.Internal(err)
-		}
-
-		err = writeSecret("admin-token", token)
-		if err != nil {
-			log.Print("write error: ", err)
-			secStore.Close()
-
-			return httperr.Internal(err)
-		}
-
-		log.Print("wrote new admin token")
-	}
-
-	adminToken = token
-
-	{
-		token, err := newToken(16)
-		if err != nil {
-			secStore.Close()
-			return httperr.Internal(err)
-		}
-
-		wState.Change(func(v *State) {
-			v.Store.DownloadToken = token
-		})
-	}
-
-	wPublicState.Change(func(v *PublicState) {
-		v.Store.New = false
-		v.Store.Open = true
-	})
-
-	go updateState()
-	go migrateSecrets()
-
-	return
-}
-
-func readSecret(name string, value any) (err error) {
-	f, err := os.Open(secStorePath(name + ".data"))
-	if err != nil {
-		return
-	}
-
-	defer f.Close()
-
-	in, err := secStore.NewReader(f)
-	if err != nil {
-		return
-	}
-
-	return json.NewDecoder(in).Decode(value)
-}
-
-func writeSecret(name string, value any) (err error) {
-	path := secStorePath(name + ".data.new")
-
-	if err = os.MkdirAll(filepath.Dir(path), 0700); err != nil {
-		return
-	}
-
-	f, err := os.Create(path)
-	if err != nil {
-		return
-	}
-
-	err = func() (err error) {
-		defer f.Close()
-
-		out, err := secStore.NewWriter(f)
-		if err != nil {
-			return
-		}
-
-		return json.NewEncoder(out).Encode(value)
-	}()
-
-	if err != nil {
-		return
-	}
-
-	err = os.Rename(f.Name(), secStorePath(name+".data"))
-	if err != nil {
-		return
-	}
-
-	go updateState()
-	return
-}
-
-var secL sync.Mutex
-
-func updateSecret[T any](name string, update func(*T)) (err error) {
-	secL.Lock()
-	defer secL.Unlock()
-
-	v := new(T)
-	err = readSecret(name, v)
-	if err != nil {
-		if !os.IsNotExist(err) {
-			return
-		}
-		err = nil
-	}
-
-	update(v)
-
-	return writeSecret(name, *v)
-}
-
-func updateSecretWithKey[T any](name, key string, update func(v *T)) (err error) {
-	secL.Lock()
-	defer secL.Unlock()
-
-	kvs := map[string]*T{}
-
-	err = readSecret(name, &kvs)
-	if err != nil {
-		if !os.IsNotExist(err) {
-			return
-		}
-		err = nil
-	}
-
-	update(kvs[key])
-
-	return writeSecret(name, kvs)
-}
-
-type KVSecrets[T any] struct{ Name string }
-
-func (s KVSecrets[T]) Data() (kvs map[string]T, err error) {
-	kvs = make(map[string]T)
-	err = readSecret(s.Name, &kvs)
-	if err != nil {
-		if !os.IsNotExist(err) {
-			return
-		}
-		err = nil
-	}
-	return
-}
-
-type KV[T any] struct {
-	K string
-	V T
-}
-
-func (s KVSecrets[T]) List(prefix string) (list []KV[T], err error) {
-	data, err := s.Data()
-	if err != nil {
-		return
-	}
-
-	list = make([]KV[T], 0, len(data))
-
-	for k, v := range data {
-		if !strings.HasPrefix(k, prefix) {
-			continue
-		}
-		list = append(list, KV[T]{k, v})
-	}
-
-	sort.Slice(list, func(i, j int) bool { return list[i].K < list[j].K })
-
-	return
-}
-
-func (s KVSecrets[T]) Keys(prefix string) (keys []string, err error) {
-	kvs, err := s.Data()
-	if err != nil {
-		return
-	}
-
-	keys = make([]string, 0, len(kvs))
-
-	for k := range kvs {
-		if !strings.HasPrefix(k, prefix) {
-			continue
-		}
-		keys = append(keys, k[len(prefix):])
-	}
-
-	sort.Strings(keys)
-
-	return
-}
-
-func (s KVSecrets[T]) Get(key string) (v T, found bool, err error) {
-	kvs, err := s.Data()
-	if err != nil {
-		return
-	}
-
-	v, found = kvs[key]
-	return
-}
-
-func (s KVSecrets[T]) Put(key string, v T) (err error) {
-	secL.Lock()
-	defer secL.Unlock()
-
-	kvs, err := s.Data()
-	if err != nil {
-		return
-	}
-
-	kvs[key] = v
-	err = writeSecret(s.Name, kvs)
-	return
-}
-
-func (s KVSecrets[T]) Del(key string) (err error) {
-	secL.Lock()
-	defer secL.Unlock()
-
-	kvs, err := s.Data()
-	if err != nil {
-		return
-	}
-
-	delete(kvs, key)
-	err = writeSecret(s.Name, kvs)
-	return
-}
-
-func (s KVSecrets[T]) GetOrCreate(key string, create func() (T, error)) (v T, err error) {
-	v, found, err := s.Get(key)
-	if err != nil {
-		return
-	}
-
-	if !found {
-		v, err = create()
-		if err != nil {
-			return
-		}
-
-		err = s.Put(key, v)
-	}
-
-	return
-}
-
-func (s KVSecrets[T]) WsList(resp *restful.Response, prefix string) {
-	keys, err := s.Keys(prefix)
-	if err != nil {
-		wsError(resp, err)
-		return
-	}
-
-	resp.WriteEntity(keys)
-}
-
-func (s KVSecrets[T]) WsGet(resp *restful.Response, key string) {
-	keys, found, err := s.Get(key)
-	if err != nil {
-		wsError(resp, err)
-		return
-	}
-
-	if !found {
-		wsNotFound(resp)
-		return
-	}
-
-	resp.WriteEntity(keys)
-}
-
-func (s KVSecrets[T]) WsPut(req *restful.Request, resp *restful.Response, key string) {
-	v := new(T)
-	err := req.ReadEntity(v)
-	if err != nil {
-		wsBadRequest(resp, err.Error())
-		return
-	}
-
-	err = s.Put(key, *v)
-	if err != nil {
-		wsError(resp, err)
-		return
-	}
-}
-
-func (s KVSecrets[T]) WsDel(req *restful.Request, resp *restful.Response, key string) {
-	err := s.Del(key)
-	if err != nil {
-		wsError(resp, err)
-		return
-	}
-}

cmd/dkl-local-server/secrets-migrate.go

@@ -1,88 +0,0 @@
-package main
-
-import (
-	"log"
-	"os"
-
-	cfsslconfig "github.com/cloudflare/cfssl/config"
-)
-
-func migrateSecrets() {
-	if _, err := os.Stat(secretDataPath()); err != nil {
-		if os.IsNotExist(err) {
-			return
-		}
-
-		log.Print("not migrating old secrets: ", err)
-
-		return
-	}
-
-	log.Print("migrating old secrets")
-
-	log := log.New(log.Default().Writer(), "secrets migration: ", log.Flags()|log.Lmsgprefix)
-
-	// load secrets
-	cfg, err := readConfig()
-	if err != nil {
-		log.Fatal(err)
-		return
-	}
-
-	var sslCfg *cfsslconfig.Config
-
-	if len(cfg.SSLConfig) == 0 {
-		sslCfg = &cfsslconfig.Config{}
-	} else {
-		sslCfg, err = cfsslconfig.LoadConfig([]byte(cfg.SSLConfig))
-		if err != nil {
-			return
-		}
-	}
-
-	secretData, err := loadSecretData(sslCfg)
-	if err != nil {
-		log.Fatal(err)
-		return
-	}
-
-	for clusterName, cluster := range secretData.clusters {
-		for k, v := range cluster.Tokens {
-			err = clusterTokens.Put(clusterName+"/"+k, v)
-			if err != nil {
-				log.Fatal(err)
-				return
-			}
-		}
-
-		for k, v := range cluster.Passwords {
-			err = clusterPasswords.Put(clusterName+"/"+k, v)
-			if err != nil {
-				log.Fatal(err)
-				return
-			}
-		}
-
-		for caName, ca := range cluster.CAs {
-			clusterCAs.Put(clusterName+"/"+caName, CA{Key: ca.Key, Cert: ca.Cert})
-
-			for signedName, signed := range ca.Signed {
-				err = clusterCASignedKeys.Put(clusterName+"/"+caName+"/"+signedName, *signed)
-				if err != nil {
-					log.Fatal(err)
-				}
-			}
-		}
-
-		for hostName, pairs := range cluster.SSHKeyPairs {
-			err = sshHostKeys.Put(hostName, pairs)
-			if err != nil {
-				log.Fatal(err)
-			}
-		}
-	}
-
-	if err := os.Rename(secretDataPath(), secretDataPath()+".migrated"); err != nil {
-		log.Fatal("failed to rename migrated secrets: ", err)
-	}
-}

cmd/dkl-local-server/secrets.go

@@ -1,20 +1,46 @@
 package main
 
 import (
+	"crypto"
+	"crypto/rand"
+	"crypto/x509"
+	"encoding/base32"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"io/ioutil"
+	"net"
 	"os"
 	"path/filepath"
+	"sort"
+	"sync"
 	"time"
 
+	"github.com/cespare/xxhash"
 	"github.com/cloudflare/cfssl/certinfo"
 	"github.com/cloudflare/cfssl/config"
+	"github.com/cloudflare/cfssl/csr"
+	"github.com/cloudflare/cfssl/helpers"
+	"github.com/cloudflare/cfssl/initca"
 	"github.com/cloudflare/cfssl/log"
+	"github.com/cloudflare/cfssl/signer"
+	"github.com/cloudflare/cfssl/signer/local"
+	"k8s.io/apimachinery/pkg/util/validation"
+	"k8s.io/apimachinery/pkg/util/validation/field"
+)
+
+var (
+	secretData *SecretData
+	DontSave   = false
 )
 
 type SecretData struct {
+	l sync.Mutex
+
+	prevHash uint64
+
 	clusters map[string]*ClusterSecrets
+	changed  bool
 	config   *config.Config
 }
 
@@ -25,6 +51,13 @@ type ClusterSecrets struct {
 	SSHKeyPairs map[string][]SSHKeyPair
 }
 
+type CA struct {
+	Key  []byte
+	Cert []byte
+
+	Signed map[string]*KeyCert
+}
+
 type KeyCert struct {
 	Key     []byte
 	Cert    []byte
@@ -35,18 +68,21 @@ func secretDataPath() string {
 	return filepath.Join(*dataDir, "secret-data.json")
 }
 
-func loadSecretData(config *config.Config) (sd *SecretData, err error) {
+func loadSecretData(config *config.Config) (err error) {
 	log.Info("Loading secret data")
 
-	sd = &SecretData{
+	sd := &SecretData{
 		clusters: make(map[string]*ClusterSecrets),
+		changed:  false,
 		config:   config,
 	}
 
 	ba, err := ioutil.ReadFile(secretDataPath())
 	if err != nil {
 		if os.IsNotExist(err) {
+			sd.changed = true
 			err = nil
+			secretData = sd
 			return
 		}
 		return
@@ -56,6 +92,209 @@ func loadSecretData(config *config.Config) (sd *SecretData, err error) {
 		return
 	}
 
+	sd.prevHash = xxhash.Sum64(ba)
+
+	secretData = sd
+	return
+}
+
+func (sd *SecretData) Changed() bool {
+	return sd.changed
+}
+
+func (sd *SecretData) Save() (err error) {
+	if DontSave {
+		return
+	}
+
+	sd.l.Lock()
+	defer sd.l.Unlock()
+
+	ba, err := json.Marshal(sd.clusters)
+	if err != nil {
+		return
+	}
+
+	h := xxhash.Sum64(ba)
+	if h == sd.prevHash {
+		return
+	}
+
+	log.Info("Saving secret data")
+	err = ioutil.WriteFile(secretDataPath(), ba, 0600)
+
+	if err == nil {
+		sd.prevHash = h
+	}
+
+	return
+}
+
+func newClusterSecrets() *ClusterSecrets {
+	return &ClusterSecrets{
+		CAs:       make(map[string]*CA),
+		Tokens:    make(map[string]string),
+		Passwords: make(map[string]string),
+	}
+}
+
+func (sd *SecretData) cluster(name string) (cs *ClusterSecrets) {
+	cs, ok := sd.clusters[name]
+	if ok {
+		return
+	}
+
+	sd.l.Lock()
+	defer sd.l.Unlock()
+
+	log.Info("secret-data: new cluster: ", name)
+
+	cs = newClusterSecrets()
+	sd.clusters[name] = cs
+	sd.changed = true
+	return
+}
+
+func (sd *SecretData) Passwords(cluster string) (passwords []string) {
+	cs := sd.cluster(cluster)
+
+	passwords = make([]string, 0, len(cs.Passwords))
+	for name := range cs.Passwords {
+		passwords = append(passwords, name)
+	}
+
+	sort.Strings(passwords)
+
+	return
+}
+
+func (sd *SecretData) Password(cluster, name string) (password string) {
+	cs := sd.cluster(cluster)
+
+	if cs.Passwords == nil {
+		cs.Passwords = make(map[string]string)
+	}
+
+	password = cs.Passwords[name]
+	return
+}
+
+func (sd *SecretData) SetPassword(cluster, name, password string) {
+	cs := sd.cluster(cluster)
+
+	if cs.Passwords == nil {
+		cs.Passwords = make(map[string]string)
+	}
+
+	cs.Passwords[name] = password
+	sd.changed = true
+}
+
+func (sd *SecretData) Token(cluster, name string) (token string, err error) {
+	cs := sd.cluster(cluster)
+
+	token = cs.Tokens[name]
+	if token != "" {
+		return
+	}
+
+	sd.l.Lock()
+	defer sd.l.Unlock()
+
+	log.Info("secret-data: new token in cluster ", cluster, ": ", name)
+
+	b := make([]byte, 16)
+	_, err = rand.Read(b)
+	if err != nil {
+		return
+	}
+
+	token = base32.StdEncoding.WithPadding(base32.NoPadding).EncodeToString(b)
+
+	cs.Tokens[name] = token
+	sd.changed = true
+	return
+}
+
+func (sd *SecretData) RenewCACert(cluster, name string) (err error) {
+	cs := sd.cluster(cluster)
+
+	ca := cs.CAs[name]
+
+	var cert *x509.Certificate
+	cert, err = helpers.ParseCertificatePEM(ca.Cert)
+	if err != nil {
+		return
+	}
+
+	var signer crypto.Signer
+	signer, err = helpers.ParsePrivateKeyPEM(ca.Key)
+	if err != nil {
+		return
+	}
+
+	newCert, err := initca.RenewFromSigner(cert, signer)
+	if err != nil {
+		return
+	}
+
+	sd.l.Lock()
+	defer sd.l.Unlock()
+
+	cs.CAs[name].Cert = newCert
+	sd.changed = true
+
+	return
+}
+
+func (sd *SecretData) CA(cluster, name string) (ca *CA, err error) {
+	cs := sd.cluster(cluster)
+
+	ca, ok := cs.CAs[name]
+	if ok {
+		checkErr := checkCertUsable(ca.Cert)
+		if checkErr != nil {
+			log.Infof("secret-data cluster %s: CA %s: regenerating certificate: %v", cluster, name, checkErr)
+
+			err = sd.RenewCACert(cluster, name)
+		}
+
+		return
+	}
+
+	sd.l.Lock()
+	defer sd.l.Unlock()
+
+	log.Info("secret-data: new CA in cluster ", cluster, ": ", name)
+
+	req := &csr.CertificateRequest{
+		CN: "Direktil Local Server",
+		KeyRequest: &csr.BasicKeyRequest{
+			A: "ecdsa",
+			S: 521, // 256, 384, 521
+		},
+		Names: []csr.Name{
+			{
+				C: "NC",
+				O: "novit.nc",
+			},
+		},
+	}
+
+	cert, _, key, err := initca.New(req)
+	if err != nil {
+		return
+	}
+
+	ca = &CA{
+		Key:    key,
+		Cert:   cert,
+		Signed: make(map[string]*KeyCert),
+	}
+
+	cs.CAs[name] = ca
+	sd.changed = true
+
 	return
 }
 
@@ -74,3 +313,104 @@ func checkCertUsable(certPEM []byte) error {
 
 	return nil
 }
+
+func (sd *SecretData) KeyCert(cluster, caName, name, profile, label string, req *csr.CertificateRequest) (kc *KeyCert, err error) {
+	for idx, host := range req.Hosts {
+		if ip := net.ParseIP(host); ip != nil {
+			// valid IP (v4 or v6)
+			continue
+		}
+
+		if host == "*" {
+			continue
+		}
+
+		if errs := validation.IsDNS1123Subdomain(host); len(errs) == 0 {
+			continue
+		}
+		if errs := validation.IsWildcardDNS1123Subdomain(host); len(errs) == 0 {
+			continue
+		}
+
+		path := field.NewPath(cluster, name, "hosts").Index(idx)
+		return nil, fmt.Errorf("%v: %q is not an IP or FQDN", path, host)
+	}
+
+	if req.CA != nil {
+		err = errors.New("no CA section allowed here")
+		return
+	}
+
+	ca, err := sd.CA(cluster, caName)
+	if err != nil {
+		return
+	}
+
+	logPrefix := fmt.Sprintf("secret-data: cluster %s: CA %s:", cluster, caName)
+
+	rh := hash(req)
+	kc, ok := ca.Signed[name]
+	if ok && rh == kc.ReqHash {
+		err = checkCertUsable(kc.Cert)
+		if err == nil {
+			return
+		}
+		log.Infof("%s regenerating certificate: ", err)
+
+	} else if ok {
+		log.Infof("%s CSR changed for %s: hash=%q previous=%q", name, rh, kc.ReqHash)
+	} else {
+		log.Infof("%s new CSR for %s", logPrefix, name)
+	}
+
+	sd.l.Lock()
+	defer sd.l.Unlock()
+
+	sgr, err := ca.Signer(sd.config.Signing)
+	if err != nil {
+		return
+	}
+
+	generator := &csr.Generator{Validator: func(_ *csr.CertificateRequest) error { return nil }}
+
+	csr, key, err := generator.ProcessRequest(req)
+	if err != nil {
+		return
+	}
+
+	signReq := signer.SignRequest{
+		Request: string(csr),
+		Profile: profile,
+		Label:   label,
+	}
+
+	cert, err := sgr.Sign(signReq)
+	if err != nil {
+		return
+	}
+
+	kc = &KeyCert{
+		Key:     key,
+		Cert:    cert,
+		ReqHash: rh,
+	}
+
+	ca.Signed[name] = kc
+	sd.changed = true
+
+	return
+}
+
+func (ca *CA) Signer(policy *config.Signing) (result *local.Signer, err error) {
+	caCert, err := helpers.ParseCertificatePEM(ca.Cert)
+	if err != nil {
+		return
+	}
+
+	caKey, err := helpers.ParsePrivateKeyPEM(ca.Key)
+	if err != nil {
+		return
+	}
+
+	return local.NewSigner(caKey, caCert, signer.DefaultSigAlgo(caKey), policy)
+}

cmd/dkl-local-server/sha512crypt.go

@@ -1,39 +0,0 @@
-package main
-
-import (
-	"encoding/base64"
-
-	crypthash "github.com/sergeymakinen/go-crypt/hash"
-	"github.com/sergeymakinen/go-crypt/sha512"
-)
-
-// for some reason, no implementation of crypt's sha512 is clean enough :(
-
-func sha512crypt(password, seed []byte) (string, error) {
-	// loose salt entropy because of character restriction in the salt
-	salt := []byte(base64.RawStdEncoding.EncodeToString(seed))[:sha512.MaxSaltLength]
-	// - base64 allows '+' where the salt accepts '.'
-	for i, c := range salt {
-		if c == '+' {
-			salt[i] = '.'
-		}
-	}
-
-	scheme := struct {
-		HashPrefix string
-		Rounds     uint32 `hash:"param:rounds,omitempty"`
-		Salt       []byte
-		Sum        [86]byte
-	}{
-		HashPrefix: sha512.Prefix,
-		Rounds:     sha512.DefaultRounds,
-		Salt:       salt,
-	}
-
-	key, err := sha512.Key([]byte(password), scheme.Salt, scheme.Rounds)
-	if err != nil {
-		return "", err
-	}
-	crypthash.LittleEndianEncoding.Encode(scheme.Sum[:], key)
-	return crypthash.Marshal(scheme)
-}

cmd/dkl-local-server/ssh-secrets.go

@@ -15,16 +15,34 @@ import (
 	"os/exec"
 )
 
-var sshHostKeys = KVSecrets[[]SSHKeyPair]{"hosts/ssh-host-keys"}
-
 type SSHKeyPair struct {
 	Type    string
 	Public  string
 	Private string
 }
 
-func getSSHKeyPairs(host string) (pairs []SSHKeyPair, err error) {
+func (sd *SecretData) SSHKeyPairs(cluster, host string) (pairs []SSHKeyPair, err error) {
-	pairs, _, err = sshHostKeys.Get(host)
+	cs := sd.cluster(cluster)
+
+	if cs.SSHKeyPairs == nil {
+		cs.SSHKeyPairs = map[string][]SSHKeyPair{}
+	}
+
+	outFile, err := ioutil.TempFile("/tmp", "dls-key.")
+	if err != nil {
+		return
+	}
+
+	outPath := outFile.Name()
+
+	removeTemp := func() {
+		os.Remove(outPath)
+		os.Remove(outPath + ".pub")
+	}
+
+	defer removeTemp()
+
+	pairs = cs.SSHKeyPairs[host]
 
 	didGenerate := false
 
@@ -41,30 +59,17 @@ genLoop:
 			}
 		}
 
-		err = func() (err error) {
+		didGenerate = true
-			outFile, err := ioutil.TempFile("/tmp", "dls-key.")
-			if err != nil {
-				return
-			}
-
-			outPath := outFile.Name()
-
-			removeTemp := func() {
-				os.Remove(outPath)
-				os.Remove(outPath + ".pub")
-			}
 
 		removeTemp()
-			defer removeTemp()
 
 		var out, privKey, pubKey []byte
 
-			cmd := exec.Command("ssh-keygen",
+		out, err = exec.Command("ssh-keygen",
 			"-N", "",
 			"-C", "root@"+host,
 			"-f", outPath,
-				"-t", keyType)
+			"-t", keyType).CombinedOutput()
-			out, err = cmd.CombinedOutput()
 		if err != nil {
 			err = fmt.Errorf("ssh-keygen failed: %v: %s", err, string(out))
 			return
@@ -75,31 +80,25 @@ genLoop:
 			return
 		}
 
+		os.Remove(outPath)
+
 		pubKey, err = ioutil.ReadFile(outPath + ".pub")
 		if err != nil {
 			return
 		}
 
+		os.Remove(outPath + ".pub")
+
 		pairs = append(pairs, SSHKeyPair{
 			Type:    keyType,
 			Public:  string(pubKey),
 			Private: string(privKey),
 		})
-			didGenerate = true
-
-			return
-		}()
-
-		if err != nil {
-			return
-		}
 	}
 
 	if didGenerate {
-		err = sshHostKeys.Put(host, pairs)
+		cs.SSHKeyPairs[host] = pairs
-		if err != nil {
+		err = sd.Save()
-			return
-		}
 	}
 
 	return

cmd/dkl-local-server/ssh-secrets_test.go

@@ -2,9 +2,16 @@ package main
 
 import "testing"
 
-func TestSSHKeyGet(t *testing.T) {
+func init() {
-	// TODO needs fake secret store
+	DontSave = true
-	// if _, err := getSSHKeyPairs("host"); err != nil {
+}
-	// 	t.Error(err)
+
-	// }
+func TestSSHKeyGet(t *testing.T) {
+	sd := &SecretData{
+		clusters: make(map[string]*ClusterSecrets),
+	}
+
+	if _, err := sd.SSHKeyPairs("test", "host"); err != nil {
+		t.Error(err)
+	}
 }

cmd/dkl-local-server/state.go

@@ -1,164 +0,0 @@
-package main
-
-import (
-	"log"
-
-	"m.cluseau.fr/go/watchable"
-	"novit.tech/direktil/pkg/localconfig"
-)
-
-type PublicState struct {
-	ServerVersion string
-	UIHash        string
-	Store         struct {
-		New  bool
-		Open bool
-	}
-}
-
-var wPublicState = watchable.New[PublicState]()
-
-type State struct {
-	HasConfig bool
-
-	Store struct {
-		DownloadToken string
-		KeyNames      []string
-	}
-
-	Clusters []ClusterState
-	Hosts    []HostState
-	Config   *localconfig.Config
-
-	Downloads map[string]DownloadSpec
-
-	HostTemplates []string
-}
-
-type ClusterState struct {
-	Name      string
-	Addons    bool
-	Passwords []string
-	Tokens    []string
-	CAs       []CAState
-}
-
-type HostState struct {
-	Name    string
-	Cluster string
-	IPs     []string
-
-	Template string `json:",omitempty"`
-}
-
-type CAState struct {
-	Name   string
-	Signed []string
-}
-
-var wState = watchable.New[State]()
-
-func init() {
-	wState.Set(State{Downloads: map[string]DownloadSpec{}})
-}
-
-func updateState() {
-	log.Print("updating state")
-
-	// store key names
-	keyNames := make([]string, 0, len(secStore.Keys))
-	for _, key := range secStore.Keys {
-		keyNames = append(keyNames, key.Name)
-	}
-
-	// config
-	cfg, err := readConfig()
-	if err != nil {
-		wState.Change(func(v *State) { v.HasConfig = false; v.Config = nil; v.Store.KeyNames = keyNames })
-		return
-	}
-
-	if secStore.IsNew() || !secStore.Unlocked() {
-		wState.Change(func(v *State) { v.HasConfig = false; v.Config = nil; v.Store.KeyNames = keyNames })
-		return
-	}
-
-	// remove heavy data
-	clusters := make([]ClusterState, 0, len(cfg.Clusters))
-	for _, cluster := range cfg.Clusters {
-		c := ClusterState{
-			Name:   cluster.Name,
-			Addons: len(cluster.Addons) != 0,
-		}
-
-		c.Passwords, err = clusterPasswords.Keys(c.Name + "/")
-		if err != nil {
-			log.Print("failed to read cluster passwords: ", err)
-		}
-		c.Tokens, err = clusterTokens.Keys(c.Name + "/")
-		if err != nil {
-			log.Print("failed to read cluster tokens: ", err)
-		}
-
-		caNames, err := clusterCAs.Keys(c.Name + "/")
-		if err != nil {
-			log.Print("failed to read cluster CAs: ", err)
-		}
-		for _, caName := range caNames {
-			ca := CAState{Name: caName}
-
-			signedNames, err := clusterCASignedKeys.Keys(c.Name + "/" + caName + "/")
-			if err != nil {
-				log.Print("failed to read cluster CA signed keys: ", err)
-			}
-			for _, signedName := range signedNames {
-				ca.Signed = append(ca.Signed, signedName)
-			}
-
-			c.CAs = append(c.CAs, ca)
-		}
-
-		clusters = append(clusters, c)
-	}
-
-	hfts, err := hostsFromTemplate.List("")
-	if err != nil {
-		log.Print("failed to read hosts from template: ", err)
-	}
-
-	hosts := make([]HostState, 0, len(cfg.Hosts)+len(hfts))
-	for _, host := range cfg.Hosts {
-		h := HostState{
-			Name:    host.Name,
-			Cluster: host.ClusterName,
-			IPs:     host.IPs,
-		}
-		hosts = append(hosts, h)
-	}
-
-	for _, kv := range hfts {
-		name, hft := kv.K, kv.V
-		h := HostState{
-			Name:    name,
-			Cluster: hft.ClusterName(cfg),
-			IPs:     []string{hft.IP},
-
-			Template: hft.Template,
-		}
-		hosts = append(hosts, h)
-	}
-
-	hostTemplates := make([]string, len(cfg.HostTemplates))
-	for i, ht := range cfg.HostTemplates {
-		hostTemplates[i] = ht.Name
-	}
-
-	// done
-	wState.Change(func(v *State) {
-		v.HasConfig = true
-		v.Store.KeyNames = keyNames
-		v.Clusters = clusters
-		v.Hosts = hosts
-		v.HostTemplates = hostTemplates
-	})
-}

cmd/dkl-local-server/tls-ca.go

@@ -1,178 +0,0 @@
-package main
-
-import (
-	"crypto"
-	"errors"
-	"fmt"
-	"log"
-	"net"
-
-	"github.com/cloudflare/cfssl/config"
-	"github.com/cloudflare/cfssl/csr"
-	"github.com/cloudflare/cfssl/helpers"
-	"github.com/cloudflare/cfssl/initca"
-	"github.com/cloudflare/cfssl/signer"
-	"github.com/cloudflare/cfssl/signer/local"
-	"k8s.io/apimachinery/pkg/util/validation"
-)
-
-type CA struct {
-	Key  []byte
-	Cert []byte
-
-	Signed map[string]*KeyCert
-}
-
-func (ca *CA) Init() (err error) {
-	req := ca.newReq()
-
-	cert, _, key, err := initca.New(req)
-	if err != nil {
-		err = fmt.Errorf("initca: %w", err)
-		return
-	}
-
-	ca.Key = key
-	ca.Cert = cert
-
-	return
-}
-
-func (ca *CA) RenewCert() (err error) {
-	var signer crypto.Signer
-	signer, err = helpers.ParsePrivateKeyPEM(ca.Key)
-	if err != nil {
-		return
-	}
-
-	newCert, _, err := initca.NewFromSigner(ca.newReq(), signer)
-	if err != nil {
-		return
-	}
-
-	ca.Cert = newCert
-
-	return
-}
-
-func (_ CA) newReq() *csr.CertificateRequest {
-	return &csr.CertificateRequest{
-		CN: "Direktil Local Server",
-		KeyRequest: &csr.KeyRequest{
-			A: "ecdsa",
-			S: 521, // 256, 384, 521
-		},
-		Names: []csr.Name{
-			{
-				O: "novit.io",
-			},
-		},
-	}
-}
-
-func (ca CA) Signer(policy *config.Signing) (result *local.Signer, err error) {
-	caCert, err := helpers.ParseCertificatePEM(ca.Cert)
-	if err != nil {
-		return
-	}
-
-	caKey, err := helpers.ParsePrivateKeyPEM(ca.Key)
-	if err != nil {
-		return
-	}
-
-	return local.NewSigner(caKey, caCert, signer.DefaultSigAlgo(caKey), policy)
-}
-
-func getUsableKeyCert(cluster, caName, name, profile, label string, req *csr.CertificateRequest, cfg *config.Config) (kc KeyCert, err error) {
-	log := log.New(log.Default().Writer(), cluster+": CA "+caName+": ", log.Flags()|log.Lmsgprefix)
-
-	ca, err := getUsableClusterCA(cluster, caName)
-	if err != nil {
-		return
-	}
-
-	for _, host := range req.Hosts {
-		if ip := net.ParseIP(host); ip != nil {
-			// valid IP (v4 or v6)
-			continue
-		}
-
-		if host == "*" {
-			continue
-		}
-
-		if errs := validation.IsDNS1123Subdomain(host); len(errs) == 0 {
-			continue
-		}
-		if errs := validation.IsWildcardDNS1123Subdomain(host); len(errs) == 0 {
-			continue
-		}
-
-		err = fmt.Errorf("%q is not an IP or FQDN", host)
-		return
-	}
-
-	if req.CA != nil {
-		err = errors.New("no CA section allowed here")
-		return
-	}
-
-	rh := hash(req)
-
-	key := cluster + "/" + caName + "/" + name
-
-	kc, found, err := clusterCASignedKeys.Get(key)
-	if err != nil {
-		return
-	}
-
-	if found {
-		if rh == kc.ReqHash {
-			err = checkCertUsable(kc.Cert)
-			if err == nil {
-				return // all good, no need to create or renew
-			}
-
-			log.Print("regenerating certificate: ", err)
-
-		} else {
-			log.Printf("CSR changed for %s: hash=%q previous=%q", name, rh, kc.ReqHash)
-		}
-	} else {
-		log.Print("new CSR for ", name)
-	}
-
-	sgr, err := ca.Signer(cfg.Signing)
-	if err != nil {
-		return
-	}
-
-	generator := &csr.Generator{Validator: func(_ *csr.CertificateRequest) error { return nil }}
-
-	csr, tlsKey, err := generator.ProcessRequest(req)
-	if err != nil {
-		return
-	}
-
-	signReq := signer.SignRequest{
-		Request: string(csr),
-		Profile: profile,
-		Label:   label,
-	}
-
-	cert, err := sgr.Sign(signReq)
-	if err != nil {
-		return
-	}
-
-	kc = KeyCert{
-		Key:     tlsKey,
-		Cert:    cert,
-		ReqHash: rh,
-	}
-
-	err = clusterCASignedKeys.Put(key, kc)
-
-	return
-}

cmd/dkl-local-server/token.go

@@ -1,24 +0,0 @@
-package main
-
-import (
-	"crypto/rand"
-	"encoding/base32"
-	"log"
-	"net/http"
-
-	"m.cluseau.fr/go/httperr"
-)
-
-func newToken(sizeInBytes int) (token string, err error) {
-	randBytes := make([]byte, sizeInBytes)
-
-	_, err = rand.Read(randBytes)
-	if err != nil {
-		log.Print("rand read error: ", err)
-		err = httperr.New(http.StatusInternalServerError, err)
-		return
-	}
-
-	token = base32.StdEncoding.WithPadding(base32.NoPadding).EncodeToString(randBytes)
-	return
-}

cmd/dkl-local-server/ui.go

@@ -1,45 +0,0 @@
-package main
-
-import (
-	"encoding/base32"
-	"io"
-	"io/fs"
-	"log"
-	"strings"
-
-	"github.com/cespare/xxhash"
-	dlshtml "novit.tech/direktil/local-server/html"
-)
-
-func computeUIHash() {
-	xxh := xxhash.New()
-
-	err := fs.WalkDir(dlshtml.FS, "ui", func(path string, entry fs.DirEntry, walkErr error) (err error) {
-		if walkErr != nil {
-			err = walkErr
-			return
-		}
-
-		if entry.IsDir() {
-			return
-		}
-
-		f, err := dlshtml.FS.Open(path)
-		if err != nil {
-			return
-		}
-		defer f.Close()
-
-		io.Copy(xxh, f)
-
-		return nil
-	})
-
-	if err != nil {
-		log.Fatal("failed to hash UI: ", err)
-	}
-
-	h := strings.ToLower(base32.HexEncoding.WithPadding(base32.NoPadding).EncodeToString(xxh.Sum(nil)))[:5]
-	log.Printf("UI hash: %s", h)
-	wPublicState.Change(func(v *PublicState) { v.UIHash = h })
-}

cmd/dkl-local-server/upstream.go

@@ -19,7 +19,7 @@ import (
 )
 
 var (
-	upstreamURL = flag.String("upstream", "https://dkl.novit.io/dist", "Upstream server for dist elements")
+	upstreamURL = flag.String("upstream", "https://direktil.novit.nc/dist", "Upstream server for dist elements")
 )
 
 func (ctx *renderContext) distFetch(path ...string) (outPath string, err error) {

cmd/dkl-local-server/ws-auth.go

@@ -7,20 +7,24 @@ import (
 )
 
 func adminAuth(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
-	tokenAuth(req, resp, chain, adminToken)
+	tokenAuth(req, resp, chain, *adminToken)
+}
+
+func hostsAuth(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
+	tokenAuth(req, resp, chain, *hostsToken, *adminToken)
 }
 
 func tokenAuth(req *restful.Request, resp *restful.Response, chain *restful.FilterChain, allowedTokens ...string) {
 	token := getToken(req)
 
 	for _, allowedToken := range allowedTokens {
-		if allowedToken != "" && token == allowedToken {
+		if allowedToken == "" || token == allowedToken {
 			chain.ProcessFilter(req, resp)
 			return
 		}
 	}
 
-	wsError(resp, ErrUnauthorized)
+	resp.WriteErrorString(401, "401: Not Authorized")
 	return
 }
 
@@ -29,12 +33,8 @@ func getToken(req *restful.Request) string {
 
 	token := req.HeaderParameter("Authorization")
 
-	if token == "" {
-		return req.QueryParameter("token")
-	}
-
 	if !strings.HasPrefix(token, bearerPrefix) {
-		return token
+		return ""
 	}
 
 	return token[len(bearerPrefix):]

cmd/dkl-local-server/ws-cluster-cas.go

@@ -1,83 +0,0 @@
-package main
-
-import (
-	"fmt"
-
-	"github.com/cloudflare/cfssl/log"
-	restful "github.com/emicklei/go-restful"
-)
-
-var clusterCAs = newClusterSecretKV[CA]("CAs")
-
-func wsClusterCAs(req *restful.Request, resp *restful.Response) {
-	clusterName := req.PathParameter("cluster-name")
-	clusterCAs.WsList(resp, clusterName+"/")
-}
-
-func wsClusterCA(req *restful.Request, resp *restful.Response) {
-	clusterName := req.PathParameter("cluster-name")
-	name := req.PathParameter("ca-name")
-
-	clusterCAs.WsGet(resp, clusterName+"/"+name)
-}
-
-func getUsableClusterCA(cluster, name string) (ca CA, err error) {
-	defer func() {
-		if err != nil {
-			err = fmt.Errorf("cluster %s CA %s: %w", cluster, name, err)
-		}
-	}()
-
-	key := cluster + "/" + name
-
-	ca, found, err := clusterCAs.Get(key)
-	if err != nil {
-		return
-	}
-
-	if !found {
-		log.Info("new CA in cluster ", cluster, ": ", name)
-
-		err = ca.Init()
-		if err != nil {
-			return
-		}
-
-		err = clusterCAs.Put(key, ca)
-		if err != nil {
-			return
-		}
-
-		return
-	}
-
-	checkErr := checkCertUsable(ca.Cert)
-	if checkErr != nil {
-		log.Infof("cluster %s: CA %s: regenerating certificate: %v", cluster, name, checkErr)
-
-		err = ca.RenewCert()
-		if err != nil {
-			err = fmt.Errorf("renew: %w", err)
-		}
-
-		err = clusterCAs.Put(key, ca)
-	}
-
-	return
-}
-
-var clusterCASignedKeys = newClusterSecretKV[KeyCert]("CA-signed-keys")
-
-func wsClusterCASignedKeys(req *restful.Request, resp *restful.Response) {
-	clusterName := req.PathParameter("cluster-name")
-	caName := req.PathParameter("ca-name")
-	clusterCASignedKeys.WsList(resp, clusterName+"/"+caName+"/")
-}
-
-func wsClusterCASignedKey(req *restful.Request, resp *restful.Response) {
-	clusterName := req.PathParameter("cluster-name")
-	caName := req.PathParameter("ca-name")
-	name := req.PathParameter("signed-name")
-
-	clusterCASignedKeys.WsGet(resp, clusterName+"/"+caName+"/"+name)
-}

cmd/dkl-local-server/ws-cluster-passwords.go

@@ -1,32 +0,0 @@
-package main
-
-import (
-	restful "github.com/emicklei/go-restful"
-)
-
-var seeds = newClusterSecretKV[[]byte]("seeds")
-
-var clusterPasswords = newClusterSecretKV[string]("passwords")
-
-func wsClusterPasswords(req *restful.Request, resp *restful.Response) {
-	clusterName := req.PathParameter("cluster-name")
-	clusterPasswords.WsList(resp, clusterName+"/")
-}
-
-func wsClusterPassword(req *restful.Request, resp *restful.Response) {
-	clusterName := req.PathParameter("cluster-name")
-	name := req.PathParameter("password-name")
-
-	clusterPasswords.WsGet(resp, clusterName+"/"+name)
-}
-
-func wsClusterSetPassword(req *restful.Request, resp *restful.Response) {
-	cluster := wsReadCluster(req, resp)
-	if cluster == nil {
-		return
-	}
-
-	name := req.PathParameter("password-name")
-
-	clusterPasswords.WsPut(req, resp, cluster.Name+"/"+name)
-}

cmd/dkl-local-server/ws-cluster-tokens.go

@@ -1,43 +0,0 @@
-package main
-
-import (
-	"crypto/rand"
-	"encoding/base32"
-
-	restful "github.com/emicklei/go-restful"
-)
-
-var clusterTokens = newClusterSecretKV[string]("tokens")
-
-func getOrCreateClusterToken(cluster, name string) (token string, err error) {
-	key := cluster + "/" + name
-
-	token, found, err := clusterTokens.Get(key)
-
-	if err != nil || found {
-		return
-	}
-
-	b := make([]byte, 16)
-	_, err = rand.Read(b)
-	if err != nil {
-		return
-	}
-
-	token = base32.StdEncoding.WithPadding(base32.NoPadding).EncodeToString(b)
-
-	err = clusterTokens.Put(key, token)
-	return
-}
-
-func wsClusterTokens(req *restful.Request, resp *restful.Response) {
-	clusterName := req.PathParameter("cluster-name")
-	clusterTokens.WsList(resp, clusterName+"/")
-}
-
-func wsClusterToken(req *restful.Request, resp *restful.Response) {
-	clusterName := req.PathParameter("cluster-name")
-	name := req.PathParameter("token-name")
-
-	clusterTokens.WsGet(resp, clusterName+"/"+name)
-}

cmd/dkl-local-server/ws-clusters.go

@@ -2,22 +2,13 @@ package main
 
 import (
 	"log"
-	"net/url"
+	"sort"
-	"strconv"
 
 	restful "github.com/emicklei/go-restful"
 
-	"novit.tech/direktil/local-server/pkg/mime"
+	"novit.nc/direktil/pkg/localconfig"
-	"novit.tech/direktil/pkg/localconfig"
 )
 
-var clusterSecretKVs = []string{}
-
-func newClusterSecretKV[T any](name string) KVSecrets[T] {
-	clusterSecretKVs = append(clusterSecretKVs, name)
-	return KVSecrets[T]{"clusters/" + name}
-}
-
 func wsListClusters(req *restful.Request, resp *restful.Response) {
 	cfg := wsReadConfig(resp)
 	if cfg == nil {
@@ -42,7 +33,7 @@ func wsReadCluster(req *restful.Request, resp *restful.Response) (cluster *local
 
 	cluster = cfg.Cluster(clusterName)
 	if cluster == nil {
-		wsNotFound(resp)
+		wsNotFound(req, resp)
 		return
 	}
 
@@ -66,58 +57,152 @@ func wsClusterAddons(req *restful.Request, resp *restful.Response) {
 
 	if len(cluster.Addons) == 0 {
 		log.Printf("cluster %q has no addons defined", cluster.Name)
-		wsNotFound(resp)
+		wsNotFound(req, resp)
 		return
 	}
 
-	cfg := wsReadConfig(resp)
+	wsRender(resp, cluster.Addons, cluster)
-	if cfg == nil {
+}
+
+func wsClusterPasswords(req *restful.Request, resp *restful.Response) {
+	cluster := wsReadCluster(req, resp)
+	if cluster == nil {
 		return
 	}
 
-	sslCfg, err := sslConfigFromLocalConfig(cfg)
+	resp.WriteEntity(secretData.Passwords(cluster.Name))
+}
+
+func wsClusterPassword(req *restful.Request, resp *restful.Response) {
+	cluster := wsReadCluster(req, resp)
+	if cluster == nil {
+		return
+	}
+
+	name := req.PathParameter("password-name")
+
+	resp.WriteEntity(secretData.Password(cluster.Name, name))
+}
+
+func wsClusterSetPassword(req *restful.Request, resp *restful.Response) {
+	cluster := wsReadCluster(req, resp)
+	if cluster == nil {
+		return
+	}
+
+	name := req.PathParameter("password-name")
+
+	var password string
+	if err := req.ReadEntity(&password); err != nil {
+		wsError(resp, err) // FIXME this is a BadRequest
+		return
+	}
+
+	secretData.SetPassword(cluster.Name, name, password)
+
+	if err := secretData.Save(); err != nil {
+		wsError(resp, err)
+		return
+	}
+}
+
+func wsClusterToken(req *restful.Request, resp *restful.Response) {
+	cluster := wsReadCluster(req, resp)
+	if cluster == nil {
+		return
+	}
+
+	name := req.PathParameter("token-name")
+
+	token, err := secretData.Token(cluster.Name, name)
 	if err != nil {
 		wsError(resp, err)
 		return
 	}
 
-	wsRender(resp, sslCfg, cluster.Addons, cluster)
+	resp.WriteEntity(token)
+}
+
+func wsClusterBootstrapPods(req *restful.Request, resp *restful.Response) {
+	cluster := wsReadCluster(req, resp)
+	if cluster == nil {
+		return
+	}
+
+	if len(cluster.BootstrapPods) == 0 {
+		log.Printf("cluster %q has no bootstrap pods defined", cluster.Name)
+		wsNotFound(req, resp)
+		return
+	}
+
+	wsRender(resp, cluster.BootstrapPods, cluster)
+}
+
+func wsClusterCAs(req *restful.Request, resp *restful.Response) {
+	cs := secretData.clusters[req.PathParameter("cluster-name")]
+	if cs == nil {
+		wsNotFound(req, resp)
+		return
+	}
+
+	keys := make([]string, 0, len(cs.CAs))
+	for k := range cs.CAs {
+		keys = append(keys, k)
+	}
+
+	sort.Strings(keys)
+
+	resp.WriteJson(keys, restful.MIME_JSON)
 }
 
 func wsClusterCACert(req *restful.Request, resp *restful.Response) {
-	clusterName := req.PathParameter("cluster-name")
+	cs := secretData.clusters[req.PathParameter("cluster-name")]
-	caName := req.PathParameter("ca-name")
+	if cs == nil {
-
+		wsNotFound(req, resp)
-	ca, found, err := clusterCAs.Get(clusterName + "/" + caName)
+		return
-	if err != nil {
+	}
-		wsError(resp, err)
+
-		return
+	ca := cs.CAs[req.PathParameter("ca-name")]
-	}
+	if ca == nil {
-	if !found {
+		wsNotFound(req, resp)
-		wsNotFound(resp)
 		return
 	}
 
-	resp.Header().Set("Content-Type", mime.CERT)
 	resp.Write(ca.Cert)
 }
 
 func wsClusterSignedCert(req *restful.Request, resp *restful.Response) {
-	clusterName := req.PathParameter("cluster-name")
+	cs := secretData.clusters[req.PathParameter("cluster-name")]
-	caName := req.PathParameter("ca-name")
+	if cs == nil {
+		wsNotFound(req, resp)
+		return
+	}
+
+	ca := cs.CAs[req.PathParameter("ca-name")]
+	if ca == nil {
+		wsNotFound(req, resp)
+		return
+	}
+
 	name := req.QueryParameter("name")
 
-	kc, found, err := clusterCASignedKeys.Get(clusterName + "/" + caName + "/" + name)
+	if name == "" {
-	if err != nil {
+		keys := make([]string, 0, len(ca.Signed))
-		wsError(resp, err)
+		for k := range ca.Signed {
-		return
+			keys = append(keys, k)
 		}
-	if !found {
+
-		wsNotFound(resp)
+		sort.Strings(keys)
+
+		resp.WriteJson(keys, restful.MIME_JSON)
+		return
+	}
+
+	kc := ca.Signed[name]
+	if kc == nil {
+		wsNotFound(req, resp)
 		return
 	}
 
-	resp.AddHeader("Content-Type", mime.CERT)
-	resp.AddHeader("Content-Disposition", "attachment; filename="+strconv.Quote(clusterName+"_"+caName+"_"+url.PathEscape(name)+".crt"))
 	resp.Write(kc.Cert)
 }

cmd/dkl-local-server/ws-configs.go

@@ -18,10 +18,7 @@ func wsUploadConfig(req *restful.Request, resp *restful.Response) {
 
 	if err != nil {
 		wsError(resp, err)
-		return
 	}
-
-	resp.WriteEntity(true)
 }
 
 func writeNewConfig(reader io.Reader) (err error) {
@@ -41,22 +38,13 @@ func writeNewConfig(reader io.Reader) (err error) {
 	cfgPath := configFilePath()
 	in, err := os.Open(cfgPath)
 
-	if err != nil {
+	if err == nil {
-		if os.IsNotExist(err) {
-			// nothing to backup
-		} else {
-			return // real error
-		}
-	} else {
 		err = backupCurrentConfig(in)
-		if err != nil {
+	} else if !os.IsNotExist(err) {
 		return
 	}
-	}
 
 	err = os.Rename(out.Name(), cfgPath)
-
-	updateState()
 	return
 }
 

cmd/dkl-local-server/ws-downloads.go

@@ -1,151 +0,0 @@
-package main
-
-import (
-	"crypto/rand"
-	"encoding/base32"
-	"log"
-	"net/http"
-	"strconv"
-	"time"
-
-	restful "github.com/emicklei/go-restful"
-	"m.cluseau.fr/go/cow"
-)
-
-type DownloadSpec struct {
-	Kind   string
-	Name   string
-	Assets []string
-
-	createdAt time.Time
-}
-
-func wsAuthorizeDownload(req *restful.Request, resp *restful.Response) {
-	var spec DownloadSpec
-
-	if err := req.ReadEntity(&spec); err != nil {
-		wsError(resp, err)
-		return
-	}
-
-	if spec.Kind == "" || spec.Name == "" || len(spec.Assets) == 0 {
-		resp.WriteErrorString(http.StatusBadRequest, "missing data")
-		return
-	}
-
-	randBytes := make([]byte, 32)
-	_, err := rand.Read(randBytes)
-	if err != nil {
-		wsError(resp, err)
-		return
-	}
-
-	token := base32.StdEncoding.WithPadding(base32.NoPadding).EncodeToString(randBytes)
-
-	spec.createdAt = time.Now()
-
-	wState.Change(func(v *State) {
-		cow.MapSet(&v.Downloads, token, spec)
-	})
-
-	log.Printf("download token created for %s %q, assets %q", spec.Kind, spec.Name, spec.Assets)
-
-	resp.WriteAsJson(token)
-}
-
-func wsDownload(req *restful.Request, resp *restful.Response) {
-	token := req.PathParameter("token")
-	asset := req.PathParameter("asset")
-
-	if token == "" || asset == "" {
-		wsNotFound(resp)
-		return
-	}
-
-	var spec DownloadSpec
-	found := false
-	wState.Change(func(v *State) {
-		var ok bool
-		spec, ok = v.Downloads[token]
-		if !ok {
-			return
-		}
-
-		newAssets := make([]string, 0, len(spec.Assets))
-		for _, a := range spec.Assets {
-			if a == asset {
-				found = true
-			} else {
-				newAssets = append(newAssets, a)
-			}
-		}
-
-		if !found {
-			wsNotFound(resp)
-			return
-		}
-
-		cow.Map(&v.Downloads)
-
-		if len(newAssets) == 0 {
-			delete(v.Downloads, token)
-		} else {
-			spec.Assets = newAssets
-			v.Downloads[token] = spec
-		}
-	})
-
-	if !found {
-		wsNotFound(resp)
-		return
-	}
-
-	log.Printf("download via token: %s %q asset %q", spec.Kind, spec.Name, asset)
-
-	cfg, err := readConfig()
-	if err != nil {
-		wsError(resp, err)
-		return
-	}
-
-	setHeader := func(ext string) {
-		resp.AddHeader("Content-Disposition", "attachment; filename="+strconv.Quote(spec.Kind+"_"+spec.Name+"_"+asset+ext))
-	}
-
-	switch spec.Kind {
-	case "cluster":
-		cluster := cfg.ClusterByName(spec.Name)
-		if cluster == nil {
-			wsNotFound(resp)
-			return
-		}
-
-		switch asset {
-		case "addons":
-			setHeader(".yaml")
-			resp.Write([]byte(cluster.Addons))
-
-		default:
-			wsNotFound(resp)
-		}
-
-	case "host":
-		host := hostOrTemplate(cfg, spec.Name)
-		if host == nil {
-			wsNotFound(resp)
-			return
-		}
-
-		switch asset {
-		case "config", "bootstrap-config":
-			setHeader(".yaml")
-		default:
-			setHeader("")
-		}
-
-		renderHost(resp.ResponseWriter, req.Request, asset, host, cfg)
-
-	default:
-		wsNotFound(resp)
-	}
-}

cmd/dkl-local-server/ws-host.go

@@ -8,28 +8,25 @@ import (
 
 	restful "github.com/emicklei/go-restful"
 
-	"novit.tech/direktil/pkg/localconfig"
+	"novit.nc/direktil/local-server/pkg/mime"
-
+	"novit.nc/direktil/pkg/localconfig"
-	"novit.tech/direktil/local-server/pkg/mime"
 )
 
-var (
+var trustXFF = flag.Bool("trust-xff", true, "Trust the X-Forwarded-For header")
-	allowDetectedHost = flag.Bool("allow-detected-host", false, "Allow access to host assets from its IP (insecure but enables unattended netboot)")
-	trustXFF          = flag.Bool("trust-xff", false, "Trust the X-Forwarded-For header")
-)
 
 type wsHost struct {
+	prefix  string
 	hostDoc string
-	getHost func(req *restful.Request) (hostName string, err error)
+	getHost func(req *restful.Request) string
 }
 
-func (ws wsHost) register(rws *restful.WebService, alterRB func(*restful.RouteBuilder)) {
+func (ws *wsHost) register(rws *restful.WebService, alterRB func(*restful.RouteBuilder)) {
 	b := func(what string) *restful.RouteBuilder {
-		return rws.GET("/" + what).To(ws.render)
+		return rws.GET(ws.prefix + "/" + what).To(ws.render)
 	}
 
 	for _, rb := range []*restful.RouteBuilder{
-		rws.GET("").To(ws.get).
+		rws.GET(ws.prefix).To(ws.get).
 			Doc("Get the "+ws.hostDoc+"'s details").
 			Returns(200, "OK", localconfig.Host{}),
 
@@ -58,9 +55,6 @@ func (ws wsHost) register(rws *restful.WebService, alterRB func(*restful.RouteBu
 		b("boot.tar").
 			Produces(mime.TAR).
 			Doc("Get the " + ws.hostDoc + "'s /boot archive (ie: for metal upgrades)"),
-		b("boot-efi.tar").
-			Produces(mime.TAR).
-			Doc("Get the " + ws.hostDoc + "'s /boot archive (ie: for metal upgrades)"),
 
 		// read-only ISO support
 		b("boot.iso").
@@ -73,57 +67,42 @@ func (ws wsHost) register(rws *restful.WebService, alterRB func(*restful.RouteBu
 			Produces(mime.IPXE).
 			Doc("Get the " + ws.hostDoc + "'s IPXE code (for netboot)"),
 
-		// boot support
 		b("kernel").
 			Produces(mime.OCTET).
 			Doc("Get the " + ws.hostDoc + "'s kernel (ie: for netboot)"),
+
 		b("initrd").
 			Produces(mime.OCTET).
 			Doc("Get the " + ws.hostDoc + "'s initial RAM disk (ie: for netboot)"),
-
-		// - bootstrap config
-		b("bootstrap-config").
-			Produces(mime.YAML).
-			Doc("Get the " + ws.hostDoc + "'s bootstrap configuration"),
-		b("bootstrap-config.json").
-			Doc("Get the " + ws.hostDoc + "'s bootstrap configuration (as JSON)"),
-		// - bootstrap
-		b("bootstrap.tar").
-			Produces(mime.TAR).
-			Doc("Get the " + ws.hostDoc + "'s bootstrap seed archive"),
 	} {
 		alterRB(rb)
 		rws.Route(rb)
 	}
 }
 
-func (ws wsHost) host(req *restful.Request, resp *restful.Response) (host *localconfig.Host, cfg *localconfig.Config) {
+func (ws *wsHost) host(req *restful.Request, resp *restful.Response) (host *localconfig.Host, cfg *localconfig.Config) {
-	hostname, err := ws.getHost(req)
+	hostname := ws.getHost(req)
-	if err != nil {
-		wsError(resp, err)
-		return
-	}
 	if hostname == "" {
-		wsNotFound(resp)
+		wsNotFound(req, resp)
 		return
 	}
 
-	cfg, err = readConfig()
+	cfg, err := readConfig()
 	if err != nil {
 		wsError(resp, err)
 		return
 	}
 
-	host = hostOrTemplate(cfg, hostname)
+	host = cfg.Host(hostname)
 	if host == nil {
-		wsNotFound(resp)
+		log.Print("no host named ", hostname)
+		wsNotFound(req, resp)
 		return
 	}
-
 	return
 }
 
-func (ws wsHost) get(req *restful.Request, resp *restful.Response) {
+func (ws *wsHost) get(req *restful.Request, resp *restful.Response) {
 	host, _ := ws.host(req, resp)
 	if host == nil {
 		return
@@ -132,7 +111,7 @@ func (ws wsHost) get(req *restful.Request, resp *restful.Response) {
 	resp.WriteEntity(host)
 }
 
-func (ws wsHost) render(req *restful.Request, resp *restful.Response) {
+func (ws *wsHost) render(req *restful.Request, resp *restful.Response) {
 	host, cfg := ws.host(req, resp)
 	if host == nil {
 		return
@@ -164,26 +143,21 @@ func renderHost(w http.ResponseWriter, r *http.Request, what string, host *local
 	case "kernel":
 		err = renderKernel(w, r, ctx)
 
-	// boot v2
-	case "bootstrap-config":
-		err = renderBootstrapConfig(w, r, ctx, false)
-	case "bootstrap-config.json":
-		err = renderBootstrapConfig(w, r, ctx, true)
 	case "initrd":
 		err = renderCtx(w, r, ctx, what, buildInitrd)
-	case "bootstrap.tar":
+
-		err = renderCtx(w, r, ctx, what, buildBootstrap)
 	case "boot.iso":
 		err = renderCtx(w, r, ctx, what, buildBootISO)
+
 	case "boot.tar":
 		err = renderCtx(w, r, ctx, what, buildBootTar)
-	case "boot-efi.tar":
-		err = renderCtx(w, r, ctx, what, buildBootEFITar)
 
 	case "boot.img":
 		err = renderCtx(w, r, ctx, what, buildBootImg)
+
 	case "boot.img.gz":
 		err = renderCtx(w, r, ctx, what, buildBootImgGZ)
+
 	case "boot.img.lz4":
 		err = renderCtx(w, r, ctx, what, buildBootImgLZ4)
 

cmd/dkl-local-server/ws-hosts-from-templates.go

@@ -1,117 +0,0 @@
-package main
-
-import (
-	"log"
-	"net/netip"
-
-	"github.com/emicklei/go-restful"
-
-	"novit.tech/direktil/pkg/localconfig"
-)
-
-var hostsFromTemplate = KVSecrets[HostFromTemplate]{"hosts-from-template"}
-
-type HostFromTemplate struct {
-	Template string
-	IP       string
-}
-
-func (hft HostFromTemplate) ClusterName(cfg *localconfig.Config) string {
-	for _, ht := range cfg.HostTemplates {
-		if ht.Name == hft.Template {
-			return ht.ClusterName
-		}
-	}
-	return ""
-}
-
-func hostOrTemplate(cfg *localconfig.Config, name string) (host *localconfig.Host) {
-	host = cfg.Host(name)
-	if host != nil {
-		log.Print("no host named ", name)
-		return
-	}
-
-	hft, found, err := hostsFromTemplate.Get(name)
-	if err != nil {
-		log.Print("failed to read store: ", err)
-		return
-	}
-
-	if !found {
-		log.Print("no host from template named ", name)
-		return
-	}
-
-	ht := cfg.HostTemplate(hft.Template)
-	if ht == nil {
-		log.Print("no host template named ", name)
-		return
-	}
-
-	host = &localconfig.Host{}
-	*host = *ht
-	host.Name = name
-	host.IPs = []string{hft.IP}
-	return
-}
-
-func wsHostsFromTemplateList(req *restful.Request, resp *restful.Response) {
-	hostsFromTemplate.WsList(resp, "")
-}
-
-func wsHostsFromTemplateSet(req *restful.Request, resp *restful.Response) {
-	name := req.PathParameter("name")
-
-	cfg, err := readConfig()
-	if err != nil {
-		wsError(resp, err)
-		return
-	}
-
-	v := HostFromTemplate{}
-	if err := req.ReadEntity(&v); err != nil {
-		wsBadRequest(resp, err.Error())
-		return
-	}
-
-	if v.Template == "" {
-		wsBadRequest(resp, "template is required")
-		return
-	}
-	if v.IP == "" {
-		wsBadRequest(resp, "ip is required")
-		return
-	}
-	if _, err := netip.ParseAddr(v.IP); err != nil {
-		wsBadRequest(resp, "bad IP: "+err.Error())
-		return
-	}
-
-	found := false
-	for _, ht := range cfg.HostTemplates {
-		if ht.Name != v.Template {
-			continue
-		}
-		found = true
-		break
-	}
-
-	if !found {
-		wsBadRequest(resp, "no host template with this name")
-		return
-	}
-
-	if err := hostsFromTemplate.Put(name, v); err != nil {
-		wsError(resp, err)
-		return
-	}
-
-	updateState()
-}
-
-func wsHostsFromTemplateDelete(req *restful.Request, resp *restful.Response) {
-	name := req.PathParameter("name")
-	hostsFromTemplate.WsDel(req, resp, name)
-	updateState()
-}

cmd/dkl-local-server/ws-public.go

@@ -1,195 +0,0 @@
-package main
-
-import (
-	"archive/tar"
-	"bytes"
-	"io"
-	"io/fs"
-	"log"
-	"net/http"
-	"os"
-	"path/filepath"
-
-	restful "github.com/emicklei/go-restful"
-	"m.cluseau.fr/go/httperr"
-	"novit.tech/direktil/local-server/secretstore"
-)
-
-type NamedPassphrase struct {
-	Name       string
-	Passphrase []byte
-}
-
-func wsUnlockStore(req *restful.Request, resp *restful.Response) {
-	np := NamedPassphrase{}
-	err := req.ReadEntity(&np)
-	if err != nil {
-		resp.WriteError(http.StatusBadRequest, err)
-		return
-	}
-
-	defer secretstore.Memzero(np.Passphrase)
-
-	if secStore.IsNew() {
-		if len(np.Name) == 0 {
-			wsBadRequest(resp, "no name given")
-			return
-		}
-	}
-
-	if len(np.Passphrase) == 0 {
-		wsBadRequest(resp, "no passphrase given")
-		return
-	}
-
-	if secStore.Unlocked() {
-		if secStore.HasKey(np.Passphrase) {
-			resp.WriteEntity(adminToken)
-		} else {
-			wsError(resp, ErrUnauthorized)
-		}
-		return
-	}
-
-	if err := unlockSecretStore(np.Name, np.Passphrase); err.Any() {
-		err.WriteJSON(resp.ResponseWriter)
-		return
-	}
-
-	resp.WriteEntity(adminToken)
-}
-
-func wsStoreDownload(req *restful.Request, resp *restful.Response) {
-	token := req.QueryParameter("token")
-	if token != wState.Get().Store.DownloadToken {
-		wsError(resp, ErrInvalidToken)
-		return
-	}
-
-	buf := new(bytes.Buffer)
-	arch := tar.NewWriter(buf)
-
-	root := os.DirFS(secStoreRoot())
-
-	err := fs.WalkDir(root, ".", func(path string, d fs.DirEntry, readErr error) (err error) {
-		if readErr != nil {
-			err = readErr
-			return
-		}
-
-		if path == "." {
-			return
-		}
-
-		fi, err := d.Info()
-		if err != nil {
-			return
-		}
-
-		hdr, err := tar.FileInfoHeader(fi, "")
-		if err != nil {
-			return
-		}
-
-		hdr.Name = path
-		hdr.Uid = 0
-		hdr.Gid = 0
-
-		err = arch.WriteHeader(hdr)
-		if err != nil {
-			return
-		}
-
-		if fi.IsDir() {
-			return
-		}
-
-		f, err := root.Open(path)
-		if err != nil {
-			return
-		}
-		defer f.Close()
-
-		io.Copy(arch, f)
-
-		return
-	})
-
-	if err != nil {
-		wsError(resp, err)
-		return
-	}
-
-	err = arch.Close()
-	if err != nil {
-		wsError(resp, err)
-		return
-	}
-
-	buf.WriteTo(resp)
-}
-
-func wsStoreUpload(req *restful.Request, resp *restful.Response) {
-	if !secStore.IsNew() {
-		wsError(resp, httperr.BadRequest("store is not new"))
-		return
-	}
-
-	buf := new(bytes.Buffer)
-
-	_, err := io.Copy(buf, req.Request.Body)
-	if err != nil {
-		wsError(resp, err)
-		return
-	}
-
-	arch := tar.NewReader(buf)
-
-	root := secStoreRoot()
-
-	for {
-		hdr, err := arch.Next()
-		if err == io.EOF {
-			err = nil
-			break
-		} else if err != nil {
-			wsError(resp, err)
-			return
-		}
-
-		log.Print(hdr.Name)
-
-		fullPath := filepath.Join(root, hdr.Name)
-
-		switch {
-		case hdr.FileInfo().IsDir():
-			err = os.MkdirAll(fullPath, 0700)
-			if err != nil {
-				wsError(resp, err)
-				return
-			}
-
-		default:
-			content, err := io.ReadAll(io.LimitReader(arch, hdr.Size))
-			if err != nil {
-				wsError(resp, err)
-				return
-			}
-
-			err = os.WriteFile(fullPath, content, 0600)
-			if err != nil {
-				wsError(resp, err)
-				return
-			}
-		}
-	}
-
-	if err != nil {
-		wsError(resp, err)
-		return
-	}
-
-	openSecretStore()
-
-	resp.WriteEntity(map[string]any{"ok": true})
-}

cmd/dkl-local-server/ws-store.go

@@ -1,80 +0,0 @@
-package main
-
-import (
-	"strconv"
-	"strings"
-
-	restful "github.com/emicklei/go-restful"
-	"novit.tech/direktil/local-server/secretstore"
-)
-
-func wsStoreAddKey(req *restful.Request, resp *restful.Response) {
-	np := NamedPassphrase{}
-
-	err := req.ReadEntity(&np)
-	if err != nil {
-		wsBadRequest(resp, err.Error())
-		return
-	}
-
-	np.Name = strings.TrimSpace(np.Name)
-
-	if len(np.Name) == 0 {
-		wsBadRequest(resp, "no name given")
-		return
-	}
-
-	if len(np.Passphrase) == 0 {
-		wsBadRequest(resp, "no passphrase given")
-		return
-	}
-
-	for _, k := range secStore.Keys {
-		if k.Name == np.Name {
-			wsBadRequest(resp, "there's already a passphrase named "+strconv.Quote(np.Name))
-			return
-		}
-	}
-
-	secStore.AddKey(np.Name, np.Passphrase)
-	defer updateState()
-
-	err = secStore.SaveTo(secKeysStorePath())
-	if err != nil {
-		wsError(resp, err)
-		return
-	}
-}
-
-func wsStoreDelKey(req *restful.Request, resp *restful.Response) {
-	name := ""
-
-	err := req.ReadEntity(&name)
-	if err != nil {
-		wsBadRequest(resp, err.Error())
-		return
-	}
-
-	newKeys := make([]secretstore.KeyEntry, 0, len(secStore.Keys))
-	for _, k := range secStore.Keys {
-		if k.Name == name {
-			continue
-		}
-
-		newKeys = append(newKeys, k)
-	}
-
-	if len(newKeys) == 0 {
-		wsBadRequest(resp, "can't remove the last key from the store")
-		return
-	}
-
-	secStore.Keys = newKeys
-	defer updateState()
-
-	err = secStore.SaveTo(secKeysStorePath())
-	if err != nil {
-		wsError(resp, err)
-		return
-	}
-}

cmd/dkl-local-server/ws.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"errors"
 	"fmt"
 	"log"
 	"net"
@@ -9,130 +8,73 @@ import (
 	"strings"
 	"text/template"
 
-	cfsslconfig "github.com/cloudflare/cfssl/config"
 	"github.com/emicklei/go-restful"
-	"m.cluseau.fr/go/httperr"
 
-	"novit.tech/direktil/pkg/localconfig"
+	"novit.nc/direktil/local-server/pkg/mime"
-
+	"novit.nc/direktil/pkg/localconfig"
-	"novit.tech/direktil/local-server/pkg/mime"
 )
 
 func registerWS(rest *restful.Container) {
-	// public-level APIs
-	{
-		ws := &restful.WebService{}
-		ws.
-			Path("/public").
-			Produces(mime.JSON).
-			Consumes(mime.JSON).
-			Route(ws.POST("/unlock-store").To(wsUnlockStore).
-				Reads(NamedPassphrase{}).
-				Writes("").
-				Doc("Try to unlock the store")).
-			Route(ws.GET("/store.tar").To(wsStoreDownload).
-				Produces(mime.TAR).
-				Param(ws.QueryParameter("token", "the download token")).
-				Doc("Fetch the encrypted store")).
-			Route(ws.POST("/store.tar").To(wsStoreUpload).
-				Consumes(mime.TAR).
-				Doc("Upload an existing store")).
-			Route(ws.GET("/downloads/{token}/{asset}").To(wsDownload).
-				Param(ws.PathParameter("token", "the download token")).
-				Param(ws.PathParameter("asset", "the requested asset")).
-				Doc("Fetch an asset via a download token"))
-
-		rest.Add(ws)
-	}
-
 	// Admin-level APIs
-	ws := (&restful.WebService{}).
+	ws := &restful.WebService{}
-		Filter(requireSecStore).
+	ws.Filter(adminAuth).
-		Filter(adminAuth).
+		HeaderParameter("Authorization", "Admin bearer token")
-		Param(restful.HeaderParameter("Authorization", "Admin bearer token").Required(true)).
-		Produces(mime.JSON)
-
-	// - store management
-	ws.Route(ws.POST("/store/add-key").To(wsStoreAddKey).
-		Consumes(mime.JSON).Reads(NamedPassphrase{}).
-		Doc("Add an unlock key to the store"))
-	ws.Route(ws.POST("/store/delete-key").To(wsStoreDelKey).
-		Consumes(mime.JSON).Reads("").
-		Doc("Remove an unlock key to the store (by its name)"))
-
-	// - downloads
-	ws.Route(ws.POST("/authorize-download").To(wsAuthorizeDownload).
-		Consumes(mime.JSON).Reads(DownloadSpec{}).
-		Produces(mime.JSON).
-		Doc("Create a download token for the given download"))
 
 	// - configs API
 	ws.Route(ws.POST("/configs").To(wsUploadConfig).
-		Consumes(mime.YAML).Param(ws.BodyParameter("config", "The new full configuration")).
-		Produces(mime.JSON).Writes(true).
 		Doc("Upload a new current configuration, archiving the previous one"))
 
 	// - clusters API
 	ws.Route(ws.GET("/clusters").To(wsListClusters).
 		Doc("List clusters"))
 
-	ws.Route(ws.GET("/hosts-from-template").To(wsHostsFromTemplateList).
+	ws.Route(ws.GET("/clusters/{cluster-name}").To(wsCluster).
-		Doc("List host template instances"))
+		Doc("Get cluster details"))
-	ws.Route(ws.POST("/hosts-from-template/{name}").To(wsHostsFromTemplateSet).
-		Reads(HostFromTemplate{}).
-		Doc("Create or update a host template instance"))
-	ws.Route(ws.DELETE("/hosts-from-template/{name}").To(wsHostsFromTemplateDelete).
-		Reads(HostFromTemplate{}).
-		Doc("Delete a host template instance"))
 
-	const (
+	ws.Route(ws.GET("/clusters/{cluster-name}/addons").To(wsClusterAddons).
-		GET = http.MethodGet
-		PUT = http.MethodPut
-	)
-
-	cluster := func(method, subPath string) *restful.RouteBuilder {
-		return ws.Method(method).Path("/clusters/{cluster-name}" + subPath).
-			Param(ws.PathParameter("cluster-name", "name of the cluster"))
-	}
-
-	for _, builder := range []*restful.RouteBuilder{
-		cluster(GET, "").To(wsCluster).
-			Doc("Get cluster details"),
-
-		cluster(GET, "/addons").To(wsClusterAddons).
 		Produces(mime.YAML).
 		Doc("Get cluster addons").
 		Returns(http.StatusOK, "OK", nil).
-			Returns(http.StatusNotFound, "The cluster does not exists or does not have addons defined", nil),
+		Returns(http.StatusNotFound, "The cluster does not exists or does not have addons defined", nil))
 
-		cluster(GET, "/tokens").To(wsClusterTokens).
+	ws.Route(ws.GET("/clusters/{cluster-name}/bootstrap-pods").To(wsClusterBootstrapPods).
-			Doc("List cluster's tokens"),
+		Produces(mime.YAML).
-		cluster(GET, "/tokens/{token-name}").To(wsClusterToken).
+		Doc("Get cluster bootstrap pods YAML definitions").
-			Doc("Get cluster's token"),
+		Returns(http.StatusOK, "OK", nil).
+		Returns(http.StatusNotFound, "The cluster does not exists or does not have bootstrap pods defined", nil))
 
-		cluster(GET, "/passwords").To(wsClusterPasswords).
+	ws.Route(ws.GET("/clusters/{cluster-name}/passwords").To(wsClusterPasswords).
-			Doc("List cluster's passwords"),
+		Doc("List cluster's passwords"))
-		cluster(GET, "/passwords/{password-name}").To(wsClusterPassword).
+	ws.Route(ws.GET("/clusters/{cluster-name}/passwords/{password-name}").To(wsClusterPassword).
-			Doc("Get cluster's password"),
+		Doc("Get cluster's password"))
-		cluster(PUT, "/passwords/{password-name}").To(wsClusterSetPassword).
+	ws.Route(ws.PUT("/clusters/{cluster-name}/passwords/{password-name}").To(wsClusterSetPassword).
-			Doc("Set cluster's password"),
+		Doc("Set cluster's password"))
 
-		cluster(GET, "/CAs").To(wsClusterCAs).
+	ws.Route(ws.GET("/clusters/{cluster-name}/ca").To(wsClusterCAs).
-			Doc("Get cluster CAs"),
+		Doc("Get cluster CAs"))
-		cluster(GET, "/CAs/{ca-name}/certificate").To(wsClusterCACert).
+	ws.Route(ws.GET("/clusters/{cluster-name}/ca/{ca-name}/certificate").To(wsClusterCACert).
 		Produces(mime.CACERT).
-			Doc("Get cluster CA's certificate"),
+		Doc("Get cluster CA's certificate"))
-		cluster(GET, "/CAs/{ca-name}/signed").To(wsClusterSignedCert).
+	ws.Route(ws.GET("/clusters/{cluster-name}/ca/{ca-name}/signed").To(wsClusterSignedCert).
 		Produces(mime.CERT).
 		Param(ws.QueryParameter("name", "signed reference name").Required(true)).
-			Doc("Get cluster's certificate signed by the CA"),
+		Doc("Get cluster's certificate signed by the CA"))
-	} {
+
-		ws.Route(builder)
+	ws.Route(ws.GET("/clusters/{cluster-name}/tokens/{token-name}").To(wsClusterToken).
-	}
+		Doc("Get cluster's token"))
 
 	ws.Route(ws.GET("/hosts").To(wsListHosts).
 		Doc("List hosts"))
 
+	(&wsHost{
+		prefix:  "/hosts/{host-name}",
+		hostDoc: "given host",
+		getHost: func(req *restful.Request) string {
+			return req.PathParameter("host-name")
+		},
+	}).register(ws, func(rb *restful.RouteBuilder) {
+	})
+
 	ws.Route(ws.GET("/ssh-acls").To(wsSSH_ACL_List))
 	ws.Route(ws.GET("/ssh-acls/{acl-name}").To(wsSSH_ACL_Get))
 	ws.Route(ws.PUT("/ssh-acls/{acl-name}").To(wsSSH_ACL_Set))
@@ -140,28 +82,10 @@ func registerWS(rest *restful.Container) {
 	rest.Add(ws)
 
 	// Hosts API
-	ws = (&restful.WebService{}).
+	ws = &restful.WebService{}
-		Filter(requireSecStore).
+	ws.Path("/me")
-		Filter(adminAuth).
+	ws.Filter(hostsAuth).
-		Path("/hosts/{host-name}").
+		HeaderParameter("Authorization", "Host or admin bearer token")
-		Param(ws.HeaderParameter("Authorization", "Host or admin bearer token"))
-
-	(&wsHost{
-		hostDoc: "given host",
-		getHost: func(req *restful.Request) (string, error) {
-			return req.PathParameter("host-name"), nil
-		},
-	}).register(ws, func(rb *restful.RouteBuilder) {
-		rb.Param(ws.PathParameter("host-name", "host's name"))
-	})
-
-	rest.Add(ws)
-
-	// Detected host API
-	ws = (&restful.WebService{}).
-		Filter(requireSecStore).
-		Path("/me").
-		Param(ws.HeaderParameter("Authorization", "Host or admin bearer token"))
 
 	(&wsHost{
 		hostDoc: "detected host",
@@ -170,51 +94,10 @@ func registerWS(rest *restful.Container) {
 		rb.Notes("In this case, the host is detected from the remote IP")
 	})
 
-	// Hosts by token API
-	ws = (&restful.WebService{}).
-		Filter(requireSecStore).
-		Path("/hosts-by-token/{host-token}").
-		Param(ws.PathParameter("host-token", "host's download token"))
-
-	(&wsHost{
-		hostDoc: "token's host",
-		getHost: func(req *restful.Request) (host string, err error) {
-			reqToken := req.PathParameter("host-token")
-
-			data, err := hostDownloadTokens.Data()
-			if err != nil {
-				return
-			}
-
-			for h, token := range data {
-				if token == reqToken {
-					host = h
-					return
-				}
-			}
-
-			return
-		},
-	}).register(ws, func(rb *restful.RouteBuilder) {
-		rb.Notes("In this case, the host is detected from the token")
-	})
-
 	rest.Add(ws)
 }
 
-func requireSecStore(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
+func detectHost(req *restful.Request) string {
-	if !secStore.Unlocked() {
-		wsError(resp, ErrStoreLocked)
-		return
-	}
-	chain.ProcessFilter(req, resp)
-}
-
-func detectHost(req *restful.Request) (hostName string, err error) {
-	if !*allowDetectedHost {
-		return
-	}
-
 	r := req.Request
 	remoteAddr := r.RemoteAddr
 
@@ -232,17 +115,17 @@ func detectHost(req *restful.Request) (hostName string, err error) {
 
 	cfg, err := readConfig()
 	if err != nil {
-		return
+		return ""
 	}
 
 	host := cfg.HostByIP(hostIP)
 
 	if host == nil {
 		log.Print("no host found for IP ", hostIP)
-		return
+		return ""
 	}
 
-	return host.Name, nil
+	return host.Name
 }
 
 func wsReadConfig(resp *restful.Response) *localconfig.Config {
@@ -256,28 +139,19 @@ func wsReadConfig(resp *restful.Response) *localconfig.Config {
 	return cfg
 }
 
-func wsNotFound(resp *restful.Response) {
+func wsNotFound(req *restful.Request, resp *restful.Response) {
-	wsError(resp, ErrNotFound)
+	http.NotFound(resp.ResponseWriter, req.Request)
-}
-
-func wsBadRequest(resp *restful.Response, err string) {
-	httperr.New(http.StatusBadRequest, errors.New(err)).WriteJSON(resp.ResponseWriter)
 }
 
 func wsError(resp *restful.Response, err error) {
 	log.Output(2, fmt.Sprint("request failed: ", err))
-
+	resp.WriteErrorString(
-	switch err := err.(type) {
+		http.StatusInternalServerError,
-	case httperr.Error:
+		http.StatusText(http.StatusInternalServerError))
-		err.WriteJSON(resp.ResponseWriter)
-
-	default:
-		httperr.Internal(err).WriteJSON(resp.ResponseWriter)
-	}
 }
 
-func wsRender(resp *restful.Response, sslCfg *cfsslconfig.Config, tmplStr string, value interface{}) {
+func wsRender(resp *restful.Response, tmplStr string, value interface{}) {
-	tmpl, err := template.New("wsRender").Funcs(templateFuncs(sslCfg)).Parse(tmplStr)
+	tmpl, err := template.New("wsRender").Funcs(templateFuncs).Parse(tmplStr)
 	if err != nil {
 		wsError(resp, err)
 		return

gen-api-js.sh

@@ -1 +0,0 @@
-docker run --rm --net=host --user $(id -u) -v ${PWD}:/local swaggerapi/swagger-codegen-cli generate -i http://[::1]:7606/swagger.json -l javascript -o /local/js/api/

go.mod

@@ -1,81 +1,55 @@
-module novit.tech/direktil/local-server
+module novit.nc/direktil/local-server
 
-go 1.21
+go 1.17
 
 require (
+	github.com/cavaliercoder/go-cpio v0.0.0-20180626203310-925f9528c45e
 	github.com/cespare/xxhash v1.1.0
-	github.com/cloudflare/cfssl v1.6.5
+	github.com/cloudflare/cfssl v0.0.0-20181213083726-b94e044bb51e
-	github.com/dustin/go-humanize v1.0.1
+	github.com/dustin/go-humanize v1.0.0
-	github.com/emicklei/go-restful v2.16.0+incompatible
+	github.com/emicklei/go-restful v2.10.0+incompatible
-	github.com/emicklei/go-restful-openapi v1.4.1
+	github.com/emicklei/go-restful-openapi v1.2.0
-	github.com/go-git/go-git/v5 v5.12.0
 	github.com/mcluseau/go-swagger-ui v0.0.0-20191019002626-fd9128c24a34
-	github.com/miolini/datacounter v1.0.3
+	github.com/miolini/datacounter v1.0.1
 	github.com/oklog/ulid v1.3.1
-	github.com/pierrec/lz4 v2.6.1+incompatible
+	github.com/pierrec/lz4 v2.3.0+incompatible
-	github.com/sergeymakinen/go-crypt v1.0.0
-	golang.org/x/crypto v0.22.0
 	gopkg.in/src-d/go-billy.v4 v4.3.2
 	gopkg.in/src-d/go-git.v4 v4.13.1
-	gopkg.in/yaml.v2 v2.4.0
+	gopkg.in/yaml.v2 v2.2.4
-	k8s.io/apimachinery v0.29.3
+	k8s.io/apimachinery v0.0.0-20191203211716-adc6f4cd9e7d
-	m.cluseau.fr/go v0.0.0-20230809064045-12c5a121c766
+	novit.nc/direktil/pkg v0.0.0-20191211161950-96b0448b84c2
-	novit.tech/direktil/pkg v0.0.0-20240415130406-0d2e181a4ed6
 )
 
-replace github.com/zmap/zlint/v3 => github.com/zmap/zlint/v3 v3.3.1
-
 require (
-	dario.cat/mergo v1.0.0 // indirect
+	github.com/PuerkitoBio/purell v1.1.1 // indirect
-	github.com/Microsoft/go-winio v0.6.1 // indirect
+	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
-	github.com/ProtonMail/go-crypto v1.0.0 // indirect
+	github.com/emirpasic/gods v1.12.0 // indirect
-	github.com/cavaliergopher/cpio v1.0.1 // indirect
-	github.com/cloudflare/circl v1.3.7 // indirect
-	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
-	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/frankban/quicktest v1.5.0 // indirect
-	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
+	github.com/go-openapi/jsonpointer v0.19.3 // indirect
-	github.com/go-git/go-billy/v5 v5.5.0 // indirect
+	github.com/go-openapi/jsonreference v0.19.3 // indirect
-	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/go-openapi/spec v0.19.3 // indirect
-	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/swag v0.19.5 // indirect
-	github.com/go-openapi/jsonreference v0.21.0 // indirect
+	github.com/gobuffalo/envy v1.7.1 // indirect
-	github.com/go-openapi/spec v0.21.0 // indirect
+	github.com/gobuffalo/packd v0.3.0 // indirect
-	github.com/go-openapi/swag v0.23.0 // indirect
-	github.com/gobuffalo/envy v1.10.2 // indirect
-	github.com/gobuffalo/packd v1.0.2 // indirect
 	github.com/gobuffalo/packr v1.30.1 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/protobuf v1.3.2 // indirect
-	github.com/google/certificate-transparency-go v1.1.8 // indirect
+	github.com/google/certificate-transparency-go v1.0.21 // indirect
+	github.com/google/go-cmp v0.3.1 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
-	github.com/jmoiron/sqlx v1.3.5 // indirect
+	github.com/joho/godotenv v1.3.0 // indirect
-	github.com/joho/godotenv v1.5.1 // indirect
+	github.com/json-iterator/go v1.1.8 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
+	github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
-	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/mailru/easyjson v0.7.0 // indirect
-	github.com/kevinburke/ssh_config v1.2.0 // indirect
-	github.com/kisielk/sqlstruct v0.0.0-20210630145711-dae28ed37023 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/modern-go/reflect2 v1.0.1 // indirect
-	github.com/pjbgf/sha1cd v0.3.0 // indirect
+	github.com/rogpeppe/go-internal v1.5.0 // indirect
-	github.com/rogpeppe/go-internal v1.12.0 // indirect
+	github.com/sergi/go-diff v1.0.0 // indirect
-	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
-	github.com/skeema/knownhosts v1.2.2 // indirect
 	github.com/src-d/gcfg v1.4.0 // indirect
-	github.com/weppos/publicsuffix-go v0.30.2 // indirect
+	github.com/xanzy/ssh-agent v0.2.1 // indirect
-	github.com/xanzy/ssh-agent v0.3.3 // indirect
+	golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 // indirect
-	github.com/zmap/zcrypto v0.0.0-20231219022726-a1f61fb1661c // indirect
+	golang.org/x/net v0.0.0-20191014212845-da9a3fd4c582 // indirect
-	github.com/zmap/zlint/v3 v3.5.0 // indirect
+	golang.org/x/sys v0.0.0-20191018095205-727590c5006e // indirect
-	golang.org/x/mod v0.17.0 // indirect
+	golang.org/x/text v0.3.2 // indirect
-	golang.org/x/net v0.24.0 // indirect
-	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/sys v0.19.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/tools v0.20.0 // indirect
-	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/klog/v2 v2.120.1 // indirect
-	k8s.io/utils v0.0.0-20240310230437-4693a0247e57 // indirect
 )

go.sum

@@ -1,468 +1,270 @@
-cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
-dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
-dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
+github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
-github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
-github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
 github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8/go.mod h1:I0gYDMZ6Z5GRU7l58bNFSkPTFN6Yl12dsUlAZ8xy98g=
+github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
-github.com/ProtonMail/go-crypto v1.0.0 h1:LRuvITjQWX+WIfr930YHG2HNfjR1uOfyf5vE0kC2U78=
-github.com/ProtonMail/go-crypto v1.0.0/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0=
 github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
+github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
+github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs=
 github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
+github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
-github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
-github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
-github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
+github.com/cavaliercoder/go-cpio v0.0.0-20180626203310-925f9528c45e h1:hHg27A0RSSp2Om9lubZpiMgVbvn39bsUmW9U5h0twqc=
-github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
+github.com/cavaliercoder/go-cpio v0.0.0-20180626203310-925f9528c45e/go.mod h1:oDpT4efm8tSYHXV5tHSdRvBet/b/QzxZ+XyyPehvm3A=
-github.com/cavaliergopher/cpio v1.0.1 h1:KQFSeKmZhv0cr+kawA3a0xTQCU4QxXF1vhU7P7av2KM=
-github.com/cavaliergopher/cpio v1.0.1/go.mod h1:pBdaqQjnvXxdS/6CvNDwIANIFSP0xRKI16PX4xejRQc=
 github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
-github.com/cloudflare/cfssl v1.6.4 h1:NMOvfrEjFfC63K3SGXgAnFdsgkmiq4kATme5BfcqrO8=
+github.com/cloudflare/cfssl v0.0.0-20181213083726-b94e044bb51e h1:Qux+lbuMaRzkQyTdzgtz8MgzPtzmaPQy6DXmxpdxT3U=
-github.com/cloudflare/cfssl v1.6.4/go.mod h1:8b3CQMxfWPAeom3zBnGJ6sd+G1NkL5TXqmDXacb+1J0=
+github.com/cloudflare/cfssl v0.0.0-20181213083726-b94e044bb51e/go.mod h1:yMWuSON2oQp+43nFtAV/uvKQIFpSPerB57DCt9t8sSA=
-github.com/cloudflare/cfssl v1.6.5 h1:46zpNkm6dlNkMZH/wMW22ejih6gIaJbzL2du6vD7ZeI=
-github.com/cloudflare/cfssl v1.6.5/go.mod h1:Bk1si7sq8h2+yVEDrFJiz3d7Aw+pfjjJSZVaD+Taky4=
-github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I=
-github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
-github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
-github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
-github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
+github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
+github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
-github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
+github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
-github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcejNsXKSkQ6lcIaNec2nyfOdlTBR2lU=
+github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
+github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
+github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/emicklei/go-restful v2.9.6+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
-github.com/emicklei/go-restful v2.16.0+incompatible h1:rgqiKNjTnFQA6kkhFe16D8epTksy9HQ1MyrbDXSdYhM=
+github.com/emicklei/go-restful v2.10.0+incompatible h1:l6Soi8WCOOVAeCo4W98iBFC6Og7/X8bpRt51oNLZ2C8=
-github.com/emicklei/go-restful v2.16.0+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
+github.com/emicklei/go-restful v2.10.0+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
-github.com/emicklei/go-restful-openapi v1.4.1 h1:SocVTIQWnXyit4dotTrwmncBAjtRaBmfcHjo3XGcCm4=
+github.com/emicklei/go-restful-openapi v1.2.0 h1:ohRZ1yEZERGzqaozBgxa3A0lt6c6KF14xhs3IL9ECwg=
-github.com/emicklei/go-restful-openapi v1.4.1/go.mod h1:kWQ8rQMVQ6G6lePwjDveJ00KjAUr/jq6z1X8DrDP3Gc=
+github.com/emicklei/go-restful-openapi v1.2.0/go.mod h1:cy7o3Ge8ZWZ5E90mpEY81sJZZFs2pkuYcLvfngYy1l0=
+github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
 github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
-github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
+github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
-github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
-github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=
-github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/frankban/quicktest v1.5.0 h1:Tb4jWdSpdjKzTUicPnY61PZxKbDoGa7ABbrReT3gQVY=
 github.com/frankban/quicktest v1.5.0/go.mod h1:jaStnuzAqU1AJdCO0l53JDCJrVDKcS03DbaAcR7Ks/o=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0=
 github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
-github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY=
+github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
-github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4=
+github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
-github.com/gliderlabs/ssh v0.3.7 h1:iV3Bqi942d9huXnzEF2Mt+CY9gLu8DNM4Obd+8bODRE=
-github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
-github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic=
-github.com/go-git/go-billy/v5 v5.5.0 h1:yEY4yhzCDuMGSv83oGxiBotRzhwhNr8VZyphhiu+mTU=
-github.com/go-git/go-billy/v5 v5.5.0/go.mod h1:hmexnoNsr2SJU1Ju67OaNz5ASJY3+sHgFRpCtpDCKow=
-github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4=
-github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII=
-github.com/go-git/go-git/v5 v5.11.0 h1:XIZc1p+8YzypNr34itUfSvYJcv+eYdTnTvOZ2vD3cA4=
-github.com/go-git/go-git/v5 v5.11.0/go.mod h1:6GFcX2P3NM7FPBfpePbpLd21XxsgdAt+lKqXmCUiUCY=
-github.com/go-git/go-git/v5 v5.12.0 h1:7Md+ndsjrzZxbddRDZjF14qK+NN56sy6wkqaVrjZtys=
-github.com/go-git/go-git/v5 v5.12.0/go.mod h1:FTM9VKtnI2m65hNI/TenDDDnUf2Q9FHnXYjuz9i5OEY=
-github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
-github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-openapi/jsonpointer v0.0.0-20180322222829-3a0015ad55fa/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
-github.com/go-openapi/jsonpointer v0.20.2 h1:mQc3nmndL8ZBzStEo3JYF8wzmeWffDH4VbXz58sAx6Q=
+github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
-github.com/go-openapi/jsonpointer v0.20.2/go.mod h1:bHen+N0u1KEO3YlmqOjTT9Adn1RfD91Ar825/PuiRVs=
+github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w=
-github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
+github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
+github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
 github.com/go-openapi/jsonreference v0.0.0-20180322222742-3fb327e6747d/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
-github.com/go-openapi/jsonreference v0.20.4 h1:bKlDxQxQJgwpUSgOENiMPzCTBVuc7vTdXSSgNeAhojU=
+github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
-github.com/go-openapi/jsonreference v0.20.4/go.mod h1:5pZJyJP2MnYCpoeoMAql78cCHauHj0V9Lhc506VOpw4=
+github.com/go-openapi/jsonreference v0.19.3 h1:5cxNfTy0UVC3X8JL5ymxzyoUZmo8iZb+jeTWn7tUa8o=
-github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ=
+github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
-github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4=
+github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
 github.com/go-openapi/spec v0.0.0-20180415031709-bcff419492ee/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
-github.com/go-openapi/spec v0.20.14 h1:7CBlRnw+mtjFGlPDRZmAMnq35cRzI91xj03HVyUi/Do=
+github.com/go-openapi/spec v0.19.3 h1:0XRyw8kguri6Yw4SxhsQA/atC88yqrk0+G4YhI2wabc=
-github.com/go-openapi/spec v0.20.14/go.mod h1:8EOhTpBoFiask8rrgwbLC3zmJfz4zsCUueRuPM6GNkw=
+github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
-github.com/go-openapi/spec v0.21.0 h1:LTVzPc3p/RzRnkQqLRndbAzjY0d0BCL72A6j3CdL9ZY=
+github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
-github.com/go-openapi/spec v0.21.0/go.mod h1:78u6VdPw81XU44qEWGhtr982gJ5BWg2c0I5XwVMotYk=
 github.com/go-openapi/swag v0.0.0-20180405201759-811b1089cde9/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
-github.com/go-openapi/swag v0.22.9 h1:XX2DssF+mQKM2DHsbgZK74y/zj4mo9I99+89xUmuZCE=
+github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-openapi/swag v0.22.9/go.mod h1:3/OXnFfnMAwBD099SwYRk7GD3xOrr1iL7d/XNLXVVwE=
+github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY=
-github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
+github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
-github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
-github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
-github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
 github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
+github.com/gobuffalo/envy v1.7.1 h1:OQl5ys5MBea7OGCdvPbBJWRgnhC/fGona6QKfvFeau8=
 github.com/gobuffalo/envy v1.7.1/go.mod h1:FurDp9+EDPE4aIUS3ZLyD+7/9fpx7YRt/ukY6jIHf0w=
-github.com/gobuffalo/envy v1.10.2 h1:EIi03p9c3yeuRCFPOKcSfajzkLb3hrRjEpHGI8I2Wo4=
-github.com/gobuffalo/envy v1.10.2/go.mod h1:qGAGwdvDsaEtPhfBzb3o0SfDea8ByGn9j8bKmVft9z8=
 github.com/gobuffalo/logger v1.0.0/go.mod h1:2zbswyIUa45I+c+FLXuWl9zSWEiVuthsk8ze5s8JvPs=
+github.com/gobuffalo/packd v0.3.0 h1:eMwymTkA1uXsqxS0Tpoop3Lc0u3kTfiMBE6nKtQU4g4=
 github.com/gobuffalo/packd v0.3.0/go.mod h1:zC7QkmNkYVGKPw4tHpBQ+ml7W/3tIebgeo1b36chA3Q=
-github.com/gobuffalo/packd v1.0.2 h1:Yg523YqnOxGIWCp69W12yYBKsoChwI7mtu6ceM9Bwfw=
-github.com/gobuffalo/packd v1.0.2/go.mod h1:sUc61tDqGMXON80zpKGp92lDb86Km28jfvX7IAyxFT8=
 github.com/gobuffalo/packr v1.30.1 h1:hu1fuVR3fXEZR7rXNW3h8rqSML8EVAf6KNm0NKO/wKg=
 github.com/gobuffalo/packr v1.30.1/go.mod h1:ljMyFO2EcrnzsHsN99cvbq055Y9OhRrIaviy289eRuk=
 github.com/gobuffalo/packr/v2 v2.5.1/go.mod h1:8f9c96ITobJlPzI44jj+4tHnEKNt0xXWSVlXRN9X1Iw=
-github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
+github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/google/certificate-transparency-go v1.1.7 h1:IASD+NtgSTJLPdzkthwvAG1ZVbF2WtFg4IvoA68XGSw=
+github.com/google/certificate-transparency-go v1.0.21 h1:Yf1aXowfZ2nuboBsg7iYGLmwsOARdV86pfH3g95wXmE=
-github.com/google/certificate-transparency-go v1.1.7/go.mod h1:FSSBo8fyMVgqptbfF6j5p/XNdgQftAhSmXcIxV9iphE=
+github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg=
-github.com/google/certificate-transparency-go v1.1.8 h1:LGYKkgZF7satzgTak9R4yzfJXEeYVAjV6/EAEJOf1to=
-github.com/google/certificate-transparency-go v1.1.8/go.mod h1:bV/o8r0TBKRf1X//iiiSgWrvII4d7/8OiA+3vG26gI8=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-github/v50 v50.2.0/go.mod h1:VBY8FB6yPIjrtKhozXv4FQupxKLS6H4m6xFZlT43q8Q=
-github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
-github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
+github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
-github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=
 github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
-github.com/joho/godotenv v1.4.0/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
+github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
+github.com/json-iterator/go v1.1.8 h1:QiWkFLKq0T7mpzwOTu6BzNDbfTE8OLrYhVKYMLF46Ok=
-github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
+github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
-github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
-github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/karrick/godirwalk v1.10.12/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
+github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v2wtGp9Gmz1Ze3eVRAWJMLokvN3QjdzCHLY=
 github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
-github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
+github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
-github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/kisielk/sqlstruct v0.0.0-20210630145711-dae28ed37023 h1:/pb3UJ+3ZtSEUKWnufwsoVF7f0AX5ytPULbTwHMgbq4=
-github.com/kisielk/sqlstruct v0.0.0-20210630145711-dae28ed37023/go.mod h1:yyMNCyc/Ib3bDTKd379tNMpB/7/H5TjM2Y9QJ5THLbE=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
 github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
-github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
+github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20180323154445-8b799c424f57/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
+github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
-github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
-github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM=
-github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
-github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
 github.com/mcluseau/go-swagger-ui v0.0.0-20191019002626-fd9128c24a34 h1:F3u4DKQ4T30mlBNFmSGzTqdkmVqbfVORv34ZRvc7PuE=
 github.com/mcluseau/go-swagger-ui v0.0.0-20191019002626-fd9128c24a34/go.mod h1:lcyE8C83VRamH/oTpikU4+yVCCxLthWgDOqjHSsu+ZY=
-github.com/miolini/datacounter v1.0.3 h1:tanOZPVblGXQl7/bSZWoEM8l4KK83q24qwQLMrO/HOA=
+github.com/miolini/datacounter v1.0.1 h1:4hs8Sc03o2jADLol/aWgesWS565mV9h8314QGA+gss4=
-github.com/miolini/datacounter v1.0.3/go.mod h1:C45dc2hBumHjDpEU64IqPwR6TDyPVpzOqqRTN7zmBUA=
+github.com/miolini/datacounter v1.0.1/go.mod h1:C45dc2hBumHjDpEU64IqPwR6TDyPVpzOqqRTN7zmBUA=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
+github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/mreiferson/go-httpclient v0.0.0-20160630210159-31f0106b4474/go.mod h1:OQA4XLvDbMgS8P0CevmM4m9Q3Jq4phKUzcocxuGJ5m8=
+github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
-github.com/mreiferson/go-httpclient v0.0.0-20201222173833-5e475fde3a4d/go.mod h1:OQA4XLvDbMgS8P0CevmM4m9Q3Jq4phKUzcocxuGJ5m8=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
 github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
-github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg=
+github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
+github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
+github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
-github.com/pierrec/lz4 v2.6.1+incompatible h1:9UY3+iC23yxF0UfGaYrGplQ+79Rg+h/q9FV9ix19jjM=
+github.com/pierrec/lz4 v2.3.0+incompatible h1:CZzRn4Ut9GbUkHlQ7jqBXeZQV41ZSKWFc302ZU6lUTk=
-github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pierrec/lz4 v2.3.0+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
-github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
-github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.3.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/rogpeppe/go-internal v1.5.0 h1:Usqs0/lDK/NqTkvrmKSwA/3XkZAs7ZAW/eLeQ2MVBTw=
 github.com/rogpeppe/go-internal v1.5.0/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
-github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
-github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
-github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
-github.com/sergeymakinen/go-crypt v1.0.0 h1:R9yyekVU0bxP7MUUJd3uCcGQxg5RqMJ/ahy2bllx9qg=
+github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
-github.com/sergeymakinen/go-crypt v1.0.0/go.mod h1:5NPTCUNfQrNlck+I9ONHFT55UvGWzosSf+QQPSuxYBE=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
-github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
-github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
-github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
-github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/skeema/knownhosts v1.2.1 h1:SHWdIUa82uGZz+F+47k8SY4QhhI291cXCpopT1lK2AQ=
-github.com/skeema/knownhosts v1.2.1/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3ThzgDxUwo=
-github.com/skeema/knownhosts v1.2.2 h1:Iug2P4fLmDw9f41PB6thxUkNUkJzB5i+1/exaj40L3A=
-github.com/skeema/knownhosts v1.2.2/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3ThzgDxUwo=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
+github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
 github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4=
 github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
-github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
+github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
-github.com/weppos/publicsuffix-go v0.13.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln16JPQ02lHAdn5k=
+github.com/xanzy/ssh-agent v0.2.1 h1:TCbipTQL2JiiCprBWx9frJ2eJlCYT00NmctrHxVAr70=
-github.com/weppos/publicsuffix-go v0.15.1-0.20220329081811-9a40b608a236/go.mod h1:HYux0V0Zi04bHNwOHy4cXJVz/TQjYonnF6aoYhj+3QE=
-github.com/weppos/publicsuffix-go v0.30.2-0.20230730094716-a20f9abcc222 h1:h2JizvZl9aIj6za9S5AyrkU+OzIS4CetQthH/ejO+lg=
-github.com/weppos/publicsuffix-go v0.30.2-0.20230730094716-a20f9abcc222/go.mod h1:s41lQh6dIsDWIC1OWh7ChWJXLH0zkJ9KHZVqA7vHyuQ=
-github.com/weppos/publicsuffix-go v0.30.2 h1:Np18yzfMR90jNampWFs7iSh2sw/qCZkhL41/ffyihCU=
-github.com/weppos/publicsuffix-go v0.30.2/go.mod h1:/hGscit36Yt+wammfBBwdMdxBT8btsTt6KvwO9OvMyM=
 github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4=
-github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
-github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-github.com/zmap/rc2 v0.0.0-20131011165748-24b9757f5521/go.mod h1:3YZ9o3WnatTIZhuOtot4IcUfzoKVjUHqu6WALIyI0nE=
-github.com/zmap/rc2 v0.0.0-20190804163417-abaa70531248/go.mod h1:3YZ9o3WnatTIZhuOtot4IcUfzoKVjUHqu6WALIyI0nE=
-github.com/zmap/zcertificate v0.0.0-20180516150559-0e3d58b1bac4/go.mod h1:5iU54tB79AMBcySS0R2XIyZBAVmeHranShAFELYx7is=
-github.com/zmap/zcertificate v0.0.1/go.mod h1:q0dlN54Jm4NVSSuzisusQY0hqDWvu92C+TWveAxiVWk=
-github.com/zmap/zcrypto v0.0.0-20201211161100-e54a5822fb7e/go.mod h1:aPM7r+JOkfL+9qSB4KbYjtoEzJqUK50EXkkJabeNJDQ=
-github.com/zmap/zcrypto v0.0.0-20220402174210-599ec18ecbac/go.mod h1:egdRkzUylATvPkWMpebZbXhv0FMEMJGX/ur0D3Csk2s=
-github.com/zmap/zcrypto v0.0.0-20231219022726-a1f61fb1661c h1:U1b4THKcgOpJ+kILupuznNwPiURtwVW3e9alJvji9+s=
-github.com/zmap/zcrypto v0.0.0-20231219022726-a1f61fb1661c/go.mod h1:GSDpFDD4TASObxvfZfvpZZ3OWHIUHMlhVWlkOe4ewVk=
-github.com/zmap/zlint/v3 v3.3.1 h1:IrIY2Qd2Wr9ZHhdQ3mszehSydz+x6OROClztMEK+2bU=
-github.com/zmap/zlint/v3 v3.3.1/go.mod h1:fPCW5acxhqw4HU1Vm0t9oFEPo1/uH9hI0sci/Z++hEI=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8=
-golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
+golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
-golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
-golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
-golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
-golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
-golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
-golang.org/x/crypto v0.20.0 h1:jmAMJJZXr5KiCw05dfYK9QnqaqKLYXijU23lsEdcQqg=
-golang.org/x/crypto v0.20.0/go.mod h1:Xwo95rrVNIoSMx9wa1JroENMToLWn3RNVrTBpLHgZPQ=
-golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
-golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=
-golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20191014212845-da9a3fd4c582 h1:p9xBe/w/OzkeYVKm234g55gMdD1nSIooTir5kV11kfA=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20191014212845-da9a3fd4c582/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
-golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
-golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
-golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
-golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
-golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
-golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191018095205-727590c5006e h1:ZtoklVMHQy6BFRHkbG6JzK+S6rX82//Yeok1vMlizfQ=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191018095205-727590c5006e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
-golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
-golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
-golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
-golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
-golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
-golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
-golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U=
-golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
-golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190624180213-70d37148ca0c/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ=
-golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg=
-golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY=
-golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw=
-gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
-google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
-google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
-google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
-google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/src-d/go-billy.v4 v4.3.2 h1:0SQA1pRztfTFx2miS8sA97XvooFeNOmvUenF4o0EcVg=
 gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98=
 gopkg.in/src-d/go-git-fixtures.v3 v3.5.0 h1:ivZFOIltbce2Mo8IjzUHAFoq/IylO9WHhNOAJK+LsJg=
 gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g=
 gopkg.in/src-d/go-git.v4 v4.13.1 h1:SRtFyV8Kxc0UP7aCHcijOMQGPxHSmMOPrzulQWolkYE=
 gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
 gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+k8s.io/apimachinery v0.0.0-20191203211716-adc6f4cd9e7d h1:q+OZmYewHJeMCzwpHkXlNTtk5bvaUMPCikKvf77RBlo=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+k8s.io/apimachinery v0.0.0-20191203211716-adc6f4cd9e7d/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
-k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8=
+k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
-k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU=
+k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
-k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU=
+novit.nc/direktil/pkg v0.0.0-20191211161950-96b0448b84c2 h1:LN3K19gAJ1GamJXkzXAQmjbl8xCV7utqdxTTrM89MMc=
-k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU=
+novit.nc/direktil/pkg v0.0.0-20191211161950-96b0448b84c2/go.mod h1:zwTVO6U0tXFEaga73megQIBK7yVIKZJVePaIh/UtdfU=
-k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
+sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
-k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
+sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
-k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ=
-k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-k8s.io/utils v0.0.0-20240310230437-4693a0247e57 h1:gbqbevonBh57eILzModw6mrkbwM0gQBEuevE/AaBsHY=
-k8s.io/utils v0.0.0-20240310230437-4693a0247e57/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-m.cluseau.fr/go v0.0.0-20230809064045-12c5a121c766 h1:JRzMBDbUwrTTGDJaJSH0ap4vRL0Q9CN1bG8a6n49eaQ=
-m.cluseau.fr/go v0.0.0-20230809064045-12c5a121c766/go.mod h1:BMv3aOSYpupuiiG3Ch3ND88aB5CfAks3YZuRLE8j1ls=
-novit.tech/direktil/pkg v0.0.0-20240120172717-8498a102796f h1:7y11nLhChrrsLQwRaW7wn/9x+Xn2gEVtzj75VkOpJ+o=
-novit.tech/direktil/pkg v0.0.0-20240120172717-8498a102796f/go.mod h1:zjezU6tELE880oYHs/WAauGBupKIEQQ7KqWTB69RW10=
-novit.tech/direktil/pkg v0.0.0-20240415114750-ccdbf2e2a5e4 h1:8HviBvbPzIBo2VpDl2jc6iPwiqlOrAbXqRhtn/yYMYE=
-novit.tech/direktil/pkg v0.0.0-20240415114750-ccdbf2e2a5e4/go.mod h1:zjezU6tELE880oYHs/WAauGBupKIEQQ7KqWTB69RW10=
-novit.tech/direktil/pkg v0.0.0-20240415130406-0d2e181a4ed6 h1:D0TN5GyZ4d88ILpgVZgcZ62027lW8/LLnQSpQyN2yOw=
-novit.tech/direktil/pkg v0.0.0-20240415130406-0d2e181a4ed6/go.mod h1:zjezU6tELE880oYHs/WAauGBupKIEQQ7KqWTB69RW10=

govc.env

@@ -0,0 +1,8 @@
+export GOVC_DATACENTER=
+export GOVC_PASSWORD=
+export GOVC_URL=
+export GOVC_USERNAME=
+export GOVC_INSECURE=1
+export GOVC_DATASTORE=
+export NOVIT_VM_FOLDER=
+export NOVIT_ISO_FOLDER=

hack/build

@@ -1,3 +0,0 @@
-#! /bin/sh
-set -ex
-go build -o dist/ -trimpath -ldflags "-X main.Version=${GIT_TAG:-$(git describe --always --dirty)}" $*

hack/docker-build

@@ -1,8 +0,0 @@
-#! /bin/bash
-set -ex
-case "$1" in
-commit) tag=$(git describe --always --dirty) ;;
-"")     tag=latest ;;
-*)      tag=$1 ;;
-esac
-docker build -t novit.tech/direktil/local-server:$tag .

hack/install

@@ -1,4 +0,0 @@
-#! /bin/sh
-set -ex
-go install -trimpath -ldflags "-X main.Version=$(git describe --always --dirty)" \
-    ./cmd/dkl-dir2config

html/html.go

@@ -1,6 +0,0 @@
-package dlshtml
-
-import "embed"
-
-//go:embed favicon.ico ui
-var FS embed.FS

html/ui/app.css

@@ -1,23 +0,0 @@
-
-.downloads {
-    display: flex;
-    align-content: stretch;
-}
-
-.downloads > * {
-    margin-left: 6pt;
-}
-.downloads > *:first-child {
-    margin-left: 0;
-}
-
-.downloads > div {
-    display: flex;
-    flex-flow: column;
-    max-height: 100pt;
-    overflow: auto;
-}
-
-.cluster {
-    max-width: 50%;
-}

html/ui/index.html

@@ -1,139 +0,0 @@
-<!doctype html>
-<html>
-<head>
-<title>Direktil Local Server</title>
-<style>
-@import url('./style.css');
-@import url('./app.css');
-</style>
-<script src="js/jsonpatch.min.js" crossorigin="anonymous"></script>
-<script src="js/app.js" type="module" defer></script>
-<body>
-
-<div id="app">
-<header>
-    <div id="logo">
-        <img src="/favicon.ico" />
-        <span>Direktil Local Server</span>
-    </div>
-    <div class="utils">
-        <span id="login-hdr" v-if="session.token">
-            Logged in
-            <button class="link" @click="copyText(session.token)">&#x1F5D0;</button>
-        </span>
-
-        <span>server <code>{{ serverVersion || '-----' }}</code></span>
-        <span>ui     <code>{{ uiHash || '-----' }}</code></span>
-
-        <span :class="publicState ? 'green' : 'red'">&#x1F5F2;</span>
-    </div>
-</header>
-
-<div class="error" v-if="error">
-    <button class="btn-close" @click="error=null">&times;</button>
-    <div class="code" v-if="error.code">{{ error.code }}</div>
-    <div class="message">{{ error.message }}</div>
-</div>
-
-<template v-if="!publicState">
-    <p>Not connected.</p>
-</template>
-<template v-else-if="publicState.Store.New">
-    <p>Store is new.</p>
-    <p>Option 1: initialize a new store</p>
-    <form @submit="unlockStore">
-        <input type="text"     v-model="forms.store.name"  name="name" placeholder="Name" /><br/>
-        <input type="password" v-model="forms.store.pass1" name="passphrase" required placeholder="Passphrase" />
-        <input type="password" v-model="forms.store.pass2" required placeholder="Passphrase confirmation" />
-        <input type="submit" value="initialize" :disabled="!forms.store.pass1 || forms.store.pass1 != forms.store.pass2" />
-    </form>
-    <p>Option 2: upload a previously downloaded store</p>
-    <form @submit="uploadStore">
-        <input type="file" ref="storeUpload" />
-        <input type="submit" value="upload" />
-    </form>
-</template>
-<template v-else-if="!publicState.Store.Open">
-    <p>Store is not open.</p>
-    <form @submit="unlockStore">
-        <input type="password" name="passphrase" v-model="forms.store.pass1" required placeholder="Passphrase" />
-        <input type="submit" value="unlock" :disabled="!forms.store.pass1" />
-    </form>
-</template>
-<template v-else-if="!state">
-    <p v-if="!session.token">Not logged in.</p>
-    <p v-else>Invalid token</p>
-
-    <form @submit="unlockStore">
-        <input type="password" v-model="forms.store.pass1" required placeholder="Passphrase" />
-        <input type="submit" value="log in"/>
-    </form>
-</template>
-<template v-else>
-  <div v-if="state.Clusters" id="clusters">
-    <h2>Clusters</h2>
-
-    <div class="sheets">
-        <Cluster v-for="c in state.Clusters" :cluster="c" :token="session.token" :state="state" />
-    </div>
-  </div>
-
-  <div v-if="state.Hosts" id="hosts">
-    <h2>Hosts</h2>
-
-    <div class="sheets">
-        <Host v-for="h in state.Hosts" :host="h" :token="session.token" :state="state" />
-    </div>
-  </div>
-
-  <h2>Admin actions</h2>
-
-  <h3>Config</h3>
-  <form @submit="uploadConfig">
-      <input type="file" ref="configUpload" required />
-      <input type="submit" value="upload config" />
-  </form>
-
-  <h3>Store</h3>
-  <p><a :href="'/public/store.tar?token='+state.Store.DownloadToken" target="_blank">Download</a></p>
-  <form @submit="storeAddKey" action="/store/add-key">
-      <p>Add an unlock phrase:</p>
-      <input type="text"     v-model="forms.store.name"  name="name" required placeholder="Name" /><br/>
-      <input type="password" v-model="forms.store.pass1" name="passphrase" autocomplete="new-password" required placeholder="Phrase" />
-      <input type="password" v-model="forms.store.pass2" autocomplete="new-password" required placeholder="Phrase confirmation" />
-      <input type="submit" value="add unlock phrase" :disabled="!forms.store.pass1 || forms.store.pass1 != forms.store.pass2" />
-  </form>
-  <form @submit="storeDelKey" action="/store/delete-key">
-      <p>Remove an unlock phrase:</p>
-      <input type="text" v-model="forms.delKey.name"  name="name" required placeholder="Name" />
-      <input type="submit" value="remove unlock phrase" />
-
-      <p v-if="state.Store.KeyNames">Available names:
-        <template v-for="k,i in state.Store.KeyNames">{{i?", ":""}}<code @click="forms.delKey.name=k">{{k}}</code></template>.</p>
-  </form>
-
-<template v-if="state.HostTemplates && state.HostTemplates.length">
-  <h3>Hosts from template</h3>
-  <form @submit="hostFromTemplateAdd" action="">
-      <p>Add a host from template instance:</p>
-      <input type="text" v-model="forms.hostFromTemplate.name" required placeholder="Name" />
-      <select v-model="forms.hostFromTemplate.Template" required>
-        <option v-for="name in state.HostTemplates" :value="name">{{name}}</option>
-      </select>
-      <input type="text" v-model="forms.hostFromTemplate.IP" required placeholder="IP" />
-      <input type="submit" value="add instance" />
-  </form>
-  <form @submit="hostFromTemplateDel" action="">
-      <p>Remove a host from template instance:</p>
-      <select v-model="forms.hostFromTemplateDel" required>
-        <option v-for="h in hostsFromTemplate" :value="h.Name">{{h.Name}}</option>
-      </select>
-      <input type="submit" value="delete instance" :disabled="!forms.hostFromTemplateDel" />
-  </form>
-</template>
-
-</template>
-</div>
-
-</body>
-</html>

html/ui/js/Cluster.js

@@ -1,35 +0,0 @@
-
-import Downloads from './Downloads.js';
-import GetCopy from './GetCopy.js';
-
-export default {
-    components: { Downloads, GetCopy },
-    props: [ 'cluster', 'token', 'state' ],
-    template: `
-<div class="cluster">
-  <div class="title">Cluster {{ cluster.Name }}</div>
-  <div class="section">Tokens</div>
-  <section class="links">
-    <GetCopy v-for="n in cluster.Tokens" :token="token" :name="n" :href="'/clusters/'+cluster.Name+'/tokens/'+n" />
-  </section>
-  <div class="section">Passwords</div>
-  <section class="links">
-    <GetCopy v-for="n in cluster.Passwords" :token="token" :name="n" :href="'/clusters/'+cluster.Name+'/passwords/'+n" />
-  </section>
-  <div class="section">Downloads</div>
-  <section class="downloads">
-    <Downloads :token="token" :state="state" kind="cluster" :name="cluster.Name" />
-  </section>
-  <div class="section">CAs</div>
-  <table><tr><th>Name</th><th>Certificate</th><th>Signed certificates</th></tr>
-  <tr v-for="ca in cluster.CAs">
-    <td>{{ ca.Name }}</td>
-    <td><GetCopy :token="token" name="cert" :href="'/clusters/'+cluster.Name+'/CAs/'+ca.Name+'/certificate'" /></td>
-    <td><template v-for="signed in ca.Signed">
-      {{" "}}
-      <GetCopy :token="token" :name="signed" :href="'/clusters/'+cluster.Name+'/CAs/'+ca.Name+'/signed?name='+signed" />
-    </template></td>
-  </tr></table>
-</div>
-`
-}

html/ui/js/Downloads.js

@@ -1,64 +0,0 @@
-
-export default {
-    props: [ 'kind', 'name', 'token', 'state' ],
-    data() {
-        return { createDisabled: false, selectedAssets: {} }
-    },
-    computed: {
-        availableAssets() {
-            return {
-                cluster: ['addons'],
-                host: [
-                    "kernel",
-                    "initrd",
-                    "bootstrap.tar",
-                    "boot.img.lz4",
-                    "boot.iso",
-                    "config",
-                    "bootstrap-config",
-                    "boot.tar",
-                    "boot-efi.tar",
-                    "boot.img.gz",
-                    "boot.img",
-                    "ipxe",
-                ],
-            }[this.kind]
-        },
-        downloads() {
-            let ret = []
-            Object.entries(this.state.Downloads)
-              .filter(e => { let d=e[1]; return d.Kind == this.kind && d.Name == this.name })
-              .forEach(e => {
-                let token= e[0], d = e[1]
-                d.Assets.forEach(asset => {
-                    ret.push({name: asset, url: '/public/downloads/'+token+'/'+asset})
-                })
-              })
-          return ret
-        },
-        assets() {
-            return this.availableAssets.filter(a => this.selectedAssets[a])
-        },
-    },
-    methods: {
-        createToken() {
-            event.preventDefault()
-            this.createDisabled = true
-
-            fetch('/authorize-download', {
-                method: 'POST',
-                body: JSON.stringify({Kind: this.kind, Name: this.name, Assets: this.assets}),
-                headers: { 'Authorization': 'Bearer ' + this.token, 'Content-Type': 'application/json' },
-            }).then((resp) => resp.json())
-              .then((token) => { this.selectedAssets = {}; this.createDisabled = false })
-              .catch((e) => { alert('failed to create link'); this.createDisabled = false })
-        },
-    },
-    template: `<div class="downloads">
-  <div class="options">
-    <span v-for="asset in availableAssets"><label><input type="checkbox" v-model="selectedAssets[asset]" />&nbsp;{{ asset }}</label></span>
-  </div>
-  <button :disabled="createDisabled || assets.length==0" @click="createToken">+</button>
-  <div><a v-for="d in downloads" target="_blank" :href="d.url">{{ d.name }}</a></div>
-</div>`
-}

html/ui/js/GetCopy.js

@@ -1,32 +0,0 @@
-export default {
-    props: [ 'name', 'href', 'token' ],
-    data() { return {showCopied: false} },
-    template: `<span class="notif"><div v-if="showCopied">copied!</div><a :href="href" @click="fetchAndSave()">{{name}}</a>&nbsp;<a href="#" class="copy" @click="fetchAndCopy()">&#x1F5D0;</a></span>`,
-    methods: {
-        fetch() {
-            event.preventDefault()
-            return fetch(this.href, {
-                method: 'GET',
-                headers: { 'Authorization': 'Bearer ' + this.token },
-            })
-        },
-        handleFetchError(e) {
-            console.log("failed to get value:", e)
-            alert('failed to get value')
-        },
-        fetchAndSave() {
-            this.fetch().then(resp => resp.blob()).then((value) => {
-                window.open(URL.createObjectURL(value), "_blank")
-            }).catch(this.handleFetchError)
-        },
-        fetchAndCopy() {
-            this.fetch()
-            .then((resp) => resp.headers.get("content-type") == "application/json" ? resp.json() : resp.text())
-            .then((value) => {
-                window.navigator.clipboard.writeText(value)
-                this.showCopied = true
-                setTimeout(() => { this.showCopied = false }, 1000)
-            }).catch(this.handleFetchError)
-        },
-    },
-}

html/ui/js/Host.js

@@ -1,22 +0,0 @@
-
-import Downloads from './Downloads.js';
-
-export default {
-    components: { Downloads },
-    props: [ 'host', 'token', 'state' ],
-    template: `
-<div class="host">
-  <div class="title">Host {{ host.Name }}</div>
-  <section>
-    <div><small>Cluster: {{ host.Cluster }}<template v-if="host.Template"> ({{ host.Template }})</template></small></div>
-    <template v-for="ip in host.IPs">
-      <code>{{ ip }}</code>{{" "}}
-    </template>
-  </section>
-  <div class="section">Downloads</div>
-  <section>
-    <Downloads :token="token" :state="state" kind="host" :name="host.Name" />
-  </section>
-</div>
-`
-}

html/ui/js/app.js

@@ -1,242 +0,0 @@
-
-import { createApp } from './vue.esm-browser.js';
-
-import Cluster from './Cluster.js';
-import Host    from './Host.js';
-
-createApp({
-    components: { Cluster, Host },
-    data() {
-        return {
-            forms: {
-                store: {},
-                storeUpload: {},
-                delKey: {},
-                hostFromTemplate: {},
-                hostFromTemplateDel: "",
-            },
-            session: {},
-            error: null,
-            publicState: null,
-            serverVersion: null,
-            uiHash: null,
-            watchingState: false,
-            state: null,
-        }
-    },
-    mounted() {
-        this.session = JSON.parse(sessionStorage.state || "{}")
-        this.watchPublicState()
-    },
-    watch: {
-        session: {
-            deep: true,
-            handler(v) {
-                sessionStorage.state = JSON.stringify(v)
-
-                if (v.token && !this.watchingState) {
-                    this.watchState()
-                    this.watchingState = true
-                }
-            }
-        },
-        publicState: {
-            deep: true,
-            handler(v) {
-                if (v) {
-                    this.serverVersion = v.ServerVersion
-                    if (this.uiHash && v.UIHash != this.uiHash) {
-                        console.log("reloading")
-                        location.reload()
-                    } else {
-                        this.uiHash = v.UIHash
-                    }
-                }
-            },
-        }
-    },
-
-    computed: {
-        hostsFromTemplate() {
-            return (this.state.Hosts||[]).filter((h) => h.Template)
-        },
-    },
-
-    methods: {
-        copyText(text) {
-            event.preventDefault()
-            window.navigator.clipboard.writeText(text)
-        },
-        setToken() {
-            event.preventDefault()
-            this.session.token = this.forms.setToken
-            this.forms.setToken = null
-        },
-        uploadStore() {
-            event.preventDefault()
-            this.apiPost('/public/store.tar', this.$refs.storeUpload.files[0], (v) => {
-                this.forms.store = {}
-            }, "application/tar")
-        },
-        namedPassphrase(name, passphrase) {
-            return {Name: this.forms.store.name, Passphrase: btoa(this.forms.store.pass1)}
-        },
-        storeAddKey() {
-            this.apiPost('/store/add-key', this.namedPassphrase(), (v) => {
-                this.forms.store = {}
-            })
-        },
-        storeDelKey() {
-            event.preventDefault()
-
-            let name = this.forms.delKey.name
-
-            if (!confirm("Remove key named "+JSON.stringify(name)+"?")) {
-                return
-            }
-            this.apiPost('/store/delete-key', name , (v) => {
-                this.forms.delKey = {}
-            })
-        },
-        unlockStore() {
-            this.apiPost('/public/unlock-store', this.namedPassphrase(), (v) => {
-                this.forms.store = {}
-
-                if (v) {
-                    this.session.token = v
-                    if (!this.watchingState) {
-                        this.watchState()
-                        this.watchingState = true
-                    }
-                }
-            })
-        },
-        uploadConfig() {
-            this.apiPost('/configs', this.$refs.configUpload.files[0], (v) => {}, "text/vnd.yaml")
-        },
-        hostFromTemplateAdd() {
-            let v = this.forms.hostFromTemplate;
-            this.apiPost('/hosts-from-template/'+v.name, v, (v) => { this.forms.hostFromTemplate = {} });
-        },
-        hostFromTemplateDel() {
-            event.preventDefault()
-
-            let v = this.forms.hostFromTemplateDel;
-            if (!confirm("delete host template instance "+v+"?")) {
-                return
-            }
-            this.apiDelete('/hosts-from-template/'+v, (v) => { this.forms.hostFromTemplateDel = "" });
-        },
-        apiPost(action, data, onload, contentType = 'application/json') {
-            event.preventDefault()
-
-            if (data === undefined) {
-                throw("action " + action + ": no data")
-            }
-
-            /* TODO
-            fetch(action, {
-                method: 'POST',
-                body: JSON.stringify(data),
-            })
-              .then((response) => response.json())
-              .then((result) => onload)
-            // */
-
-            var xhr = new XMLHttpRequest()
-
-            xhr.responseType = 'json'
-            // TODO spinner, pending action notification, or something
-            xhr.onerror = () => {
-                // this.actionResults.splice(idx, 1, {...item, done: true, failed: true })
-            }
-            xhr.onload = (r) => {
-                if (xhr.status != 200) {
-                    this.error = xhr.response
-                    return
-                }
-                // this.actionResults.splice(idx, 1, {...item, done: true, resp: xhr.responseText})
-                this.error = null
-                if (onload) {
-                    onload(xhr.response)
-                }
-            }
-
-            xhr.open("POST", action)
-            xhr.setRequestHeader('Accept', 'application/json')
-            xhr.setRequestHeader('Content-Type', contentType)
-            if (this.session.token) {
-                xhr.setRequestHeader('Authorization', 'Bearer '+this.session.token)
-            }
-
-            if (contentType == "application/json") {
-                xhr.send(JSON.stringify(data))
-            } else {
-                xhr.send(data)
-            }
-        },
-        apiDelete(action, data, onload) {
-            event.preventDefault()
-
-            var xhr = new XMLHttpRequest()
-            xhr.onload = (r) => {
-                if (xhr.status != 200) {
-                    this.error = xhr.response
-                    return
-                }
-                this.error = null
-                if (onload) {
-                    onload(xhr.response)
-                }
-            }
-            xhr.open("DELETE", action)
-            xhr.setRequestHeader('Accept', 'application/json')
-            if (this.session.token) {
-                xhr.setRequestHeader('Authorization', 'Bearer '+this.session.token)
-            }
-            xhr.send()
-        },
-        download(url) {
-            event.target.target = '_blank'
-            event.target.href = this.downloadLink(url)
-        },
-        downloadLink(url) {
-            // TODO once-shot download link
-            return url + '?token=' + this.session.token
-        },
-        watchPublicState() {
-            this.watchStream('publicState', '/public-state')
-        },
-        watchState() {
-            this.watchStream('state', '/state', true)
-        },
-        watchStream(field, path, withToken) {
-            let evtSrc = new EventSource(path + (withToken ? '?token='+this.session.token : ''));
-            evtSrc.onmessage = (e) => {
-                let update = JSON.parse(e.data)
-
-                console.log("watch "+path+":", update)
-
-                if (update.err) {
-                    console.log("watch error from server:", err)
-                }
-                if (update.set) {
-                    this[field] = update.set
-                }
-                if (update.p) { // patch
-                    new jsonpatch.JSONPatch(update.p, true).apply(this[field])
-                }
-            }
-            evtSrc.onerror = (e) => {
-                // console.log("event source " + path + " error:", e)
-                if (evtSrc) evtSrc.close()
-
-                this[field] = null
-
-                window.setTimeout(() => { this.watchStream(field, path, withToken) }, 1000)
-            }
-        },
-    }
-
-}).mount('#app')
-

html/ui/style.css

@@ -1,152 +0,0 @@
-body {
-    background: white;
-}
-
-button[disabled] {
-    opacity: 0.5;
-}
-
-a[href], a[href]:visited, button.link {
-    border: none;
-    color: blue;
-    background: none;
-    cursor: pointer;
-    text-decoration: none;
-}
-
-table {
-    border-collapse: collapse;
-}
-th, td {
-    border-left:   dotted 1pt;
-    border-right:  dotted 1pt;
-    border-bottom: dotted 1pt;
-    padding: 2pt 4pt;
-}
-tr:first-child > th {
-    border-top: dotted 1pt;
-}
-th, tr:last-child > td {
-    border-bottom: solid 1pt;
-}
-
-.flat > * { margin-left: 1ex; }
-.flat > *:first-child { margin-left: 0; }
-
-.green { color: green; }
-.red   { color: red; }
-
-@media (prefers-color-scheme: dark) {
-  body {
-    background: black;
-    color: orange;
-  }
-  button, input[type=submit] {
-    background: #333;
-    color: #eee;
-  }
-  a[href], a[href]:visited, button.link {
-    border: none;
-    color: #31b0fa;
-  }
-
-  .red { color: #c00; }
-}
-
-header {
-    display: flex;
-    align-items: center;
-    border-bottom: 2pt solid;
-    margin: 0 0 1em 0;
-    padding: 1ex;
-    justify-content: space-between;
-}
-#logo > img {
-    vertical-align: middle;
-}
-header .utils > * {
-    margin-left: 1ex;
-}
-
-.error {
-    display: flex;
-    position: relative;
-    background: rgba(255,0,0,0.2);
-    border: 1pt solid red;
-    justify-content: space-between;
-    align-items: center;
-}
-.error .btn-close,
-.error .code {
-    background: #600;
-    color: white;
-    font-weight: bold;
-    border: none;
-    align-self: stretch;
-    padding: 1ex 1em;
-}
-.error .code {
-    order: 1;
-
-    display: flex;
-    align-items: center;
-    text-align: center;
-}
-.error .message {
-    order: 2;
-    padding: 1ex 2em;
-}
-.error .btn-close {
-    order: 3;
-}
-
-.sheets {
-    display: flex;
-    align-items: stretch;
-}
-.sheets > div {
-    margin: 0 1ex;
-    border: 1pt solid;
-    border-radius: 6pt;
-}
-.sheets .title {
-    text-align: center;
-    font-weight: bold;
-    font-size: large;
-    padding: 2pt 6pt;
-    background: rgba(127,127,127,0.5);
-}
-.sheets .section {
-    padding: 2pt 6pt 2pt 6pt;
-    font-weight: bold;
-    border-top: 1px dotted;
-}
-.sheets section {
-    margin: 2pt 6pt 6pt 6pt;
-}
-.sheets > *:last-child > table:last-child > tr:last-child > td {
-    border-bottom: none;
-}
-
-.notif {
-    display: inline-block;
-    position: relative;
-}
-.notif > div:first-child {
-    position: absolute;
-    min-width: 100%; height: 100%;
-    background: white;
-    opacity: 75%;
-    text-align: center;
-}
-
-.links > * { margin-left: 1ex; }
-.links > *:first-child { margin-left: 0; }
-
-@media (prefers-color-scheme: dark) {
-  .notif > div:first-child {
-    background: black;
-  }
-}
-
-.copy { font-size: small; }

install

@@ -1,2 +0,0 @@
-#! /bin/sh
-go install -trimpath ./cmd/...

modd.conf

@@ -1,26 +1,10 @@
-modd.conf {}
+**/*.go go.mod go.sum Dockerfile {
-
-**/*.go go.mod go.sum {
   prep: go test ./...
-  prep: mkdir -p dist
+  prep: go install -trimpath ./cmd/...
-  prep: hack/build ./...
+  prep: docker build --build-arg GOPROXY=$GOPROXY -t dls .
-  #prep: docker build --build-arg GOPROXY=$GOPROXY -t dls .
   #daemon +sigterm: /var/lib/direktil/test-run
 }
 
-html/**/* {
-  prep: hack/build ./cmd/dkl-local-server
-}
-
-dist/dkl-local-server {
-  prep: mkdir -p tmp
-  daemon +sigterm: dist/dkl-local-server -data tmp -auto-unlock test
-}
-
-dist/dkl-dir2config {
-  prep: dist/dkl-dir2config --debug --in test-dir2config
-}
-
 **/*.proto !dist/**/* {
   prep: for mod in @mods; do protoc -I ./ --go_out=plugins=grpc,paths=source_relative:. $mod; done
 }

pkg/clustersconfig/clustersconfig.go

@@ -4,6 +4,7 @@ import (
 	"flag"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"log"
 	"net"
 	"os"
@@ -24,9 +25,11 @@ var (
 
 type Config struct {
 	Hosts         []*Host
+	Groups        []*Group
 	Clusters      []*Cluster
 	Configs       []*Template
-	StaticPods   map[string][]*Template `yaml:"static_pods"`
+	StaticPods    []*Template            `yaml:"static_pods"`
+	BootstrapPods map[string][]*Template `yaml:"bootstrap_pods"`
 	Addons        map[string][]*Template
 	SSLConfig     string         `yaml:"ssl_config"`
 	CertRequests  []*CertRequest `yaml:"cert_requests"`
@@ -41,7 +44,7 @@ func FromBytes(data []byte) (*Config, error) {
 }
 
 func FromFile(path string) (*Config, error) {
-	ba, err := os.ReadFile(path)
+	ba, err := ioutil.ReadFile(path)
 	if err != nil {
 		return nil, err
 	}
@@ -86,6 +89,15 @@ func (c *Config) HostByMAC(mac string) *Host {
 	return nil
 }
 
+func (c *Config) Group(name string) *Group {
+	for _, group := range c.Groups {
+		if group.Name == name {
+			return group
+		}
+	}
+	return nil
+}
+
 func (c *Config) Cluster(name string) *Cluster {
 	for _, cluster := range c.Clusters {
 		if cluster.Name == name {
@@ -104,6 +116,15 @@ func (c *Config) ConfigTemplate(name string) *Template {
 	return nil
 }
 
+func (c *Config) StaticPodsTemplate(name string) *Template {
+	for _, s := range c.StaticPods {
+		if s.Name == name {
+			return s
+		}
+	}
+	return nil
+}
+
 func (c *Config) CSR(name string) *CertRequest {
 	for _, s := range c.CertRequests {
 		if s.Name == name {
@@ -119,25 +140,23 @@ func (c *Config) SaveTo(path string) error {
 		return err
 	}
 
-	return os.WriteFile(path, ba, 0600)
+	return ioutil.WriteFile(path, ba, 0600)
 }
 
 type Template struct {
 	Name     string
 	Template string
+
+	parsedTemplate *template.Template
 }
 
 func (t *Template) Execute(contextName, elementName string, wr io.Writer, data interface{}, extraFuncs map[string]interface{}) error {
+	if t.parsedTemplate == nil {
 		var templateFuncs = map[string]interface{}{
 			"indent": func(indent, s string) (indented string) {
 				indented = indent + strings.Replace(s, "\n", "\n"+indent, -1)
 				return
 			},
-		"yaml": func(v any) (s string, err error) {
-			ba, err := yaml.Marshal(v)
-			s = string(ba)
-			return
-		},
 		}
 
 		for name, f := range extraFuncs {
@@ -150,6 +169,8 @@ func (t *Template) Execute(contextName, elementName string, wr io.Writer, data i
 		if err != nil {
 			return err
 		}
+		t.parsedTemplate = tmpl
+	}
 
 	if *templateDetailsDir != "" {
 		templateID++
@@ -160,7 +181,7 @@ func (t *Template) Execute(contextName, elementName string, wr io.Writer, data i
 		base += string(filepath.Separator)
 		log.Print("writing template details: ", base, "{in,data,out}")
 
-		if err := os.WriteFile(base+"in", []byte(t.Template), 0600); err != nil {
+		if err := ioutil.WriteFile(base+"in", []byte(t.Template), 0600); err != nil {
 			return err
 		}
 
@@ -169,7 +190,7 @@ func (t *Template) Execute(contextName, elementName string, wr io.Writer, data i
 			return err
 		}
 
-		if err := os.WriteFile(base+"data", yamlBytes, 0600); err != nil {
+		if err := ioutil.WriteFile(base+"data", yamlBytes, 0600); err != nil {
 			return err
 		}
 
@@ -183,37 +204,40 @@ func (t *Template) Execute(contextName, elementName string, wr io.Writer, data i
 		wr = io.MultiWriter(wr, out)
 	}
 
-	return tmpl.Execute(wr, data)
+	return t.parsedTemplate.Execute(wr, data)
 }
 
 // Host represents a host served by this server.
 type Host struct {
 	WithRev
 
-	Template bool `json:",omitempty"`
-
 	Name        string
-	Labels      map[string]string `json:",omitempty"`
+	Labels      map[string]string
-	Annotations map[string]string `json:",omitempty"`
+	Annotations map[string]string
 
-	MAC     string `json:",omitempty"`
+	MAC     string
 	IP      string
-	IPs     []string `json:",omitempty"`
+	IPs     []string
 	Cluster string
 	Group   string
+	Vars    Vars
+}
 
-	Net    string
+// Group represents a group of hosts and provides their configuration.
-	IPFrom map[string]string `json:",omitempty" yaml:"ip_from"`
+type Group struct {
+	WithRev
 
-	IPXE            string `json:",omitempty"`
+	Name        string
+	Labels      map[string]string
+	Annotations map[string]string
+
+	Master     bool
+	IPXE       string
 	Kernel     string
 	Initrd     string
-	BootstrapConfig string `yaml:"bootstrap_config"`
 	Config     string
-	Versions        map[string]string
-
 	StaticPods string `yaml:"static_pods"`
-
+	Versions   map[string]string
 	Vars       Vars
 }
 
@@ -229,12 +253,12 @@ type Cluster struct {
 	Annotations map[string]string
 
 	Domain        string
-	Addons  []string
+	Addons        string
+	BootstrapPods string `yaml:"bootstrap_pods"`
 	Subnets       struct {
 		Services string
 		Pods     string
 	}
-
 	Vars Vars
 }
 
@@ -249,7 +273,7 @@ func (c *Cluster) DNSSvcIP() net.IP {
 func (c *Cluster) NthSvcIP(n byte) net.IP {
 	_, cidr, err := net.ParseCIDR(c.Subnets.Services)
 	if err != nil {
-		panic(fmt.Errorf("invalid services CIDR: %v", err))
+		panic(fmt.Errorf("Invalid services CIDR: %v", err))
 	}
 
 	ip := cidr.IP

pkg/clustersconfig/dir.go

@@ -3,6 +3,7 @@ package clustersconfig
 import (
 	"fmt"
 	"io/ioutil"
+	"log"
 	"os"
 	"path"
 	"path/filepath"
@@ -14,38 +15,40 @@ import (
 // Debug enables debug logs from this package.
 var Debug = false
 
-func FromDir(
+func FromDir(dirPath, defaultsPath string) (*Config, error) {
-	read func(path string) ([]byte, error),
+	if Debug {
-	assemble func(path string) ([]byte, error),
+		log.Printf("loading config from dir %s (defaults from %s)", dirPath, defaultsPath)
-	listBase func(path string) ([]string, error),
-	listMerged func(path string) ([]string, error),
-) (*Config, error) {
-
-	load := func(dir, name string, out any) (err error) {
-		ba, err := assemble(filepath.Join(dir, name))
-		if err != nil {
-			return
 	}
-		err = yaml.UnmarshalStrict(ba, out)
+
+	defaults, err := NewDefaults(defaultsPath)
 	if err != nil {
-			return
+		return nil, fmt.Errorf("failed to load defaults: %v", err)
+	}
+
+	store := &dirStore{dirPath}
+	load := func(dir, name string, out Rev) error {
+		ba, err := store.Get(path.Join(dir, name))
+		if err != nil {
+			return fmt.Errorf("failed to load %s/%s from dir: %v", dir, name, err)
+		}
+		if err = defaults.Load(dir, ".yaml", out, ba); err != nil {
+			return fmt.Errorf("failed to enrich %s/%s from defaults: %v", dir, name, err)
 		}
 		return nil
 	}
 
 	config := &Config{
 		Addons:        make(map[string][]*Template),
-		StaticPods: make(map[string][]*Template),
+		BootstrapPods: make(map[string][]*Template),
 	}
 
 	// load clusters
-	names, err := listBase("clusters")
+	names, err := store.List("clusters")
 	if err != nil {
 		return nil, fmt.Errorf("failed to list clusters: %v", err)
 	}
 
 	for _, name := range names {
-		name, _ = strings.CutSuffix(name, ".yaml")
 		cluster := &Cluster{Name: name}
 		if err := load("clusters", name, cluster); err != nil {
 			return nil, err
@@ -54,14 +57,98 @@ func FromDir(
 		config.Clusters = append(config.Clusters, cluster)
 	}
 
+	// load groups
+	names, err = store.List("groups")
+	if err != nil {
+		return nil, fmt.Errorf("failed to list groups: %v", err)
+	}
+
+	read := func(rev, filePath string) (data []byte, fromDefaults bool, err error) {
+		data, err = store.Get(filePath)
+		if err != nil {
+			err = fmt.Errorf("faild to read %s: %v", filePath, err)
+			return
+		}
+
+		if data != nil {
+			return // ok
+		}
+
+		if len(rev) == 0 {
+			err = fmt.Errorf("entry not found: %s", filePath)
+			return
+		}
+
+		data, err = defaults.ReadAll(rev, filePath+".yaml")
+		if err != nil {
+			err = fmt.Errorf("failed to read %s:%s: %v", rev, filePath, err)
+			return
+		}
+
+		fromDefaults = true
+		return
+	}
+
+	template := func(rev, dir, name string, templates *[]*Template) (ref string, err error) {
+		ref = name
+		if len(name) == 0 {
+			return
+		}
+
+		ba, fromDefaults, err := read(rev, path.Join(dir, name))
+		if err != nil {
+			return
+		}
+
+		if fromDefaults {
+			ref = rev + ":" + name
+		}
+
+		if !hasTemplate(ref, *templates) {
+			if Debug {
+				log.Printf("new template in %s: %s", dir, ref)
+			}
+
+			*templates = append(*templates, &Template{
+				Name:     ref,
+				Template: string(ba),
+			})
+		}
+
+		return
+	}
+
+	for _, name := range names {
+		group := &Group{Name: name}
+		if err := load("groups", name, group); err != nil {
+			return nil, err
+		}
+
+		group.Config, err = template(group.Rev(), "configs", group.Config, &config.Configs)
+		if err != nil {
+			return nil, fmt.Errorf("failed to load config for group %q: %v", name, err)
+		}
+
+		if Debug {
+			log.Printf("group %q: config=%q static_pods=%q",
+				group.Name, group.Config, group.StaticPods)
+		}
+
+		group.StaticPods, err = template(group.Rev(), "static-pods", group.StaticPods, &config.StaticPods)
+		if err != nil {
+			return nil, fmt.Errorf("failed to load static pods for group %q: %v", name, err)
+		}
+
+		config.Groups = append(config.Groups, group)
+	}
+
 	// load hosts
-	names, err = listBase("hosts")
+	names, err = store.List("hosts")
 	if err != nil {
 		return nil, fmt.Errorf("failed to list hosts: %v", err)
 	}
 
 	for _, name := range names {
-		name, _ = strings.CutSuffix(name, ".yaml")
 		o := &Host{Name: name}
 		if err := load("hosts", name, o); err != nil {
 			return nil, err
@@ -71,20 +158,28 @@ func FromDir(
 	}
 
 	// load config templates
-	loadTemplates := func(dir string, templates *[]*Template) error {
+	loadTemplates := func(rev, dir string, templates *[]*Template) error {
-		names, err := listMerged(dir)
+		names, err := store.List(dir)
 		if err != nil {
 			return fmt.Errorf("failed to list %s: %v", dir, err)
 		}
 
-		for _, fullName := range names {
+		if len(rev) != 0 {
-			name, _ := strings.CutSuffix(fullName, ".yaml")
+			var defaultsNames []string
+			defaultsNames, err = defaults.List(rev, dir)
+			if err != nil {
+				return fmt.Errorf("failed to list %s:%s: %v", rev, dir, err)
+			}
 
+			names = append(names, defaultsNames...)
+		}
+
+		for _, name := range names {
 			if hasTemplate(name, *templates) {
 				continue
 			}
 
-			ba, err := read(path.Join(dir, fullName))
+			ba, _, err := read(rev, path.Join(dir, name))
 			if err != nil {
 				return err
 			}
@@ -98,57 +193,53 @@ func FromDir(
 		return nil
 	}
 
-	loadTemplates("configs", &config.Configs)
-
 	// cluster addons
 	for _, cluster := range config.Clusters {
-		addonSets := cluster.Addons
+		addonSet := cluster.Addons
-		if len(addonSets) == 0 {
+		if len(addonSet) == 0 {
 			continue
 		}
 
-		for _, addonSet := range addonSets {
 		if _, ok := config.Addons[addonSet]; ok {
 			continue
 		}
 
 		templates := make([]*Template, 0)
-			if err = loadTemplates(path.Join("addons", addonSet), &templates); err != nil {
+		if err = loadTemplates(cluster.Rev(), path.Join("addons", addonSet), &templates); err != nil {
 			return nil, err
 		}
 
 		config.Addons[addonSet] = templates
 	}
-	}
 
-	// cluster static pods
+	// cluster bootstrap pods
-	for _, host := range config.Hosts {
+	for _, cluster := range config.Clusters {
-		bpSet := host.StaticPods
+		bpSet := cluster.BootstrapPods
 		if bpSet == "" {
 			continue
 		}
 
-		if _, ok := config.StaticPods[bpSet]; ok {
+		if _, ok := config.BootstrapPods[bpSet]; ok {
 			continue
 		}
 
 		templates := make([]*Template, 0)
-		if err = loadTemplates(path.Join("static-pods", bpSet), &templates); err != nil {
+		if err = loadTemplates(cluster.Rev(), path.Join("bootstrap-pods", bpSet), &templates); err != nil {
 			return nil, err
 		}
 
-		config.StaticPods[bpSet] = templates
+		config.BootstrapPods[bpSet] = templates
 	}
 
 	// load SSL configuration
-	if ba, err := read("ssl-config.json"); err == nil {
+	if ba, err := ioutil.ReadFile(filepath.Join(dirPath, "ssl-config.json")); err == nil {
 		config.SSLConfig = string(ba)
 
 	} else if !os.IsNotExist(err) {
 		return nil, err
 	}
 
-	if ba, err := read("cert-requests.yaml"); err == nil {
+	if ba, err := ioutil.ReadFile(filepath.Join(dirPath, "cert-requests.yaml")); err == nil {
 		reqs := make([]*CertRequest, 0)
 		if err = yaml.Unmarshal(ba, &reqs); err != nil {
 			return nil, err

pkg/initrdconfig/config.go

@@ -1,61 +0,0 @@
-package config
-
-type Config struct {
-	AntiPhishingCode string `json:"anti_phishing_code"`
-
-	Keymap  string
-	Modules string
-
-	Auths []Auth
-
-	Networks []struct {
-		Name       string
-		Interfaces []struct {
-			Var     string
-			N       int
-			Regexps []string
-		}
-		Script string
-	}
-
-	LVM       []LvmVG
-	Bootstrap Bootstrap
-}
-
-type Auth struct {
-	Name     string
-	SSHKey   string `yaml:"sshKey"`
-	Password string `yaml:"password"`
-}
-
-type LvmVG struct {
-	VG  string
-	PVs struct {
-		N       int
-		Regexps []string
-	}
-
-	Defaults struct {
-		FS   string
-		Raid *RaidConfig
-	}
-
-	LVs []struct {
-		Name    string
-		Crypt   string
-		FS      string
-		Raid    *RaidConfig
-		Size    string
-		Extents string
-	}
-}
-
-type RaidConfig struct {
-	Mirrors int
-	Stripes int
-}
-
-type Bootstrap struct {
-	Dev  string
-	Seed string
-}

pkg/mime/mime.go

@@ -1,7 +1,6 @@
 package mime
 
 const (
-	JSON   = "application/json"
 	YAML   = "text/vnd.yaml"
 	TAR    = "application/tar"
 	DISK   = "application/x-diskimage"

pkg/utf16/utf16.go

@@ -1,29 +0,0 @@
-package utf16
-
-import (
-	"encoding/binary"
-    "fmt"
-	"unicode/utf8"
-)
-
-func FromUTF8(data []byte) (res []byte) {
-    endian := binary.LittleEndian
-
-	res = make([]byte, (len(data)+1)*2)
-
-    res = res[:2]
-    endian.PutUint16(res, 0xfeff)
-
-	for len(data) > 0 {
-		r, size := utf8.DecodeRune(data)
-		if r > 65535 {
-            panic(fmt.Errorf("r=0x%x > 0xffff", r))
-        }
-
-		slen := len(res)
-		res = res[:slen+2]
-		endian.PutUint16(res[slen:], uint16(r))
-		data = data[size:]
-	}
-	return
-}

secretstore/io.go

@@ -1,30 +0,0 @@
-package secretstore
-
-import (
-	"crypto/rand"
-	"encoding/binary"
-	"fmt"
-	"io"
-)
-
-func readFull(in io.Reader, ba []byte) (err error) {
-	_, err = io.ReadFull(in, ba)
-	return
-}
-
-func read[T any](in io.Reader) (v T, err error) {
-	err = binary.Read(in, binary.BigEndian, &v)
-	return
-}
-
-var readSize = read[uint16]
-
-func randRead(ba []byte) (err error) {
-	err = readFull(rand.Reader, ba)
-	if err != nil {
-		err = fmt.Errorf("failed to read random bytes: %w", err)
-		return
-	}
-
-	return
-}

secretstore/mem.go

@@ -1,9 +0,0 @@
-package secretstore
-
-func Memzero(ba []byte) { memzero(ba) }
-
-func memzero(ba []byte) {
-	for i := range ba {
-		ba[i] = 0
-	}
-}

secretstore/reader.go

@@ -1,68 +0,0 @@
-package secretstore
-
-import (
-	"crypto/aes"
-	"crypto/cipher"
-	"io"
-)
-
-func (s *Store) NewReader(reader io.Reader) (r io.Reader, err error) {
-	iv := [aes.BlockSize]byte{}
-
-	err = readFull(reader, iv[:])
-	if err != nil {
-		return
-	}
-
-	r = storeReader{reader, s.NewDecrypter(iv)}
-	return
-}
-
-type storeReader struct {
-	reader    io.Reader
-	decrypter cipher.Stream
-}
-
-func (r storeReader) Read(ba []byte) (n int, err error) {
-	n, err = r.reader.Read(ba)
-
-	if n > 0 {
-		r.decrypter.XORKeyStream(ba[:n], ba[:n])
-	}
-
-	return
-}
-
-func (s *Store) NewWriter(writer io.Writer) (r io.Writer, err error) {
-	iv := [aes.BlockSize]byte{}
-
-	if err = randRead(iv[:]); err != nil {
-		return
-	}
-
-	_, err = writer.Write(iv[:])
-	if err != nil {
-		return
-	}
-
-	r = storeWriter{writer, s.NewEncrypter(iv)}
-	return
-}
-
-type storeWriter struct {
-	writer    io.Writer
-	encrypter cipher.Stream
-}
-
-func (r storeWriter) Write(ba []byte) (n int, err error) {
-	if len(ba) == 0 {
-		return
-	}
-
-	encBA := make([]byte, len(ba))
-	r.encrypter.XORKeyStream(encBA, ba)
-
-	n, err = r.writer.Write(encBA)
-
-	return
-}

secretstore/secret-store.go

@@ -1,278 +0,0 @@
-package secretstore
-
-import (
-	"bufio"
-	"bytes"
-	"crypto/aes"
-	"crypto/cipher"
-	"crypto/sha512"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"log"
-	"os"
-	"strconv"
-	"syscall"
-
-	"golang.org/x/crypto/argon2"
-)
-
-type Store struct {
-	Salt [aes.BlockSize]byte
-	Keys []KeyEntry
-
-	unlocked bool
-	key      [32]byte
-}
-
-type KeyEntry struct {
-	Name   string
-	Hash   [64]byte
-	EncKey [32]byte
-}
-
-func New() (s *Store) {
-	s = &Store{}
-	syscall.Mlock(s.key[:])
-	return
-}
-
-func Open(path string) (s *Store, err error) {
-	f, err := os.Open(path)
-	if err != nil {
-		return
-	}
-
-	defer f.Close()
-
-	s = New()
-	_, err = s.ReadFrom(bufio.NewReader(f))
-
-	return
-}
-
-func (s *Store) SaveTo(path string) (err error) {
-	f, err := os.OpenFile(path, syscall.O_CREAT|syscall.O_TRUNC|syscall.O_WRONLY, 0600)
-	if err != nil {
-		return
-	}
-
-	defer f.Close()
-
-	out := bufio.NewWriter(f)
-
-	_, err = s.WriteTo(out)
-	if err != nil {
-		return
-	}
-
-	err = out.Flush()
-	if err != nil {
-		return
-	}
-
-	return
-}
-
-func (s *Store) Close() {
-	memzero(s.key[:])
-	syscall.Munlock(s.key[:])
-	s.unlocked = false
-}
-
-func (s *Store) IsNew() bool {
-	return len(s.Keys) == 0
-}
-
-func (s *Store) Unlocked() bool {
-	return s.unlocked
-}
-
-func (s *Store) Init(name string, passphrase []byte) (err error) {
-	err = randRead(s.key[:])
-	if err != nil {
-		return
-	}
-	err = randRead(s.Salt[:])
-	if err != nil {
-		return
-	}
-
-	s.AddKey(name, passphrase)
-
-	s.unlocked = true
-
-	return
-}
-
-var jsonFormatHdr = []byte("{json}")
-
-func (s *Store) ReadFrom(in io.Reader) (n int64, err error) {
-	memzero(s.key[:])
-	s.unlocked = false
-
-	defer func() {
-		if err != nil {
-			log.Output(2, fmt.Sprintf("failed after %d bytes", n))
-		}
-	}()
-
-	readFull := func(ba []byte) {
-		var nr int
-		nr, err = io.ReadFull(in, ba)
-		n += int64(nr)
-	}
-
-	// read the file's start (json header or start of salt)
-
-	readFull(s.Salt[:len(jsonFormatHdr)])
-	if err != nil {
-		return
-	}
-
-	if !bytes.Equal(s.Salt[:len(jsonFormatHdr)], jsonFormatHdr) {
-		// old key file
-
-		// finish reading the salt
-		readFull(s.Salt[len(jsonFormatHdr):])
-		if err != nil {
-			return
-		}
-
-		// read the (encrypted) keys
-		s.Keys = make([]KeyEntry, 0)
-		for {
-			k := KeyEntry{Name: "key-" + strconv.Itoa(len(s.Keys))}
-			readFull(k.Hash[:])
-			if err != nil {
-				if err == io.EOF {
-					err = nil
-				}
-				return
-			}
-			readFull(k.EncKey[:])
-			if err != nil {
-				return
-			}
-
-			s.Keys = append(s.Keys, k)
-		}
-	}
-
-	err = json.NewDecoder(in).Decode(s)
-	return
-}
-
-func (s *Store) WriteTo(out io.Writer) (n int64, err error) {
-	_, err = out.Write(jsonFormatHdr)
-	if err != nil {
-		return
-	}
-	err = json.NewEncoder(out).Encode(s)
-	return
-}
-
-var ErrNoSuchKey = errors.New("no such key")
-
-func (s *Store) HasKey(passphrase []byte) bool {
-	key, hash := s.keyPairFromPassword(passphrase)
-	defer memzero(key[:])
-
-	for _, k := range s.Keys {
-		if k.Hash == hash {
-			return true
-		}
-	}
-
-	return false
-}
-
-func (s *Store) Unlock(passphrase []byte) (ok bool) {
-	key, hash := s.keyPairFromPassword(passphrase)
-	defer memzero(key[:])
-
-	var idx = -1
-	for i := range s.Keys {
-		if hash == s.Keys[i].Hash {
-			idx = i
-			break
-		}
-	}
-
-	if idx == -1 {
-		return
-	}
-
-	s.decryptTo(s.key[:], s.Keys[idx].EncKey[:], &key)
-
-	s.unlocked = true
-	return true
-}
-
-func (s *Store) AddKey(name string, passphrase []byte) {
-	key, hash := s.keyPairFromPassword(passphrase)
-	memzero(passphrase)
-
-	defer memzero(key[:])
-
-	k := KeyEntry{Name: name, Hash: hash}
-
-	encKey := s.encrypt(s.key[:], &key)
-	copy(k.EncKey[:], encKey)
-
-	s.Keys = append(s.Keys, k)
-}
-
-func (s *Store) keyPairFromPassword(password []byte) (key [32]byte, hash [64]byte) {
-	keySlice := argon2.IDKey(password, s.Salt[:], 1, 64*1024, 4, 32)
-
-	copy(key[:], keySlice)
-	memzero(keySlice)
-
-	hash = sha512.Sum512(key[:])
-
-	return
-}
-
-func (s *Store) NewEncrypter(iv [aes.BlockSize]byte) cipher.Stream {
-	if !s.unlocked {
-		panic("not unlocked")
-	}
-	return newEncrypter(iv, &s.key)
-}
-
-func (s *Store) NewDecrypter(iv [aes.BlockSize]byte) cipher.Stream {
-	if !s.unlocked {
-		panic("not unlocked")
-	}
-	return newDecrypter(iv, &s.key)
-}
-
-func (s *Store) encrypt(src []byte, key *[32]byte) (dst []byte) {
-	dst = make([]byte, len(src))
-	newEncrypter(s.Salt, key).XORKeyStream(dst, src)
-	return
-}
-
-func (s *Store) decryptTo(dst []byte, src []byte, key *[32]byte) {
-	newDecrypter(s.Salt, key).XORKeyStream(dst, src)
-}
-
-func newEncrypter(iv [aes.BlockSize]byte, key *[32]byte) cipher.Stream {
-	c, err := aes.NewCipher(key[:])
-	if err != nil {
-		panic(fmt.Errorf("failed to init AES: %w", err))
-	}
-
-	return cipher.NewCFBEncrypter(c, iv[:])
-}
-
-func newDecrypter(iv [aes.BlockSize]byte, key *[32]byte) cipher.Stream {
-	c, err := aes.NewCipher(key[:])
-	if err != nil {
-		panic(fmt.Errorf("failed to init AES: %w", err))
-	}
-
-	return cipher.NewCFBDecrypter(c, iv[:])
-}

upload-vmware.sh

@@ -0,0 +1,27 @@
+set -e
+
+dir=/var/lib/direktil/
+PATH=$PATH:$dir
+cd $dir
+
+if [ ! -f govc.env ]; then
+    echo ERROR: govc.env file not found in dir $dir ; exit 1
+fi
+source govc.env
+
+if [ $# != 2 ]; then
+    echo "Usage: $0 <VM_NAME> <NOVIT_HOST>" ; exit 1
+fi
+
+if [[ -z $NOVIT_VM_FOLDER || -z $NOVIT_ISO_FOLDER ]]; then
+    echo "ERROR: All GOVC env vars (including NOVIT_VM_FOLDER and NOVIT_ISO_FOLDER) must be provided" ; exit 1
+fi
+
+VM=$1
+HOST=$2
+
+govc vm.power -off "$NOVIT_VM_FOLDER/$VM" || true
+sleep 5
+curl localhost:7606/hosts/$HOST/boot.iso | govc datastore.upload - "$NOVIT_ISO_FOLDER/$VM.iso"
+sleep 5
+govc vm.power -on "$NOVIT_VM_FOLDER/$VM"