mirror of
https://github.com/grafana/grafana.git
synced 2025-07-30 04:12:09 +08:00
722c414fef
* Encryption: Add support to encrypt/decrypt sjd * Add datasources.Service as a proxy to datasources db operations * Encrypt ds.SecureJsonData before calling SQLStore * Move ds cache code into ds service * Fix tlsmanager tests * Fix pluginproxy tests * Remove some securejsondata.GetEncryptedJsonData usages * Add pluginsettings.Service as a proxy for plugin settings db operations * Add AlertNotificationService as a proxy for alert notification db operations * Remove some securejsondata.GetEncryptedJsonData usages * Remove more securejsondata.GetEncryptedJsonData usages * Fix lint errors * Minor fixes * Remove encryption global functions usages from ngalert * Fix lint errors * Minor fixes * Minor fixes * Remove securejsondata.DecryptedValue usage * Refactor the refactor * Remove securejsondata.DecryptedValue usage * Move securejsondata to migrations package * Move securejsondata to migrations package * Minor fix * Fix integration test * Fix integration tests * Undo undesired changes * Fix tests * Add context.Context into encryption methods * Fix tests * Fix tests * Fix tests * Trigger CI * Fix test * Add names to params of encryption service interface * Remove bus from CacheServiceImpl * Add logging * Add keys to logger Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> * Add missing key to logger Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> * Undo changes in markdown files * Fix formatting * Add context to secrets service * Rename decryptSecureJsonData to decryptSecureJsonDataFn * Name args in GetDecryptedValueFn * Add template back to NewAlertmanagerNotifier * Copy GetDecryptedValueFn to ngalert * Add logging to pluginsettings * Fix pluginsettings test Co-authored-by: Tania B <yalyna.ts@gmail.com> Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
88 lines
2.2 KiB
Go
88 lines
2.2 KiB
Go
package util
|
|
|
|
import (
|
|
"crypto/aes"
|
|
"crypto/cipher"
|
|
"crypto/rand"
|
|
"crypto/sha256"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
|
|
"golang.org/x/crypto/pbkdf2"
|
|
)
|
|
|
|
const saltLength = 8
|
|
|
|
// Decrypt decrypts a payload with a given secret.
|
|
// Deprecated. Do not use it.
|
|
// Use encryption.Service instead.
|
|
func Decrypt(payload []byte, secret string) ([]byte, error) {
|
|
if len(payload) < saltLength {
|
|
return nil, fmt.Errorf("unable to compute salt")
|
|
}
|
|
salt := payload[:saltLength]
|
|
key, err := encryptionKeyToBytes(secret, string(salt))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
block, err := aes.NewCipher(key)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// The IV needs to be unique, but not secure. Therefore it's common to
|
|
// include it at the beginning of the ciphertext.
|
|
if len(payload) < aes.BlockSize {
|
|
return nil, errors.New("payload too short")
|
|
}
|
|
iv := payload[saltLength : saltLength+aes.BlockSize]
|
|
payload = payload[saltLength+aes.BlockSize:]
|
|
payloadDst := make([]byte, len(payload))
|
|
|
|
stream := cipher.NewCFBDecrypter(block, iv)
|
|
|
|
// XORKeyStream can work in-place if the two arguments are the same.
|
|
stream.XORKeyStream(payloadDst, payload)
|
|
return payloadDst, nil
|
|
}
|
|
|
|
// Encrypt encrypts a payload with a given secret.
|
|
// Deprecated. Do not use it.
|
|
// Use encryption.Service instead.
|
|
func Encrypt(payload []byte, secret string) ([]byte, error) {
|
|
salt, err := GetRandomString(saltLength)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
key, err := encryptionKeyToBytes(secret, salt)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
block, err := aes.NewCipher(key)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// The IV needs to be unique, but not secure. Therefore it's common to
|
|
// include it at the beginning of the ciphertext.
|
|
ciphertext := make([]byte, saltLength+aes.BlockSize+len(payload))
|
|
copy(ciphertext[:saltLength], salt)
|
|
iv := ciphertext[saltLength : saltLength+aes.BlockSize]
|
|
if _, err := io.ReadFull(rand.Reader, iv); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
stream := cipher.NewCFBEncrypter(block, iv)
|
|
stream.XORKeyStream(ciphertext[saltLength+aes.BlockSize:], payload)
|
|
|
|
return ciphertext, nil
|
|
}
|
|
|
|
// Key needs to be 32bytes
|
|
func encryptionKeyToBytes(secret, salt string) ([]byte, error) {
|
|
return pbkdf2.Key([]byte(secret), []byte(salt), 10000, 32, sha256.New), nil
|
|
}
|