awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-07 11:27:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

add missing error logs on secrets backup

Browse Source
This commit is contained in:
Maidul Islam
2024-08-08 13:01:14 -04:00
parent 254446c895
commit 6f56ed5474
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/packages/util/secrets.go
+15 -6
View File
@@ -299,10 +299,10 @@ func GetAllEnvironmentVariables(params models.GetAllSecretsParameters, projectCo
if !isConnected { if !isConnected {
backupEncryptionKey, _ := GetBackupEncryptionKey() backupEncryptionKey, _ := GetBackupEncryptionKey()
if backupEncryptionKey != nil { if backupEncryptionKey != nil {
backedSecrets, err := ReadBackupSecrets(infisicalDotJson.WorkspaceId, params.Environment, params.SecretsPath, backupEncryptionKey) backedUpSecrets, err := ReadBackupSecrets(infisicalDotJson.WorkspaceId, params.Environment, params.SecretsPath, backupEncryptionKey)
if len(backedSecrets) > 0 { if len(backedUpSecrets) > 0 {
PrintWarning("Unable to fetch latest secret(s) due to connection error, serving secrets from last successful fetch. For more info, run with --debug") PrintWarning("Unable to fetch the latest secret(s) due to connection error, serving secrets from last successful fetch. For more info, run with --debug")
secretsToReturn = backedSecrets secretsToReturn = backedUpSecrets
errorToReturn = err errorToReturn = err
} }
} }
@@ -525,6 +525,9 @@ func WriteBackupSecrets(workspace string, environment string, secretsPath string
} }
marshaledSecrets, _ := json.Marshal(secrets) marshaledSecrets, _ := json.Marshal(secrets)
result, err := crypto.EncryptSymmetric(marshaledSecrets, encryptionKey) result, err := crypto.EncryptSymmetric(marshaledSecrets, encryptionKey)
if err != nil {
return fmt.Errorf("WriteBackupSecrets: Unable to encrypt local secret backup to file [err=%s]", err)
}
listOfSecretsMarshalled, _ := json.Marshal(result) listOfSecretsMarshalled, _ := json.Marshal(result)
err = os.WriteFile(fmt.Sprintf("%s/%s", fullPathToSecretsBackupFolder, fileName), listOfSecretsMarshalled, 0600) err = os.WriteFile(fmt.Sprintf("%s/%s", fullPathToSecretsBackupFolder, fileName), listOfSecretsMarshalled, 0600)
if err != nil { if err != nil {
@@ -557,9 +560,15 @@ func ReadBackupSecrets(workspace string, environment string, secretsPath string,
} }
var encryptedBackUpSecrets models.SymmetricEncryptionResult var encryptedBackUpSecrets models.SymmetricEncryptionResult
_ = json.Unmarshal(encryptedBackupSecretsAsBytes, &encryptedBackUpSecrets) err = json.Unmarshal(encryptedBackupSecretsAsBytes, &encryptedBackUpSecrets)
result, err := crypto.DecryptSymmetric(encryptionKey, encryptedBackUpSecrets.CipherText, encryptedBackUpSecrets.AuthTag, encryptedBackUpSecrets.Nonce) if err != nil {
return nil, fmt.Errorf("ReadBackupSecrets: unable to parse encrypted backup secrets. The secrets backup may be malformed [err=%s]", err)
}
result, err := crypto.DecryptSymmetric(encryptionKey, encryptedBackUpSecrets.CipherText, encryptedBackUpSecrets.AuthTag, encryptedBackUpSecrets.Nonce)
if err != nil {
return nil, fmt.Errorf("ReadBackupSecrets: unable to decrypt encrypted backup secrets [err=%s]", err)
}
var plainTextSecrets []models.SingleEnvironmentVariable var plainTextSecrets []models.SingleEnvironmentVariable
_ = json.Unmarshal(result, &plainTextSecrets) _ = json.Unmarshal(result, &plainTextSecrets)