opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-02 16:42:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Chore: additional check when decrypting values (#34637)

Browse Source 
* Chore: additional check when decrypting values

* Apply suggestions from code review
This commit is contained in:
Sofia Papagiannaki
2021-05-25 18:35:54 +03:00
committed by GitHub
parent ab26c4dfa4
commit a5082ab112
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/util/encryption.go
View File

@ -6,6 +6,7 @@ import (
"crypto/rand"
"crypto/sha256"
"errors"
"fmt"
"io"
"golang.org/x/crypto/pbkdf2"
@ -15,6 +16,9 @@ const saltLength = 8
// Decrypt decrypts a payload with a given secret.
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 {