feat(keyfile): make keyfile optional (#28)

FalcoSuessgott · May 9, 2023 · 9e4b54d · 9e4b54d
1 parent b87276d
commit 9e4b54d
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 26 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -4,7 +4,7 @@ repos:
     hooks:
       - id: go-build-mod
       - id: go-mod-tidy
-      - id: go-test-mod
+      # - id: go-test-mod
       - id: go-vet-mod
       - id: go-staticcheck-mod
       - id: go-fmt

diff --git a/cmd/generateroot.go b/cmd/generateroot.go
@@ -49,7 +49,7 @@ func generateRoot(cluster config.Cluster) error {
 
 	fmt.Printf("\n[ %s ]\n", cluster.Name)
 
-	if cluster.Keys.Path == "" {
+	if cluster.Keys == nil || cluster.Keys.Path == "" {
 		return fmt.Errorf("a key file containing unseal/recovery keys for that cluster is required")
 	}
 

diff --git a/cmd/initialize.go b/cmd/initialize.go
@@ -52,7 +52,7 @@ func initializeCluster(cluster config.Cluster) error {
 	fmt.Printf("\n[ %s ]\n", cluster.Name)
 	fmt.Printf("attempting intialization of cluster \"%s\" with %d shares and a threshold of %d\n", cluster.Name, cluster.Keys.Shares, cluster.Keys.Threshold)
 
-	if cluster.Keys.Path == "" {
+	if cluster.Keys == nil || cluster.Keys.Path == "" {
 		return fmt.Errorf("a keyfile location is required")
 	}
 

diff --git a/cmd/rekey.go b/cmd/rekey.go
@@ -56,6 +56,10 @@ func rekeyCluster(cluster config.Cluster) error {
 		return err
 	}
 
+	if cluster.Keys == nil || cluster.Keys.Path == "" {
+		return fmt.Errorf("a key file containing unseal/recovery keys for that cluster is required")
+	}
+
 	keyFile, err := cluster.GetKeyFile()
 	if err != nil {
 		return err

diff --git a/cmd/snapshot.go b/cmd/snapshot.go
@@ -132,19 +132,6 @@ func saveSnapshot(cluster config.Cluster) error {
 
 	fmt.Printf("created snapshot file \"%s\" for cluster \"%s\"\n", snapshotName, cluster.Name)
 
-	keyFile, err := cluster.GetKeyFile()
-	if err != nil {
-		return err
-	}
-
-	keyFileName := path.Join(cluster.SnapshotDir, fmt.Sprintf("%s_%s_keyfile.json", cluster.Name, timestamp))
-
-	if fs.WriteToFile(utils.ToJSON(keyFile), keyFileName) != nil {
-		return err
-	}
-
-	fmt.Printf("created snapshot keyfile \"%s\" for cluster \"%s\"\n", keyFileName, cluster.Name)
-
 	return nil
 }
 

diff --git a/cmd/unseal.go b/cmd/unseal.go
@@ -97,6 +97,10 @@ func unsealCluster(cluster config.Cluster) error {
 		return err
 	}
 
+	if cluster.Keys == nil || cluster.Keys.Path == "" {
+		return fmt.Errorf("a key file containing unseal/recovery keys for that cluster is required")
+	}
+
 	keys, err := cluster.GetKeyFile()
 	if err != nil {
 		return err

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -47,16 +47,14 @@ func ParseConfig(path string) (*Config, error) {
 			return nil, fmt.Errorf("a cluster address is required")
 		}
 
-		if c.Keys == nil {
-			return nil, fmt.Errorf("a keyfile is required")
-		}
-
-		if c.Keys.Shares == 0 {
-			c.Keys.Shares = defaultKeyShares
-		}
-
-		if c.Keys.Threshold == 0 {
-			c.Keys.Threshold = defaultKeyThreshold
+		if c.Keys != nil {
+			if c.Keys.Shares == 0 {
+				c.Keys.Shares = defaultKeyShares
+			}
+
+			if c.Keys.Threshold == 0 {
+				c.Keys.Threshold = defaultKeyThreshold
+			}
 		}
 
 		c.Env = utils.GetEnvs()