feat: Phase 4 Tasks 3-4 - CLI encryption integration

Integrated encryption into backup workflow:

cmd/encryption.go:
- loadEncryptionKey() - loads from file or env var
- Supports base64-encoded keys (32 bytes)
- Supports raw 32-byte keys
- Supports passphrases (PBKDF2 derivation)
- Priority: --encryption-key-file > DBBACKUP_ENCRYPTION_KEY

cmd/backup_impl.go:
- encryptLatestBackup() - finds and encrypts single backups
- encryptLatestClusterBackup() - encrypts cluster backups
- findLatestBackup() - locates most recent backup file
- findLatestClusterBackup() - locates cluster backup
- Encryption applied after successful backup
- Integrated into all backup modes (cluster, single, sample)

internal/backup/encryption.go:
- EncryptBackupFile() - encrypts backup in-place
- DecryptBackupFile() - decrypts to new file
- IsBackupEncrypted() - checks metadata/file format
- Updates .meta.json with encryption info
- Replaces original with encrypted version

internal/metadata/metadata.go:
- Added Encrypted bool field
- Added EncryptionAlgorithm string field
- Tracks encryption status in backup metadata

internal/metadata/save.go:
- Helper to save BackupMetadata to .meta.json

tests/encryption_smoke_test.sh:
- Basic smoke test for encryption/decryption
- Verifies data integrity
- Tests with env var key source

CLI Flags (already existed):
--encrypt                      Enable encryption
--encryption-key-file PATH     Key file path
--encryption-key-env VAR       Env var name (default: DBBACKUP_ENCRYPTION_KEY)

Usage Examples:
  # Encrypt with key file
  ./dbbackup backup single mydb --encrypt --encryption-key-file /path/to/key

  # Encrypt with env var
  export DBBACKUP_ENCRYPTION_KEY="base64_encoded_key"
  ./dbbackup backup single mydb --encrypt

  # Cluster backup with encryption
  ./dbbackup backup cluster --encrypt --encryption-key-file key.txt

Features:
 Post-backup encryption (doesn't slow down backup itself)
 In-place encryption (overwrites original)
 Metadata tracking (encrypted flag)
 Multiple key sources (file/env/passphrase)
 Base64 and raw key support
 PBKDF2 for passphrases
 Automatic latest backup detection
 Works with all backup modes

Status: ENCRYPTION FULLY INTEGRATED 
Next: Task 5 - Restore decryption integration
This commit is contained in:
2025-11-26 07:54:25 +00:00
parent 872f21c8cd
commit c620860de3
6 changed files with 488 additions and 1 deletions

77
cmd/encryption.go Normal file
View File

@@ -0,0 +1,77 @@
package cmd
import (
"encoding/base64"
"fmt"
"os"
"strings"
"dbbackup/internal/crypto"
)
// loadEncryptionKey loads encryption key from file or environment variable
func loadEncryptionKey(keyFile, keyEnvVar string) ([]byte, error) {
// Priority 1: Key file
if keyFile != "" {
keyData, err := os.ReadFile(keyFile)
if err != nil {
return nil, fmt.Errorf("failed to read encryption key file: %w", err)
}
// Try to decode as base64 first
if decoded, err := base64.StdEncoding.DecodeString(strings.TrimSpace(string(keyData))); err == nil && len(decoded) == crypto.KeySize {
return decoded, nil
}
// Use raw bytes if exactly 32 bytes
if len(keyData) == crypto.KeySize {
return keyData, nil
}
// Otherwise treat as passphrase and derive key
salt, err := crypto.GenerateSalt()
if err != nil {
return nil, fmt.Errorf("failed to generate salt: %w", err)
}
key := crypto.DeriveKey([]byte(strings.TrimSpace(string(keyData))), salt)
return key, nil
}
// Priority 2: Environment variable
if keyEnvVar != "" {
keyData := os.Getenv(keyEnvVar)
if keyData == "" {
return nil, fmt.Errorf("encryption enabled but %s environment variable not set", keyEnvVar)
}
// Try to decode as base64 first
if decoded, err := base64.StdEncoding.DecodeString(strings.TrimSpace(keyData)); err == nil && len(decoded) == crypto.KeySize {
return decoded, nil
}
// Otherwise treat as passphrase and derive key
salt, err := crypto.GenerateSalt()
if err != nil {
return nil, fmt.Errorf("failed to generate salt: %w", err)
}
key := crypto.DeriveKey([]byte(strings.TrimSpace(keyData)), salt)
return key, nil
}
return nil, fmt.Errorf("encryption enabled but no key source specified (use --encryption-key-file or set %s)", keyEnvVar)
}
// isEncryptionEnabled checks if encryption is requested
func isEncryptionEnabled() bool {
return encryptBackupFlag
}
// generateEncryptionKey generates a new random encryption key
func generateEncryptionKey() ([]byte, error) {
salt, err := crypto.GenerateSalt()
if err != nil {
return nil, err
}
// For key generation, use salt as both password and salt (random)
return crypto.DeriveKey(salt, salt), nil
}