percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-01 18:25:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #896 from percona/PT-2347-kdf

Browse Source 
PT-2347 Use KDF instead of hash
This commit is contained in:
Sveta Smirnova
2024-12-18 20:39:00 +03:00
committed by GitHub
parent 754c40628d 91fec36bac
commit c019ecfb8a
3 changed files with 107 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/go/pt-secure-collect/collect.go
View File

@@ -3,7 +3,6 @@ package main
import (
"archive/tar"
"compress/gzip"
"crypto/sha256"
"fmt"
"io"
"io/ioutil"
@@ -49,10 +48,14 @@ func collectData(opts *cliOptions) error {
}
if !*opts.NoEncrypt && *opts.EncryptPassword != "" {
password := sha256.Sum256([]byte(*opts.EncryptPassword))
key, err := deriveKey(*opts.EncryptPassword)
if err != nil {
return errors.WithStack(err)
}
encryptedFile := tarFile + ".aes"
log.Infof("Encrypting %q file into %q", tarFile, encryptedFile)
encrypt(tarFile, encryptedFile, password)
encrypt(tarFile, encryptedFile, key)
}
return nil

56
src/go/pt-secure-collect/ecncrypt_test.go Normal file
View File

@@ -0,0 +1,56 @@
package main
import (
"os"
"testing"
"github.com/AlekSi/pointer"
"github.com/stretchr/testify/require"
)
func TestEncrypt(t *testing.T) {
data := []byte("The quick brown fox jumps over the lazy dog")
input, err := os.CreateTemp(".", "*-input")
require.NoError(t, err)
t.Cleanup(func() { os.Remove(input.Name()) })
err = os.WriteFile(input.Name(), data, 0o600)
require.NoError(t, err)
output, err := os.CreateTemp(".", "*-output")
require.NoError(t, err)
t.Cleanup(func() { os.Remove(output.Name()) })
encrypted, err := os.CreateTemp(".", "*-encrypted")
require.NoError(t, err)
t.Cleanup(func() { os.Remove(encrypted.Name()) })
err = encryptorCmd(&cliOptions{
Command: "encrypt",
EncryptPassword: pointer.ToString("password"),
EncryptInFile: pointer.ToString(input.Name()),
EncryptOutFile: pointer.ToString(encrypted.Name()),
})
require.NoError(t, err)
encryptedData, err := os.ReadFile(encrypted.Name())
require.NoError(t, err)
// Check that the encrypted data is different from the original data
require.NotEqual(t, data, encryptedData)
err = encryptorCmd(&cliOptions{
Command: "decrypt",
EncryptPassword: pointer.ToString("password"),
DecryptInFile: pointer.ToString(encrypted.Name()),
DecryptOutFile: pointer.ToString(output.Name()),
})
require.NoError(t, err)
decryptedData, err := os.ReadFile(output.Name())
require.NoError(t, err)
// Check that the decrypted data is the same as the original data
require.Equal(t, data, decryptedData)
}

52
src/go/pt-secure-collect/encrypt.go
View File

@@ -11,10 +11,50 @@ import (
"github.com/pkg/errors"
log "github.com/sirupsen/logrus"
"golang.org/x/crypto/hkdf"
)
var (
// hkdfInfo used as the context info for HKDF.
hkdfInfo = []byte("Percona Toolkit")
// salt is a random 256-byte array used as a salt for HKDF.
salt = [256]byte{
0x33, 0xc5, 0xc5, 0x5f, 0x3e, 0x81, 0xf6, 0x8d, 0x51, 0xd8, 0x18, 0xb9, 0xb7, 0x09, 0x70, 0x51,
0xc3, 0x60, 0x66, 0xef, 0xd4, 0x97, 0x2e, 0xdf, 0x11, 0x59, 0x34, 0x94, 0x47, 0xab, 0xd4, 0x44,
0xac, 0x2e, 0x89, 0x81, 0x85, 0xd5, 0x83, 0xbd, 0x2d, 0xb5, 0x43, 0xdd, 0xd7, 0x6c, 0x1b, 0xa7,
0x6d, 0x8f, 0xb7, 0x84, 0x33, 0x1a, 0x5e, 0x31, 0x76, 0x4b, 0x5d, 0x3b, 0x98, 0x38, 0xe3, 0x93,
0x28, 0xcc, 0x91, 0x30, 0x37, 0xb6, 0x06, 0xd2, 0xab, 0xdc, 0x9a, 0x14, 0xab, 0xb7, 0xd2, 0x90,
0xd6, 0x1f, 0x1c, 0xc1, 0x74, 0x2c, 0xc2, 0x08, 0x27, 0x68, 0x7a, 0xdd, 0xef, 0x6e, 0xb9, 0x59,
0xb0, 0x2f, 0x76, 0x36, 0xba, 0xd8, 0x55, 0x22, 0xba, 0x95, 0xd6, 0xfa, 0xa1, 0x69, 0xab, 0x95,
0x94, 0x1f, 0x61, 0x7f, 0x56, 0x34, 0xaa, 0x17, 0x78, 0xf8, 0xbb, 0xa0, 0x4e, 0x61, 0xad, 0xee,
0x51, 0x1c, 0x42, 0xa7, 0x07, 0x44, 0xd5, 0xa6, 0x16, 0x72, 0x1b, 0x05, 0x4e, 0xd4, 0xbf, 0x32,
0x7d, 0xec, 0x8d, 0x4b, 0x19, 0xd2, 0x32, 0x50, 0x3d, 0x1f, 0x2a, 0x51, 0xc9, 0x62, 0x22, 0x75,
0xb5, 0xde, 0x0d, 0x58, 0x2b, 0x3a, 0xf8, 0x0e, 0xfc, 0x43, 0x07, 0xc3, 0x60, 0x65, 0x83, 0x3d,
0xa9, 0x84, 0x02, 0x3a, 0x13, 0x85, 0x3e, 0x8d, 0x87, 0x04, 0xee, 0x58, 0x8d, 0x9a, 0xbc, 0xc0,
0xec, 0xdd, 0x92, 0xf3, 0x96, 0x03, 0x86, 0xbe, 0x51, 0xb8, 0x96, 0xd5, 0x38, 0xed, 0x03, 0x7b,
0x18, 0x77, 0x26, 0xaf, 0x15, 0x94, 0x60, 0x25, 0x1b, 0x3f, 0x57, 0xa7, 0xe4, 0xe6, 0x63, 0xf8,
0xe2, 0xca, 0x15, 0x3d, 0xa3, 0xee, 0xcb, 0xef, 0xb3, 0x23, 0x41, 0x54, 0xd4, 0xaa, 0x93, 0xb4,
0x48, 0xd3, 0x97, 0x7c, 0x39, 0x5e, 0x1d, 0x05, 0x93, 0x34, 0x70, 0xdf, 0xd6, 0xf0, 0x30, 0xc7,
}
)
// deriveKey derives a cryptographically strong key from password.
func deriveKey(password string) ([]byte, error) {
hkdf := hkdf.New(sha256.New, []byte(password), salt[:], hkdfInfo)
key := make([]byte, 32)
if _, err := io.ReadFull(hkdf, key); err != nil {
return nil, errors.Wrap(err, "Cannot derive key from password")
}
return key, nil
}
func encryptorCmd(opts *cliOptions) (err error) {
password := sha256.Sum256([]byte(*opts.EncryptPassword))
key, err := deriveKey(*opts.EncryptPassword)
if err != nil {
return errors.WithStack(err)
}
switch opts.Command {
case "decrypt":
@@ -22,19 +62,18 @@ func encryptorCmd(opts *cliOptions) (err error) {
*opts.DecryptOutFile = strings.TrimSuffix(filepath.Base(*opts.DecryptInFile), ".aes")
}
log.Infof("Decrypting file %q into %q", *opts.DecryptInFile, *opts.DecryptOutFile)
err = decrypt(*opts.DecryptInFile, *opts.DecryptOutFile, password)
err = decrypt(*opts.DecryptInFile, *opts.DecryptOutFile, key)
case "encrypt":
if *opts.EncryptOutFile == "" {
*opts.EncryptOutFile = filepath.Base(*opts.EncryptInFile) + ".aes"
}
log.Infof("Encrypting file %q into %q", *opts.EncryptInFile, *opts.EncryptOutFile)
err = encrypt(*opts.EncryptInFile, *opts.EncryptOutFile, password)
err = encrypt(*opts.EncryptInFile, *opts.EncryptOutFile, key)
}
return
}
func encrypt(infile, outfile string, pass [32]byte) error {
key := pass[:]
func encrypt(infile, outfile string, key []byte) error {
inFile, err := os.Open(infile)
if err != nil {
return errors.Wrapf(err, "Cannot open input file %q", infile)
@@ -64,8 +103,7 @@ func encrypt(infile, outfile string, pass [32]byte) error {
return nil
}
func decrypt(infile, outfile string, pass [32]byte) error {
key := pass[:]
func decrypt(infile, outfile string, key []byte) error {
inFile, err := os.Open(infile)
if err != nil {
return errors.Wrapf(err, "Cannot open %q for reading", infile)