kenmirrors/ente
1
0
Fork 0
mirror of https://github.com/ente-io/ente.git synced 2025-08-08 07:28:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

CLI: Allow setting secrets path via env var

Browse Source 
Adds a new enviroment variable `ENTE_CLI_SECRETS_PATH`, that allows
specifying the path to a `secrets.txt` like the one used in the
dockerized version. If no path is provided, the old behaviour is maintained.
This commit is contained in:
Pablo Ovelleiro Corral 2024-07-11 18:38:52 +02:00
parent e881c15026
commit 97b5577d68
No known key found for this signature in database
GPG Key ID: 29E9A6ED72CCB334
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cli/pkg/secrets/secret.go
View File

@ -26,10 +26,15 @@ const (
func GetOrCreateClISecret() []byte {
// get password
secret, err := keyring.Get(secretService, secretUser)
if err != nil {
if !errors.Is(err, keyring.ErrNotFound) {
if secretsFile := os.Getenv("ENTE_CLI_SECRETS_PATH"); secretsFile != "" {
return GetSecretFromSecretText(secretsFile)
}
if IsRunningInContainer() {
return GetSecretFromSecretText()
return GetSecretFromSecretText(fmt.Sprintf("%s.secret.txt", constants.CliDataPath))
} else {
log.Fatal(fmt.Errorf("error getting password from keyring: %w", err))
}
@ -51,9 +56,7 @@ func GetOrCreateClISecret() []byte {
// GetSecretFromSecretText reads the scecret from the secret text file.
// If the file does not exist, it will be created and write random 32 byte secret to it.
func GetSecretFromSecretText() []byte {
// Define the path to the secret text file
secretFilePath := fmt.Sprintf("%s.secret.txt", constants.CliDataPath)
func GetSecretFromSecretText(secretFilePath string) []byte {
// Check if file exists
_, err := os.Stat(secretFilePath)