mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-18 05:52:51 +00:00
01fe34a526
# Which Problems Are Solved Opaque tokens now use authenticated encryption. # How the Problems Are Solved - Upgrade zitadel/oidc to v3.47 - Copy crypto implementation for refresh and session tokens (internal to zitadel) - Added config that allows validating old tokens for gradual roll-out # Additional Changes - Set NX cache for `integration-test-build` to `false`, working on a seperate fix. # Additional Context - closes #11315 --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: muhlemmer <[email protected]>
227 lines
5.7 KiB
Go
227 lines
5.7 KiB
Go
package crypto
|
|
|
|
import (
|
|
"crypto/aes"
|
|
"crypto/cipher"
|
|
"crypto/rand"
|
|
"encoding/base64"
|
|
"errors"
|
|
"io"
|
|
"unicode/utf8"
|
|
|
|
"github.com/go-jose/go-jose/v4"
|
|
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
)
|
|
|
|
var _ EncryptionAlgorithm = (*AESCrypto)(nil)
|
|
|
|
type AESCrypto struct {
|
|
keys map[string]string
|
|
encryptionKeyID string
|
|
keyIDs []string
|
|
legacyToken bool
|
|
}
|
|
|
|
func NewAESCrypto(config *KeyConfig, keyStorage KeyStorage) (*AESCrypto, error) {
|
|
keys, ids, err := LoadKeys(config, keyStorage)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &AESCrypto{
|
|
keys: keys,
|
|
encryptionKeyID: config.EncryptionKeyID,
|
|
keyIDs: ids,
|
|
legacyToken: config.LegacyToken,
|
|
}, nil
|
|
}
|
|
|
|
func (a *AESCrypto) Algorithm() string {
|
|
return "aes"
|
|
}
|
|
|
|
func (a *AESCrypto) Encrypt(value []byte) ([]byte, error) {
|
|
return EncryptAES(value, a.encryptionKey())
|
|
}
|
|
|
|
func (a *AESCrypto) Decrypt(value []byte, keyID string) ([]byte, error) {
|
|
key, err := a.decryptionKey(keyID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return DecryptAES(value, key)
|
|
}
|
|
|
|
// DecryptString decrypts the value using the key identified by keyID.
|
|
// When the decrypted value contains non-UTF8 characters an error is returned.
|
|
func (a *AESCrypto) DecryptString(value []byte, keyID string) (string, error) {
|
|
b, err := a.Decrypt(value, keyID)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
if !utf8.Valid(b) {
|
|
return "", zerrors.ThrowPreconditionFailed(err, "CRYPT-hiCh0", "non-UTF-8 in decrypted string")
|
|
}
|
|
|
|
return string(b), nil
|
|
}
|
|
|
|
func (a *AESCrypto) EncryptionKeyID() string {
|
|
return a.encryptionKeyID
|
|
}
|
|
|
|
func (a *AESCrypto) DecryptionKeyIDs() []string {
|
|
return a.keyIDs
|
|
}
|
|
|
|
func (a *AESCrypto) EncryptToken(data string) (string, error) {
|
|
encrypter, err := jose.NewEncrypter(jose.A256GCM, jose.Recipient{
|
|
Algorithm: jose.A256GCMKW,
|
|
Key: a.encryptionKey(),
|
|
KeyID: a.encryptionKeyID,
|
|
}, nil)
|
|
if err != nil {
|
|
return "", zerrors.ThrowInternal(err, "CRYPTO-Woox2", "Errors.Internal")
|
|
}
|
|
|
|
encrypted, err := encrypter.Encrypt([]byte(data))
|
|
if err != nil {
|
|
return "", zerrors.ThrowInternal(err, "CRYPTO-Woox3", "Errors.Internal")
|
|
}
|
|
|
|
serialized, err := encrypted.CompactSerialize()
|
|
if err != nil {
|
|
return "", zerrors.ThrowInternal(err, "CRYPT-Woox4", "Errors.Internal")
|
|
}
|
|
return serialized, nil
|
|
}
|
|
|
|
func (a *AESCrypto) DecryptToken(value string) (string, error) {
|
|
key, err := a.decryptionKey(a.encryptionKeyID)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
decrypted, err := a.decryptA256GCM(value, key)
|
|
if err == nil {
|
|
return decrypted, nil
|
|
}
|
|
if !a.legacyToken {
|
|
return "", err
|
|
}
|
|
decrypted, err2 := a.decryptLegacyToken(value, key)
|
|
if err2 != nil {
|
|
return "", errors.Join(err, err2)
|
|
}
|
|
return decrypted, nil
|
|
}
|
|
|
|
func (a *AESCrypto) LegacyTokenEnabled() bool {
|
|
return a.legacyToken
|
|
}
|
|
|
|
func (a *AESCrypto) decryptA256GCM(value string, key string) (string, error) {
|
|
jwe, err := jose.ParseEncrypted(value, []jose.KeyAlgorithm{jose.A256GCMKW}, []jose.ContentEncryption{jose.A256GCM})
|
|
if err != nil {
|
|
return "", zerrors.ThrowPreconditionFailed(err, "CRYPT-ha6Oh", "malformed encrypted value")
|
|
}
|
|
decrypted, err := jwe.Decrypt(key)
|
|
if err != nil {
|
|
return "", zerrors.ThrowUnauthenticated(err, "CRYPT-OhN2u", "failed to decrypt value")
|
|
}
|
|
if !utf8.Valid(decrypted) {
|
|
return "", zerrors.ThrowPreconditionFailed(err, "CRYPT-Koh1u", "non-UTF-8 in decrypted string")
|
|
}
|
|
return string(decrypted), nil
|
|
}
|
|
|
|
func (a *AESCrypto) decryptLegacyToken(value string, key string) (string, error) {
|
|
text, err := base64.RawURLEncoding.DecodeString(value)
|
|
if err != nil {
|
|
return "", zerrors.ThrowPreconditionFailed(err, "CRYPT-Eep6o", "malformed encrypted value")
|
|
}
|
|
decrypted, err := DecryptAES(text, key)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
if !utf8.Valid(decrypted) {
|
|
return "", zerrors.ThrowPreconditionFailed(err, "CRYPT-ohGh6", "non-UTF-8 in decrypted string")
|
|
}
|
|
return string(decrypted), nil
|
|
}
|
|
|
|
func (a *AESCrypto) encryptionKey() string {
|
|
return a.keys[a.encryptionKeyID]
|
|
}
|
|
|
|
func (a *AESCrypto) decryptionKey(keyID string) (string, error) {
|
|
key, ok := a.keys[keyID]
|
|
if !ok {
|
|
return "", zerrors.ThrowNotFound(nil, "CRYPT-nkj1s", "unknown key id")
|
|
}
|
|
return key, nil
|
|
}
|
|
|
|
func EncryptAESString(data string, key string) (string, error) {
|
|
encrypted, err := EncryptAES([]byte(data), key)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return base64.URLEncoding.EncodeToString(encrypted), nil
|
|
}
|
|
|
|
func EncryptAES(plainText []byte, key string) ([]byte, error) {
|
|
block, err := aes.NewCipher([]byte(key))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
maxSize := 64 * 1024 * 1024
|
|
if len(plainText) > maxSize {
|
|
return nil, zerrors.ThrowPreconditionFailedf(nil, "CRYPT-AGg4t3", "data too large, max bytes: %v", maxSize)
|
|
}
|
|
cipherText := make([]byte, aes.BlockSize+len(plainText))
|
|
iv := cipherText[:aes.BlockSize]
|
|
if _, err = io.ReadFull(rand.Reader, iv); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
stream := cipher.NewCFBEncrypter(block, iv)
|
|
stream.XORKeyStream(cipherText[aes.BlockSize:], plainText)
|
|
|
|
return cipherText, nil
|
|
}
|
|
|
|
func DecryptAESString(data string, key string) (string, error) {
|
|
text, err := base64.URLEncoding.DecodeString(data)
|
|
if err != nil {
|
|
return "", nil
|
|
}
|
|
decrypted, err := DecryptAES(text, key)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return string(decrypted), nil
|
|
}
|
|
|
|
func DecryptAES(text []byte, key string) ([]byte, error) {
|
|
cipherText := make([]byte, len(text))
|
|
copy(cipherText, text)
|
|
|
|
block, err := aes.NewCipher([]byte(key))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if len(cipherText) < aes.BlockSize {
|
|
err = zerrors.ThrowPreconditionFailed(nil, "CRYPT-23kH1", "cipher text block too short")
|
|
return nil, err
|
|
}
|
|
iv := cipherText[:aes.BlockSize]
|
|
cipherText = cipherText[aes.BlockSize:]
|
|
|
|
stream := cipher.NewCFBDecrypter(block, iv)
|
|
stream.XORKeyStream(cipherText, cipherText)
|
|
|
|
return cipherText, err
|
|
}
|