Skip to content

Commit

Permalink
feat(config): don't write unencrypted secret to disk
Browse files Browse the repository at this point in the history
thanks to frezbo from talos for pointing this out
  • Loading branch information
budimanjojo committed Sep 19, 2022
1 parent e21af93 commit 4fac2d5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 13 deletions.
10 changes: 1 addition & 9 deletions cmd/genconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,7 @@ var (
var secretFile string
for _, file := range genconfigSecretFile {
if _, err := os.Stat(file); err == nil {
secret, err := decrypt.DecryptYamlWithSops(file)
if err != nil {
log.Fatalf("failed to decrypt/read secret file %s: %s", file, err)
}
err = os.WriteFile("/tmp/talsecret.yaml", secret, 0600)
if err != nil {
log.Fatalf("failed to write temp file to /tmp directory: %s", err)
}
secretFile = "/tmp/talsecret.yaml"
secretFile = file
} else if errors.Is(err, os.ErrNotExist) {
continue
} else {
Expand Down
9 changes: 5 additions & 4 deletions pkg/talos/input.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package talos

import (
"os"

"github.com/budimanjojo/talhelper/pkg/config"
"github.com/budimanjojo/talhelper/pkg/decrypt"
tconfig "github.com/talos-systems/talos/pkg/machinery/config"
"github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1"
"github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/generate"
"gopkg.in/yaml.v3"
)

func NewClusterInput(c *config.TalhelperConfig, secretFile string) (*generate.Input, error) {
Expand All @@ -20,15 +20,16 @@ func NewClusterInput(c *config.TalhelperConfig, secretFile string) (*generate.In
var secrets *generate.SecretsBundle

if secretFile != "" {
secrets, err = NewSecretBundle(generate.NewClock(), generate.WithVersionContract(versionContract), generate.WithSecrets(secretFile))
decrypted, err := decrypt.DecryptYamlWithSops(secretFile)
if err != nil {
return nil, err
}

err = os.Remove(secretFile)
err = yaml.Unmarshal(decrypted, &secrets)
if err != nil {
return nil, err
}
secrets.Clock = generate.NewClock()
} else {
secrets, err = NewSecretBundle(generate.NewClock(), generate.WithVersionContract(versionContract))
if err != nil {
Expand Down

0 comments on commit 4fac2d5

Please sign in to comment.