jkaninda/pg-bkup
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

refactor: renaming encrypt functions

Browse Source
This commit is contained in:
Jonas Kaninda
2024-10-08 21:27:53 +02:00
parent d997ce84ab
commit dbed77ac8a
5 changed files with 36 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/backup.go
View File

@@ -294,12 +294,12 @@ func ftpBackup(db *dbConfig, config *BackupConfig) {
func encryptBackup(config *BackupConfig) {
if config.usingKey {
err := encrypt(filepath.Join(tmpPath, config.backupFileName), config.publicKey)
err := encryptWithGPGPublicKey(filepath.Join(tmpPath, config.backupFileName), config.publicKey)
if err != nil {
utils.Fatal("Error during encrypting backup %v", err)
}
} else if config.passphrase != "" {
err := Encrypt(filepath.Join(tmpPath, config.backupFileName), config.passphrase)
err := encryptWithGPGSymmetric(filepath.Join(tmpPath, config.backupFileName), config.passphrase)
if err != nil {
utils.Fatal("Error during encrypting backup %v", err)
}

22
pkg/encrypt.go
View File

@@ -16,8 +16,8 @@ import (
"strings"
)
// Decrypt decrypts backup file using a passphrase
func Decrypt(inputFile string, passphrase string) error {
// decryptWithGPGSymmetric decrypts backup file using a passphrase
func decryptWithGPGSymmetric(inputFile string, passphrase string) error {
utils.Info("Decrypting backup using passphrase...")
//Create gpg home dir
@@ -39,8 +39,8 @@ func Decrypt(inputFile string, passphrase string) error {
return nil
}
// Encrypt encrypts backup using a passphrase
func Encrypt(inputFile string, passphrase string) error {
// encryptWithGPGSymmetric encrypts backup using a passphrase
func encryptWithGPGSymmetric(inputFile string, passphrase string) error {
utils.Info("Encrypting backup using passphrase...")
//Create gpg home dir
@@ -62,8 +62,8 @@ func Encrypt(inputFile string, passphrase string) error {
return nil
}
// encrypt encrypts backup using a public key
func encrypt(inputFile string, publicKey string) error {
// encryptWithGPGPublicKey encrypts backup using a public key
func encryptWithGPGPublicKey(inputFile string, publicKey string) error {
utils.Info("Encrypting backup using public key...")
// Read the public key
pubKeyBytes, err := os.ReadFile(publicKey)
@@ -82,13 +82,13 @@ func encrypt(inputFile string, publicKey string) error {
return errors.New(fmt.Sprintf("Error creating key ring: %v", err))
}
// Read the file to encrypt
// Read the file to encryptWithGPGPublicKey
fileContent, err := os.ReadFile(inputFile)
if err != nil {
return errors.New(fmt.Sprintf("Error reading file: %v", err))
}
// Encrypt the file
// encryptWithGPGSymmetric the file
message := crypto.NewPlainMessage(fileContent)
encMessage, err := keyRing.Encrypt(message, nil)
if err != nil {
@@ -106,10 +106,10 @@ func encrypt(inputFile string, publicKey string) error {
}
// decrypt decrypts backup file using a private key and passphrase.
// decryptWithGPGPrivateKey decrypts backup file using a private key and passphrase.
// privateKey GPG private key
// passphrase GPG passphrase
func decrypt(inputFile, privateKey, passphrase string) error {
func decryptWithGPGPrivateKey(inputFile, privateKey, passphrase string) error {
utils.Info("Encrypting backup using private key...")
// Read the private key
@@ -149,7 +149,7 @@ func decrypt(inputFile, privateKey, passphrase string) error {
return errors.New(fmt.Sprintf("Error reading encrypted file: %s", err))
}
// Decrypt the file
// decryptWithGPGSymmetric the file
encryptedMessage := crypto.NewPGPMessage(encFileContent)
message, err := keyRing.Decrypt(encryptedMessage, nil, 0)
if err != nil {

8
pkg/restore.go
View File

@@ -72,17 +72,17 @@ func RestoreDatabase(db *dbConfig, conf *RestoreConfig) {
if conf.usingKey {
utils.Warn("Backup decryption using a private key is not fully supported")
err := decrypt(filepath.Join(tmpPath, conf.file), conf.privateKey, conf.passphrase)
err := decryptWithGPGPrivateKey(filepath.Join(tmpPath, conf.file), conf.privateKey, conf.passphrase)
if err != nil {
utils.Fatal("Error during decrypting backup %v", err)
utils.Fatal("error during decrypting backup %v", err)
}
} else {
if conf.passphrase == "" {
utils.Error("Error, passphrase or private key required")
utils.Fatal("Your file seems to be a GPG file.\nYou need to provide GPG keys. GPG_PASSPHRASE or GPG_PRIVATE_KEY environment variable is required.")
} else {
//Decrypt file
err := Decrypt(filepath.Join(tmpPath, conf.file), conf.passphrase)
//decryptWithGPGSymmetric file
err := decryptWithGPGSymmetric(filepath.Join(tmpPath, conf.file), conf.passphrase)
if err != nil {
utils.Fatal("Error decrypting file %s %v", file, err)
}