setup: infer the key type from the key hierarchy

Signed-off-by: Morten Linderud <[email protected]>
Foxboron · Jul 30, 2024 · 98466dc · 98466dc
1 parent 7ddcbea
commit 98466dc
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/backend/backend.go b/backend/backend.go
@@ -43,6 +43,26 @@ type KeyHierarchy struct {
 	state *config.State
 }
 
+func (k *KeyHierarchy) GetConfig(keydir string) *config.Keys {
+	return &config.Keys{
+		PK: &config.KeyConfig{
+			Privkey: filepath.Join(keydir, "PK/PK.key"),
+			Pubkey:  filepath.Join(keydir, "PK/PK.pem"),
+			Type:    string(k.PK.Type()),
+		},
+		KEK: &config.KeyConfig{
+			Privkey: filepath.Join(keydir, "KEK/KEK.key"),
+			Pubkey:  filepath.Join(keydir, "KEK/KEK.pem"),
+			Type:    string(k.KEK.Type()),
+		},
+		Db: &config.KeyConfig{
+			Privkey: filepath.Join(keydir, "db/db.key"),
+			Pubkey:  filepath.Join(keydir, "db/db.pem"),
+			Type:    string(k.Db.Type()),
+		},
+	}
+}
+
 func NewKeyHierarchy(state *config.State) *KeyHierarchy {
 	return &KeyHierarchy{
 		state: state,

diff --git a/cmd/sbctl/setup.go b/cmd/sbctl/setup.go
@@ -6,6 +6,7 @@ import (
 	"path"
 
 	"github.com/foxboron/sbctl"
+	"github.com/foxboron/sbctl/backend"
 	"github.com/foxboron/sbctl/config"
 	"github.com/foxboron/sbctl/logging"
 	"github.com/foxboron/sbctl/lsm"
@@ -47,6 +48,12 @@ func PrintConfig(state *config.State) error {
 		if err != nil {
 			return err
 		}
+	} else {
+		kh, err := backend.GetKeyHierarchy(state.Fs, state)
+		if err != nil {
+			return err
+		}
+		state.Config.Keys = kh.GetConfig(state.Config.Keydir)
 	}
 
 	// Setup the files