π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[infra] Update CLI file creation defaults (#13189)
neeraj-pilotc9ff42dcfab0
diff --git a/cli/pkg/secrets/secret.go b/cli/pkg/secrets/secret.goindex 5742b5646c..8d736eb259 100644--- a/cli/pkg/secrets/secret.go+++ b/cli/pkg/secrets/secret.go@@ -77,7 +77,7 @@ func GetSecretFromSecretText(secretFilePath string) []byte {}key := make([]byte, keyLength)rand.Read(key)- err = os.WriteFile(secretFilePath, key, 0644)+ err = createSecretFile(secretFilePath, key)if err != nil {log.Fatal(fmt.Errorf("error writing to secret file: %w", err))}@@ -92,3 +92,16 @@ func GetSecretFromSecretText(secretFilePath string) []byte {}return secret}++func createSecretFile(path string, secret []byte) error {+ file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0600)+ if err != nil {+ return err+ }+ _, writeErr := file.Write(secret)+ closeErr := file.Close()+ if writeErr != nil {+ return writeErr+ }+ return closeErr+}diff --git a/cli/pkg/secrets/secret_test.go b/cli/pkg/secrets/secret_test.gonew file mode 100644index 0000000000..7999028764--- /dev/null+++ b/cli/pkg/secrets/secret_test.go@@ -0,0 +1,96 @@+package secrets++import (+ "bytes"+ "os"+ "path/filepath"+ "runtime"+ "testing"+)++func TestGetSecretFromSecretTextCreatesPrivateFile(t *testing.T) {+ path := filepath.Join(t.TempDir(), "secret.txt")++ want := GetSecretFromSecretText(path)+ if len(want) != keyLength {+ t.Fatalf("secret length = %d, want %d", len(want), keyLength)+ }++ if runtime.GOOS != "windows" {+ info, err := os.Stat(path)+ if err != nil {+ t.Fatal(err)+ }+ if got := info.Mode().Perm(); got != 0600 {+ t.Fatalf("secret file mode = %04o, want 0600", got)+ }+ }++ if got := GetSecretFromSecretText(path); !bytes.Equal(got, want) {+ t.Fatal("reading the secret again returned different bytes")+ }+}++func TestGetSecretFromSecretTextPreservesExistingFileMode(t *testing.T) {+ if runtime.GOOS == "windows" {+ t.Skip("Windows does not preserve POSIX file modes")+ }++ path := filepath.Join(t.TempDir(), "secret.txt")+ want := bytes.Repeat([]byte{1}, keyLength)+ if err := os.WriteFile(path, want, 0400); err != nil {+ t.Fatal(err)+ }+ if err := os.Chmod(path, 0400); err != nil {+ t.Fatal(err)+ }++ got := GetSecretFromSecretText(path)+ if !bytes.Equal(got, want) {+ t.Fatal("existing secret changed")+ }++ info, err := os.Stat(path)+ if err != nil {+ t.Fatal(err)+ }+ if got := info.Mode().Perm(); got != 0400 {+ t.Fatalf("existing secret file mode = %04o, want 0400", got)+ }+}++func TestCreateSecretFileDoesNotOverwriteExistingFile(t *testing.T) {+ path := filepath.Join(t.TempDir(), "secret.txt")+ want := bytes.Repeat([]byte{1}, keyLength)+ if err := os.WriteFile(path, want, 0644); err != nil {+ t.Fatal(err)+ }+ if runtime.GOOS != "windows" {+ if err := os.Chmod(path, 0644); err != nil {+ t.Fatal(err)+ }+ }++ err := createSecretFile(path, bytes.Repeat([]byte{2}, keyLength))+ if !os.IsExist(err) {+ t.Fatalf("createSecretFile() error = %v, want file-exists error", err)+ }++ got, err := os.ReadFile(path)+ if err != nil {+ t.Fatal(err)+ }+ if !bytes.Equal(got, want) {+ t.Fatal("existing secret was overwritten")+ }++ if runtime.GOOS != "windows" {+ info, err := os.Stat(path)+ if err != nil {+ t.Fatal(err)+ }+ if got := info.Mode().Perm(); got != 0644 {+ t.Fatalf("existing secret file mode = %04o, want 0644", got)+ }+ }+}